Eric Lee / smarc-fsl-linux-kernel

02 Nov, 2011

1 commit

  • 6585dea1f   Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc ... Browse Code »

    * 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
    arm/imx: use Kconfig choice for low-level debug UART selection
    ARM: realview: use Kconfig choice for debug UART selection
    ARM: plat-samsung: use Kconfig choice for debug UART selection
    ARM: versatile: convert logical CPU numbers to physical numbers
    ARM: ux500: convert logical CPU numbers to physical numbers
    ARM: shmobile: convert logical CPU numbers to physical numbers
    ARM: msm: convert logical CPU numbers to physical numbers
    ARM: exynos4: convert logical CPU numbers to physical numbers

    Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
    ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug

    Linus Torvalds
     

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

1 commit

23 Oct, 2011

1 commit

21 Oct, 2011

1 commit

  • a06f916b7   ARM: smp: fix clipping of number of CPUs ... Browse Code »

    Rather than clipping the number of CPUs using the compile-time NR_CPUS
    constant, use the runtime nr_cpu_ids value instead. This allows the
    nr_cpus command line option to work as expected.

    Cc:
    Reported-by: Mark Salter
    Signed-off-by: Russell King

    Russell King
     

20 Oct, 2011

1 commit

18 Oct, 2011

1 commit

17 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
     

17 Sep, 2011

1 commit

22 Aug, 2011

1 commit

12 Aug, 2011

4 commits

  • 5cb843ca0   ARM: realview: ensure visibility of writes during reset ... Browse Code »

    The various reset routines in mach-realview rely on an FPGA to
    power-cycle the board after writing some magic runes to memory-mapped
    registers.

    This patch adds a dsb() following the writes, so that they become
    visible before we mdelay(1000) in the arch_reset code. Without this
    patch, the timeout would expire sporadically, causing the reset to fail.

    Signed-off-by: Will Deacon

    Will Deacon
     
  • 8f3c4537b   ARM: gpio: make trivial GPIOLIB implementation the default ... Browse Code »

    Rather than marking the mach/gpio.h header files which want to use the
    trivial GPIOLIB implementation, mark those which do not want to use it
    instead. This means that by default, you get the trivial implementation
    and only have to do something extra if you need to. This should
    encourage the use of the trivial default implementation.

    As an additional bonus, several gpio.h header files become empty.

    Acked-by: H Hartley Sweeten
    Tested-by: Jamie Iles
    Acked-by: Kukjin Kim
    Signed-off-by: Russell King

    Russell King
     
  • 01e7dc89d   ARM: gpio: consolidate gpio_to_irq ... Browse Code »

    Many of the gpio_to_irq implementations use the gpiolib version of this
    function. Provide the standard gpiolib gpio_to_irq() for everyone, but
    allow platforms to override it if they wish. Add the neccessary
    overrides for those platforms which do not use the standard definition.

    Acked-by: Kukjin Kim
    Signed-off-by: Russell King

    Russell King
     
  • 22fe67837   ARM: gpio: consolidate trivial gpiolib implementations ... Browse Code »

    Consolidate 24 trivial gpiolib implementions out of mach/gpio.h
    into asm/gpio.h. This is basically the include of asm-generic/gpio.h
    and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep
    as described in Documentation/gpio.txt

    Acked-by: H Hartley Sweeten
    Tested-by: David Brown
    Acked-by: David Brown
    Tested-by: Linus Walleij
    Acked-by: Kukjin Kim
    Tested-by: Shawn Guo
    Signed-off-by: Russell King

    Russell King
     

23 Jul, 2011

1 commit

19 Jul, 2011

1 commit

07 Jul, 2011

2 commits

  • 7fa22bd54   ARM: 6993/1: platsmp: Allow secondary cpu hotplug with maxcpus=1 ... Browse Code »

    If an ARM system has multiple cpus in the same socket and the
    kernel is booted with maxcpus=1, secondary cpus are possible but
    not present due to how platform_smp_prepare_cpus() is called.
    Since most typical ARM processors don't actually support physical
    hotplug, initialize the present map to be equal to the possible
    map in generic ARM SMP code. Also, always call
    platform_smp_prepare_cpus() as long as max_cpus is non-zero (0
    means no SMP) to allow platform code to do any SMP setup.

    After applying this patch it's possible to boot an ARM system
    with maxcpus=1 on the command line and then hotplug in secondary
    cpus via sysfs. This is more in line with how x86 does things.

    Signed-off-by: Stephen Boyd
    Cc: Paul Mundt
    Cc: Kukjin Kim
    Cc: David Brown
    Cc: Tony Lindgren
    Cc: Srinidhi Kasagar
    Cc: Linus Walleij
    Signed-off-by: Russell King

    Stephen Boyd
     
  • f022e4e41   ARM: 6986/1: mach-realview: add TCM support for PB1176 ... Browse Code »

    Enable TCM support on the RealView PB1176 - we have now taken
    the precautions necessary to support even multi-board builds of
    RealView systems with TCM enabled.

    Signed-off-by: Linus Walleij
    Signed-off-by: Russell King

    Linus Walleij
     

24 May, 2011

4 commits

23 May, 2011

1 commit

21 May, 2011

2 commits

  • 667f390be   ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info ... Browse Code »

    The set_vpp() method provided by physmap passes a map_info back to
    the platform code, which has little relevance as far as the platform
    is concerned (this parameter is completely unused).

    Instead, pass the platform_device, which can be used in the pismo
    driver to retrieve some important information in a nicer way, instead
    of the hack that was in place.

    The empty set_vpp function in board-at572d940hf_ek.c is left untouched,
    as the board/SoC is scheduled for removal.

    Cc: Andrew Victor
    Cc: Nicolas Ferre
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Cc: Philipp Zabel
    Cc: Eric Miao
    Cc: Ben Dooks
    Acked-by: Artem Bityutskiy
    Acked-by: David Woodhouse
    Signed-off-by: Marc Zyngier
    Signed-off-by: Russell King

    Marc Zyngier
     
  • b8b87aefe   ARM: 6903/1: Realview: Use physmap driver instead of integrator-flash ... Browse Code »

    Tested on a PB11-MPCore.

    Signed-off-by: Marc Zyngier
    Acked-by: Catalin Marinas
    Acked-by: David Woodhouse
    Signed-off-by: Russell King

    Marc Zyngier
     

12 May, 2011

3 commits

26 Mar, 2011

1 commit

20 Mar, 2011

1 commit

17 Mar, 2011

1 commit

19 Feb, 2011

3 commits