11 Jan, 2012

1 commit

  • MTD pull for 3.3

    * tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits)
    mtd: Fix dependency for MTD_DOC200x
    mtd: do not use mtd->block_markbad directly
    logfs: do not use 'mtd->block_isbad' directly
    mtd: introduce mtd_can_have_bb helper
    mtd: do not use mtd->suspend and mtd->resume directly
    mtd: do not use mtd->lock, unlock and is_locked directly
    mtd: do not use mtd->sync directly
    mtd: harmonize mtd_writev usage
    mtd: do not use mtd->lock_user_prot_reg directly
    mtd: mtd->write_user_prot_reg directly
    mtd: do not use mtd->read_*_prot_reg directly
    mtd: do not use mtd->get_*_prot_info directly
    mtd: do not use mtd->read_oob directly
    mtd: mtdoops: do not use mtd->panic_write directly
    romfs: do not use mtd->get_unmapped_area directly
    mtd: do not use mtd->get_unmapped_area directly
    mtd: do use mtd->point directly
    mtd: introduce mtd_has_oob helper
    mtd: mtdcore: export symbols cleanup
    mtd: clean-up the default_mtd_writev function
    ...

    Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c

    Linus Torvalds
     

10 Jan, 2012

1 commit


05 Jan, 2012

1 commit

  • Rather than using DaVinci specific davinci_soc_info based
    restart hook, use the restart hook available in the machine
    descriptor instead.

    Tested on DM365 and AM18x EVMs.

    v2:
    Changed to use restart hook in machine descriptor
    per Russell's comment.

    Signed-off-by: Sekhar Nori
    Signed-off-by: Russell King

    Sekhar Nori
     

05 Dec, 2011

1 commit

  • On OMAP-L138 platform, EDMA event queue 0 should be used for audio
    transfers so that they are not starved by video data moving on event queue 1.

    Commit 48519f0ae03bc7e86b3dc93e56f1334d53803770 (ASoC: davinci: let platform
    data define edma queue numbers) had a side-effect of changing this behavior
    by making the driver actually honor the platform data passed.

    Fix this now by passing event queue 0 as the queue to be used for audio
    transfers.

    Signed-off-by: Manjunathappa, Prakash
    Signed-off-by: Sekhar Nori
    Cc: # v2.6.36.x and above

    Manjunathappa, Prakash
     

08 Nov, 2011

1 commit

  • * git://git.infradead.org/mtd-2.6: (226 commits)
    mtd: tests: annotate as DANGEROUS in Kconfig
    mtd: tests: don't use mtd0 as a default
    mtd: clean up usage of MTD_DOCPROBE_ADDRESS
    jffs2: add compr=lzo and compr=zlib options
    jffs2: implement mount option parsing and compression overriding
    mtd: nand: initialize ops.mode
    mtd: provide an alias for the redboot module name
    mtd: m25p80: don't probe device which has status of 'disabled'
    mtd: nand_h1900 never worked
    mtd: Add DiskOnChip G3 support
    mtd: m25p80: add EON flash EN25Q32B into spi flash id table
    mtd: mark block device queue as non-rotational
    mtd: r852: make r852_pm_ops static
    mtd: m25p80: add support for at25df321a spi data flash
    mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks
    mtd: nand: switch `check_pattern()' to standard `memcmp()'
    mtd: nand: invalidate cache on unaligned reads
    mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set
    mtd: nand: wait to set BBT version
    mtd: nand: scrub BBT on ECC errors
    ...

    Fix up trivial conflicts:
    - arch/arm/mach-at91/board-usb-a9260.c
    Merged into board-usb-a926x.c
    - drivers/mtd/maps/lantiq-flash.c
    add_mtd_partitions -> mtd_device_register vs changed to use
    mtd_device_parse_register.

    Linus Torvalds
     

02 Nov, 2011

1 commit

  • * 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits)
    ARM: tegra: update defconfig
    arm/tegra: Harmony: Configure PMC for low-level interrupts
    arm/tegra: device tree support for ventana board
    arm/tegra: add support for ventana pinmuxing
    arm/tegra: prepare Seaboard pinmux code for derived boards
    arm/tegra: pinmux: ioremap registers
    gpio/tegra: Convert to a platform device
    arm/tegra: Convert pinmux driver to a platform device
    arm/dt: Tegra: Add pinmux node to tegra20.dtsi
    arm/tegra: Prep boards for gpio/pinmux conversion to pdevs
    ARM: mx5: fix clock usage for suspend
    ARM i.MX entry-macro.S: remove now unused code
    ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
    ARM i.MX tzic: add handle_irq function
    ARM i.MX avic: add handle_irq function
    ARM: mx25: Add the missing IIM base definition
    ARM i.MX avic: convert to use generic irq chip
    mx31moboard: Add poweroff support
    ARM: mach-qong: Add watchdog support
    ARM: davinci: AM18x: Add wl1271/wlan support
    ...

    Fix up conflicts in:
    arch/arm/mach-at91/at91sam9g45.c
    arch/arm/mach-mx5/devices-imx53.h
    arch/arm/plat-mxc/include/mach/memory.h

    Linus Torvalds
     

