13 Sep, 2013

1 commit

  • Pull ARM SoC fixes from Olof Johansson:
    "A small batch of fixes that have trickled in over the last week of the
    merge window.

    Also included are few small devicetree updates for sunxi, since it
    enables me to use one of their newer boards (cubieboard2) for
    additional test coverage. The support for that SoC is new for 3.12,
    so there's no exposure to new regressions due to it"

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: dts: sun7i: olinuxino-micro: Enable the EMAC
    ARM: dts: sun7i: cubieboard2: Enable the EMAC
    ARM: dts: sun7i: Add the muxing options for the EMAC
    ARM: dts: sun7i: Enable the Ethernet in the A20
    i2c: davinci: Fix bad dev_get_platdata() conversion
    ARM: vexpress: allow dcscb and tc2_pm in a combined ARMv6+v7 build
    ARM: shmobile: lager: Do not use register_type field of struct sh_eth_plat_data
    ARM: pxa: ssp: Check return values from phandle lookups
    ARM: PCI: versatile: Fix SMAP register offsets
    ARM: PCI: versatile: Fix PCI I/O
    ARM: PCI: versatile: Fix map_irq function to match hardware
    ARM: ep93xx: Don't use modem interface on the second UART
    ARM: shmobile: r8a7779: Update early timer initialisation order

    Linus Torvalds
     

11 Sep, 2013

2 commits

  • From Ryan Mallon, a fix for ep93xx.

    * tag 'ep93xx-fixes-for-3.12' of git://github.com/RyanMallon/linux-ep93xx:
    ARM: ep93xx: Don't use modem interface on the second UART

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • Pull MMC updates from Chris Ball:
    "MMC highlights for 3.12:

    Core:
    - Support Allocation Units 8MB-64MB in SD3.0, previous max was 4MB.
    - The slot-gpio helper can now handle GPIO debouncing card-detect.
    - Read supported voltages from DT "voltage-ranges" property.

    Drivers:
    - dw_mmc: Add support for ARC architecture, and support exynos5420.
    - mmc_spi: Support CD/RO GPIOs.
    - sh_mobile_sdhi: Add compatibility for more Renesas SoCs.
    - sh_mmcif: Add DT support for DMA channels"

    * tag 'mmc-updates-for-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (50 commits)
    Revert "mmc: tmio-mmc: Remove .set_pwr() callback from platform data"
    mmc: dw_mmc: Add support for ARC
    mmc: sdhci-s3c: initialize host->quirks2 for using quirks2
    mmc: sdhci-s3c: fix the wrong register value, when clock is disabled
    mmc: esdhc: add support to get voltage from device-tree
    mmc: sdhci: get voltage from sdhc host
    mmc: core: parse voltage from device-tree
    mmc: omap_hsmmc: use the generic config for omap2plus devices
    mmc: omap_hsmmc: clear status flags before starting a new command
    mmc: dw_mmc: exynos: Add a new compatible string for exynos5420
    mmc: sh_mmcif: revision-specific CLK_CTRL2 handling
    mmc: sh_mmcif: revision-specific Command Completion Signal handling
    mmc: sh_mmcif: add support for Device Tree DMA bindings
    mmc: sh_mmcif: move header include from header into .c
    mmc: SDHI: add DT compatibility strings for further SoCs
    mmc: dw_mmc-pci: enable bus-mastering mode
    mmc: dw_mmc-pci: get resources from a proper BAR
    mmc: tmio-mmc: Remove .set_pwr() callback from platform data
    mmc: tmio-mmc: Remove .get_cd() callback from platform data
    mmc: sh_mobile_sdhi: Remove .set_pwr() callback from platform data
    ...

    Linus Torvalds
     

07 Sep, 2013

