Doug / smarc-fsl-linux-kernel

20 Jul, 2012

2 commits

12 Jul, 2012

1 commit

02 Jul, 2012

6 commits

14 Jun, 2012

13 commits

25 May, 2012

1 commit

  • b1bf7d4d1   Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    Pull GPIO driver changes from Grant Likely:
    "Lots of gpio changes, both to core code and drivers.

    Changes do touch architecture code to remove the need for separate
    arm/gpio.h includes in most architectures.

    Some new drivers are added, and a number of gpio drivers are converted
    to use irq_domains for gpio inputs used as interrupts. Device tree
    support has been amended to allow multiple gpio_chips to use the same
    device tree node.

    Remaining changes are primarily bug fixes."

    * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6: (33 commits)
    gpio/generic: initialize basic_mmio_gpio shadow variables properly
    gpiolib: Remove 'const' from data argument of gpiochip_find()
    gpio/rc5t583: add gpio driver for RICOH PMIC RC5T583
    gpiolib: quiet gpiochip_add boot message noise
    gpio: mpc8xxx: Prevent NULL pointer deref in demux handler
    gpio/lpc32xx: Add device tree support
    gpio: Adjust of_xlate API to support multiple GPIO chips
    gpiolib: Implement devm_gpio_request_one()
    gpio-mcp23s08: dbg_show: fix pullup configuration display
    Add support for TCA6424A
    gpio/omap: (re)fix wakeups on level-triggered GPIOs
    gpio/omap: fix broken context restore for non-OFF mode transitions
    gpio/omap: fix missing check in *_runtime_suspend()
    gpio/omap: remove cpu_is_omapxxxx() checks from *_runtime_resume()
    gpio/omap: remove suspend/resume callbacks
    gpio/omap: remove retrigger variable in gpio_irq_handler
    gpio/omap: remove saved_wakeup field from struct gpio_bank
    gpio/omap: remove suspend_wakeup field from struct gpio_bank
    gpio/omap: remove saved_fallingdetect, saved_risingdetect
    gpio/omap: remove virtual_irq_start variable
    ...

    Conflicts:
    drivers/gpio/gpio-samsung.c

    Linus Torvalds
     

19 May, 2012

1 commit

  • e92935e13   gpio/lpc32xx: Add device tree support ... Browse Code »

    This patch adds device tree support for gpio-lpc32xx.c.

    To register the various GPIO banks as (struct) gpio_chips via the same DT
    gpio-controller, we utilize the adjusted of_xlate API to manipulate the
    actually used struct gpio_chip.

    Signed-off-by: Roland Stigge
    Reviewed-by: Arnd Bergmann
    Signed-off-by: Grant Likely

    Roland Stigge
     

22 Apr, 2012

7 commits

30 Mar, 2012

3 commits

  • 4bde23f87   Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull arm-soc fixes from Olof Johansson:
    "This is a first pass of some of the merge window fallout for ARM
    platforms.

    Nothing controversial:
    - A system.h fallout fix for OMAP
    - PXA fixes for breakage caused by the regulator struct changes
    - GPIO fixes for OMAP to properly deal with dynamic IRQ allocation
    - A mismerge in our arm-soc tree of an lpc32xx change for networking
    - A fix for USB setup on tegra
    - An undo of __init annotation of display mux setup on OMAP that's
    needed at runtime"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: pxa: fix build issue on stargate2
    ARM: pxa: fix build issue on cm-x300
    ARM: pxa: fix build failure for regulator consumer in em-x270.c
    ARM: LPC32xx: clock.c: Fix lpc-eth clock reference
    ARM: OMAP: pm: fix compilation break
    ARM: OMAP: Remove OMAP_GPIO_IRQ macro definition
    drivers: input: Fix OMAP_GPIO_IRQ with gpio_to_irq() in ams_delta_serio_exit()
    ARM: OMAP: boards: Fix OMAP_GPIO_IRQ usage with gpio_to_irq()
    ARM: pxa: fix regulator related build fail in magician_defconfig
    ARM: tegra: Fix device tree AUXDATA for USB/EHCI
    ARM: OMAP2+: Remove __init from DSI mux functions

    Linus Torvalds
     
  • 820d41cf0   Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull "ARM: cleanups of io includes" from Olof Johansson:
    "Rob Herring has done a sweeping change cleaning up all of the
    mach/io.h includes, moving some of the oft-repeated macros to a common
    location and removing a bunch of boiler plate. This is another step
    closer to a common zImage for multiple platforms."

    Fix up various fairly trivial conflicts ( removal vs changes
    around it, tegra localtimer.o is *still* gone, yadda-yadda).

    * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
    ARM: tegra: Include assembler.h in sleep.S to fix build break
    ARM: pxa: use common IOMEM definition
    ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
    ARM: __io abuse cleanup
    ARM: create a common IOMEM definition
    ARM: iop13xx: fix missing declaration of iop13xx_init_early
    ARM: fix ioremap/iounmap for !CONFIG_MMU
    ARM: kill off __mem_pci
    ARM: remove bunch of now unused mach/io.h files
    ARM: make mach/io.h include optional
    ARM: clps711x: remove unneeded include of mach/io.h
    ARM: dove: add explicit include of dove.h to addr-map.c
    ARM: at91: add explicit include of hardware.h to uncompressor
    ARM: ep93xx: clean-up mach/io.h
    ARM: tegra: clean-up mach/io.h
    ARM: orion5x: clean-up mach/io.h
    ARM: davinci: remove unneeded mach/io.h include
    [media] davinci: remove includes of mach/io.h
    ARM: OMAP: Remove remaining includes for mach/io.h
    ARM: msm: clean-up mach/io.h
    ...

    Linus Torvalds
     
  • 714daf73d   ARM: LPC32xx: clock.c: Fix lpc-eth clock reference ... Browse Code »

    During a complex merge for v3.4, one line of the commit
    c20b909be9ba27173294a52d08cab293ec030a2c ("ARM: LPC32xx: Ethernet support") was
    reverted wrongly ("lpc-eth.0" -> "lpc-net.0") while the other conflicts were
    merged correctly. This patch re-applies the clock name "lpc-eth.0".

    Signed-off-by: Roland Stigge
    Signed-off-by: Olof Johansson

    Roland Stigge
     