21 Sep, 2011

1 commit


17 Sep, 2011

1 commit

  • The wl1271 daughter card for AM18x EVMs is a combo wireless connectivity
    add-on card, based on the LS Research TiWi module with Texas
    Instruments' wl1271 solution.
    It is a 4-wire, 1.8V, embedded SDIO WLAN device with an external IRQ
    line and is power-controlled by a GPIO-based fixed regulator.

    Add support for the WLAN capabilities of this expansion board.

    Signed-off-by: Ido Yariv
    Signed-off-by: Sekhar Nori

    Ido Yariv
     

11 Sep, 2011

2 commits

  • Recall the recently added prefix requirements:
    * "NAND_" for flags in nand.h, used in nand_chip.options
    * "NAND_BBT_" for flags in bbm.h, used in nand_chip.bbt_options
    or in nand_bbt_descr.options

    Thus, I am changing NAND_USE_FLASH_BBT to NAND_BBT_USE_FLASH.

    Again, this flag is found in bbm.h and so should NOT be used in the
    "nand_chip.options" field.

    Signed-off-by: Brian Norris
    Signed-off-by: Artem Bityutskiy

    Brian Norris
     
  • This patch works with the following three flags from two headers (nand.h
    and bbm.h):
    (1) NAND_USE_FLASH_BBT (nand.h)
    (2) NAND_USE_FLASH_BBT_NO_OOB (nand.h)
    (3) NAND_BBT_NO_OOB (bbm.h)

    These flags are all related and interdependent, yet they were in
    different headers. Flag (2) is simply the combination of (1) and (3) and
    can be eliminated.

    This patch accomplishes the following:
    * eliminate NAND_USE_FLASH_BBT_NO_OOB (i.e., flag (2))
    * move NAND_USE_FLASH_BBT (i.e., flag (1)) to bbm.h

    It's important to note that because (1) and (3) are now both found in
    bbm.h, they should NOT be used in the "nand_chip.options" field.

    I removed a small section from the mtdnand DocBook because it referes to
    NAND_USE_FLASH_BBT in nand.h, which has been moved to bbm.h.

    Signed-off-by: Brian Norris
    Signed-off-by: Artem Bityutskiy

    Brian Norris
     

07 Sep, 2011

1 commit

  • DA850/OMAP-L138 EMAC driver uses random mac address instead of
    a fixed one because the mac address is not stuffed into EMAC
    platform data.

    This patch provides a function which reads the mac address
    stored in SPI flash (registered as MTD device) and populates the
    EMAC platform data. The function which reads the mac address is
    registered as a callback which gets called upon addition of MTD
    device.

    NOTE: In case the MAC address stored in SPI flash is erased, follow
    the instructions at [1] to restore it.

    [1] http://processors.wiki.ti.com/index.php/GSG:_OMAP-L138_DVEVM_Additional_Procedures#Restoring_MAC_address_on_SPI_Flash

    Modifications in v2:
    Guarded registering the mtd_notifier only when MTD is enabled.
    Earlier this was handled using mtd_has_partitions() call, but
    this has been removed in Linux v3.0.

    Modifications in v3:
    a. Guarded da850_evm_m25p80_notify_add() function and
    da850evm_spi_notifier structure with CONFIG_MTD macros.
    b. Renamed da850_evm_register_mtd_user() function to
    da850_evm_setup_mac_addr() and removed the struct mtd_notifier
    argument to this function.
    c. Passed the da850evm_spi_notifier structure to register_mtd_user()
    function.

    Modifications in v4:
    Moved the da850_evm_setup_mac_addr() function within the first
    CONFIG_MTD ifdef construct.

    Signed-off-by: Rajashekhara, Sudhakar
    Signed-off-by: Sekhar Nori
    Cc: stable@kernel.org

    Rajashekhara, Sudhakar
     

22 Aug, 2011

1 commit


27 Jul, 2011