1 commit

  • Pull ARM SoC cleanups from Olof Johansson:
    "This branch contains code cleanups, moves and removals for 3.12.

    There's a large number of various cleanups, and a nice net removal of
    13500 lines of code.

    Highlights worth mentioning are:

    - A series of patches from Stephen Boyd removing the ARM local timer
    API.
    - Move of Qualcomm MSM IOMMU code to drivers/iommu.
    - Samsung PWM driver cleanups from Tomasz Figa, removing legacy PWM
    driver and switching over to the drivers/pwm one.
    - Removal of some unusued auto-generated headers for OMAP2+ (PRM/CM).

    There's also a move of a header file out of include/linux/i2c/ to
    platform_data, where it really belongs. It touches mostly ARM
    platform code for include changes so we took it through our tree"

    * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
    ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK
    gpio: (gpio-pca953x) move header to linux/platform_data/
    arm: zynq: hotplug: Remove unreachable code
    ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*()
    tegra: simplify use of devm_ioremap_resource
    ARM: SAMSUNG: Remove plat/regs-timer.h header
    ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
    ARM: SAMSUNG: Remove pwm-clock infrastructure
    ARM: SAMSUNG: Remove old PWM timer platform devices
    pwm: Remove superseded pwm-samsung-legacy driver
    ARM: SAMSUNG: Modify board files to use new PWM platform device
    ARM: SAMSUNG: Rework private data handling in dev-backlight
    pwm: Add new pwm-samsung driver
    ARM: mach-mvebu: remove redundant DT parsing and validation
    ARM: msm: Only compile io.c on platforms that use it
    iommu/msm: Move mach includes to iommu directory
    ARM: msm: Remove devices-iommu.c
    ARM: msm: Move mach/board.h contents to common.h
    ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
    ARM: msm: Remove TMR and TMR0 static mappings
    ...

    Linus Torvalds
     

03 Sep, 2013

1 commit


30 Aug, 2013

1 commit


26 Aug, 2013

3 commits

  • The generic option DEBUG_LL_UART_PL01X is now used to select the UART
    type for the kernel low-level debugging on the ep93xx platform. This
    enables two config options to provide the physical and virtual base
    address of the debug UART.

    Use the generic options instead of providing platform specific options
    to select the debug UART.

    UART1 is selected with: DEBUG_UART_PHYS = 0x808c0000
    DEBUG_UART_VIRT = 0xfedc0000

    UART2 is selected with: DEBUG_UART_PHYS = 0x808d0000
    DEBUG_UART_VIRT = 0xfedd0000

    UART3 is selected with: DEBUG_UART_PHYS = 0x808e0000
    DEBUG_UART_VIRT = 0xfede0000

    The selected UART must already be initialized by the bootloader. If it
    isn't setup nothing will appear (which might be desired).

    Signed-off-by: H Hartley Sweeten
    Cc: Ryan Mallon
    Signed-off-by: Russell King

    Hartley Sweeten
     
  • Now that the PL01X debug include can mostly stand alone without
    requiring platforms to provide any macros, move it into the debug
    directory so it can be directly included. This allows us to get rid of
    a lot of debug-macros include files.

    The autodetect case for Versatile Express and the ux500 are left alone;
    these are more complicated implementations.

    Acked-by: Rob Herring
    Acked-by: Ryan Mallon
    Signed-off-by: Russell King

    Russell King
     
  • Move the definition of the UART register addresses out of the platform
    specific header files into the Kconfig files.

    Acked-by: Ryan Mallon
    Signed-off-by: Russell King

    Russell King
     

25 Aug, 2013

1 commit


10 Jul, 2013

1 commit

  • Preparing to move the parsing of reboot= to generic kernel code forces
    the change in reboot_mode handling to use the enum.

    [akpm@linux-foundation.org: fix arch/arm/mach-socfpga/socfpga.c]
    Signed-off-by: Robin Holt
    Cc: Russell King
    Cc: Russ Anderson
    Cc: Robin Holt
    Cc: H. Peter Anvin
    Cc: Guan Xuetao
    Acked-by: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Robin Holt
     

18 Mar, 2013

1 commit

  • Commit 210dce5f "ARM: ep93xx: properly wait for UART FIFO to be empty"

    Removed the timeout loop while waiting for the uart transmit fifo to
    empty. Some bootloaders leave the uart in a state where there might
    be bytes in the uart that are not transmitted when execution is handed
    over to the kernel. This results in a deadlocked system while waiting
    for the fifo to empty.

    Add back the timeout wait to prevent the deadlock.

    Increase the wait time to hopefully prevent the decompressor corruption
    that lead to commit 210dce5f. This corruption was probably due to a
    slow uart baudrate. The 10* increase in the wait time should be enough
    for all cases.

    Signed-off-by: H Hartley Sweeten
    Acked-by: Florian Fainelli
    Signed-off-by: Ryan Mallon

    H Hartley Sweeten
     

