06 Apr, 2014

2 commits

  • Pull ARM SoC cleanups from Arnd Bergmann:
    "These cleanup patches are mainly move stuff around and should all be
    harmless. They are mainly split out so that other branches can be
    based on top to avoid conflicts.

    Notable changes are:

    - We finally remove all mach/timex.h, after CLOCK_TICK_RATE is no
    longer used (Uwe Kleine-König)
    - The Qualcomm MSM platform is split out into legacy mach-msm and
    new-style mach-qcom, to allow easier maintainance of the new
    hardware support without regressions (Kumar Gala)
    - A rework of some of the Kconfig logic to simplify multiplatform
    support (Rob Herring)
    - Samsung Exynos gets closer to supporting multiplatform (Sachin
    Kamat and others)
    - mach-bcm3528 gets merged into mach-bcm (Stephen Warren)
    - at91 gains some common clock framework support (Alexandre Belloni,
    Jean-Jacques Hiblot and other French people)"

    * tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (89 commits)
    ARM: hisi: select HAVE_ARM_SCU only for SMP
    ARM: efm32: allow uncompress debug output
    ARM: prima2: build reset code standalone
    ARM: at91: add PWM clock
    ARM: at91: move sam9261 SoC to common clk
    ARM: at91: prepare common clk transition for sam9261 SoC
    ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
    ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
    ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
    ARM: at91: dt: Add at91sam9261 dt SoC support
    ARM: at91: switch sam9rl to common clock framework
    ARM: at91/dt: define main clk frequency of at91sam9rlek
    ARM: at91/dt: define at91sam9rl clocks
    ARM: at91: prepare common clk transition for sam9rl SoCs
    ARM: at91: prepare sam9 dt boards transition to common clk
    ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
    ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
    ARM: at91: Add at91sam9rl DT SoC support
    ARM: at91: prepare at91sam9rl DT transition
    ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
    ...

    Linus Torvalds
     
  • Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
    "Lots of isolated bug fixes that were not found to be important enough
    to be submitted before the merge window or backported into stable
    kernels.

    The vast majority of these came out of Arnd's randconfig testing and
    just prevents running into build-time bugs in configurations that we
    do not care about in practice"

    * tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
    ARM: at91: fix a typo
    ARM: moxart: fix CPU selection
    ARM: tegra: fix board DT pinmux setup
    ARM: nspire: Fix compiler warning
    IXP4xx: Fix DMA masks.
    Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation"
    IXP4xx: Fix Goramo Multilink GPIO conversion.
    Revert "ARM: ixp4xx: fix gpio rework"
    ARM: tegra: make debug_ll code build for ARMv6
    ARM: sunxi: fix build for THUMB2_KERNEL
    ARM: exynos: add missing include of linux/module.h
    ARM: exynos: fix l2x0 saved regs handling
    ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK
    ARM: samsung: select ATAGS where necessary
    ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic
    ARM: samsung: allow serial driver to be disabled
    ARM: s5pv210: enable IDE support in MACH_TORBRECK
    ARM: s5p64x0: fix building with only one soc type
    ARM: s3c64xx: select power domains only when used
    ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1
    ...

    Linus Torvalds
     

22 Mar, 2014

1 commit

  • The 'og' machine tries to always initialized the PCI code, but that
    may be disabled in Kconfig, leading to a build error.

    This patch changes the code to use the same Kconfig symbol to decide
    about calling the ks8695_init_pci function at build time that we
    use to decide about building the ks8695 PCI support.

    Signed-off-by: Arnd Bergmann
    Acked-by: Greg Ungerer

    Arnd Bergmann
     

12 Mar, 2014

1 commit


19 Feb, 2014