1 commit

  • * 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
    ARM: S5P64X0: External Interrupt Support
    ARM: EXYNOS4: Enable MFC on Samsung NURI
    ARM: EXYNOS4: Enable MFC on universal_c210
    ARM: S5PV210: Enable MFC on Goni
    ARM: S5P: Add support for MFC device
    ARM: EXYNOS4: Add support FIMD on SMDKC210
    ARM: EXYNOS4: Add platform device and helper functions for FIMD
    ARM: EXYNOS4: Add resource definition for FIMD
    ARM: EXYNOS4: Change devname for FIMD clkdev
    ARM: SAMSUNG: Add IRQ_I2S0 definition
    ARM: SAMSUNG: Add platform device for idma
    ARM: EXYNOS4: Add more registers to be saved and restored for PM
    ARM: EXYNOS4: Add more register addresses of CMU
    ARM: EXYNOS4: Add platform device for dwmci driver
    ARM: EXYNOS4: configure rtc-s3c on NURI
    ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
    ARM: EXYNOS4: configure ADC on NURI
    ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
    ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
    ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
    ...

    Fix up tons of silly conflicts:
    - arch/arm/mach-davinci/include/mach/psc.h
    - arch/arm/mach-exynos4/Kconfig
    - arch/arm/mach-exynos4/mach-smdkc210.c
    - arch/arm/mach-exynos4/pm.c
    - arch/arm/mach-imx/mm-imx1.c
    - arch/arm/mach-imx/mm-imx21.c
    - arch/arm/mach-imx/mm-imx25.c
    - arch/arm/mach-imx/mm-imx27.c
    - arch/arm/mach-imx/mm-imx31.c
    - arch/arm/mach-imx/mm-imx35.c
    - arch/arm/mach-mx5/mm.c
    - arch/arm/mach-s5pv210/mach-goni.c
    - arch/arm/mm/Kconfig

    Linus Torvalds
     

19 Jul, 2011

1 commit


08 Jul, 2011

1 commit


12 Mar, 2011

2 commits

  • Commit 75e2ea643fe43d5aa836475acee5bd97cd9ea4bf (davinci: DA850/OMAP-L138 EVM
    expander setup and UI card detection) introduced a useless variable: it's
    always set to 1 before it's checked in da850_evm_setup_nor_nand()...

    Signed-off-by: Sergei Shtylyov
    Acked-by: Sekhar Nori
    Signed-off-by: Kevin Hilman

    Sergei Shtylyov
     
  • This patch adds the on-board SPI flash device to the
    DA850/OMAP-L138/AM18x EVM. It also registers the SPI flash
    device to the MTD subsystem.

    Based on SPI flash device support for MityDSP-L138F platform.

    Signed-off-by: Sekhar Nori
    [michael.williamson@criticallink.com: moved da850_evm_spi1_pdata to devices-da8xx.c]
    [michael.williamson@criticallink.com: moved da850evm_init_spi1 to devices-da8xx.c]
    Signed-off-by: Michael Williamson
    Signed-off-by: Kevin Hilman

    Sekhar Nori
     

01 Mar, 2011

2 commits


23 Dec, 2010