06 Feb, 2013

1 commit

  • …-2.6 into next/cleanup

    From Shawn Guo:
    The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
    are unused on ARM architecure. Samsung has some code setting up wdog
    in arch_decomp_wdog(). But since CONFIG_S3C_BOOT_WATCHDOG is defined
    nowhere, it will not run. Otherwise, system can not boot at all when
    wdog is set up but no one pats it.

    * tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
    ARM: samsung: remove unused arch_decomp_wdog() code
    ARM: remove unused arch_decomp_wdog()
    ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG

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

    Olof Johansson
     

15 Jan, 2013

1 commit

  • From Rob Herring:

    Initial irqchip init infrastructure and GIC and VIC clean-ups

    This creates irqchip initialization infrastructure from Thomas
    Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips
    and adapted to use the new infrastructure. All DT enabled platforms
    using GIC and VIC are converted over to use the new irqchip_init.

    * tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux:
    irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h
    ARM: picoxcell: use common irqchip_init function
    ARM: spear: use common irqchip_init function
    irqchip: Move ARM VIC to drivers/irqchip
    ARM: samsung: remove unused tick.h
    ARM: remove unneeded vic.h includes
    ARM: remove mach .handle_irq for VIC users
    ARM: VIC: set handle_arch_irq in VIC initialization
    ARM: VIC: shrink down vic.h
    irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h
    ARM: use common irqchip_init for GIC init
    irqchip: Move ARM GIC to drivers/irqchip
    ARM: remove mach .handle_irq for GIC users
    ARM: GIC: set handle_arch_irq in GIC initialization
    ARM: GIC: remove direct use of gic_raise_softirq
    ARM: GIC: remove assembly ifdefs from gic.h
    ARM: mach-ux500: use SGI0 to wake up the other core
    arm: add set_handle_irq() to register the parent IRQ controller handler function
    irqchip: add basic infrastructure
    irqchip: add to the directories part of the IRQ subsystem in MAINTAINERS

    Fixed up massive merge conflicts with the timer cleanup due to adjacent changes:

    Signed-off-by: Olof Johansson

    Conflicts:
    arch/arm/mach-bcm/board_bcm.c
    arch/arm/mach-cns3xxx/cns3420vb.c
    arch/arm/mach-ep93xx/adssphere.c
    arch/arm/mach-ep93xx/edb93xx.c
    arch/arm/mach-ep93xx/gesbc9312.c
    arch/arm/mach-ep93xx/micro9.c
    arch/arm/mach-ep93xx/simone.c
    arch/arm/mach-ep93xx/snappercl15.c
    arch/arm/mach-ep93xx/ts72xx.c
    arch/arm/mach-ep93xx/vision_ep9307.c
    arch/arm/mach-highbank/highbank.c
    arch/arm/mach-imx/mach-imx6q.c
    arch/arm/mach-msm/board-dt-8960.c
    arch/arm/mach-netx/nxdb500.c
    arch/arm/mach-netx/nxdkn.c
    arch/arm/mach-netx/nxeb500hmi.c
    arch/arm/mach-nomadik/board-nhk8815.c
    arch/arm/mach-picoxcell/common.c
    arch/arm/mach-realview/realview_eb.c
    arch/arm/mach-realview/realview_pb1176.c
    arch/arm/mach-realview/realview_pb11mp.c
    arch/arm/mach-realview/realview_pba8.c
    arch/arm/mach-realview/realview_pbx.c
    arch/arm/mach-socfpga/socfpga.c
    arch/arm/mach-spear13xx/spear1310.c
    arch/arm/mach-spear13xx/spear1340.c
    arch/arm/mach-spear13xx/spear13xx.c
    arch/arm/mach-spear3xx/spear300.c
    arch/arm/mach-spear3xx/spear310.c
    arch/arm/mach-spear3xx/spear320.c
    arch/arm/mach-spear3xx/spear3xx.c
    arch/arm/mach-spear6xx/spear6xx.c
    arch/arm/mach-tegra/board-dt-tegra20.c
    arch/arm/mach-tegra/board-dt-tegra30.c
    arch/arm/mach-u300/core.c
    arch/arm/mach-ux500/board-mop500.c
    arch/arm/mach-ux500/cpu-db8500.c
    arch/arm/mach-versatile/versatile_ab.c
    arch/arm/mach-versatile/versatile_dt.c
    arch/arm/mach-versatile/versatile_pb.c
    arch/arm/mach-vexpress/v2m.c
    include/asm-generic/vmlinux.lds.h

    Olof Johansson
     

