Eric Lee / smarc-fsl-linux-kernel

10 Jan, 2012

3 commits

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

    Board-level changes

    This adds and extends support for specific boards on a number of
    ARM platforms: omap, imx, samsung, tegra, ...

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
    Enable 32 bit flash support for iMX21ADS board
    ARM: mx31pdk: Add MC13783 RTC support
    iomux-mx25: configuration to support CSPI3 on CSI pins
    MX1:apf9328: Add i2c support
    mioa701: add newly available DoC G3 chip
    arm/tegra: remove __initdata annotation from pinmux tables
    arm/tegra: Use bus notifiers to trigger pinmux setup
    arm/tegra: Refactor board-*-pinmux.c to share code
    arm/tegra: Fix mistake in Trimslice's pinmux
    arm/tegra: Rework Seaboard-vs-Ventana pinmux table
    arm/tegra: Remove useless entries from ventana_pinmux[]
    arm/tegra: PCIe: Remove include of mach/pinmux.h
    arm/tegra: Harmony PCIe: Don't touch pinmux
    arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio
    arm/tegra: Split Seaboard GPIO table to allow for Ventana
    ARM: imx6q: generate imx6q dtb files
    arm/imx6q: Rename Sabreauto to Armadillo2
    arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
    arm/imx6: add imx6q sabrelite board support
    dts/imx: rename uart labels to consistent with hw spec
    ...

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

    Device tree conversions for samsung and tegra

    Both platforms had some initial device tree support, but this adds
    much more to actually make it usable.

    * tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
    ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN
    ARM: EXYNOS: Add Exynos4 device tree enabled board file
    rtc: rtc-s3c: Add device tree support
    input: samsung-keypad: Add device tree support
    ARM: S5PV210: Modify platform data for pl330 driver
    ARM: S5PC100: Modify platform data for pl330 driver
    ARM: S5P64x0: Modify platform data for pl330 driver
    ARM: EXYNOS: Add a alias for pdma clocks
    ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build
    ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers
    DMA: PL330: Add device tree support
    ARM: EXYNOS: Modify platform data for pl330 driver
    DMA: PL330: Infer transfer direction from transfer request instead of platform data
    DMA: PL330: move filter function into driver
    serial: samsung: Fix build for non-Exynos4210 devices
    serial: samsung: add device tree support
    serial: samsung: merge probe() function from all SoC specific extensions
    serial: samsung: merge all SoC specific port reset functions
    ARM: SAMSUNG: register uart clocks to clock lookup list
    serial: samsung: remove all uses of get_clksrc and set_clksrc
    ...

    Fix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and
    drivers/tty/serial/Kconfig both due to just adding code close to
    changes.

    Linus Torvalds
     
  • 421b759b8   Merge branch 'samsung/cleanup' into next/boards ... Browse Code »

    Conflicts:
    arch/arm/mach-imx/mach-imx6q.c
    arch/arm/mach-omap2/board-ti8168evm.c
    arch/arm/mach-s3c64xx/Kconfig
    arch/arm/mach-tegra/Makefile
    arch/arm/mach-tegra/board-dt-tegra20.c
    arch/arm/mach-tegra/common.c

    Lots of relatively simple conflicts between the board
    changes and stuff from the arm tree. This pulls in
    the resolution from the samsung/cleanup tree, so we
    don't get conflicting merges.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

08 Jan, 2012

