Eric Lee / smarc-fsl-linux-kernel

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

1 commit

  • ff4b8a57f   Merge branch 'driver-core-next' into Linux 3.2 ... Browse Code »

    This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
    and it fixes the build error in the arch/x86/kernel/microcode_core.c
    file, that the merge did not catch.

    The microcode_core.c patch was provided by Stephen Rothwell
    who was invaluable in the merge issues involved
    with the large sysdev removal process in the driver-core tree.

    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

05 Jan, 2012

2 commits

03 Jan, 2012

1 commit

  • cc511b8d8   ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch] ... Browse Code »
    86

    This patch introduces common.[ch] which are used only in the
    arch/arm/mach-exynos/ directory. The common.c file merges
    the cpu.c, init.c, irq-combiner.c and irq-eint.c files which
    are used commonly on EXYNOS SoCs and the common.h file replaces
    with plat/exynos4.h file.

    Cc: Ben Dooks
    Signed-off-by: Kukjin Kim
    Signed-off-by: Russell King

    Kukjin Kim
     

24 Dec, 2011

3 commits

22 Dec, 2011

1 commit

  • 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
     

19 Dec, 2011

1 commit

  • 2f0778afa   ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime ... Browse Code »
    86

    sched_clock() is yet another blocker on the road to the single
    image. This patch implements an idea by Russell King:

    http://www.spinics.net/lists/linux-omap/msg49561.html

    Instead of asking the platform to implement both sched_clock()
    itself and the rollover callback, simply register a read()
    function, and let the ARM code care about sched_clock() itself,
    the conversion to ns and the rollover. sched_clock() uses
    this read() function as an indirection to the platform code.
    If the platform doesn't provide a read(), the code falls back
    to the jiffy counter (just like the default sched_clock).

    This allow some simplifications and possibly some footprint gain
    when multiple platforms are compiled in. Among the drawbacks,
    the removal of the *_fixed_sched_clock optimization which could
    negatively impact some platforms (sa1100, tegra, versatile
    and omap).

    Tested on 11MPCore, OMAP4 and Tegra.

    Cc: Imre Kaloz
    Cc: Eric Miao
    Cc: Colin Cross
    Cc: Erik Gilling
    Cc: Olof Johansson
    Cc: Sascha Hauer
    Cc: Alessandro Rubini
    Cc: STEricsson
    Cc: Lennert Buytenhek
    Cc: Ben Dooks
    Tested-by: Jamie Iles
    Tested-by: Tony Lindgren
    Tested-by: Kyungmin Park
    Acked-by: Linus Walleij
    Acked-by: Nicolas Pitre
    Acked-by: Krzysztof Halasa
    Acked-by: Kukjin Kim
    Signed-off-by: Marc Zyngier
    Signed-off-by: Russell King

    Marc Zyngier
     

06 Dec, 2011

1 commit

17 Nov, 2011

1 commit

  • 12b248eba   ARM: S5P: Fix export.h inclusion ... Browse Code »

    Commit 32aaeffbd4a7 ("Merge branch 'modsplit-Oct31 2011'...")
    breaks build like following and this fixes it to add inclusion
    .

    arch/arm/plat-s5p/sysmmu.c:302: error: 'THIS_MODULE' undeclared here (not in a function)

    Signed-off-by: Kukjin Kim

    Kukjin Kim
     

16 Nov, 2011

1 commit

  • db0d4db22   ARM: gic: allow GIC to support non-banked setups ... Browse Code »
    43

    The GIC support code is heavily using the fact that hardware
    implementations are exposing banked registers. Unfortunately, it
    looks like at least one GIC implementation (EXYNOS) offers both
    the distributor and the CPU interfaces at different addresses,
    depending on the CPU.

    This problem is solved by allowing the distributor and CPU interface
    addresses to be per-cpu variables for the platforms that require it.
    The EXYNOS code is updated not to mess with the GIC internals while
    handling interrupts, and struct gic_chip_data is back to being private.
    The DT binding for the gic is updated to allow an optional "cpu-offset"
    value, which is used to compute the various base addresses.

    Finally, a new config option (GIC_NON_BANKED) is used to control this
    feature, so the overhead is only present on kernels compiled with
    support for EXYNOS.

    Tested on Origen (EXYNOS4) and Panda (OMAP4).

    Cc: Kukjin Kim
    Cc: Will Deacon
    Cc: Thomas Abraham
    Acked-by: Rob Herring
    Signed-off-by: Marc Zyngier

    Marc Zyngier
     

06 Nov, 2011

2 commits

  • 830145796   ARM: EXYNOS: Add ARCH_EXYNOS and reorganize arch/arm/mach-exynos ... Browse Code »

    The arch/arm/mach-exynos4 directory (CONFIG_ARCH_EXYNOS4) has
    made for plaforms based on EXYNOS4 SoCs. But since upcoming
    Samsung's SoCs such as EXYNOS5 (ARM Cortex A15) can reuse most
    codes in current mach-exynos4, one mach-exynos directory will
    be used for them.

    This patch changes to CONFIG_ARCH_EXYNOS (arch/arm/mach-exynos)
    but keeps original CONFIG_ARCH_EXYNOS4 in mach-exynos/Kconfig to
    avoid changing in driver side.

    Cc: Arnd Bergmann
    Cc: Russell King
    Signed-off-by: Kukjin Kim

    Kukjin Kim
     
  • 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

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
     

26 Oct, 2011

1 commit

  • efb8d21b2   Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty ... Browse Code »

    * 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (79 commits)
    TTY: serial_core: Fix crash if DCD drop during suspend
    tty/serial: atmel_serial: bootconsole removed from auto-enumerates
    Revert "TTY: call tty_driver_lookup_tty unconditionally"
    tty/serial: atmel_serial: add device tree support
    tty/serial: atmel_serial: auto-enumerate ports
    tty/serial: atmel_serial: whitespace and braces modifications
    tty/serial: atmel_serial: change platform_data variable name
    tty/serial: RS485 bindings for device tree
    TTY: call tty_driver_lookup_tty unconditionally
    TTY: pty, release tty in all ptmx_open fail paths
    TTY: make tty_add_file non-failing
    TTY: drop driver reference in tty_open fail path
    8250_pci: Fix kernel panic when pch_uart is disabled
    h8300: drivers/serial/Kconfig was moved
    parport_pc: release IO region properly if unsupported ITE887x card is found
    tty: Support compat_ioctl get/set termios_locked
    hvc_console: display printk messages on console.
    TTY: snyclinkmp: forever loop in tx_load_dma_buffer()
    tty/n_gsm: avoid fifo overflow in gsm_dlci_data_output
    tty/n_gsm: fix a bug in gsm_dlci_data_output (adaption = 2 case)
    ...

    Fix up Conflicts in:
    - drivers/tty/serial/8250_pci.c
    Trivial conflict with removed duplicate device ID
    - drivers/tty/serial/atmel_serial.c
    Annoying silly conflict between "specify the port num via
    platform_data" and other changes to atmel_console_init

    Linus Torvalds
     

21 Oct, 2011

1 commit

20 Oct, 2011

1 commit

17 Oct, 2011

1 commit

06 Oct, 2011

1 commit

04 Oct, 2011

14 commits

26 Sep, 2011

1 commit

21 Sep, 2011

2 commits

17 Sep, 2011

1 commit