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

1 commit

  • 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

1 commit

  • 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
     

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
     

25 Oct, 2011

1 commit

22 Oct, 2011

1 commit

  • fb630b9fc   ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM ... Browse Code »

    v2:
    - register_syscore_ops(&s3c24xx_irq_syscore_ops) does not need to be
    conditionally compiled out, it is already optimized out on !CONFIG_PM
    - fix also s3c2412 and s3c2416 affected by the same build issue

    v1:
    s3c2440.c fails to build if !CONFIG_PM because in such case
    s3c2410_pm_syscore_ops is not defined. Same error should happen also
    in s3c2410.c and s3c2442.c

    Signed-off-by: Domenico Andreoli
    Signed-off-by: Kukjin Kim

    Domenico Andreoli
     

17 Oct, 2011

1 commit

  • 0744a3ee3   ARM: platform fixups: remove mdesc argument to fixup function ... Browse Code »

    Get rid of the mdesc pointer in the fixup function call. No one uses
    the mdesc pointer, it shouldn't be modified anyway, and we can't wrap
    it, so let's remove it.

    Platform files found by:

    $ regexp=$(git grep -h '\.fixup.*=' arch/arm |
    sed 's!.*= *\([^,]*\),* *!\1!' | sort -u |
    tr '\n' '|' | sed 's,|$,,;s,|,\\|,g')
    $ git grep $regexp arch/arm

    Acked-by: Nicolas Pitre
    Signed-off-by: Russell King

    Russell King
     

09 Oct, 2011

1 commit

04 Oct, 2011

2 commits

21 Sep, 2011

2 commits

16 Sep, 2011

2 commits

14 Sep, 2011

1 commit

22 Aug, 2011

1 commit

26 Jul, 2011

2 commits

  • 4b478cedc   Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel… ... Browse Code »

    …/git/arm/linux-arm-soc

    * 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
    ARM: mach-loki: delete
    ARM: mach-s3c2400: delete
    ARM: mach-s3c24a0: delete

    Linus Torvalds
     
  • ae4c42e4e   Merge branch 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc ... Browse Code »

    * 'next/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (133 commits)
    ARM: EXYNOS4: Change devname for FIMD clkdev
    ARM: S3C64XX: Cleanup mach/regs-fb.h from mach-s3c64xx
    ARM: S5PV210: Cleanup mach/regs-fb.h from mach-s5pv210
    ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100
    ARM: S3C24XX: Use generic s3c_set_platdata for devices
    ARM: S3C64XX: Use generic s3c_set_platdata for OneNAND
    ARM: SAMSUNG: Use generic s3c_set_platdata for NAND
    ARM: SAMSUNG: Use generic s3c_set_platdata for USB OHCI
    ARM: SAMSUNG: Use generic s3c_set_platdata for HWMON
    ARM: SAMSUNG: Use generic s3c_set_platdata for FB
    ARM: SAMSUNG: Use generic s3c_set_platdata for TS
    ARM: S3C64XX: Add PWM backlight support on SMDK6410
    ARM: S5P64X0: Add PWM backlight support on SMDK6450
    ARM: S5P64X0: Add PWM backlight support on SMDK6440
    ARM: S5PC100: Add PWM backlight support on SMDKC100
    ARM: S5PV210: Add PWM backlight support on SMDKV210
    ARM: EXYNOS4: Add PWM backlight support on SMDKC210
    ARM: EXYNOS4: Add PWM backlight support on SMDKV310
    ARM: SAMSUNG: Create a common infrastructure for PWM backlight support
    clocksource: convert 32-bit down counting clocksource on S5PV210/S5P64X0
    ...

    Fix up trivial conflict in arch/arm/mach-imx/mach-scb9328.c

    Linus Torvalds
     

25 Jul, 2011

1 commit

  • b6844e8f6   Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (237 commits)
    ARM: 7004/1: fix traps.h compile warnings
    ARM: 6998/2: kernel: use proper memory barriers for bitops
    ARM: 6997/1: ep93xx: increase NR_BANKS to 16 for support of 128MB RAM
    ARM: Fix build errors caused by adding generic macros
    ARM: CPU hotplug: ensure we migrate all IRQs off a downed CPU
    ARM: CPU hotplug: pass in proper affinity mask on IRQ migration
    ARM: GIC: avoid routing interrupts to offline CPUs
    ARM: CPU hotplug: fix abuse of irqdesc->node
    ARM: 6981/2: mmci: adjust calculation of f_min
    ARM: 7000/1: LPAE: Use long long printk format for displaying the pud
    ARM: 6999/1: head, zImage: Always Enter the kernel in ARM state
    ARM: btc: avoid invalidating the branch target cache on kernel TLB maintanence
    ARM: ARM_DMA_ZONE_SIZE is no more
    ARM: mach-shark: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
    ARM: mach-sa1100: move ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
    ARM: mach-realview: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
    ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
    ARM: mach-ixp4xx: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
    ARM: mach-h720x: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
    ARM: mach-davinci: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size
    ...

    Linus Torvalds
     

20 Jul, 2011

1 commit

18 Jul, 2011

1 commit

  • 632b7cf6c   ARM: mach-s3c2400: delete ... Browse Code »

    On Tue, 28 Jun 2011, Ben Dooks wrote:

    > On Tue, Jun 28, 2011 at 11:22:57PM +0200, Arnd Bergmann wrote:
    >
    > > On a related note, what about mach-s3c2400? It seems to be even more
    > > incomplete.
    >
    > Probably the same fate awaits that. It is so old that there's little
    > incentive to do anything with it.

    So out it goes as well.

    The PORT_S3C2400 definition in include/linux/serial_core.h is left there
    to prevent a reuse of the same number for another port type.

    Signed-off-by: Nicolas Pitre
    Acked-by: Arnd Bergmann

    Nicolas Pitre
     

05 Jul, 2011

1 commit

02 Jul, 2011

1 commit

  • 29cb3cd20   ARM: pm: allow suspend finisher to return error codes ... Browse Code »

    There are SoCs where attempting to enter a low power state is ignored,
    and the CPU continues executing instructions with all state preserved.
    It is over-complex at that point to disable the MMU just to call the
    resume path.

    Instead, allow the suspend finisher to return error codes to abort
    suspend in this circumstance, where the cpu_suspend internals will then
    unwind the saved state on the stack. Also omit the tlb flush as no
    changes to the page tables will have happened.

    Signed-off-by: Russell King

    Russell King
     

24 Jun, 2011

2 commits

25 Apr, 2011

1 commit

  • bb072c3cf   ARM / Samsung: Use struct syscore_ops for "core" power management ... Browse Code »

    Replace sysdev classes and struct sys_device objects used for "core"
    power management by Samsung platforms with struct syscore_ops objects
    that are simpler.

    This generally reduces the code size and the kernel memory footprint.
    It also is necessary for removing sysdevs entirely from the kernel in
    the future.

    Signed-off-by: Rafael J. Wysocki
    Acked-by: Greg Kroah-Hartman
    Acked-by: Kukjin Kim

    Rafael J. Wysocki
     

29 Mar, 2011

2 commits

08 Mar, 2011

1 commit

15 Jan, 2011

1 commit

07 Jan, 2011

1 commit

03 Jan, 2011

1 commit

17 Dec, 2010

1 commit

06 Dec, 2010

1 commit

30 Nov, 2010

1 commit

28 Oct, 2010

1 commit

20 Oct, 2010

1 commit

  • 6451d7783   arm: remove machine_desc.io_pg_offst and .phys_io ... Browse Code »

    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
     

18 Oct, 2010

1 commit

16 Jul, 2010

1 commit