1 commit

  • 7affca353   Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core ... Browse Code »

    * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)
    arm: fix up some samsung merge sysdev conversion problems
    firmware: Fix an oops on reading fw_priv->fw in sysfs loading file
    Drivers:hv: Fix a bug in vmbus_driver_unregister()
    driver core: remove __must_check from device_create_file
    debugfs: add missing #ifdef HAS_IOMEM
    arm: time.h: remove device.h #include
    driver-core: remove sysdev.h usage.
    clockevents: remove sysdev.h
    arm: convert sysdev_class to a regular subsystem
    arm: leds: convert sysdev_class to a regular subsystem
    kobject: remove kset_find_obj_hinted()
    m86k: gpio - convert sysdev_class to a regular subsystem
    mips: txx9_sram - convert sysdev_class to a regular subsystem
    mips: 7segled - convert sysdev_class to a regular subsystem
    sh: dma - convert sysdev_class to a regular subsystem
    sh: intc - convert sysdev_class to a regular subsystem
    power: suspend - convert sysdev_class to a regular subsystem
    power: qe_ic - convert sysdev_class to a regular subsystem
    power: cmm - convert sysdev_class to a regular subsystem
    s390: time - convert sysdev_class to a regular subsystem
    ...

    Fix up conflicts with 'struct sysdev' removal from various platform
    drivers that got changed:
    - arch/arm/mach-exynos/cpu.c
    - arch/arm/mach-exynos/irq-eint.c
    - arch/arm/mach-s3c64xx/common.c
    - arch/arm/mach-s3c64xx/cpu.c
    - arch/arm/mach-s5p64x0/cpu.c
    - arch/arm/mach-s5pv210/common.c
    - arch/arm/plat-samsung/include/plat/cpu.h
    - arch/powerpc/kernel/sysfs.c
    and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h

    Linus Torvalds
     

07 Jan, 2012

2 commits

05 Jan, 2012

1 commit

23 Dec, 2011

3 commits

  • 0cfb26e1f   ARM: SAMSUNG: register uart clocks to clock lookup list ... Browse Code »

    Samsung uart driver lookups the clock using the connection id 'clk_uart_baud'.
    The uart clocks for all Samsung platforms are reorganized to register them
    with the lookup name as required by the uart driver.

    Cc: Ben Dooks
    Signed-off-by: Thomas Abraham
    Signed-off-by: Kukjin Kim

    Thomas Abraham
     
  • afba7f91e   ARM: SAMSUNG: remove struct 's3c24xx_uart_clksrc' and all uses of it ... Browse Code »

    With clkdev based clock lookup added to samsung serial driver, the use
    of 'struct s3c24xx_uart_clksrc' to supply clock names in platform
    data is removed from all the Samsung platform code.

    Cc: Ben Dooks
    Cc: Ramax Lo
    Cc: Vasily Khoruzhick
    Signed-off-by: Thomas Abraham
    Signed-off-by: Kukjin Kim

    Thomas Abraham
     
  • 046c217c6   ARM: S3C2440: move handling of fclk/n clock to platform code ... Browse Code »

    s3c2440 uses fclk/n (fclk divided by n) clock as one of the possible clocks used
    to generate the baud rate clock. The divider 'n' in this case can be logically
    represented outside of the uart controller.

    This patch creates a new clock by name "fclk_n" for s3c2440 based platforms to
    represent the fclk/n clock in the platform code. This clock provides a get_rate
    callback that checks the UCON0/1/2 registers to determine the clock rate. The
    samsung uart driver would receive the "fclk_n" clock name as one of the possible
    baud rate clock options and the driver need not determine clock rate of fclk/n.

    Cc: Ben Dooks
    Cc: Vasily Khoruzhick
    Signed-off-by: Thomas Abraham
    Signed-off-by: Kukjin Kim

    Thomas Abraham
     

22 Dec, 2011

2 commits

  • edbaa603e   driver-core: remove sysdev.h usage. ... Browse Code »

    The sysdev.h file should not be needed by any in-kernel code, so remove
    the .h file from these random files that seem to still want to include
    it.

    The sysdev code will be going away soon, so this include needs to be
    removed no matter what.

    Cc: Jiandong Zheng
    Cc: Scott Branden
    Cc: Russell King
    Cc: Kukjin Kim
    Cc: David Brown
    Cc: Daniel Walker
    Cc: Bryan Huntsman
    Cc: Ben Dooks
    Cc: Wan ZongShun
    Cc: Haavard Skinnemoen
    Cc: Hans-Christian Egtvedt
    Cc: Guan Xuetao
    Cc: "Venkatesh Pallipadi
    Cc: Thomas Gleixner
    Cc: Ingo Molnar
    Cc: "H. Peter Anvin"
    Cc: Grant Likely
    Cc: Richard Purdie
    Cc: Matthew Garrett
    Signed-off-by: Kay Sievers

    Kay Sievers
     
  • 4a858cfc9   arm: convert sysdev_class to a regular subsystem ... Browse Code »
    43

    After all sysdev classes are ported to regular driver core entities, the
    sysdev implementation will be entirely removed from the kernel.

    Cc: Kukjin Kim
    Cc: Russell King
    Cc: Ben Dooks
    Cc: Vinod Koul
    Cc: Boojin Kim
    Cc: Linus Walleij
    Cc: Lucas De Marchi
    Cc: Heiko Stuebner
    Signed-off-by: Kay Sievers
    Signed-off-by: Greg Kroah-Hartman

    Kay Sievers
     