4 commits

  • Apart from the regular AM18x/DA850/OMAP-L138 SoC operating
    at 300MHz, these SoCs have variants that can operate at a
    maximum of 456MHz. Variants at 408Mhz and 375 Mhz are available
    as well.

    Not all silicon is qualified to run at higher speeds and
    unfortunately the maximum speed the chip can support can only
    be determined from the label on the package (not software
    readable).

    The EVM hardware for all these variants is the same (except
    for the actual SoC populated).

    U-Boot on the EVM sets up ATAG_REVISION to inform the OS
    regarding the speed grade supported by the silicon. We use
    this information to pass on the speed grade information to
    the SoC code.

    Signed-off-by: Sekhar Nori
    Signed-off-by: Kevin Hilman

    Sekhar Nori
     
  • This patch adds a pca953x platform device for the tca6416 found on the evm
    baseboard. The tca6416 is a GPIO expander, also found on the UI board at a
    separate I2C address. The pins of the baseboard IO expander are connected to
    software reset, deep sleep enable, test points, a push button, DIP switches and
    LEDs.

    Add support for the push button, DIP switches and LEDs and test points (as
    free GPIOs). The reset and deep sleep enable connections are reserved by the
    setup routine so that userspace can't toggle those lines.

    The existing tca6416-keypad driver was not employed because there was no
    apararent way to register the LEDs connected to gpio's on the tca6416 while
    simultaneously registering the tca6416-keypad instance.

    Signed-off-by: Ben Gardiner
    Reviewed-by: Chris Cordahi
    CC: Govindarajan, Sriramakrishnan
    Reviewed-by: Sekhar Nori
    Reviewed-by: Dmitry Torokhov
    CC: Gabor Juhos
    Signed-off-by: Kevin Hilman

    Ben Gardiner
     
  • The setup and teardown methods of the UI expander reference the SEL_{A,B,C}
    pins by 'magic number' in each function. This uses the common enum for their offsets
    in the expander setup and teardown functions.

    Signed-off-by: Ben Gardiner
    Reviewed-by: Chris Cordahi
    Reviewed-by: Sekhar Nori
    Signed-off-by: Sekhar Nori
    CC: Victor Rodriguez
    Signed-off-by: Kevin Hilman

    Ben Gardiner
     
  • This patch adds EV_KEYs for each of the 8 pushbuttons on the UI board via a
    gpio-key device.

    The expander is a tca6416; it controls the SEL_{A,B,C} lines which enable and
    disable the peripherals found on the UI board in addition to the 8 pushbuttons
    mentioned above. The reason the existing tca6416-keypad driver is not employed
    is because there was no aparent way to keep the gpio lines used as
    SEL_{A,B,C} registered while simultaneously registering the pushbuttons as a
    tca6416-keypad instance.

    Some experimentation with the polling interval was performed; we were searching
    for the largest polling interval that did not affect the feel of the
    responsiveness of the buttons. It is very subjective but 200ms seems to be a
    good value that accepts firm pushes but rejects very light ones. The key values
    assigned to the buttons were arbitrarily chosen to be F1-F8.

    Signed-off-by: Ben Gardiner
    Reviewed-by: Chris Cordahi
    CC: Govindarajan, Sriramakrishnan
    Reviewed-by: Sekhar Nori
    Signed-off-by: Sekhar Nori
    CC: Kevin Hilman
    CC: Gabor Juhos
    Signed-off-by: Kevin Hilman

    Ben Gardiner
     

10 Dec, 2010

2 commits

  • There was a single case of 'da850evm' prefix in the board-da850-evm.c file
    where the reset of the prefixes were 'da850_evm'; change it to 'da850_evm' for
    consistency.

    Signed-off-by: Ben Gardiner
    Acked-by: Sekhar Nori
    Signed-off-by: Kevin Hilman

    Ben Gardiner
     
  • When the RMII PHY on the UI board is enabled with CONFIG_DA850_UI_RMII
    then then following will be printed to the console when warnings are
    also enabled:

    WARNING: at drivers/gpio/gpiolib.c:1567 __gpio_set_value+0x4c/0x5c()
    Modules linked in:
    [] (unwind_backtrace+0x0/0xf8) from [] (warn_slowpath_common+0x4c/0x64)
    [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_null+0x1c/0x24)
    [] (warn_slowpath_null+0x1c/0x24) from [] (__gpio_set_value+0x4c/0x5c)
    [] (__gpio_set_value+0x4c/0x5c) from [] (da850_evm_ui_expander_setup+0x1e4/0x2
    44)
    [] (da850_evm_ui_expander_setup+0x1e4/0x244) from [] (pca953x_probe+0x1f8/0x29
    0)

    Traced the WARN_ON to the gpio_set_value(rmii_sel,0) call in
    da850_evm_setup_emac_rmii. Replacing the call with the _cansleep variant
    results in no more warning. Also replacing the gpio_set_value calls in the
    teardown function.

    Signed-off-by: Ben Gardiner
    Reviewed-by: Chris Cordahi
    Signed-off-by: Kevin Hilman

    Ben Gardiner
     

22 Oct, 2010

1 commit


20 Oct, 2010

1 commit

  • Since we're now using addruart to establish the debug mapping, we can
    remove the io_pg_offst and phys_io members of struct machine_desc.

    The various declarations were removed using the following script:

    grep -rl MACHINE_START arch/arm | xargs \
    sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }'

    [ Initial patch was from Jeremy Kerr, example script from Russell King ]

    Signed-off-by: Nicolas Pitre
    Acked-by: Eric Miao

    Nicolas Pitre
     

04 Oct, 2010

1 commit


24 Sep, 2010