1 commit

  • This cleanup series gets rid of for platforms not using
    ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
    387798b (ARM: initial multiplatform support).)

    To make this work some code out of arch/arm needed to be adapted. The
    respective changes got acks by their maintainers to be taken via armsoc
    (with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).

    Compared to the previous pull request there was another patch added that
    fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
    squash this fix into the original commit to save him from the need to
    reverify the series.

    * tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux:
    ARM: ixp4xx: fix timer latch calculation
    ARM: drop for !ARCH_MULTIPLATFORM, too
    ARM: rpc: stop using
    ARM: ixp4xx: stop using
    input: ixp4xx-beeper: don't use symbols from
    ARM: at91: don't use
    ARM: ep93xx: stop using mach/timex.h
    ARM: mmp: stop using mach/timex.h
    ARM: netx: stop using mach/timex.h
    ARM: sa1100: stop using mach/timex.h
    clocksource: sirf/marco+prima2: drop usage of CLOCK_TICK_RATE
    rtc: pxa: drop unused #define TIMER_FREQ
    rtc: at91sam9: include explicitly
    ARM/serial: at91: switch atmel serial to use gpiolib

    Signed-off-by: Olof Johansson

    Olof Johansson
     

21 Dec, 2013

1 commit

  • While isn't used for multi-platform builds since long it
    still is for "normal" builds. As the previous patches fix all sites to
    not make use of this per-platform file, it can go now for good also for
    platforms that are not (yet) converted to multi-platform.

    While at it there are no users of CLOCK_TICK_RATE any more, so also drop
    the dummy #define.

    Signed-off-by: Uwe Kleine-König

    Uwe Kleine-König
     

03 Dec, 2013

1 commit


30 Aug, 2013

1 commit


10 Jul, 2013

1 commit

  • Preparing to move the parsing of reboot= to generic kernel code forces
    the change in reboot_mode handling to use the enum.

    [akpm@linux-foundation.org: fix arch/arm/mach-socfpga/socfpga.c]
    Signed-off-by: Robin Holt
    Cc: Russell King
    Cc: Russ Anderson
    Cc: Robin Holt
    Cc: H. Peter Anvin
    Cc: Guan Xuetao
    Acked-by: Russell King
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Robin Holt
     

06 Feb, 2013

1 commit

  • …-2.6 into next/cleanup

    From Shawn Guo:
    The series cleans up ARCH_HAS_DECOMP_WDOG and arch_decomp_wdog which
    are unused on ARM architecure. Samsung has some code setting up wdog
    in arch_decomp_wdog(). But since CONFIG_S3C_BOOT_WATCHDOG is defined
    nowhere, it will not run. Otherwise, system can not boot at all when
    wdog is set up but no one pats it.

    * tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6:
    ARM: samsung: remove unused arch_decomp_wdog() code
    ARM: remove unused arch_decomp_wdog()
    ARM: decompress: remove unused ARCH_HAS_DECOMP_WDOG

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

    Olof Johansson
     

15 Jan, 2013

1 commit

  • Clockevent cleanup series from Shawn Guo.

    Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
    cleanup.

    * clocksource/cleanup:
    clocksource: use clockevents_config_and_register() where possible
    ARM: use clockevents_config_and_register() where possible
    clockevents: export clockevents_config_and_register for module use
    + sync to Linux 3.8-rc3

    Signed-off-by: Olof Johansson

    Conflicts:
    arch/arm/mach-pxa/time.c

    Olof Johansson
     

11 Jan, 2013

1 commit

  • With ARCH_HAS_DECOMP_WDOG removed from arch/arm/boot/compressed/decompress.c,
    all the arch_decomp_wdog() definition at platform level is unneeded.
    Remmove it.

    Signed-off-by: Shawn Guo
    Acked-by: Nicolas Pitre
    Acked-by: Jason Cooper

    Shawn Guo
     

04 Jan, 2013

1 commit

  • CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
    markings need to be removed.

    This change removes the use of __devinit, __devexit_p, __devinitdata,
    and __devexit from these drivers.

    Based on patches originally written by Bill Pemberton, but redone by me
    in order to handle some of the coding style issues better, by hand.

    Cc: Bill Pemberton
    Cc: Russell King
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

25 Dec, 2012

