Eric Lee / smarc-fsl-linux-kernel

06 Nov, 2011

1 commit

  • 7abec10c6   Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc: (79 commits)
    ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung
    ARM: SAMSUNG: Cleanup resources by using macro
    ARM: SAMSUNG: Cleanup plat-samsung/devs.c and devs.h
    ARM: S5P: To merge devs.c files to one devs.c
    ARM: S3C64XX: To merge devs.c files to one devs.c
    ARM: S3C24XX: To merge s3c24xx devs.c files to one devs.c
    ARM: S5P64X0: Add Power Management support
    ARM: S5P: Make the sleep code common for S5P series SoCs
    ARM: S5P: Make the common S5P PM code conditionally compile
    ARM: SAMSUNG: Move S5P header files to plat-samsung
    ARM: SAMSUNG: Move S3C24XX header files to plat-samsung
    ARM: SAMSUNG: Moving each SoC support header files
    ARM: SAMSUNG: Consolidate plat/pll.h
    ARM: SAMSUNG: Consolidate plat/pwm-clock.h
    ARM: SAMSUNG: Cleanup mach/clkdev.h
    ARM: SAMSUNG: remove sdhci default configuration setup platform helper
    ARM: EXYNOS4: Add FIMC device on SMDKV310 board
    ARM: EXYNOS4: Add header file protection macros
    ARM: EXYNOS4: Add usb ehci device to the SMDKV310
    ARM: S3C2443: Add hsspi-clock from pclk and rename S3C2443 hsspi sclk
    ...

    Fix up conflicts in
    - arch/arm/mach-exynos4/{Kconfig,clock.c}
    ARM_CPU_SUSPEND, various random device tables (gah!)
    - drivers/gpio/Makefile
    sa1100 gpio added, samsung gpio drivers merged

    Linus Torvalds
     

05 Nov, 2011

1 commit

  • fba956992   Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma ... Browse Code »

    * 'next' of git://git.infradead.org/users/vkoul/slave-dma: (63 commits)
    dmaengine: mid_dma: mask_peripheral_interrupt only when dmac is idle
    dmaengine/ep93xx_dma: add module.h include
    pch_dma: Reduce wasting memory
    pch_dma: Fix suspend issue
    dma/timberdale: free_irq() on an error path
    dma: shdma: transfer based runtime PM
    dmaengine: shdma: protect against the IRQ handler
    dmaengine i.MX DMA/SDMA: add missing include of linux/module.h
    dmaengine: delete redundant chan_id and chancnt initialization in dma drivers
    dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool
    dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers
    serial: sh-sci: don't filter on DMA device, use only channel ID
    ARM: SAMSUNG: Remove Samsung specific enum type for dma direction
    ASoC: Samsung: Update DMA interface
    spi/s3c64xx: Merge dma control code
    spi/s3c64xx: Add support DMA engine API
    ARM: SAMSUNG: Remove S3C-PL330-DMA driver
    ARM: S5P64X0: Use generic DMA PL330 driver
    ARM: S5PC100: Use generic DMA PL330 driver
    ARM: S5PV210: Use generic DMA PL330 driver
    ...

    Fix up fairly trivial conflicts in
    - arch/arm/mach-exynos4/{Kconfig,clock.c}
    - arch/arm/mach-s5p64x0/dma.c

    Linus Torvalds
     

02 Nov, 2011

