22 Feb, 2013

4 commits

  • Pull ARM SoC board specific changes from Arnd Bergmann:
    "These updates are all for board specific code, including

    - defconfig updates for shmobile, davinci, bcm2835, imx, omap and
    tegra

    - SD/MMC and I2C support on bcm2835 (Raspberry PI)

    - minor updates for PXA

    - shmobile updates to GPIO usage in board files

    - More things in OMAP board files are moved over to device tree
    probing

    - Better support for audio devices on some OMAP platforms"

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (55 commits)
    ARM: imx_v4_v5_defconfig: Add VPU support
    ARM: imx: configs: enable netfilter support
    ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
    ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
    RX-51: Register twl4030-madc device
    RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
    ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
    ARM: OMAP1: nokia770: enable CBUS/Retu
    ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
    ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
    ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
    ARM: OMAP2+: craneboard: support the TPS65910 PMU
    ARM: OMAP2+: craneboard: support NAND device
    ARM: OMAP3: cm-t3517: add MMC support
    ARM: OMAP2+: Remove apollon board support
    ARM: shmobile: armadillo800eva: set clock rates before timer init
    ARM: tegra: defconfig updates
    ARM: shmobile: mackerel: Use gpio_request_one()
    ARM: shmobile: kzm9g: Use gpio_request_one()
    ARM: shmobile: bonito: Use gpio_request_one()
    ...

    Linus Torvalds
     
  • Pull ARM SoC-specific updates from Arnd Bergmann:
    "This is a larger set of new functionality for the existing SoC
    families, including:

    - vt8500 gains support for new CPU cores, notably the Cortex-A9 based
    wm8850

    - prima2 gains support for the "marco" SoC family, its SMP based
    cousin

    - tegra gains support for the new Tegra4 (Tegra114) family

    - socfpga now supports a newer version of the hardware including SMP

    - i.mx31 and bcm2835 are now using DT probing for their clocks

    - lots of updates for sh-mobile

    - OMAP updates for clocks, power management and USB

    - i.mx6q and tegra now support cpuidle

    - kirkwood now supports PCIe hot plugging

    - tegra clock support is updated

    - tegra USB PHY probing gets implemented diffently"

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits)
    ARM: prima2: remove duplicate v7_invalidate_l1
    ARM: shmobile: r8a7779: Correct TMU clock support again
    ARM: prima2: fix __init section for cpu hotplug
    ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3)
    ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3)
    arm: socfpga: Add SMP support for actual socfpga harware
    arm: Add v7_invalidate_l1 to cache-v7.S
    arm: socfpga: Add entries to enable make dtbs socfpga
    arm: socfpga: Add new device tree source for actual socfpga HW
    ARM: tegra: sort Kconfig selects for Tegra114
    ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
    ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
    ARM: tegra: Fix build error for gic update
    ARM: tegra: remove empty tegra_smp_init_cpus()
    ARM: shmobile: Register ARM architected timer
    ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
    ARM: shmobile: r8a7779: Correct TMU clock support
    ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
    ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
    ARM: mxs: use apbx bus clock to drive the timers on timrotv2
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups from Arnd Bergmann:
    "A large number of cleanups, all over the platforms. This is dominated
    largely by the Samsung platforms (s3c, s5p, exynos) and a few of the
    others moving code out of arch/arm into more appropriate subsystems.

    The clocksource and irqchip drivers are now abstracted to the point
    where platforms that are already cleaned up do not need to even
    specify the driver they use, it can all get configured from the device
    tree as we do for normal device drivers. The clocksource changes
    basically touch every single platform in the process.

    We further clean up the use of platform specific header files here,
    with the goal of turning more of the platforms over to being
    "multiplatform" enabled, which implies that they cannot expose their
    headers to architecture independent code any more.

    It is expected that no functional changes are part of the cleanup.
    The overall reduction in total code lines is mostly the result of
    removing broken and obsolete code."

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits)
    ARM: mvebu: correct gated clock documentation
    ARM: kirkwood: add missing include for nsa310
    ARM: exynos: move exynos4210-combiner to drivers/irqchip
    mfd: db8500-prcmu: update resource passing
    drivers/db8500-cpufreq: delete dangling include
    ARM: at91: remove NEOCORE 926 board
    sunxi: Cleanup the reset code and add meaningful registers defines
    ARM: S3C24XX: header mach/regs-mem.h local
    ARM: S3C24XX: header mach/regs-power.h local
    ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
    ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
    ARM: S3C24XX: transform s3c2443 subirqs into new structure
    ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs
    ARM: S3C24XX: move s3c2443 irq code to irq.c
    ARM: S3C24XX: transform s3c2416 irqs into new structure
    ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs
    ARM: S3C24XX: move s3c2416 irq init to common irq code
    ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property
    ARM: S3C24XX: Move irq syscore-ops to irq-pm
    clocksource: always define CLOCKSOURCE_OF_DECLARE
    ...

    Linus Torvalds
     
  • Pull USB patches from Greg Kroah-Hartman:
    "Here's the big USB merge for 3.9-rc1

    Nothing major, lots of gadget fixes, and of course, xhci stuff.

    All of this has been in linux-next for a while, with the exception of
    the last 3 patches, which were reverts of patches in the tree that
    caused problems, they went in yesterday."

    * tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (190 commits)
    Revert "USB: EHCI: make ehci-vt8500 a separate driver"
    Revert "USB: EHCI: make ehci-orion a separate driver"
    Revert "USB: update host controller Kconfig entries"
    USB: update host controller Kconfig entries
    USB: EHCI: make ehci-orion a separate driver
    USB: EHCI: make ehci-vt8500 a separate driver
    USB: usb-storage: unusual_devs update for Super TOP SATA bridge
    USB: ehci-omap: Fix autoloading of module
    USB: ehci-omap: Don't free gpios that we didn't request
    USB: option: add Huawei "ACM" devices using protocol = vendor
    USB: serial: fix null-pointer dereferences on disconnect
    USB: option: add Yota / Megafon M100-1 4g modem
    drivers/usb: add missing GENERIC_HARDIRQS dependencies
    USB: storage: properly handle the endian issues of idProduct
    testusb: remove all mentions of 'usbfs'
    usb: gadget: imx_udc: make it depend on BROKEN
    usb: omap_control_usb: fix compile warning
    ARM: OMAP: USB: Add phy binding information
    ARM: OMAP2: MUSB: Specify omap4 has mailbox
    ARM: OMAP: devices: create device for usb part of control module
    ...

    Linus Torvalds
     