1 commit

  • Now that the only field in struct sys_timer is .init, delete the struct,
    and replace the machine descriptor .timer field with the initialization
    function itself.

    This will enable moving timer drivers into drivers/clocksource without
    having to place a public prototype of each struct sys_timer object into
    include/linux; the intent is to create a single of_clocksource_init()
    function that determines which timer driver to initialize by scanning
    the device dtree, much like the proposed irqchip_init() at:
    http://www.spinics.net/lists/arm-kernel/msg203686.html

    Includes mach-omap2 fixes from Igor Grinberg.

    Tested-by: Robert Jarzmik
    Signed-off-by: Stephen Warren

    Stephen Warren
     

07 Oct, 2012

2 commits

  • This is a series from Arnd that fixes a number of compiler warnings
    when building defconfigs on ARM.

    * late/fixes:
    ARM: footbridge: nw_gpio_lock is raw_spin_lock
    ARM: mv78xx0: correct addr_map_cfg __initdata annotation
    ARM: footbridge: remove RTC_IRQ definition
    ARM: soc: dependency warnings for errata
    ARM: ks8695: __arch_virt_to_dma type handling
    ARM: rpc: check device_register return code in ecard_probe
    ARM: davinci: don't mark da850_register_cpufreq as __init
    ARM: iop13xx: fix iq81340sc_atux_map_irq prototype
    ARM: iop13xx: mark iop13xx_scan_bus as __devinit
    ARM: mv78xx0: mark mv78xx0_timer_init as __init_refok
    ARM: s3c24xx: fix multiple section mismatch warnings
    ARM: at91: unused variable in at91_pm_verify_clocks
    ARM: at91: skip at91_io_desc definition for NOMMU
    ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRM
    ARM: pxa: remove sharpsl_fatal_check function
    ARM: pxa: define palmte2_pxa_keys conditionally
    ARM: pxa: Wunused-result warning in viper board file
    ARM: shark: fix shark_pci_init return code

    Fixed trivial conflicts in arch/arm/mach-at91/setup.c.

    Signed-off-by: Olof Johansson

    Olof Johansson
     
  • __arch_virt_to_dma expects a virtual address pointer, but
    the ks8695 implementation of this macro treats it as an
    integer. Adding a type cast avoids hundreds of identical
    warning messages.

    Without this patch, building acs5k_defconfig results in:

    arch/arm/include/asm/dma-mapping.h: In function 'virt_to_dma':
    arch/arm/include/asm/dma-mapping.h:60:2: warning: passing argument 1 of '__virt_to_phys' makes integer from pointer without a cast [enabled by default]
    arch/arm/include/asm/memory.h:172:60: note: expected 'long unsigned int' but argument is of type 'void *'
    In file included from include/linux/dma-mapping.h:73:0,
    from include/linux/skbuff.h:33,
    from security/commoncap.c:21:

    Signed-off-by: Arnd Bergmann
    Cc: Krzysztof Halasa
    Cc: Daniel Silverstone
    Cc: Ben Dooks

    Arnd Bergmann
     

02 Oct, 2012