13 Jan, 2013

3 commits

  • Now that we have VIC moved to drivers/irqchip and all VIC DT init for
    platforms using irqchip_init, move gic.h and update the remaining
    includes.

    Signed-off-by: Rob Herring
    Cc: Thomas Gleixner
    Cc: Hartley Sweeten
    Cc: Ryan Mallon
    Cc: Russell King
    Cc: Alessandro Rubini
    Acked-by: Linus Walleij
    Cc: STEricsson
    Cc: Ben Dooks
    Cc: Kukjin Kim
    Cc: linux-samsung-soc@vger.kernel.org

    Rob Herring
     
  • Numerous includes of asm/hardware/vic.h aren't needed, so remove them.

    Signed-off-by: Rob Herring
    Acked-by: H Hartley Sweeten
    Cc: Ryan Mallon
    Cc: Russell King
    Cc: Hubert Feurstein
    Cc: Alessandro Rubini
    Acked-by: Linus Walleij
    Cc: STEricsson
    Cc: Ben Dooks
    Cc: Kukjin Kim
    Acked-by: Mark Brown
    Cc: Kyungmin Park
    Acked-By: Maxime Ripard
    Cc: linux-samsung-soc@vger.kernel.org
    Cc: patches@opensource.wolfsonmicro.com
    Acked-by: Arnd Bergmann

    Rob Herring
     
  • Now that the VIC initialization sets up the handle_arch_irq pointer, we
    can remove it for all machines and make it static. Move vic_handle_irq
    to avoid a forward declaration.

    Signed-off-by: Rob Herring
    Cc: Ryan Mallon
    Cc: Russell King
    Cc: Hubert Feurstein
    Cc: Alessandro Rubini
    Cc: STEricsson
    Cc: Ben Dooks
    Cc: Kyungmin Park
    Cc: Shiraz Hashim
    Cc: Rajeev Kumar
    Acked-by: H Hartley Sweeten
    Acked-by: Jamie Iles
    Acked-by: Linus Walleij
    Acked-by: Mark Brown
    Acked-by: Viresh Kumar
    Acked-by: Kukjin Kim
    Acked-by: Olof Johansson
    Acked-by: Arnd Bergmann

    Rob Herring
     

11 Jan, 2013

1 commit

  • With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c,
    all the arch_decomp_wdog() definition at platform level is unneeded.
    Remmove it.

    Signed-off-by: Shawn Guo
    Acked-by: Nicolas Pitre
    Acked-by: Jason Cooper

    Shawn Guo
     

25 Dec, 2012

2 commits

  • 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
     
  • remove ARM's struct sys_timer .offset function pointer, and instead
    directly set the arch_gettimeoffset function pointer when the timer
    driver is initialized. This requires multiplying all function results
    by 1000, since the removed arm_gettimeoffset() did this. Also,
    s/unsigned long/u32/ just to make the function prototypes exactly
    match that of arch_gettimeoffset.

    Cc: Russell King
    Cc: Andrew Victor
    Cc: Nicolas Ferre
    Cc: Jean-Christophe Plagniol-Villard
    Cc: Hartley Sweeten
    Cc: Ryan Mallon
    Cc: Ben Dooks
    Cc: Kukjin Kim
    Signed-off-by: Stephen Warren

    Stephen Warren
     

12 Dec, 2012

1 commit

  • This patch changes the busy-waiting loop around in the decompressor
    putc() function on the UART FIFO register. Without a proper wait, the
    output of the decompressor was corrupted like this:

    Uncompressing Linx. done, booting th enl

    To highlight the issue more evidently, looping 100 times instead of 1000
    makes the issue appear much faster. This patch takes the approach of
    using an active while loop until the FIFO is empty (not FULL).
    This issue happened to me on Sim.One running at 200Mhz.

    Signed-off-by: Florian Fainelli
    Signed-off-by: Ryan Mallon

    Florian Fainelli
     