06 Dec, 2011

1 commit

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
     

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
     

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
     

09 Oct, 2011

1 commit

06 Oct, 2011

1 commit

04 Oct, 2011

1 commit

21 Sep, 2011

3 commits

16 Sep, 2011

2 commits

22 Aug, 2011

1 commit

27 Jul, 2011

1 commit

  • 60063497a   atomic: use <linux/atomic.h> ... Browse Code »

    This allows us to move duplicated code in
    (atomic_inc_not_zero() for now) to

    Signed-off-by: Arun Sharma
    Reviewed-by: Eric Dumazet
    Cc: Ingo Molnar
    Cc: David Miller
    Cc: Eric Dumazet
    Acked-by: Mike Frysinger
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Arun Sharma
     

26 Jul, 2011

1 commit

  • 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
     

23 Jul, 2011

1 commit

  • 7235dd74a   Merge branch 'spi/next' of git://git.secretlab.ca/git/linux-2.6 ... Browse Code »

    * 'spi/next' of git://git.secretlab.ca/git/linux-2.6: (34 commits)
    spi/imx: add device tree probe support
    spi/imx: copy gpio number passed by platform data into driver private data
    spi/imx: use soc name in spi device type naming scheme
    spi/imx: merge type SPI_IMX_VER_0_7 into SPI_IMX_VER_0_4
    spi/imx: do not use spi_imx2_3 to name SPI_IMX_VER_2_3 function and macro
    spi/imx: use mx21 to name SPI_IMX_VER_0_0 function and macro
    spi/imx: do not make copy of spi_imx_devtype_data
    spi/dw: Add spi number into spi irq desc
    spi/tegra: Use engineering names in DT compatible property
    spi/fsl_spi: fix CPM spi driver
    mach-s3c2410: remove unused spi-gpio.h file
    spi: remove obsolete spi-s3c24xx-gpio driver
    mach-gta2: remove unused spi-gpio.h include
    mach-qt2410: convert to spi_gpio
    mach-jive: convert to spi_gpio
    spi/pxa2xx: Remove unavailable ssp_type from documentation
    spi/bfin_spi: uninline fat queue funcs
    spi/bfin_spi: constify pin array
    spi/bfin_spi: use structs for accessing hardware regs
    spi/topcliff-pch: Support new device ML7223 IOH
    ...

    Fix up trivial conflict in arch/arm/mach-ep93xx/Makefile

    Linus Torvalds
     

21 Jul, 2011

1 commit

20 Jul, 2011

1 commit

08 Jul, 2011

1 commit

  • d34c1fcdd   ARM: S3C2440: fix section mismatch on mini2440 ... Browse Code »

    If mini2440_init() is in __init, mini2440_parse_features() should also
    be in __init. Fixes:

    (.text+0x9adc): Section mismatch in reference from the function mini2440_parse_features.clone.0() to the
    (unknown reference) .init.data:(unknown)
    The function mini2440_parse_features.clone.0() references the (unknown reference) __initdata (unknown).

    Signed-off-by: Wolfram Sang
    Cc: Michel Pollet
    Signed-off-by: Kukjin Kim

    Wolfram Sang
     

05 Jul, 2011

1 commit

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
     

19 Apr, 2011

1 commit

14 Apr, 2011

1 commit

31 Mar, 2011

1 commit

29 Mar, 2011

2 commits