2 commits

  • Pull ARM soc board specific updates from Olof Johansson:
    "Misc board updates:
    - Greg added a handful of boards to KS8695 (since he has stepped up
    to maintain it).
    - Qualcomm has added DT-only board support for a couple of their
    newer SoCs.
    - misc other updates for Samsung and Freescale boards."

    Fix up trivial conflict in arch/arm/mach-shmobile/board-armadillo800eva.c
    due to gpio device data being added next to hdmi device data that got moved.

    * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    ARM: msm: Allow 8960 and 8660 to compile together
    ARM: msm: Allow msm_iomap-8x60 and msm_iomap-8960 to coexist
    ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
    ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
    ARM: EXYNOS: Use generic pwm driver in Origen board
    ARM: shmobile: armadillo800eva: Add support RTC
    ARM: ks8695: add board support for the OpenGear boards based on the KS8695
    ARM: ks8695: add board support for the SnapGear boards based on the KS8695
    ARM: dts: Add heartbeat gpio-leds support to Origen
    ARM: dts: Use active low flag for gpio-keys on Origen
    ARM: shmobile: marzen: enable thermal sensor
    ARM: shmobile: marzen: fixup regulator id for smsc911x
    ARM: shmobile: marzen: add SDHI0 support
    ARM: mmp: enable debug uart port in defconfig
    ARM: mmp: implement DEBUG_LL port choice
    ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
    ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore
    ARM: mx27pdk: Add audio support
    ARM: ttc_dkb: add nand support

    Linus Torvalds
     
  • Pull ARM soc driver specific changes from Olof Johansson:
    - A long-coming conversion of various platforms to a common LED
    infrastructure
    - AT91 is moved over to use the newer MCI driver for MMC
    - Pincontrol conversions for samsung platforms
    - DT bindings for gscaler on samsung
    - i2c driver fixes for tegra, acked by i2c maintainer

    Fix up conflicts as per Olof.

    * tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
    drivers: bus: omap_l3: use resources instead of hardcoded irqs
    pinctrl: exynos: Fix wakeup IRQ domain registration check
    pinctrl: samsung: Uninline samsung_pinctrl_get_soc_data
    pinctrl: exynos: Correct the detection of wakeup-eint node
    pinctrl: exynos: Mark exynos_irq_demux_eint as inline
    pinctrl: exynos: Handle only unmasked wakeup interrupts
    pinctrl: exynos: Fix typos in gpio/wkup _irq_mask
    pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTa
    drivers: bus: Move the OMAP interconnect driver to drivers/bus/
    i2c: tegra: dynamically control fast clk
    i2c: tegra: I2_M_NOSTART functionality not supported in Tegra20
    ARM: tegra: clock: remove unused clock entry for i2c
    ARM: tegra: clock: add connection name in i2c clock entry
    i2c: tegra: pass proper name for getting clock
    ARM: tegra: clock: add i2c fast clock entry in clock table
    ARM: EXYNOS: Adds G-Scaler device from Device Tree
    ARM: EXYNOS: Add clock support for G-Scaler
    ARM: EXYNOS: Enable pinctrl driver support for EXYNOS4 device tree enabled platform
    ARM: dts: Add pinctrl node entries for SAMSUNG EXYNOS4210 SoC
    ARM: EXYNOS: skip wakeup interrupt setup if pinctrl driver is used
    ...

    Linus Torvalds
     

23 Sep, 2012

1 commit

  • __iomem annotation cleanup branch from Arnd.

    * cleanup/__iomem: (21 commits)
    net: seeq: use __iomem pointers for MMIO
    video: da8xx-fb: use __iomem pointers for MMIO
    scsi: eesox: use __iomem pointers for MMIO
    serial: ks8695: use __iomem pointers for MMIO
    input: rpcmouse: use __iomem pointers for MMIO
    ARM: samsung: use __iomem pointers for MMIO
    ARM: spear13xx: use __iomem pointers for MMIO
    ARM: sa1100: use __iomem pointers for MMIO
    ARM: prima2: use __iomem pointers for MMIO
    ARM: nomadik: use __iomem pointers for MMIO
    ARM: msm: use __iomem pointers for MMIO
    ARM: lpc32xx: use __iomem pointers for MMIO
    ARM: ks8695: use __iomem pointers for MMIO
    ARM: ixp4xx: use __iomem pointers for MMIO
    ARM: iop32x: use __iomem pointers for MMIO
    ARM: iop13xx: use __iomem pointers for MMIO
    ARM: integrator: use __iomem pointers for MMIO
    ARM: imx: use __iomem pointers for MMIO
    ARM: ebsa110: use __iomem pointers for MMIO
    ARM: at91: use __iomem pointers for MMIO
    ...

    Signed-off-by: Olof Johansson

    Olof Johansson
     

19 Sep, 2012

1 commit


08 Sep, 2012

