02 Dec, 2015

1 commit

  • The ARM core kernel already calls clocksource_of_init() so why
    go to all the trouble of locating and probing this node in the
    machine. CLOCKSOURCE_OF_DECLARE() will take care of it in the
    clocksource driver, and thus we can also get rid of the
    dangling header file

    Suggested-by: Arnd Bergmann
    Acked-by: Thomas Gleixner
    Acked-by: Daniel Lezcano
    Signed-off-by: Linus Walleij
    Signed-off-by: Arnd Bergmann

    Linus Walleij
     

02 Sep, 2015

1 commit

  • Pull irq updates from Thomas Gleixner:
    "This updated pull request does not contain the last few GIC related
    patches which were reported to cause a regression. There is a fix
    available, but I let it breed for a couple of days first.

    The irq departement provides:

    - new infrastructure to support non PCI based MSI interrupts
    - a couple of new irq chip drivers
    - the usual pile of fixlets and updates to irq chip drivers
    - preparatory changes for removal of the irq argument from interrupt
    flow handlers
    - preparatory changes to remove IRQF_VALID"

    * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (129 commits)
    irqchip/imx-gpcv2: IMX GPCv2 driver for wakeup sources
    irqchip: Add bcm2836 interrupt controller for Raspberry Pi 2
    irqchip: Add documentation for the bcm2836 interrupt controller
    irqchip/bcm2835: Add support for being used as a second level controller
    irqchip/bcm2835: Refactor handle_IRQ() calls out of MAKE_HWIRQ
    PCI: xilinx: Fix typo in function name
    irqchip/gic: Ensure gic_cpu_if_up/down() programs correct GIC instance
    irqchip/gic: Only allow the primary GIC to set the CPU map
    PCI/MSI: pci-xgene-msi: Consolidate chained IRQ handler install/remove
    unicore32/irq: Prepare puv3_gpio_handler for irq argument removal
    tile/pci_gx: Prepare trio_handle_level_irq for irq argument removal
    m68k/irq: Prepare irq handlers for irq argument removal
    C6X/megamode-pic: Prepare megamod_irq_cascade for irq argument removal
    blackfin: Prepare irq handlers for irq argument removal
    arc/irq: Prepare idu_cascade_isr for irq argument removal
    sparc/irq: Use access helper irq_data_get_affinity_mask()
    sparc/irq: Use helper irq_data_get_irq_handler_data()
    parisc/irq: Use access helper irq_data_get_affinity_mask()
    mn10300/irq: Use access helper irq_data_get_affinity_mask()
    irqchip/i8259: Prepare i8259_irq_dispatch for irq argument removal
    ...

    Linus Torvalds
     

25 Aug, 2015

1 commit


27 Jul, 2015

1 commit

  • Now that the GIC chip implementation enables IRQCHIP_SKIP_SET_WAKE and
    IRQCHIP_MASK_ON_SUSPEND by default, the platforms requiring them need
    not override the irqchip flags as before.

    This patch removes all the users of gic_set_irqchip_flags and the
    function itself.

    Signed-off-by: Sudeep Holla
    Acked-by: Linus Walleij
    Cc: Marc Zyngier
    Cc: Simon Horman
    Cc: Jason Cooper
    Cc: Michal Simek
    Cc: Magnus Damm
    Cc: Gregory CLEMENT
    Cc: Geert Uytterhoeven
    Cc: Lorenzo Pieralisi
    Cc: linux-arm-kernel@lists.infradead.org
    Link: http://lkml.kernel.org/r/1436971109-20189-2-git-send-email-sudeep.holla@arm.com
    Signed-off-by: Thomas Gleixner

    Sudeep Holla
     

18 May, 2015

1 commit


15 Mar, 2015

1 commit


10 Jul, 2014

1 commit


28 Feb, 2014

1 commit


27 Nov, 2013

2 commits


26 Sep, 2013

2 commits


20 Aug, 2013

1 commit


07 Jun, 2013

1 commit


04 May, 2013