2 commits

  • f906fb1d7   Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/board' of git://git.linaro.org/people/arnd/arm-soc: (34 commits)
    ep93xx: add support Vision EP9307 SoM
    ARM: mxs: Add initial support for DENX MX28
    ARM: EXYNOS4: Add support SMDK4412 Board
    ARM: EXYNOS4: Add MCT support for EXYNOS4412
    ARM: EXYNOS4: Add functions for gic interrupt handling
    ARM: EXYNOS4: Add support clock for EXYNOS4412
    ARM: EXYNOS4: Add support new EXYNOS4412 SoC
    ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212
    ARM: EXYNOS4: Add support PPI in external GIC
    ARM: EXYNOS4: convert boot_params to atag_offset
    ixp4xx: support omicron ixp425 based boards
    ARM: EXYNOS4: Add support SMDK4212 Board
    ARM: EXYNOS4: Add support PM for EXYNOS4212
    ARM: EXYNOS4: Add support clock for EXYNOS4212
    ARM: EXYNOS4: Add support new EXYNOS4212 SoC
    at91: USB-A9G20 C01 & C11 board support
    at91: merge board USB-A9260 and USB-A9263 together
    at91: add support for RSIs EWS board
    ARM: SAMSUNG: Fix mask value for S5P64X0 CPU IDs
    ARM: SAMSUNG: Fix mask for S3C64xx CPU IDs
    ...

    Linus Torvalds
     
  • 952414505   Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
    ARM: mach-mxs: fix machines' initializers order
    mmc: mxcmmc: explicitly includes mach/hardware.h
    arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
    arm/imx: remove mx27_setup_weimcs() from mx27.h
    arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
    arm/imx: remove mx31_setup_weimcs() from mx31.h
    ARM: tegra: devices.c should include devices.h
    ARM: tegra: cpu-tegra: unexport two functions
    ARM: tegra: cpu-tegra: sparse type fix
    ARM: tegra: dma: staticify some tables and functions
    ARM: tegra: tegra2_clocks: don't export some tables
    ARM: tegra: tegra_powergate_is_powered should be static
    ARM: tegra: tegra_rtc_read_ms should be static
    ARM: tegra: tegra_init_cache should be static
    ARM: tegra: pcie: 0 -> NULL changes
    ARM: tegra: pcie: include board.h
    ARM: tegra: pcie: don't cast __iomem pointers
    ARM: tegra: tegra2_clocks: 0 -> NULL changes
    ARM: tegra: tegra2_clocks: don't cast __iomem pointers
    ARM: tegra: timer: don't cast __iomem pointers
    ...

    Fix up trivial conflicts in
    arch/arm/mach-omap2/Makefile,
    arch/arm/mach-u300/{Makefile.boot,core.c}
    arch/arm/plat-{mxc,omap}/devices.c

    Linus Torvalds
     

01 Nov, 2011

5 commits

  • cfaf8fc5b   Merge branch 'depends/rmk/memory_h' into next/cleanup2 ... Browse Code »

    There are lots of conflicts between the omap and exynos cleanups
    and the memory.h remove series.

    Conflicts:
    arch/arm/mach-exynos4/mach-smdkc210.c
    arch/arm/mach-exynos4/mach-smdkv310.c
    arch/arm/mach-imx/mach-cpuimx27.c
    arch/arm/mach-omap1/board-ams-delta.c
    arch/arm/mach-omap1/board-generic.c
    arch/arm/mach-omap1/board-h2.c
    arch/arm/mach-omap1/board-h3.c
    arch/arm/mach-omap1/board-nokia770.c
    arch/arm/mach-omap1/board-osk.c
    arch/arm/mach-omap1/board-palmte.c
    arch/arm/mach-omap1/board-palmtt.c
    arch/arm/mach-omap1/board-palmz71.c
    arch/arm/mach-omap1/board-sx1.c
    arch/arm/mach-omap1/board-voiceblue.c
    arch/arm/mach-omap1/io.c
    arch/arm/mach-omap2/board-generic.c
    arch/arm/mach-omap2/io.c
    arch/arm/plat-omap/io.c

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • a7fadac10   Merge branch 'depends/rmk/devel-stable' into next/board ... Browse Code »

    The exynos4 updates conflict with code from the arm devel-stable branch
    and new boards need to set atag_offset in place of boot_param.

    Conflicts:
    arch/arm/Kconfig
    arch/arm/mach-exynos4/include/mach/entry-macro.S
    arch/arm/mach-exynos4/mach-smdkc210.c
    arch/arm/mach-exynos4/mach-smdkv310.c
    arch/arm/mach-exynos4/mct.c

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • 3e965b176   Merge branch 'next/fixes' into next/cleanup ... Browse Code »

    Conflicts:
    arch/arm/mach-mxs/include/mach/gpio.h
    arch/arm/plat-mxc/include/mach/gpio.h
    drivers/video/omap/lcd_apollon.c
    drivers/video/omap/lcd_ldp.c
    drivers/video/omap/lcd_overo.c

    Arnd Bergmann
     
  • 5839fec9d   Merge branch 'depends/rmk/memory_h' into next/fixes ... Browse Code »

    Fix up all conflicts between the memory.h cleanup and bug fixes.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     
  • 43872fa78   Merge branch 'depends/rmk/gpio' into next/fixes ... Browse Code »

    This sorts out merge conflicts with the arm/gpio branch that
    already got merged into mainline Linux.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

29 Oct, 2011