3 commits

  • * ks8695/boards:
    ARM: ks8695: add board support for the OpenGear boards based on the KS8695
    ARM: ks8695: add board support for the SnapGear boards based on the KS8695

    Olof Johansson
     
  • A number of boards produced by OpenGear and based on the Micrel KS8695 SoC.
    Add board support to the KS8695 kernel code to support them.

    The following machine type entries will need to be added back into the
    mach-types file with these in mainline:

    cm4008 MACH_CM4008 CM4008 624
    cm41xx MACH_CM41XX CM41XX 672
    cm4002 MACH_CM4002 CM4002 876
    im42xx MACH_IM42XX IM42XX 1105
    im4004 MACH_IM4004 IM4004 1400

    Signed-off-by: Greg Ungerer
    Acked-by: Arnd Bergmann
    Signed-off-by: Olof Johansson

    Greg Ungerer
     
  • A number of boards produced by SnapGear are based on the Micrel KS8695 SoC.
    Add board support to the KS8695 kernel code to support them.

    The following machine type entries will need to be added back into the
    mach-types file with these in mainline:

    lite300 MACH_LITE300 LITE300 408
    se4200 MACH_SE4200 SE4200 809
    sg310 MACH_SG310 SG310 1564

    Signed-off-by: Greg Ungerer
    Acked-by: Arnd Bergmann
    Signed-off-by: Olof Johansson

    Greg Ungerer
     

05 Sep, 2012

4 commits


01 Aug, 2012

1 commit


14 May, 2012

2 commits

  • Most PCI implementations perform simple root bus scanning. Rather than
    having each group of platforms provide a duplicated bus scan function,
    provide the PCI configuration ops structure via the hw_pci structure,
    and call the root bus scanning function from core ARM PCI code.

    Acked-by: Krzysztof Hałasa
    Signed-off-by: Russell King

    Russell King
     
  • Most PCI implementations use the standard PCI swizzle function, which
    handles the well defined behaviour of PCI-to-PCI bridges which can be
    found on cards (eg, four port ethernet cards.)

    Rather than having almost every platform specify the standard swizzle
    function, make this the default when no swizzle function is supplied.
    Therefore, a swizzle function only needs to be provided when there is
    something exceptional which needs to be handled.

    This gets rid of the swizzle initializer from 47 files, and leaves us
    with just two platforms specifying a swizzle function: ARM Integrator
    and Chalice CATS.

    Acked-by: Krzysztof Hałasa
    Signed-off-by: Russell King

    Russell King
     

30 Mar, 2012

1 commit

  • Pull "ARM: cleanups of io includes" from Olof Johansson:
    "Rob Herring has done a sweeping change cleaning up all of the
    mach/io.h includes, moving some of the oft-repeated macros to a common
    location and removing a bunch of boiler plate. This is another step
    closer to a common zImage for multiple platforms."

    Fix up various fairly trivial conflicts ( removal vs changes
    around it, tegra localtimer.o is *still* gone, yadda-yadda).

    * tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
    ARM: tegra: Include assembler.h in sleep.S to fix build break
    ARM: pxa: use common IOMEM definition
    ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
    ARM: __io abuse cleanup
    ARM: create a common IOMEM definition
    ARM: iop13xx: fix missing declaration of iop13xx_init_early
    ARM: fix ioremap/iounmap for !CONFIG_MMU
    ARM: kill off __mem_pci
    ARM: remove bunch of now unused mach/io.h files
    ARM: make mach/io.h include optional
    ARM: clps711x: remove unneeded include of mach/io.h
    ARM: dove: add explicit include of dove.h to addr-map.c
    ARM: at91: add explicit include of hardware.h to uncompressor
    ARM: ep93xx: clean-up mach/io.h
    ARM: tegra: clean-up mach/io.h
    ARM: orion5x: clean-up mach/io.h
    ARM: davinci: remove unneeded mach/io.h include
    [media] davinci: remove includes of mach/io.h
    ARM: OMAP: Remove remaining includes for mach/io.h
    ARM: msm: clean-up mach/io.h
    ...

    Linus Torvalds
     

29 Mar, 2012