29 Mar, 2012

1 commit

  • ff877c498   Merge tag 'drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull "ARM: More SoC driver updates" from Olof Johansson:
    "This branch contains a handful of driver updates, mostly to the
    LPC32xx platform but also for Samsung EXYNOS and Davinci.

    It had a few context conflicts against patches already merged through
    fixes-non-critical. We should have resolved this early during the
    development cycle by pulling them in as a dependency, instead I did it
    after the fact this time."

    * tag 'drivers2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    gpio/samsung: use ioremap() for EXYNOS4 GPIOlib
    gpio/samsung: add support GPIOlib for EXYNOS5250
    ARM: EXYNOS: add support GPIO for EXYNOS5250
    ARM: LPC32xx: Ethernet support
    ARM: LPC32xx: USB Support
    ARM: davinci: dm644x evm: add support for VPBE display
    ARM: davinci: dm644x: add support for v4l2 video display
    ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure
    ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure
    arm: lpc32xx: phy3250: add rtc & touch device
    ARM: LPC32xx: clock.c: Clock registration fixes
    ARM: LPC32xx: clock.c: jiffies wrapping
    ARM: LPC32xx: clock.c: Missing header file
    ARM: LPC32XX: Remove broken non-static declaration
    ARM: LPC32xx: clock.c: Fix mutex lock issues
    ARM: LPC32xx: clock.c: warning fix
    ARM: LPC32xx: Added lpc32xx_defconfig

    Linus Torvalds
     

28 Mar, 2012