1 commit

  • Pull ARM updates from Russell King:
    "The major items included in here are:

    - MCPM, multi-cluster power management, part of the infrastructure
    required for ARMs big.LITTLE support.

    - A rework of the ARM KVM code to allow re-use by ARM64.

    - Error handling cleanups of the IS_ERR_OR_NULL() madness and fixes
    of that stuff for arch/arm

    - Preparatory patches for Cortex-M3 support from Uwe Kleine-König.

    There is also a set of three patches in here from Hugh/Catalin to
    address freeing of inappropriate page tables on LPAE. You already
    have these from akpm, but they were already part of my tree at the
    time he sent them, so unfortunately they'll end up with duplicate
    commits"

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (77 commits)
    ARM: EXYNOS: remove unnecessary use of IS_ERR_VALUE()
    ARM: IMX: remove unnecessary use of IS_ERR_VALUE()
    ARM: OMAP: use consistent error checking
    ARM: cleanup: OMAP hwmod error checking
    ARM: 7709/1: mcpm: Add explicit AFLAGS to support v6/v7 multiplatform kernels
    ARM: 7700/2: Make cpu_init() notrace
    ARM: 7702/1: Set the page table freeing ceiling to TASK_SIZE
    ARM: 7701/1: mm: Allow arch code to control the user page table ceiling
    ARM: 7703/1: Disable preemption in broadcast_tlb*_a15_erratum()
    ARM: mcpm: provide an interface to set the SMP ops at run time
    ARM: mcpm: generic SMP secondary bringup and hotplug support
    ARM: mcpm_head.S: vlock-based first man election
    ARM: mcpm: Add baremetal voting mutexes
    ARM: mcpm: introduce helpers for platform coherency exit/setup
    ARM: mcpm: introduce the CPU/cluster power API
    ARM: multi-cluster PM: secondary kernel entry code
    ARM: cacheflush: add synchronization helpers for mixed cache state accesses
    ARM: cpu hotplug: remove majority of cache flushing from platforms
    ARM: smp: flush L1 cache in cpu_die()
    ARM: tegra: remove tegra specific cpu_disable()
    ...

    Linus Torvalds
     

03 May, 2013

1 commit


08 Apr, 2013