2 commits

  • …m/linux/kernel/git/dhowells/linux-asm_system

    Pull "Disintegrate and delete asm/system.h" from David Howells:
    "Here are a bunch of patches to disintegrate asm/system.h into a set of
    separate bits to relieve the problem of circular inclusion
    dependencies.

    I've built all the working defconfigs from all the arches that I can
    and made sure that they don't break.

    The reason for these patches is that I recently encountered a circular
    dependency problem that came about when I produced some patches to
    optimise get_order() by rewriting it to use ilog2().

    This uses bitops - and on the SH arch asm/bitops.h drags in
    asm-generic/get_order.h by a circuituous route involving asm/system.h.

    The main difficulty seems to be asm/system.h. It holds a number of
    low level bits with no/few dependencies that are commonly used (eg.
    memory barriers) and a number of bits with more dependencies that
    aren't used in many places (eg. switch_to()).

    These patches break asm/system.h up into the following core pieces:

    (1) asm/barrier.h

    Move memory barriers here. This already done for MIPS and Alpha.

    (2) asm/switch_to.h

    Move switch_to() and related stuff here.

    (3) asm/exec.h

    Move arch_align_stack() here. Other process execution related bits
    could perhaps go here from asm/processor.h.

    (4) asm/cmpxchg.h

    Move xchg() and cmpxchg() here as they're full word atomic ops and
    frequently used by atomic_xchg() and atomic_cmpxchg().

    (5) asm/bug.h

    Move die() and related bits.

    (6) asm/auxvec.h

    Move AT_VECTOR_SIZE_ARCH here.

    Other arch headers are created as needed on a per-arch basis."

    Fixed up some conflicts from other header file cleanups and moving code
    around that has happened in the meantime, so David's testing is somewhat
    weakened by that. We'll find out anything that got broken and fix it..

    * tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)
    Delete all instances of asm/system.h
    Remove all #inclusions of asm/system.h
    Add #includes needed to permit the removal of asm/system.h
    Move all declarations of free_initmem() to linux/mm.h
    Disintegrate asm/system.h for OpenRISC
    Split arch_align_stack() out from asm-generic/system.h
    Split the switch_to() wrapper out of asm-generic/system.h
    Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h
    Create asm-generic/barrier.h
    Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h
    Disintegrate asm/system.h for Xtensa
    Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]
    Disintegrate asm/system.h for Tile
    Disintegrate asm/system.h for Sparc
    Disintegrate asm/system.h for SH
    Disintegrate asm/system.h for Score
    Disintegrate asm/system.h for S390
    Disintegrate asm/system.h for PowerPC
    Disintegrate asm/system.h for PA-RISC
    Disintegrate asm/system.h for MN10300
    ...

    Linus Torvalds
     
  • Disintegrate asm/system.h for ARM.

    Signed-off-by: David Howells
    cc: Russell King
    cc: linux-arm-kernel@lists.infradead.org

    David Howells
     

24 Mar, 2012