02 Oct, 2012

1 commit

  • Pull ARM soc multiplatform enablement from Olof Johansson:
    "This is a pretty significant branch. It's the introduction of the
    first multiplatform support on ARM, and with this (and the later
    branch) merged, it is now possible to build one kernel that contains
    support for highbank, vexpress, mvebu, socfpga, and picoxcell. More
    platforms will be convered over in the next few releases.

    Two critical last things had to be done for this to be practical and
    possible:
    * Today each platform has its own include directory under
    mach-/include/mach/*, and traditionally that is where a lot
    of driver/platform shared definitions have gone, such as platform
    data structures. They now need to move out to a common location
    instead, and this branch moves a large number of those out to
    include/linux/platform_data.
    * Each platform used to list the device trees to compile for its
    boards in mach-/Makefile.boot.

    Both of the above changes will mean that there are some merge
    conflicts to come (and some to resolve here). It's a one-time move
    and once it settles in, we should be good for quite a while. Sorry
    for the overhead."

    Fix conflicts as per Olof.

    * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
    ARM: add v7 multi-platform defconfig
    ARM: msm: Move core.h contents into common.h
    ARM: highbank: call highbank_pm_init from .init_machine
    ARM: dtb: move all dtb targets to common Makefile
    ARM: spear: move platform_data definitions
    ARM: samsung: move platform_data definitions
    ARM: orion: move platform_data definitions
    ARM: vexpress: convert to multi-platform
    ARM: initial multiplatform support
    ARM: mvebu: move armada-370-xp.h in mach dir
    ARM: vexpress: remove dependency on mach/* headers
    ARM: picoxcell: remove dependency on mach/* headers
    ARM: move all dtb targets out of Makefile.boot
    ARM: picoxcell: move debug macros to include/debug
    ARM: socfpga: move debug macros to include/debug
    ARM: mvebu: move debug macros to include/debug
    ARM: vexpress: move debug macros to include/debug
    ARM: highbank: move debug macros to include/debug
    ARM: move debug macros to common location
    ARM: make mach/gpio.h headers optional
    ...

    Linus Torvalds
     

22 Sep, 2012

1 commit

  • * multiplatform/platform-data:
    ARM: spear: move platform_data definitions
    ARM: samsung: move platform_data definitions
    ARM: orion: move platform_data definitions
    ARM: nomadik: move platform_data definitions
    ARM: w90x900: move platform_data definitions
    ARM: vt8500: move platform_data definitions
    ARM: tegra: move sdhci platform_data definition
    ARM: sa1100: move platform_data definitions
    ARM: pxa: move platform_data definitions
    ARM: netx: move platform_data definitions
    ARM: msm: move platform_data definitions
    ARM: imx: move platform_data definitions
    ARM: ep93xx: move platform_data definitions
    ARM: davinci: move platform_data definitions
    ARM: at91: move platform_data definitions

    Conflicts due to removed files:
    arch/arm/mach-tegra/board-harmony.c
    arch/arm/mach-tegra/board-trimslice.c

    Conflicts due to code removal:
    arch/arm/mach-tegra/board-paz00.c

    Context conflicts in:
    drivers/mmc/host/sdhci-tegra.c
    drivers/net/irda/pxaficp_ir.c

    Signed-off-by: Olof Johansson

    Olof Johansson
     

17 Sep, 2012

2 commits


14 Sep, 2012

2 commits

  • Most platforms don't need mach/gpio.h and it prevents multi-platform
    kernel images. Add CONFIG_NEED_MACH_GPIO_H and make platforns select it
    if they need gpio.h. This is platforms that define __GPIOLIB_COMPLEX
    or have lots of implicit includes pulled in by mach/gpio.h.

    at91 and omap have gpio clean-up pending and can drop
    CONFIG_NEED_MACH_GPIO_H once that is in.

    Signed-off-by: Rob Herring
    Cc: Russell King
    Acked-by: Jason Cooper
    Acked-by: Linus Walleij

    Rob Herring
     
  • 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 ep93xx include directories

    Signed-off-by: Arnd Bergmann
    Acked-by: Mark Brown
    Acked-by: Greg Kroah-Hartman
    Acked-by: Nicolas Pitre
    Acked-by: Hartley Sweeten
    Acked-by: Ryan Mallon
    Acked-by: Vinod Koul
    Cc: Grant Likely
    Cc: Jeff Garzik
    Cc: Dan Williams
    Cc: Dmitry Torokhov
    Cc: Florian Tobias Schandinat
    Cc: Liam Girdwood
    Cc: Jaroslav Kysela
    Cc: Takashi Iwai
    Cc: Mika Westerberg
    Cc: Axel Lin

    Arnd Bergmann
     

07 Sep, 2012

1 commit

  • Include linux/sizes.h to fix below build errors:

    CC arch/arm/mach-ep93xx/adssphere.o
    arch/arm/mach-ep93xx/adssphere.c: In function 'adssphere_init_machine':
    arch/arm/mach-ep93xx/adssphere.c:32:49: error: 'SZ_32M' undeclared (first use in this function)
    arch/arm/mach-ep93xx/adssphere.c:32:49: note: each undeclared identifier is reported only once for each function it appears in
    make[1]: *** [arch/arm/mach-ep93xx/adssphere.o] Error 1
    make: *** [arch/arm/mach-ep93xx] Error 2

    CC arch/arm/mach-ep93xx/gesbc9312.o
    arch/arm/mach-ep93xx/gesbc9312.c: In function 'gesbc9312_init_machine':
    arch/arm/mach-ep93xx/gesbc9312.c:32:49: error: 'SZ_8M' undeclared (first use in this function)
    arch/arm/mach-ep93xx/gesbc9312.c:32:49: note: each undeclared identifier is reported only once for each function it appears in
    make[1]: *** [arch/arm/mach-ep93xx/gesbc9312.o] Error 1
    make: *** [arch/arm/mach-ep93xx] Error 2

    Signed-off-by: Axel Lin
    Signed-off-by: Ryan Mallon

    Axel Lin
     

24 Jul, 2012

1 commit

  • Pull arm soc-specific updates from Arnd Bergmann:
    "This is stuff that does not fit well into another category and in
    particular is not related to a particular board. The largest part in
    here is extending the am33xx support in the omap platform."

    Fix up trivial conflicts in arch/arm/mach-{imx/mach-mx35_3ds.c, tegra/Makefile}

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (74 commits)
    ARM: LPC32xx: Add PWM support
    ARM: LPC32xx: Add PWM clock
    ARM: LPC32xx: Set system serial based on cpu unique id
    ARM: vexpress: Config option for early printk console
    ARM: vexpress: Add Device Tree for V2P-CA15_CA7 core tile
    ARM: vexpress: Convert V2P-CA15 Device Tree to 64 bit addresses
    ARM: vexpress: Add fixed regulator for SMSC
    ARM: vexpress: Add missing SP804 interrupt in motherboard's DTS files
    ARM: vexpress: Initial common clock support
    ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
    ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
    ARM: EXYNOS: Make combiner_init function static
    ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
    ARM: versatile: Make plat-versatile clock optional
    ARM: vexpress: Check master site in daughterboard's sysctl operations
    ARM: vexpress: remove automatic errata workaround selection
    ARM: LPC32xx: Adjust to pl08x DMA interface changes
    ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
    ARM: imx: fix mx51 ehci setup errors
    ARM: imx: make ehci power/oc polarities configurable
    ...

    Linus Torvalds
     

11 Jun, 2012

1 commit


04 Jun, 2012

2 commits


02 Jun, 2012

1 commit

  • Pull mtd update from David Woodhouse:
    - More robust parsing especially of xattr data in JFFS2
    - Updates to mxc_nand and gpmi drivers to support new boards and device tree
    - Improve consistency of information about ECC strength in NAND devices
    - Clean up partition handling of plat_nand
    - Support NAND drivers without dedicated access to OOB area
    - BCH hardware ECC support for OMAP
    - Other fixes and cleanups, and a few new device IDs

    Fixed trivial conflict in drivers/mtd/nand/gpmi-nand/gpmi-nand.c due to
    added include files next to each other.

    * tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd: (75 commits)
    mtd: mxc_nand: move ecc strengh setup before nand_scan_tail
    mtd: block2mtd: fix recursive call of mtd_writev
    mtd: gpmi-nand: define ecc.strength
    mtd: of_parts: fix breakage in Kconfig
    mtd: nand: fix scan_read_raw_oob
    mtd: docg3 fix in-middle of blocks reads
    mtd: cfi_cmdset_0002: Slight cleanup of fixup messages
    mtd: add fixup for S29NS512P NOR flash.
    jffs2: allow to complete xattr integrity check on first GC scan
    jffs2: allow to discriminate between recoverable and non-recoverable errors
    mtd: nand: omap: add support for hardware BCH ecc
    ARM: OMAP3: gpmc: add BCH ecc api and modes
    mtd: nand: check the return code of 'read_oob/read_oob_raw'
    mtd: nand: remove 'sndcmd' parameter of 'read_oob/read_oob_raw'
    mtd: m25p80: Add support for Winbond W25Q80BW
    jffs2: get rid of jffs2_sync_super
    jffs2: remove unnecessary GC pass on sync
    jffs2: remove unnecessary GC pass on umount
    jffs2: remove lock_super
    mtd: gpmi: add gpmi support for mx6q
    ...

    Linus Torvalds
     

27 May, 2012

2 commits

  • 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
     
  • Pull arm-soc driver specific updates from Olof Johansson:
    "These changes are specific to some driver that may be used by multiple
    boards or socs. The most significant change in here is the move of
    the samsung iommu code from a platform specific in-kernel interface to
    the generic iommu subsystem."

    Fix up trivial conflicts in arch/arm/mach-exynos/Kconfig

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
    mmc: dt: Consolidate DT bindings
    iommu/exynos: Add iommu driver for EXYNOS Platforms
    ARM: davinci: optimize the DMA ISR
    ARM: davinci: implement DEBUG_LL port choice
    ARM: tegra: Add SMMU enabler in AHB
    ARM: tegra: Add Tegra AHB driver
    Input: pxa27x_keypad add choice to set direct_key_mask
    Input: pxa27x_keypad direct key may be low active
    Input: pxa27x_keypad bug fix for direct_key_mask
    Input: pxa27x_keypad keep clock on as wakeup source
    ARM: dt: tegra: pinmux changes for USB ULPI
    ARM: tegra: add USB ULPI PHY reset GPIO to device tree
    ARM: tegra: don't hard-code USB ULPI PHY reset_gpio
    ARM: tegra: change pll_p_out4's rate to 24MHz
    ARM: tegra: fix pclk rate
    ARM: tegra: reparent sclk to pll_c_out1
    ARM: tegra: Add pllc clock init table
    ARM: dt: tegra cardhu: basic audio support
    ARM: dt: tegra30.dtsi: Add audio-related nodes
    ARM: tegra: add AUXDATA required for audio
    ...

    Linus Torvalds
     

14 May, 2012

2 commits


05 May, 2012

1 commit


12 Apr, 2012

2 commits

  • Use gpio_led_register_device to register the two leds
    connected to the ep93xx.

    Since this is a common feature for all ep93xx based boards,
    create a new Kconfig option, EP93XX_SOC_COMMON, to select
    the LEDS_GPIO_REGISTER feature.

    The struct gpio_led and struct gpio_led_platform_data variables
    have been changed to const struct because of:

    commit 9517f925f2eb9ffca78b3f0f9389fc675bcb572c
    leds: make *struct gpio_led_platform_data.leds const

    They have also been marked as __initconst because the helper
    function gpio_led_register_device makes a deep copy of the
    platform data to allow it to live in init memory:

    commit 4440673a95e63ad888a41db596edaa0c55d3a332
    leds: provide helper to register "leds-gpio" devices

    Signed-off-by: Hartley Sweeten
    Signed-off-by: Ryan Mallon

    H Hartley Sweeten
     
  • Commit ede55aaa8bb2dd37e302b2f94312306d216e5f97 "arm: ep93xx: use
    DEFINE_RES_* macros" introduced a build breakage in ep93xx due to a
    typo. Fix it.

    Signed-off-by: Ryan Mallon
    Acked-by: Hartley Sweeten

    Ryan Mallon