1 commit

  • 1fdb24e96   Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/… ... Browse Code »

    …git-cur/linux-2.6-arm

    * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
    ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
    ARM: gic, local timers: use the request_percpu_irq() interface
    ARM: gic: consolidate PPI handling
    ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
    ARM: mach-s5p64x0: remove mach/memory.h
    ARM: mach-s3c64xx: remove mach/memory.h
    ARM: plat-mxc: remove mach/memory.h
    ARM: mach-prima2: remove mach/memory.h
    ARM: mach-zynq: remove mach/memory.h
    ARM: mach-bcmring: remove mach/memory.h
    ARM: mach-davinci: remove mach/memory.h
    ARM: mach-pxa: remove mach/memory.h
    ARM: mach-ixp4xx: remove mach/memory.h
    ARM: mach-h720x: remove mach/memory.h
    ARM: mach-vt8500: remove mach/memory.h
    ARM: mach-s5pc100: remove mach/memory.h
    ARM: mach-tegra: remove mach/memory.h
    ARM: plat-tcc: remove mach/memory.h
    ARM: mach-mmp: remove mach/memory.h
    ARM: mach-cns3xxx: remove mach/memory.h
    ...

    Fix up mostly pretty trivial conflicts in:
    - arch/arm/Kconfig
    - arch/arm/include/asm/localtimer.h
    - arch/arm/kernel/Makefile
    - arch/arm/mach-shmobile/board-ap4evb.c
    - arch/arm/mach-u300/core.c
    - arch/arm/mm/dma-mapping.c
    - arch/arm/mm/proc-v7.S
    - arch/arm/plat-omap/Kconfig
    largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
    CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
    addition of NEED_MACH_MEMORY_H next to HAVE_IDE.

    Linus Torvalds
     

27 Oct, 2011

1 commit

  • ca9066628   Merge branch 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm ... Browse Code »

    * 'gpio' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (43 commits)
    ARM: 7135/1: ep93xx: bring back missing
    ARM: 7104/1: plat-pxa: break out GPIO driver specifics
    ARM: 7103/1: plat-pxa: move PXA GPIO driver to GPIO subsystem
    ARM: 7042/3: mach-ep93xx: break out GPIO driver specifics
    ARM: 7101/1: arm/tegra: Replace with
    ARM: 7094/1: arm/tegra: Move EN_VDD_1V05_GPIO to board-harmony.h
    ARM: 7083/1: rewrite U300 GPIO to use gpiolib
    ARM: 7074/1: gpio: davinci: eliminate unused variable warnings
    ARM: 7063/1: Orion: gpio: add missing include of linux/types.h
    ARM: 7055/1: arm/tegra: mach/gpio.h: include linux/types.h to fix build
    ARM: 7054/1: arm/tegra: Delete custom gpio_to_irq, and irq_to_gpio
    ARM: 7053/1: gpio/tegra: Implement gpio_chip.to_irq
    ARM: 7052/1: gpio/tegra: Remove use of irq_to_gpio
    ARM: 7057/1: mach-pnx4008: rename GPIO header
    ARM: 7056/1: plat-nomadik: kill off
    ARM: 7050/1: mach-sa1100: delete irq_to_gpio() function
    ARM: 7049/1: mach-sa1100: move SA1100 GPIO driver to GPIO subsystem
    ARM: 7045/1: mach-lpc32xx: break out GPIO driver specifics
    ARM: 7044/1: mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem
    ARM: 7043/1: mach-ixp2000: rename GPIO header
    ...

    Fix up trivial conflicts in arch/arm/mach-u300/Kconfig manually

    Linus Torvalds
     

21 Oct, 2011

1 commit

18 Oct, 2011

1 commit

17 Oct, 2011

1 commit

  • 40c6d8aee   ARM: 7022/1: allow to detect conflicting zreladdrs ... Browse Code »

    Boards used to specify zreladdr in their Makefile.boot with
    zreladdr-y := x, so conflicting zreladdrs were silently overwritten.
    This patch changes this to zreladdr-y += x, so that we end
    up with multiple words in zreladdr in such a case. We can
    detect this later and complain if necessary.

    Signed-off-by: Sascha Hauer
    Signed-off-by: Russell King

    Sascha Hauer
     

14 Oct, 2011

1 commit

09 Oct, 2011

1 commit

04 Oct, 2011

12 commits

26 Sep, 2011

1 commit

  • 639da5ee3   ARM: add an extra temp register to the low level debugging addruart macro ... Browse Code »

    Some platforms (like OMAP not to name it) are doing rather complicated
    hacks just to determine the base UART address to use. Let's give their
    addruart macro some slack by providing an extra work register which will
    allow for much needed cleanups.

    This is basically a no-op as this commit is only adding the extra argument
    to the macro but no one is using it yet.

    Signed-off-by: nicolas Pitre
    Reviewed-by: Kevin Hilman

    Nicolas Pitre
     

21 Sep, 2011

1 commit

19 Sep, 2011

2 commits

17 Sep, 2011

1 commit

16 Sep, 2011

2 commits

14 Sep, 2011

2 commits

23 Aug, 2011

1 commit

22 Aug, 2011

2 commits