20 Feb, 2013

1 commit

  • …l/git/tmlind/linux-omap into next/soc

    These changes contain the OMAP USB related platform data changes
    that were dropped from linux next because of the merge conflicts
    as requested by me and Olof. The reason was that at this point
    we really should be able to do the arch/arm related changes
    separately from driver changes to avoid dependencies between
    branches.

    These patches were initially part of the USB related MFD patches.
    Based on our comments, Roger Quadros quickly reworked these
    patches into a shared branch between ARM SoC tree and the MFD
    tree, then separate patches for the OMAP platform data and
    MFD driver.

    Note that this branch will conflict with c1d1cd597fc7
    ("ARM: OMAP2+: omap_device: remove obsolete pm_lats and
    early_device code"). Please see http://lkml.org/lkml/2013/2/11/16
    for the merge resolution.

    [arnd - resolved the merge conflict]

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>

    Arnd Bergmann
     

14 Feb, 2013

1 commit

  • Let's have a single platform data structure for the OMAP's High-Speed
    USB host subsystem instead of having 3 separate ones i.e. one for
    board data, one for USB Host (UHH) module and one for USB-TLL module.

    This makes the code much simpler and avoids creating multiple copies of
    platform data.

    Signed-off-by: Roger Quadros
    Reviewed-by: Felipe Balbi

    Roger Quadros
     

08 Feb, 2013

1 commit

  • The platform data is used not only by wlcore-based drivers, but also
    by wl1251. Move it up in the directory hierarchy to reflect this.

    Additionally, make it truly optional. At the moment, disabling
    platform data while wl1251_sdio or wlcore_sdio are enabled doesn't
    work, but it will be necessary when device tree support is
    implemented.

    Signed-off-by: Luciano Coelho
    Reviewed-by: Felipe Balbi

    Luciano Coelho
     

07 Feb, 2013

1 commit

  • This is w.r.t the changes in PHY library to support adding and getting
    multiple PHYs of the same type. In the new design, the
    binding information between the PHY and the USB controller should be
    specified in the platform specific initialization code. So it's been
    done here for OMAP platforms.

    Signed-off-by: Kishon Vijay Abraham I
    Acked-by: Tony Lindgren
    Signed-off-by: Greg Kroah-Hartman

    Kishon Vijay Abraham I
     

22 Jan, 2013

1 commit


25 Dec, 2012

1 commit

  • Now that the only field in struct sys_timer is .init, delete the struct,
    and replace the machine descriptor .timer field with the initialization
    function itself.

    This will enable moving timer drivers into drivers/clocksource without
    having to place a public prototype of each struct sys_timer object into
    include/linux; the intent is to create a single of_clocksource_init()
    function that determines which timer driver to initialize by scanning
    the device dtree, much like the proposed irqchip_init() at:
    http://www.spinics.net/lists/arm-kernel/msg203686.html

    Includes mach-omap2 fixes from Igor Grinberg.

    Tested-by: Robert Jarzmik
    Signed-off-by: Stephen Warren

    Stephen Warren
     

15 Dec, 2012

1 commit

  • The i2c handling in tfp410 driver, which handles converting parallel RGB
    to DVI, was changed in 958f2717b84e88bf833d996997fda8f73276f2af
    (OMAPDSS: TFP410: pdata rewrite). The patch changed what value the
    driver considers as invalid/undefined. Before the patch, 0 was the
    invalid value, but as 0 is a valid bus number, the patch changed this to
    -1.

    However, the fact was missed that many board files do not define the bus
    number at all, thus it's left to 0. This causes the driver to fail to
    get the i2c bus, exiting from the driver's probe with an error, meaning
    that the DVI output does not work for those boards.

    This patch fixes the issue by changing the i2c_bus number field in the
    driver's platform data from u16 to int, and setting the bus number to -1
    in the board files for the boards that did not define the bus. The
    exception is devkit8000, for which the bus is set to 1, which is the
    correct bus for that board.

    The bug exists in v3.5+ kernels.

    Signed-off-by: Tomi Valkeinen
    Reported-by: Thomas Weber
    Cc: Thomas Weber
    Cc: # v3.5+
    Signed-off-by: Tony Lindgren

    Tomi Valkeinen
     

09 Nov, 2012

1 commit


25 Oct, 2012

3 commits

  • Conflicts:
    arch/arm/mach-omap1/clock.c
    arch/arm/mach-omap2/board-2430sdp.c
    arch/arm/mach-omap2/board-4430sdp.c
    arch/arm/mach-omap2/board-cm-t35.c
    arch/arm/mach-omap2/board-igep0020.c
    arch/arm/mach-omap2/board-ldp.c
    arch/arm/mach-omap2/board-omap3beagle.c
    arch/arm/mach-omap2/board-omap3logic.c
    arch/arm/mach-omap2/board-omap4panda.c
    arch/arm/mach-omap2/board-overo.c
    arch/arm/mach-omap2/board-rm680.c
    arch/arm/mach-omap2/board-rx51.c
    arch/arm/mach-omap2/twl-common.c
    arch/arm/mach-omap2/usb-host.c
    arch/arm/mach-omap2/usb-musb.c

    Tony Lindgren
     
  • In order to make single zImage work for ARM architecture,
    we need to make sure we don't depend on private headers.

    Move USB platform_data to
    and add a minimal drivers/mfd/usb-omap.h.

    Cc: Samuel Ortiz
    Cc: Alan Stern
    Cc: Greg Kroah-Hartman
    Cc: Partha Basak
    Cc: Keshava Munegowda
    Cc: linux-usb@vger.kernel.org
    Signed-off-by: Felipe Balbi
    [tony@atomide.com: updated for local mfd/usb-omap.h]
    Signed-off-by: Tony Lindgren

    Felipe Balbi
     
  • Let's move what we can from plat/usb.h to the local usb.h
    for ARM common zImage support.

    This is needed so we can remove plat/usb.h for ARM common
    zImage support.

    Cc: Samuel Ortiz
    Cc: Alan Stern
    Cc: Greg Kroah-Hartman
    Cc: Partha Basak
    Cc: Keshava Munegowda
    Cc: linux-usb@vger.kernel.org
    Acked-by: Felipe Balbi
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

19 Oct, 2012

1 commit

  • We want to remove plat/cpu.h. To do this, let's first split
    it to private soc.h to mach-omap1 and mach-omap2. We have to
    keep plat/cpu.h around until the remaining drivers are fixed,
    so let's include the local soc.h in plat/cpu.h and for drivers
    still including plat/cpu.h.

    Once the drivers are fixed not to include plat/cpu.h, we
    can remove the file.

    This is needed for the ARM common zImage support.

    [tony@atomide.com: updated to not print a warning]
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

15 Oct, 2012

1 commit

  • Helper function for updating nand platform data has been
    added the capability to take timing structure arguement.
    Usage of omap_nand_flash_init() has been replaced by modifed
    one, omap_nand_flash_init was doing things similar to
    board_nand_init except that NAND CS# were being acquired
    based on bootloader setting. As CS# is hardwired for a given
    board, acquiring gpmc CS# has been removed, and updated with
    the value on board.

    NAND CS# used in beagle board & omap3evm was found to be CS0.
    Thomas Weber reported
    that value of devkit8000 to be CS0. Overo board was found
    to be using CS0 based on u-boot, while google grep says
    omap3touchbook too has CS0.

    Signed-off-by: Afzal Mohammed
    Reviewed-by: Jon Hunter
    Acked-by: Igor Grinberg

    Afzal Mohammed
     

11 Oct, 2012

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "A series of fixes (and in some cases, some cleanups):

    Via Tony Lindgren:
    - A collection of OMAP regression fixes, in particular because
    firmware no longer sets up all pin states before starting the
    kernel.
    - cpufreq fixes for OMAP (Rafael is on vacation and this was
    pre-agreed).
    - A longer series of misc regression fixes and cleanups, warning
    removals, etc for OMAP

    From Arnd Bergmann:
    - A series of warning fixes for various platforms (defconfig builds)

    Misc:
    - A couple of tegra fixes, one for i.MX, some vt8500 fixes, etc."

    * tag 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (73 commits)
    ARM: pxa: armcore: fix PCI PIO warnings
    ARM: integrator: use __iomem pointers for MMIO, part 2
    ARM: assabet: fix bogus warning in get_assabet_scr (again)
    ARM: shmobile: mark shmobile_init_late as __init
    ARM: integrator_cp: fix build failure
    ARM: OMAP4/AM335x: hwmod: fix disable_module regression in hardreset handling
    ARM: OMAP3: fix workaround for EMU clockdomain
    arm/omap: Replace board_ref_clock with enum values
    ARM: OMAP2+: remove duplicated include from board-omap3stalker.c
    arch/arm/plat-omap/omap-pm-noop.c: Remove unecessary semicolon
    arch/arm/mach-omap2: Remove unecessary semicolon
    arch/arm/mach-omap1/devices.c: Remove unecessary semicolon
    ARM/dts: omap5-evm: pinmux configuration for audio
    ARM/dts: Add pinctrl driver entries for omap5
    ARM/dts: omap4-panda: pinmux configuration for audio
    ARM/dts: omap4-sdp: pinmux configuration for audio
    ARM/dts: omap5-evm: Disable unused McBSP3
    ARM/dts: omap4-sdp: Disable unused McBSP3
    ARM/dts: omap4-panda: Disable unused audio IPs
    ARM: OMAP: board-omap4panda: Pin mux configuration for audio needs
    ...

    Linus Torvalds
     

09 Oct, 2012

1 commit

  • Pull sound updates from Takashi Iwai:
    "This contains pretty many small commits covering fairly large range of
    files in sound/ directory. Partly because of additional API support
    and partly because of constantly developed ASoC and ARM stuff.

    Some highlights:

    - Introduced the helper function and documentation for exposing the
    channel map via control API, as discussed in Plumbers; most of PCI
    drivers are covered, will follow more drivers later

    - Most of drivers have been replaced with the new PM callbacks (if
    the bus is supported)

    - HD-audio controller got the support of runtime PM and the support
    of D3 clock-stop. Also changing the power_save option in sysfs
    kicks off immediately to enable / disable the power-save mode.

    - Another significant code change in HD-audio is the rewrite of
    firmware loading code. Other than that, most of changes in
    HD-audio are continued cleanups and standardization for the generic
    auto parser and bug fixes (HBR, device-specific fixups), in
    addition to the support of channel-map API.

    - Addition of ASoC bindings for the compressed API, used by the
    mid-x86 drivers.

    - Lots of cleanups and API refreshes for ASoC codec drivers and
    DaVinci.

    - Conversion of OMAP to dmaengine.

    - New machine driver for Wolfson Microelectronics Bells.

    - New CODEC driver for Wolfson Microelectronics WM0010.

    - Enhancements to the ux500 and wm2000 drivers

    - A new driver for DA9055 and the support for regulator bypass mode."

    Fix up various arm soc header file reorg conflicts.

    * tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (339 commits)
    ALSA: hda - Add new codec ALC283 ALC290 support
    ALSA: hda - avoid unneccesary indices on "Headphone Jack" controls
    ALSA: hda - fix indices on boost volume on Conexant
    ALSA: aloop - add locking to timer access
    ALSA: hda - Fix hang caused by race during suspend.
    sound: Remove unnecessary semicolon
    ALSA: hda/realtek - Fix detection of ALC271X codec
    ALSA: hda - Add inverted internal mic quirk for Lenovo IdeaPad U310
    ALSA: hda - make Realtek/Sigmatel/Conexant use the generic unsol event
    ALSA: hda - make a generic unsol event handler
    ASoC: codecs: Add DA9055 codec driver
    ASoC: eukrea-tlv320: Convert it to platform driver
    ALSA: ASoC: add DT bindings for CS4271
    ASoC: wm_hubs: Ensure volume updates are handled during class W startup
    ASoC: wm5110: Adding missing volume update bits
    ASoC: wm5110: Add OUT3R support
    ASoC: wm5110: Add AEC loopback support
    ASoC: wm5110: Rename EPOUT to HPOUT3
    ASoC: arizona: Add more clock rates
    ASoC: arizona: Add more DSP options for mixer input muxes
    ...

    Linus Torvalds
     

08 Oct, 2012

1 commit

  • Commit e54adb1e79762d3591459e5b0e9b9ff578e33fdb ("ARM: OMAP: omap3evm:
    cleanup revision bits") adds a new sparse[1] warning:

    arch/arm/mach-omap2/board-omap3evm.c:90:4: warning: symbol 'get_omap3_evm_rev' was not declared. Should it be static?

    This symbol no longer appears to be used outside this file, so mark it
    static and remove the export.

    ...

    1. https://sparse.wiki.kernel.org/index.php/Main_Page

    Signed-off-by: Paul Walmsley
    Cc: Igor Grinberg
    Cc: Tony Lindgren

    Paul Walmsley
     

02 Oct, 2012

1 commit

  • Pull ARM soc general cleanups from Olof Johansson:
    "This is a large branch that contains a handful of different cleanups:

    - Fixing up the I/O space remapping on PCI on ARM. This is a series
    from Rob Herring that restructures how all pci devices allocate I/O
    space, and it's part of the work to allow multiplatform kernels.
    - A number of cleanup series for OMAP, moving and removing some
    headers, sparse irq rework and in general preparation for
    multiplatform.
    - Final removal of all non-DT boards for Tegra, it is now
    device-tree-only!
    - Removal of a stale platform, nxp4008. It's an old mobile chipset
    that is no longer in use, and was very likely never really used
    with a mainline kernel. We have not been able to find anyone
    interested in keeping it around in the kernel.
    - Removal of the legacy dmaengine driver on tegra

    + A handful of other things that I haven't described above."

    Fix up some conflicts with the staging tree (and because nxp4008 was
    removed)

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (184 commits)
    ARM: OMAP2+: serial: Change MAX_HSUART_PORTS to 6
    ARM: OMAP4: twl-common: Support for additional devices on i2c1 bus
    ARM: mmp: using for_each_set_bit to simplify the code
    ARM: tegra: harmony: fix ldo7 regulator-name
    ARM: OMAP2+: Make omap4-keypad.h local
    ARM: OMAP2+: Make l4_3xxx.h local
    ARM: OMAP2+: Make l4_2xxx.h local
    ARM: OMAP2+: Make l3_3xxx.h local
    ARM: OMAP2+: Make l3_2xxx.h local
    ARM: OMAP1: Move irda.h from plat to mach
    ARM: OMAP2+: Make hdq1w.h local
    ARM: OMAP2+: Make gpmc-smsc911x.h local
    ARM: OMAP2+: Make gpmc-smc91x.h local
    ARM: OMAP1: Move flash.h from plat to mach
    ARM: OMAP2+: Make debug-devices.h local
    ARM: OMAP1: Move board-voiceblue.h from plat to mach
    ARM: OMAP1: Move board-sx1.h from plat to mach
    ARM: OMAP2+: Make omap-wakeupgen.h local
    ARM: OMAP2+: Make omap-secure.h local
    ARM: OMAP2+: Make ctrl_module_wkup_44xx.h local
    ...

    Linus Torvalds
     

21 Sep, 2012

1 commit


19 Sep, 2012

1 commit

  • Platform data for device drivers should be defined in
    include/linux/platform_data/*.h, not in the architecture
    and platform specific directories.

    This moves such data out of the omap include directories

    Signed-off-by: Arnd Bergmann
    Acked-by: Mark Brown
    Acked-by: Greg Kroah-Hartman
    Acked-by: Nicolas Pitre
    Acked-by: Tony Lindgren
    Cc: Kevin Hilman
    Cc: "Benoît Cousson"
    Cc: Dmitry Torokhov
    Cc: David Woodhouse
    Cc: Kyungmin Park
    Cc: Ohad Ben-Cohen
    Cc: Grant Likely
    Cc: Omar Ramirez Luna
    Cc: Tomi Valkeinen
    Cc: Florian Tobias Schandinat
    Cc: Peter Ujfalusi
    Cc: Jarkko Nikula
    Cc: Liam Girdwood
    Cc: Artem Bityutskiy
    Cc: Jean Pihet
    Cc: J Keerthy
    Cc: linux-omap@vger.kernel.org

    Arnd Bergmann
     

17 Sep, 2012

1 commit


13 Sep, 2012

2 commits

  • As the plat and mach includes need to disappear for single zImage work,
    we need to remove plat/hardware.h.

    Do this by splitting plat/hardware.h into omap1 and omap2+ specific files.

    The old plat/hardware.h already has omap1 only defines, so it gets moved
    to mach/hardware.h for omap1. For omap2+, we use the local soc.h
    that for now just includes the related SoC headers to keep this patch more
    readable.

    Note that the local soc.h still includes plat/cpu.h that can be dealt
    with in later patches. Let's also include plat/serial.h from common.h for
    all the board-*.c files. This allows making the include files local later
    on without patching these files again.

    Note that only minimal changes are done in this patch for the
    drivers/watchdog/omap_wdt.c driver to keep things compiling. Further
    patches are needed to eventually remove cpu_is_omap usage in the drivers.

    Also only minimal changes are done to sound/soc/omap/* to remove the
    unneeded includes and to define OMAP44XX_MCPDM_L3_BASE locally so there's
    no need to include omap44xx.h.

    While at it, also sort some of the includes in the standard way.

    Cc: linux-watchdog@vger.kernel.org
    Cc: alsa-devel@alsa-project.org
    Cc: Peter Ujfalusi
    Cc: Jarkko Nikula
    Cc: Liam Girdwood
    Acked-by: Wim Van Sebroeck
    Acked-by: Mark Brown
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     
  • We can't use hardcoded interrupts for SPARSE_IRQ, and can replace
    the hardcoded gpio_base with twl_gpiochip.base after it's been
    allocated.

    Cc: Grant Likely
    Cc: Samuel Ortiz
    Cc: Peter Ujfalusi
    Acked-by: Linus Walleij
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

11 Sep, 2012

2 commits

  • The omap3evm has its revision information bits inside the plat/board.h
    file. Those bits are not used anywhere in the upstream tree besides the
    board-omap3evm.c file.
    Move the OMAP3EVM_BOARD_GEN_* bits to the board file and remove the
    get_omap3_evm_rev() function declaration.

    Signed-off-by: Igor Grinberg
    Signed-off-by: Tony Lindgren

    Igor Grinberg
     
  • struct omap_board_config_kernel defined in the board files
    is always empty and does not bring any added value.
    Remove the struct omap_board_config_kernel instances from the board
    files.
    Also remove the omap_get_nr_config() macro and the omap_get_var_config()
    function as both are not used for quite a long time (if ever).

    Signed-off-by: Igor Grinberg
    Signed-off-by: Tony Lindgren

    Igor Grinberg
     

05 Sep, 2012

1 commit


16 Aug, 2012

1 commit


07 Aug, 2012

1 commit

  • 1) The above commit introduced a common ->get_pendown_state() function
    into the generic code, but that function was board-specific for the
    OMAP3EVM and thus broke most other boards using this code.

    2) The above commit was mis-merged introducing another bug which
    prevents the ads7846 driver probe function to succeed.
    The omap_ads7846_init() function frees the pendown GPIO in case there is
    no ->get_pendown_state() function set by the caller (board specific
    code), so it can be requested later by the ads7846 driver.
    The above commit add a common ->get_pendown_state() function without
    removing the gpio_free() call and thus once the ads7846 driver tries
    to use the pendown GPIO, it crashes as the pendown GPIO has not been
    requested.

    3) The above commit introduces NO new functionality as
    get_pendown_state() function is already implemented in a suitable way by
    the ads7846 driver and the debounce time handling has already been
    fixed by commit 97ee9f01 (ARM: OMAP: fix the ads7846 init code).

    This reverts commit 16aced80f6739beb2a6ff7b6f96c83ba80d331e8.

    Conflicts:
    arch/arm/mach-omap2/common-board-devices.c

    Solved by taking the working version prior to the above commit.

    Cc: Zumeng Chen
    Cc: Arnd Bergmann
    Signed-off-by: Igor Grinberg
    Reviewed-by: Kevin Hilman
    Tested-by: Kevin Hilman
    Signed-off-by: Kevin Hilman

    Igor Grinberg
     

03 Aug, 2012

1 commit


10 Jul, 2012

1 commit


06 Jul, 2012

4 commits

  • Currently most ads7846 config definitions for OMAP3 series boards have
    been moved to common-board-devices.c, and it is transparent for init.
    And it's no very proper to do gpio_request based on get_pendown_state
    since omap_ads7846_init knows everything about ads7846_config.

    So it's more fit to request gpio according to the right gpio_pendown
    and set debounce time conditionally. If we don't set proper debouce
    time, there are flooded interrupt counters of ads7846 responding to
    one time touch on screen, then the driver couldn't work very well.

    This patch has been validated on 3530evm.

    Signed-off-by: Zumeng Chen
    Signed-off-by: Tony Lindgren

    Zumeng Chen
     
  • This was chosen by following the trace on the schematic from component U131
    and U134 to the CPEN pin on the USB3320 device.

    TWL4030.GPIO2-...->(T2_GPIO2_3V3)U131-..>nUSB2_EN-..>U134-..>EXP_nUSB2_1V8
    which starts EHCI tranceiver USB3320.

    This will set TWL4030.GPIO2 as output pin to drive EHCI tranceiver.

    Signed-off-by: Zumeng Chen
    Signed-off-by: Tony Lindgren

    Zumeng Chen
     
  • EHCI PHY requires these regulators:
    EVM Rev >=E --> VAUX2
    EVM Rev < E --> VUSB1V5, VUSB1V8

    Adding USB internal LDOs (vusb1v5 & vusb1v8) and VAUX2 to omap3evm
    board file. Also removing vaux2_{1/2/3} supplies as they are not
    used on omap3 evm.

    But we need not to add vaux2 in twl4030_platform_data since it will
    be added conditionally.

    Signed-off-by: Ajay Kumar Gupta
    Signed-off-by: Vaibhav Hiremath
    Signed-off-by: Zumeng Chen
    Signed-off-by: Tony Lindgren

    Zumeng Chen
     
  • Signed-off-by: Vaibhav Hiremath
    Tested-by: Zumeng Chen
    Signed-off-by: Tony Lindgren

    Zumeng Chen
     

27 May, 2012

1 commit

  • Pull sweeping late_initcall cleanup for arm-soc from Olof Johansson:
    "This is a patch series from Shawn Guo that moves from individual
    late_initcalls() to using a member in the machine structure to invoke
    a platform's late initcalls.

    This cleanup is a step in the move towards multiplatform kernels since
    it would reduce the need to check for compatible platforms in each and
    every initcall."

    Fix up trivial conflicts in arch/arm/mach-{exynos/mach-universal_c210.c,
    imx/mach-cpuimx51.c, omap2/board-generic.c} due to changes nearby (and,
    in the case of cpuimx51.c the board support being deleted)

    * tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: ux500: use machine specific hook for late init
    ARM: tegra: use machine specific hook for late init
    ARM: shmobile: use machine specific hook for late init
    ARM: sa1100: use machine specific hook for late init
    ARM: s3c64xx: use machine specific hook for late init
    ARM: prima2: use machine specific hook for late init
    ARM: pnx4008: use machine specific hook for late init
    ARM: omap2: use machine specific hook for late init
    ARM: omap1: use machine specific hook for late init
    ARM: msm: use machine specific hook for late init
    ARM: imx: use machine specific hook for late init
    ARM: exynos: use machine specific hook for late init
    ARM: ep93xx: use machine specific hook for late init
    ARM: davinci: use machine specific hook for late init
    ARM: provide a late_initcall hook for platform initialization

    Linus Torvalds
     

11 May, 2012

1 commit

  • …el/git/tmlind/linux-omap into next/cleanup

    Clean up for omap DSS board init in preparation for adding DT support.

    By Tomi Valkeinen
    via Tomi Valkeinen (1) and Tony Lindgren (1)
    * tag 'omap-cleanup-dss-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    OMAPDSS: DSI: implement generic DSI pin config
    OMAPDSS: Taal: move reset gpio handling to taal driver
    OMAPDSS: TFP410: rename dvi files to tfp410
    OMAPDSS: TFP410: rename dvi -> tfp410
    OMAP: board-files: remove custom PD GPIO handling for DVI output
    OMAPDSS: panel-dvi: add PD gpio handling

    Resolved context conflicts in arch/arm/mach-omap2/board-omap4panda.c.

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     

09 May, 2012

1 commit