2 commits

  • Pull #1 ARM updates from Russell King:
    "This one covers stuff which Arnd is waiting for me to push, as this is
    shared between both our trees and probably other trees elsewhere.

    Essentially, this contains:
    - AMBA primecell device initializer updates - mostly shrinking the
    size of the device declarations in platform code to something more
    reasonable.
    - Getting rid of the NO_IRQ crap from AMBA primecell stuff.
    - Nicolas' idle cleanups. This in combination with the restart
    cleanups from the last merge window results in a great many
    mach/system.h files being deleted."

    Yay: ~80 files, ~2000 lines deleted.

    * 'for-armsoc' of git://git.linaro.org/people/rmk/linux-arm: (60 commits)
    ARM: remove disable_fiq and arch_ret_to_user macros
    ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER
    ARM: rpc: make default fiq handler run-time installed
    ARM: make arch_ret_to_user macro optional
    ARM: amba: samsung: use common amba device initializers
    ARM: amba: spear: use common amba device initializers
    ARM: amba: nomadik: use common amba device initializers
    ARM: amba: u300: use common amba device initializers
    ARM: amba: lpc32xx: use common amba device initializers
    ARM: amba: netx: use common amba device initializers
    ARM: amba: bcmring: use common amba device initializers
    ARM: amba: ep93xx: use common amba device initializers
    ARM: amba: omap2: use common amba device initializers
    ARM: amba: integrator: use common amba device initializers
    ARM: amba: realview: get rid of private platform amba_device initializer
    ARM: amba: versatile: get rid of private platform amba_device initializer
    ARM: amba: vexpress: get rid of private platform amba_device initializer
    ARM: amba: provide common initializers for static amba devices
    ARM: amba: make use of -1 IRQs warn
    ARM: amba: u300: get rid of NO_IRQ initializers
    ...

    Linus Torvalds
     
  • Pull PCI changes (including maintainer change) from Jesse Barnes:
    "This pull has some good cleanups from Bjorn and Yinghai, as well as
    some more code from Yinghai to better handle resource re-allocation
    when enabled.

    There's also a new initcall_debug feature from Arjan which will print
    out quirk timing information to help identify slow quirks for fixing
    or refinement (Yinghai sent in a few patches to do just that once the
    new debug code landed).

    Beyond that, I'm handing off PCI maintainership to Bjorn Helgaas.
    He's been a core PCI and Linux contributor for some time now, and has
    kindly volunteered to take over. I just don't feel I have the time
    for PCI review and work that it deserves lately (I've taken on some
    other projects), and haven't been as responsive lately as I'd like, so
    I approached Bjorn asking if he'd like to manage things. He's going
    to give it a try, and I'm confident he'll do at least as well as I
    have in keeping the tree managed, patches flowing, and keeping things
    stable."

    Fix up some fairly trivial conflicts due to other cleanups (mips device
    resource fixup cleanups clashing with list handling cleanup, ppc iseries
    removal clashing with pci_probe_only cleanup etc)

    * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: (112 commits)
    PCI: Bjorn gets PCI hotplug too
    PCI: hand PCI maintenance over to Bjorn Helgaas
    unicore32/PCI: move include to asm/pci.h
    sparc/PCI: convert devtree and arch-probed bus addresses to resource
    powerpc/PCI: allow reallocation on PA Semi
    powerpc/PCI: convert devtree bus addresses to resource
    powerpc/PCI: compute I/O space bus-to-resource offset consistently
    arm/PCI: don't export pci_flags
    PCI: fix bridge I/O window bus-to-resource conversion
    x86/PCI: add spinlock held check to 'pcibios_fwaddrmap_lookup()'
    PCI / PCIe: Introduce command line option to disable ARI
    PCI: make acpihp use __pci_remove_bus_device instead
    PCI: export __pci_remove_bus_device
    PCI: Rename pci_remove_behind_bridge to pci_stop_and_remove_behind_bridge
    PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device
    PCI: print out PCI device info along with duration
    PCI: Move "pci reassigndev resource alignment" out of quirks.c
    PCI: Use class for quirk for usb host controller fixup
    PCI: Use class for quirk for ti816x class fixup
    PCI: Use class for quirk for intel e100 interrupt fixup
    ...

    Linus Torvalds
     

07 Mar, 2012

1 commit

  • Now that many platforms don't need mach/io.h, remove the unused ones.

    Signed-off-by: Rob Herring
    Acked-by: Shawn Guo
    Acked-by: Linus Walleij
    Acked-by: H Hartley Sweeten
    Acked-by: Jean-Christophe PLAGNIOL-VILLARD
    Acked-by: Jamie Iles
    Acked-by: Pawel Moll
    Acked-by: Nicolas Pitre

    Rob Herring
     

24 Feb, 2012

1 commit


23 Feb, 2012

1 commit


22 Feb, 2012

1 commit

  • Now that most platforms don't need disable_fiq and arch_ret_to_user
    macros, we can remove the empty macros or empty entry-macro.S files.

    Signed-off-by: Rob Herring
    Acked-by: Jamie Iles
    Acked-by: Nicolas Pitre
    Acked-by: Tony Lindgren
    Acked-by: Linus Walleij
    Acked-by: Ryan Mallon
    Acked-by: Nicolas Ferre
    Acked-by: H Hartley Sweeten
    Acked-by: Shawn Guo

    Rob Herring
     

10 Feb, 2012

1 commit