8 commits

  • This patch removes davinci architecture code that has now been rendered
    useless by the previous patches in the MDIO separation series.

    In addition, the earlier phy_mask definitions have been replaced with
    corresponding phy_id definitions.

    Signed-off-by: Cyril Chemparathy
    Tested-by: Michael Williamson
    Tested-by: Caglar Akyuz
    Signed-off-by: Kevin Hilman

    Cyril Chemparathy
     
  • This patch adds machine checks in the serial console init routines
    for the DA8XX EVM boards. This is needed because there are other
    DA8XX based machines that use a different UART/tty as the console
    and may be included in a common kernel build.

    Signed-off-by: Michael Williamson
    Signed-off-by: Kevin Hilman

    Michael Williamson
     
  • Setup the NAND flash timings for DA850 EVM

    Before configuring the timing values, throughput calculation
    using dd command yielded 469 kB/s write and 966 kB/s read speed.

    After the timing configuration, the throughput was measured to
    be 2.4 MB/s write and 5 MB/s read.

    [Mukul Bhatnagar: actual calculation of timing values from the
    NAND datasheet]

    Signed-off-by: Sekhar Nori
    Cc: Mukul Bhatnagar
    Acked-by: Kevin Hilman
    Signed-off-by: Kevin Hilman

    Sekhar Nori
     
  • The CPGMAC pin list in da850.c was incorrectly split into two MII/RMII mode
    specific pin lists, while what pin group is used is a function of how the board
    is wired. Copy the pin lists to board-da850-evm.c, renaming them accordingly,
    and merge the two lists in da850.c into one, da850_cpgmac_pins[], representing
    the CPGMAC module as a whole...

    Signed-off-by: Sergei Shtylyov
    Tested-by: Ben Gardiner
    Signed-off-by: Kevin Hilman

    Sergei Shtylyov
     
  • The NAND/NOR flash pin lists (da850_nand_pins/da850_nor_pins) are purely board
    specific and as such shouldn't be in da850.c -- copy them to board-da850-evm.c,
    renaming to da850_evm_nand_pins/da850_evm_nor_pins respectively, and merge the
    two lists in da850.c into one, representing the EMIF 2.5 module as a whole,
    just like we have it in da830.c...

    While at it, remove the '__init' modifier from da850_evm_setup_nor_nand() as
    this function is called from non '__init' code...

    Signed-off-by: Sergei Shtylyov
    Tested-by: Ben Gardiner
    Signed-off-by: Kevin Hilman

    Sergei Shtylyov
     
  • Keep PLL0 SYSCLK3 at a constant rate of 100MHz. This enables the AEMIF
    timing to remain valid even as the PLL0 output is changed by cpufreq
    driver to save power.

    Signed-off-by: Sekhar Nori
    Signed-off-by: Kevin Hilman

    Sekhar Nori
     
  • The Sitara AM17x SoCs from TI are an OMAP-L137 pin-to-pin
    compatible ARM9 microprocessor offering from TI.

    The Sitara AM18x SoCs from TI are an OMAP-L138 pin-to-pin
    compatible ARM9 microprocessor offering from TI.

    More information about these processors available at:
    www.ti.com/am1x

    Because of their compatibiliy with OMAP-L1x, the kernel
    support for OMAP-L1x is fully relevant to AM1x processors.

    This patch updates the Kconfig prompt and help text to include
    the AM1x part names to help users select configurations required
    for these parts easily.

    Also, the hardware information that shows up in /proc/cpuinfo
    is updated to show applicability of the respective OMAP-L1x EVMs
    for AM1x parts.

    Signed-off-by: Sekhar Nori
    Signed-off-by: Kevin Hilman

    Sekhar Nori
     
  • Without this cleanup, sparse checker reports warnings of the type:

    CHECK arch/arm/mach-davinci/board-da850-evm.c
    arch/arm/mach-davinci/board-da850-evm.c:112:22: warning: symbol 'da850_evm_nandflash_partition' was not declared. Should it be static?

    The nand flash partitions and regulator supplies are used within
    the EVM file and so should have been static

    This patch has been boot tested on DA830 and DA850 EVMs.

    Signed-off-by: Sekhar Nori
    Signed-off-by: Kevin Hilman

    Sekhar Nori
     

09 Aug, 2010

1 commit

  • …t/khilman/linux-davinci

    * 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci:
    davinci: dm646x EVM: Specify reserved EDMA channel/slots
    davinci: da8xx/omapl EVM: Specify reserved channels/slots
    davinci: support for EDMA resource sharing
    davinci: edma: provide ability to detect insufficient CC info data
    davinci: da8xx: sparse cleanup: remove duplicate entries in irq priorities
    davinci: DM365: fixed second serial port
    Davinci: tnetv107x evm board initial support
    Davinci: tnetv107x initial gpio support
    Davinci: tnetv107x soc support
    Davinci: tnetv107x decompresser uart definitions
    Davinci: generalized debug macros

    Linus Torvalds
     

06 Aug, 2010

1 commit


05 Aug, 2010

1 commit


28 Jul, 2010

1 commit