6 commits

  • mach/setup.h and mach/devices.h are only needed from inside of mach-ux500
    now, so we can simply move them out of the include/mach directory.

    Signed-off-by: Arnd Bergmann
    Signed-off-by: Linus Walleij

    Arnd Bergmann
     
  • This removes and
    from the Ux500, merging them into the local include
    "db8500-regs.h" in mach-ux500. There is some impact
    outside the ux500 machine, but most of it is dealt with
    in earlier patches.

    Contains portions of a clean-up patch from Arnd Bergmann.

    Cc: Samuel Ortiz
    Cc: Ulf Hansson
    Acked-by: Mike Turquette
    Signed-off-by: Arnd Bergmann
    Signed-off-by: Linus Walleij

    Linus Walleij
     
  • The ux500 clock driver was including
    which will not work when building for multiplatform support
    since is going away.

    Pass the base adresses in the init call instead.

    Cc: Ulf Hansson
    Cc: Mike Turquette
    Acked-by: Arnd Bergmann
    Acked-by: Ulf Hansson
    Acked-by: Mike Turquette
    Signed-off-by: Linus Walleij

    Linus Walleij
     
  • We are trying to decompose and decentralize the code in
    the DB8500 PRCMU out into subdrivers. The code moved in
    this patch concerns a group of functions used for
    decoupling and recoupling the IRQs from the GIC. During
    sleep and idle the Ux500 system will transfer all IRQ
    handling to the PRCMU using these functions.

    Basically we are left with the two alternatives of code
    placement as:

    - arch/arm/mach-ux500/pm.c - this because the code is
    closely related to the GIC, and takes ownership of
    some of the registers from the PRCMU related to this
    PM functionality.

    - drivers/mfd/db8500-prcmu-pm.c - because the code is
    affecting stuff in the PRCMU register range. But then
    this code needs to remap and handle GIC registers.

    This patch implementation is taking the first approach.

    Currently the cpuidle driver is the only piece of code
    using this set of functions, but it will later also be
    used by the suspend/resume code which is currently under
    review.

    The header file is moved to:

    The function prototypes need to be placed in a globally
    visible header since the CPUidle code is planned to move
    out to drivers/cpuidle.

    Acked-by: Samuel Ortiz
    Acked-by: Rickard Andersson
    Acked-by: Daniel Lezcano
    Signed-off-by: Linus Walleij

    Linus Walleij
     
  • We cannot use a global variable stored in to
    find the base address of the PRCMU. The real resource is already
    there from the board, so use this to look up the base address
    instead.

    Currently the patch is kept minimal so as not to interfere with
    other work being done on refactoring this driver, but at a later
    point the defines using (prcmu_base + 0xnnn) need to be replaced
    by pure offset defined for (0xnnn) and the base inlined with the
    readl()/writel() and similar codepaths.

    Acked-by: Samuel Ortiz
    Signed-off-by: Linus Walleij

    Linus Walleij
     
  • This patch will make an early remapping of the PRCMU, to be
    used when setting up the clocks, that will call down into parts
    of the PRCMU driver before it is probed.

    Going forward this will be removed like this:

    - The mailbox subsystem need to be merged.
    http://marc.info/?l=linux-kernel&m=136314559201983&w=2

    - At this point the PRCMU clock code can be moved over to the
    ux500 clock driver in drivers/clk/ux500/* and maintained
    there in a decentralized manner.

    - This early initcall and PRCMU base parameters become part of
    the ux500_clk_init() call instead.

    Cc: Suman Anna
    Cc: Loic Pallardy
    Acked-by: Samuel Ortiz
    Acked-by: Arnd Bergmann
    Acked-by: Ulf Hansson
    Signed-off-by: Linus Walleij

    Linus Walleij
     

24 Feb, 2013

1 commit

  • soc_device_register() never returns NULL, it only ever returns an
    error pointer or a valid pointer. Use the right function (IS_ERR())
    to check this.

    soc_device_to_device() only ever returns &soc_dev->dev, and so can
    never return an error or NULL if the pointer passed into it was
    valid, so there's no point checking its return.

    Signed-off-by: Russell King

    Russell King
     

22 Feb, 2013

1 commit

  • Pull ARM SoC cleanups from Arnd Bergmann:
    "A large number of cleanups, all over the platforms. This is dominated
    largely by the Samsung platforms (s3c, s5p, exynos) and a few of the
    others moving code out of arch/arm into more appropriate subsystems.

    The clocksource and irqchip drivers are now abstracted to the point
    where platforms that are already cleaned up do not need to even
    specify the driver they use, it can all get configured from the device
    tree as we do for normal device drivers. The clocksource changes
    basically touch every single platform in the process.

    We further clean up the use of platform specific header files here,
    with the goal of turning more of the platforms over to being
    "multiplatform" enabled, which implies that they cannot expose their
    headers to architecture independent code any more.

    It is expected that no functional changes are part of the cleanup.
    The overall reduction in total code lines is mostly the result of
    removing broken and obsolete code."

    * tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (133 commits)
    ARM: mvebu: correct gated clock documentation
    ARM: kirkwood: add missing include for nsa310
    ARM: exynos: move exynos4210-combiner to drivers/irqchip
    mfd: db8500-prcmu: update resource passing
    drivers/db8500-cpufreq: delete dangling include
    ARM: at91: remove NEOCORE 926 board
    sunxi: Cleanup the reset code and add meaningful registers defines
    ARM: S3C24XX: header mach/regs-mem.h local
    ARM: S3C24XX: header mach/regs-power.h local
    ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
    ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
    ARM: S3C24XX: transform s3c2443 subirqs into new structure
    ARM: S3C24XX: modify s3c2443 irq init to initialize all irqs
    ARM: S3C24XX: move s3c2443 irq code to irq.c
    ARM: S3C24XX: transform s3c2416 irqs into new structure
    ARM: S3C24XX: modify s3c2416 irq init to initialize all irqs
    ARM: S3C24XX: move s3c2416 irq init to common irq code
    ARM: S3C24XX: Modify s3c_irq_wake to use the hwirq property
    ARM: S3C24XX: Move irq syscore-ops to irq-pm
    clocksource: always define CLOCKSOURCE_OF_DECLARE
    ...

    Linus Torvalds
     

30 Jan, 2013

2 commits

  • …/linux-stericsson into next/cleanup

    From Linus Walleij:
    Removal of the <mach/id.h> include from ux500
    - First an ACKed MFD patch deleting the only consumer
    of these cpu_is* functions outside of mach-ux500
    - Introduce a new local cpu_is_u8580() in this patch
    set to avoid clashing with other patch sets.
    - Finally de-globalize <mach/id.h>.

    * tag 'ux500-no-idh' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
    ARM: ux500: de-globalize <mach/id.h>
    ARM: ux500: Introduce cpu_is_u8580()
    mfd: prcmu: delete pin control helpers

    Signed-off-by: Olof Johansson <olof@lixom.net>

    Olof Johansson
     
  • This removes the file from the global kernel include
    scope, making it a pure mach-ux500 detail. All ASIC specifics
    needed by drivers shall henceforth be passed from either platform
    data or the device tree.

    Cc: Rafael J. Wysocki
    Acked-by: Samuel Ortiz
    Signed-off-by: Linus Walleij

    Linus Walleij
     

25 Jan, 2013

1 commit

  • The u9540 stopped booting after the v3.7 merge window due to
    a lack of common clk support and early PRCMU initialisation.
    In this patch we rectify these issues, placing the u9540
    development board back into a successfully booting state.

    Signed-off-by: Lee Jones
    Signed-off-by: Linus Walleij

    Lee Jones
     

13 Jan, 2013

2 commits

  • Now that we have GIC moved to drivers/irqchip and all GIC DT init for
    platforms using irqchip_init, move gic.h and update the remaining
    includes.

    Signed-off-by: Rob Herring
    Cc: Thomas Gleixner
    Cc: Russell King
    Cc: Anton Vorontsov
    Cc: Kukjin Kim
    Cc: Sascha Hauer
    Cc: David Brown
    Cc: Daniel Walker
    Cc: Bryan Huntsman
    Cc: Tony Lindgren
    Cc: Paul Mundt
    Cc: Magnus Damm
    Cc: Viresh Kumar
    Cc: Shiraz Hashim
    Cc: Stephen Warren
    Cc: Srinidhi Kasagar
    Cc: Linus Walleij
    Cc: Samuel Ortiz

    Rob Herring
     
  • Convert all GIC DT initialization over to use common irqchip_init
    function.

    Signed-off-by: Rob Herring
    Cc: Russell King
    Cc: Kukjin Kim
    Acked-by: Shawn Guo
    Cc: Sascha Hauer
    Cc: David Brown
    Cc: Daniel Walker
    Cc: Bryan Huntsman
    Cc: Tony Lindgren
    Cc: Paul Mundt
    Cc: Magnus Damm
    Cc: Dinh Nguyen
    Cc: Viresh Kumar
    Cc: Shiraz Hashim
    Cc: Stephen Warren
    Cc: Srinidhi Kasagar
    Cc: Linus Walleij

    Rob Herring
     

01 Nov, 2012

1 commit

  • An earlier change prevented User Interface Boards (UIBs) from being
    initialised on boards which did not support them. This change had
    the undesired effect of reordering the UIB initialisation calls with
    I2C registration. Here we ensure UIBs are only setup after all
    required infrastructure is already in place.

    Acked-by: Linus Walleij
    Acked-by: Arnd Bergmann
    Signed-off-by: Lee Jones

    Lee Jones
     

25 Oct, 2012

1 commit

  • This patch fixes the build error below:

    arch/arm/mach-ux500/cpu.c: In function ‘ux500_init_irq’:
    arch/arm/mach-ux500/cpu.c:55:2: error: invalid use of undefined type ‘struct irq_chip’
    arch/arm/mach-ux500/cpu.c:55:24: error: ‘IRQCHIP_SKIP_SET_WAKE’ undeclared (first use in this function)
    arch/arm/mach-ux500/cpu.c:55:24: note: each undeclared identifier is reported only once for each function it appears in
    arch/arm/mach-ux500/cpu.c:55:48: error: ‘IRQCHIP_MASK_ON_SUSPEND’ undeclared (first use in this function)

    Acked-by: Linus Walleij
    Signed-off-by: Lee Jones

    Lee Jones
     

02 Oct, 2012

2 commits

  • Pull ARM soc-specific updates from Olof Johansson:
    "Most notable here is probably the addition of basic support for the
    BCM2835, an SoC used in some of the Roku 2 players as well as the
    much-hyped Raspberry Pi, cleaned up and contributed by Stephen Warren.
    It's still early days on mainline support, with just the basics
    working. But it has to start somewhere!

    Beyond that there's some conversions of clock infrastructure on tegra
    to common clock, misc updates for several other platforms, and OMAP
    now has its own bus (under drivers/bus) to manage its devices through.

    This branch adds two new directories outside of arch/arm:
    drivers/irqchip for new irq controllers, and drivers/bus for the above
    OMAP bus. It's expected that some of the other platforms will migrate
    parts of their platforms to those directories over time as well."

    Fix up trivial conflicts with the clk infrastructure changes.

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (62 commits)
    ARM: shmobile: add new __iomem annotation for new code
    ARM: LPC32xx: Support GPI 28
    ARM: LPC32xx: Platform update for devicetree completion of spi-pl022
    ARM: LPC32xx: Board cleanup
    irqchip: fill in empty Kconfig
    ARM: SAMSUNG: Add check for NULL in clock interface
    ARM: EXYNOS: Put PCM, Slimbus, Spdif clocks to off state
    ARM: EXYNOS: Add bus clock for FIMD
    ARM: SAMSUNG: Fix HDMI related warnings
    ARM: S3C24XX: Add .get_rate callback for "camif-upll" clock
    ARM: EXYNOS: Fix incorrect help text
    ARM: EXYNOS: Turn off clocks for NAND, OneNAND and TSI controllers
    ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move
    MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
    ARM: bcm2835: instantiate console UART
    ARM: bcm2835: add stub clock driver
    ARM: bcm2835: add system timer
    ARM: bcm2835: add interrupt controller driver
    ARM: add infra-structure for BCM2835 and Raspberry Pi
    ARM: tegra20: add CPU hotplug support
    ...

    Linus Torvalds
     
  • Pull non-critical ARM soc bug fixes from Olof Johansson:
    "These were submitted as bug fixes before v3.6 but not considered
    important enough to be included in it. Some of them cross over to
    cleanup territory as well, and aren't strictly bugfixes."

    * tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
    ARM: nomadik: remove NAND_NO_READRDY use
    ARM: pxa: fix return value check in pxa2xx_drv_pcmcia_probe()
    ARM: SAMSUNG: Add missing variable declaration in s3c64xx_spi1_set_platdata()
    ARM: S3C24XX: removes unnecessary semicolon
    ARM: S3C24xx: delete double assignment
    ARM: EXYNOS: fix address for EXYNOS4 MDMA1
    ARM: EXYNOS: fixed SYSMMU setup definition to mate parameter name
    ARM: ep93xx: Move ts72xx.h out of include/mach
    ARM: ep93xx: use __iomem pointers for MMIO
    ARM: msm: Fix early debug uart mapping on some memory configs
    ARM: msm: io: Change the default static iomappings to be shared
    ARM: msm: io: Remove 7x30 iomap region from 7x00
    ARM: msm: Remove call to missing FPGA init on 8660
    ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
    ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
    dma: tegra: make data used as *of_device_id.data const
    can: mpc5xxx_can: make data used as *of_device_id.data const
    macintosh/mediabay: make data used as *of_device_id.data const
    i2c/mpc: make data used as *of_device_id.data const
    mfd/da9052: make i2c_device_id array const
    ...

    Linus Torvalds
     

07 Sep, 2012

1 commit


22 Aug, 2012

1 commit

  • The Ux500 will be able to wake up on any IRQ, so flag it with
    IRQCHIP_SKIP_SET_WAKE, and we want to mask off the IRQs when
    going to suspend to avoid transient effects so also flag
    this with IRQCHIP_MASK_ON_SUSPEND.

    Cc: Etienne Carriere
    Signed-off-by: Linus Walleij

    Linus Walleij
     

09 Aug, 2012

1 commit

  • Counting the U9540 and the new U8540 as a U8500 family member
    does not work. Instead, split the function in two:

    cpu_is_u8500_family() covering U8500 and U8520
    cpu_is_ux540_family() covering U9540 and U8540

    This works much better in practice. Update users to keep the
    same behaviour.

    Signed-off-by: Linus Walleij

    Linus Walleij
     

27 May, 2012

1 commit

  • Pull sweeping late_initcall cleanup for arm-soc from Olof Johansson:
    "This is a patch series from Shawn Guo that moves from individual
    late_initcalls() to using a member in the machine structure to invoke
    a platform's late initcalls.

    This cleanup is a step in the move towards multiplatform kernels since
    it would reduce the need to check for compatible platforms in each and
    every initcall."

    Fix up trivial conflicts in arch/arm/mach-{exynos/mach-universal_c210.c,
    imx/mach-cpuimx51.c, omap2/board-generic.c} due to changes nearby (and,
    in the case of cpuimx51.c the board support being deleted)

    * tag 'cleanup-initcall' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: ux500: use machine specific hook for late init
    ARM: tegra: use machine specific hook for late init
    ARM: shmobile: use machine specific hook for late init
    ARM: sa1100: use machine specific hook for late init
    ARM: s3c64xx: use machine specific hook for late init
    ARM: prima2: use machine specific hook for late init
    ARM: pnx4008: use machine specific hook for late init
    ARM: omap2: use machine specific hook for late init
    ARM: omap1: use machine specific hook for late init
    ARM: msm: use machine specific hook for late init
    ARM: imx: use machine specific hook for late init
    ARM: exynos: use machine specific hook for late init
    ARM: ep93xx: use machine specific hook for late init
    ARM: davinci: use machine specific hook for late init
    ARM: provide a late_initcall hook for platform initialization

    Linus Torvalds
     

23 May, 2012

1 commit

  • Pull arm soc-specific pinctrl changes from Olof Johansson:
    "With this, five platforms are moving to the relatively new pinctrl
    subsystem for their pin management, replacing the older soc specific
    in-kernel interfaces with common code.

    There is quite a bit of net addition of code for each platform being
    added to the pinctrl subsystem. But the payback comes later when
    adding new boards can be done by only providing new device trees
    instead."

    Fix up trivial conflicts in arch/arm/mach-ux500/{Makefile,board-mop500.c}

    * tag 'pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (61 commits)
    mtd: nand: gpmi: fix compile error caused by pinctrl call
    ARM: PRIMA2: select PINCTRL and PINCTRL_SIRF in Kconfig
    ARM: nomadik: enable PINCTRL_NOMADIK where needed
    ARM: mxs: enable pinctrl support
    video: mxsfb: adopt pinctrl support
    ASoC: mxs-saif: adopt pinctrl support
    i2c: mxs: adopt pinctrl support
    mtd: nand: gpmi: adopt pinctrl support
    mmc: mxs-mmc: adopt pinctrl support
    serial: mxs-auart: adopt pinctrl support
    serial: amba-pl011: adopt pinctrl support
    spi/imx: adopt pinctrl support
    i2c: imx: adopt pinctrl support
    can: flexcan: adopt pinctrl support
    net: fec: adopt pinctrl support
    ARM: ux500: switch MSP to using pinctrl for pins
    ARM: ux500: alter MSP registration to return a device pointer
    ARM: ux500: switch to using pinctrl for uart0
    ARM: ux500: delete custom pin control system
    ARM: ux500: switch over to Nomadik pinctrl driver
    ...

    Linus Torvalds
     

14 May, 2012

1 commit

  • Conflicts:
    arch/arm/mach-ux500/cache-l2x0.c
    arch/arm/mach-ux500/clock.c
    arch/arm/mach-ux500/cpu.c
    arch/arm/mach-ux500/mbox-db5500.c
    arch/arm/mach-ux500/platsmp.c
    arch/arm/mach-ux500/timer.c

    Resolve lots of identical conflicts between the removal of
    u5500 and the addition of u8540.

    Signed-off-by: Arnd Bergmann

    Arnd Bergmann
     

08 May, 2012

1 commit