3 commits

  • 1f5b7dcfd   Merge branch 'fixes-non-critical' into next/drivers2 ... Browse Code »

    fixes-non-critical has already been merged upstream, and there are a
    handful of annoying context conflicts that it makes sense to resolve
    before sending up. Part of this is because there was parallel development
    going on between more urgent fixes and general driver fixups, it should
    settle down once the lpc32xx platform reaches a more steady state.

    Conflicts:
    arch/arm/mach-lpc32xx/clock.c
    arch/arm/mach-lpc32xx/common.h

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • 34800598b   Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull "ARM: driver specific updates" from Arnd Bergmann:
    "These are all specific to some driver. They are typically the
    platform side of a change in the drivers directory, such as adding a
    new driver or extending the interface to the platform. In cases where
    there is no maintainer for the driver, or the maintainer prefers to
    have the platform changes in the same branch as the driver changes,
    the patches to the drivers are included as well.

    A much smaller set of driver updates that depend on other branches
    getting merged first will be sent later.

    The new export of tegra_chip_uid conflicts with other changes in
    fuse.c. In rtc-sa1100.c, the global removal of IRQF_DISABLED
    conflicts with the cleanup of the interrupt handling of that driver.

    Signed-off-by: Arnd Bergmann "

    Fixed up aforementioned trivial conflicts.

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (94 commits)
    ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci
    mmc: sdhci-s3c: add platform data for the second capability
    ARM: SAMSUNG: support the second capability for samsung-soc
    ARM: EXYNOS: add support DMA for EXYNOS4X12 SoC
    ARM: EXYNOS: Add apb_pclk clkdev entry for mdma1
    ARM: EXYNOS: Enable MDMA driver
    regulator: Remove bq24022 regulator driver
    rtc: sa1100: add OF support
    pxa: magician/hx4700: Convert to gpio-regulator from bq24022
    ARM: OMAP3+: SmartReflex: fix error handling
    ARM: OMAP3+: SmartReflex: fix the use of debugfs_create_* API
    ARM: OMAP3+: SmartReflex: micro-optimization for sanity check
    ARM: OMAP3+: SmartReflex: misc cleanups
    ARM: OMAP3+: SmartReflex: move late_initcall() closer to its argument
    ARM: OMAP3+: SmartReflex: add missing platform_set_drvdata()
    ARM: OMAP3+: hwmod: add SmartReflex IRQs
    ARM: OMAP3+: SmartReflex: clear ERRCONFIG_VPBOUNDINTST only on a need
    ARM: OMAP3+: SmartReflex: Fix status masking in ERRCONFIG register
    ARM: OMAP3+: SmartReflex: Add a shutdown hook
    ARM: OMAP3+: SmartReflex Class3: disable errorgen before disable VP
    ...

    Conflicts:
    arch/arm/mach-tegra/Makefile
    arch/arm/mach-tegra/fuse.c
    drivers/rtc/rtc-sa1100.c

    Linus Torvalds
     
  • c8bc5e39a   Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull "ARM: Non-critical bug fixes" from Ardn Bergmann:
    "Simple bug fixes that were not considered important enough for
    inclusion into 3.3. One bug fix was originally intended for 3.3 but
    accidentally got missed, but is not marked stable because it should
    only get backported once later fixes also make it into v3.4.

    Signed-off-by: Arnd Bergmann "

    * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (66 commits)
    iomux-mx25.h slew rate adjusted for LCD __LD pins
    ARM: davinci: DA850: move da850_register_pm to .init.text
    ARM: davinci: cpufreq: fix compiler warning
    ARM: OMAP2+: Fix build for omap4 only builds with missing include of linux/bug.h
    ARM: OMAP2+: Fix section warnings for hsmmc_init_one
    ARM: OMAP2+: Fix build issues with missing include of linux/bug.h
    ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance
    ARM: OMAP3+: PM: VP: fix integer truncation error
    ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled
    ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()
    ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set
    ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected
    ARM: OMAP1: Fix section mismatch for omap1_init_early()
    ARM: OMAP1: Fix typo in lcd_dma.c
    ARM: OMAP: mailbox: trivial whitespace fix
    ARM: OMAP: Remove definition cpu_is_omap4430()
    ARM: OMAP2+: included some headers twice
    ARM: OMAP: clock.c: included linux/debugfs.h twice
    ARM: OMAP: don't build hwspinlock in vain
    ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it's provided
    ...

    Linus Torvalds
     

24 Mar, 2012

1 commit

  • 56c10bf82   Merge branch 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm ... Browse Code »

    Pull #1 ARM updates from Russell King:
    "This one covers stuff which Arnd is waiting for me to push, as this is
    shared between both our trees and probably other trees elsewhere.

    Essentially, this contains:
    - AMBA primecell device initializer updates - mostly shrinking the
    size of the device declarations in platform code to something more
    reasonable.
    - Getting rid of the NO_IRQ crap from AMBA primecell stuff.
    - Nicolas' idle cleanups. This in combination with the restart
    cleanups from the last merge window results in a great many
    mach/system.h files being deleted."

    Yay: ~80 files, ~2000 lines deleted.

    * 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm: (60 commits)
    ARM: remove disable_fiq and arch_ret_to_user macros
    ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER
    ARM: rpc: make default fiq handler run-time installed
    ARM: make arch_ret_to_user macro optional
    ARM: amba: samsung: use common amba device initializers
    ARM: amba: spear: use common amba device initializers
    ARM: amba: nomadik: use common amba device initializers
    ARM: amba: u300: use common amba device initializers
    ARM: amba: lpc32xx: use common amba device initializers
    ARM: amba: netx: use common amba device initializers
    ARM: amba: bcmring: use common amba device initializers
    ARM: amba: ep93xx: use common amba device initializers
    ARM: amba: omap2: use common amba device initializers
    ARM: amba: integrator: use common amba device initializers
    ARM: amba: realview: get rid of private platform amba_device initializer
    ARM: amba: versatile: get rid of private platform amba_device initializer
    ARM: amba: vexpress: get rid of private platform amba_device initializer
    ARM: amba: provide common initializers for static amba devices
    ARM: amba: make use of -1 IRQs warn
    ARM: amba: u300: get rid of NO_IRQ initializers
    ...

    Linus Torvalds
     

21 Mar, 2012

1 commit

  • f907ab06b   Merge branch 'next/fixes-non-critical' into next/drivers ... Browse Code »

    Conflicts:
    arch/arm/mach-lpc32xx/clock.c
    arch/arm/mach-pxa/pxa25x.c
    arch/arm/mach-pxa/pxa27x.c

    The conflicts with pxa are non-obvious, we have multiple branches
    adding and removing the same clock settings. According to
    Haojian Zhuang, removing the sa1100 rtc dummy clock is the correct
    fix here.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann