Eric Lee / smarc-fsl-linux-kernel

07 Nov, 2011

1 commit

  • 32aaeffbd   Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ... Browse Code »

    * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
    Revert "tracing: Include module.h in define_trace.h"
    irq: don't put module.h into irq.h for tracking irqgen modules.
    bluetooth: macroize two small inlines to avoid module.h
    ip_vs.h: fix implicit use of module_get/module_put from module.h
    nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
    include: replace linux/module.h with "struct module" wherever possible
    include: convert various register fcns to macros to avoid include chaining
    crypto.h: remove unused crypto_tfm_alg_modname() inline
    uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
    pm_runtime.h: explicitly requires notifier.h
    linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
    miscdevice.h: fix up implicit use of lists and types
    stop_machine.h: fix implicit use of smp.h for smp_processor_id
    of: fix implicit use of errno.h in include/linux/of.h
    of_platform.h: delete needless include
    acpi: remove module.h include from platform/aclinux.h
    miscdevice.h: delete unnecessary inclusion of module.h
    device_cgroup.h: delete needless include
    net: sch_generic remove redundant use of
    net: inet_timewait_sock doesnt need
    ...

    Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
    - drivers/media/dvb/frontends/dibx000_common.c
    - drivers/media/video/{mt9m111.c,ov6650.c}
    - drivers/mfd/ab3550-core.c
    - include/linux/dmaengine.h

    Linus Torvalds
     

06 Nov, 2011

2 commits

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

    * 'next/devel2' of git://git.linaro.org/people/arnd/arm-soc: (30 commits)
    ARM: mmp: register internal sram bank
    ARM: mmp: register audio sram bank
    ARM: mmp: add sram allocator
    gpio/samsung: Complain loudly if we don't know the SoC
    ARM: S3C64XX: Fix SoC identification for S3C64xx devices
    ARM: S3C2443: Remove redundant s3c_register_clocks call for init_clocks
    ARM: S3C24XX: Add devname for hsmmc1 pclk
    ARM: S3C24XX: use clk_get_rate to init fclk in common_setup_clocks
    ARM: S3C2443: Accommodate cpufreq frequency scheme in armdiv
    ARM: S3C2443: handle unset armdiv values gracefully
    ARM: S3C2443: Add get_rate operation for clk_armdiv
    ARM: S3C2416: Add comment describing the armdiv/armclk
    ARM: S3C2443: Move clk_arm and clk_armdiv to common code
    ARM: S3C24XX: Add infrastructure to transmit armdiv to common code
    ARM: S3C2416: Add armdiv_mask constant
    ARM: EXYNOS4: Add support for M-5MOLS camera on Nuri board
    ARM: EXYNOS4: Enable MFC on ORIGEN
    ARM: SAMSUNG: Add support s3c2416-adc for S3C2416/S3C2450
    ARM: SAMSUNG: Add support s3c2443-adc for S3C2443
    ARM: SAMSUNG: Allow overriding of adc device name for S3C24XX
    ...

    Linus Torvalds
     
  • 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

4 commits

31 Oct, 2011

1 commit

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
     

25 Oct, 2011

2 commits

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

  • 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

2 commits

  • 0d23d059d   ARM: S3C2416: Add armdiv_mask constant ... Browse Code »

    The S3C2416/2450 has only 3 bits for the armdiv setting instead
    of the 4 bits of the S3C2443.

    Signed-off-by: Heiko Stuebner
    Signed-off-by: Kukjin Kim

    Heiko Stuebner
     
  • 8b5da2df2   ARM: mach-s3c2410: remove memory.h ... Browse Code »

    This also removes the mach/s3c2400 version which was probably never used
    due to the fact that we have this line in arch/arm/Makefile:

    machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 [...]

    This is later used to construct the search path for:

    The compiler would be looking into mach-s3c2410 and picking up this
    version first. Any config that was actually expecting the mach-s3c2400
    version was therefore producing a broken kernel binary. Not relying on
    any of them anymore would fix that issue.

    Signed-off-by: Nicolas Pitre

    Nicolas Pitre
     

12 Oct, 2011

1 commit

09 Oct, 2011

1 commit

06 Oct, 2011

2 commits

04 Oct, 2011

5 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

3 commits

17 Sep, 2011

1 commit

16 Sep, 2011

3 commits

14 Sep, 2011

3 commits

  • 51ddf31da   ARM: SAMSUNG: Remove Samsung specific enum type for dma direction ... Browse Code »

    This patch removes the samsung specific enum type 's3c2410_dmasrc'
    and uses 'dma_data_direction' instead.

    Signed-off-by: Boojin Kim
    Acked-by: Linus Walleij
    Acked-by: Vinod Koul
    Signed-off-by: Kukjin Kim
    Signed-off-by: Vinod Koul

    Boojin Kim
     
  • 344b4c488   ASoC: Samsung: Update DMA interface ... Browse Code »

    This patch adds to support the DMA PL330 driver that uses
    DMA generic API. Samsung sound driver uses DMA generic API
    if architecture supports it. Otherwise, use samsung specific
    S3C-PL330 API driver to transfer PCM data.

    Signed-off-by: Boojin Kim
    Acked-by: Linus Walleij
    Acked-by: Vinod Koul
    Cc: Jassi Brar
    Cc: Liam Girdwood
    Acked-by: Mark Brown
    [kgene.kim@samsung.com: removed useless variable]
    Signed-off-by: Kukjin Kim
    Signed-off-by: Vinod Koul

    Boojin Kim
     
  • c4e166255   ARM: SAMSUNG: Add common DMA operations ... Browse Code »

    This patch adds common DMA operations which are used for Samsung DMA
    drivers. Currently there are two types of DMA driver for Samsung SoCs.
    The one is S3C-DMA for S3C SoCs and the other is PL330-DMA for S5P SoCs.
    This patch provides funcion pointers for common DMA operations to DMA
    client driver like SPI and Audio. It makes DMA client drivers support
    multi-platform.
    In addition, this common DMA operations implement the shared actions
    that are needed for DMA client driver. For example shared actions are
    filter() function for dma_request_channel() and parameter passing for
    device_prep_slave_sg().

    Signed-off-by: Boojin Kim
    Acked-by: Linus Walleij
    Acked-by: Vinod Koul
    Signed-off-by: Kukjin Kim
    Signed-off-by: Vinod Koul

    Boojin Kim
     

22 Aug, 2011

1 commit

17 Aug, 2011

1 commit