Commit 6b5a12db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC multiplatform code updates from Arnd Bergmann:
 "This branch is the culmination of 5 years of effort to bring the ARMv6
  and ARMv7 platforms together such that they can all be enabled and
  boot the same kernel.  It has been a tremendous amount of cleanup and
  refactoring by a huge number of people, and creation of several new
  (and major) subsystems to better abstract out all the platform details
  in an appropriate manner.

  The bulk of this branch is a large patchset from Arnd that brings
  several of the more minor and older platforms we have closer to
  multiplatform support.  Among these are MMP, S3C64xx, Orion5x, mv78xx0
  and realview Much of this is moving around header files from old mach
  directories, but there are also some cleanup patches of debug_ll
  (lowlevel debug per-platform options) and other parts.

  Linus Walleij also has some patchs to clean up the older ARM Realview
  platforms by finally introducing DT support, and Rob Herring has some
  for ARM Versatile which is now DT-only.  Both of these platforms are
  now multiplatform.

  Finally, a couple of patches from Russell for Dove PMU, and a fix from
  Valentin Rothberg for Exynos ADC, which were rebased on top of the
  series to avoid conflicts"

* tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
  ARM: realview: don't select SMP_ON_UP for UP builds
  ARM: s3c: simplify s3c_irqwake_{e,}intallow definition
  ARM: s3c64xx: fix pm-debug compilation
  iio: exynos-adc: fix irqf_oneshot.cocci warnings
  ARM: realview: build realview-dt SMP support only when used
  ARM: realview: select apropriate targets
  ARM: realview: clean up header files
  ARM: realview: make all header files local
  ARM: no longer make CPU targets visible separately
  ARM: integrator: use explicit core module options
  ARM: realview: enable multiplatform
  ARM: make default platform work for NOMMU
  ARM: debug-ll: move DEBUG_LL_UART_EFM32 to correct Kconfig location
  ARM: defconfig: use correct debug_ll settings
  ARM: versatile: convert to multi-platform
  ARM: versatile: merge mach code into a single file
  ARM: versatile: switch to DT only booting and remove legacy code
  ARM: versatile: add DT based PCI detection
  ARM: pxa: mark ezx structures as __maybe_unused
  ARM: pxa: mark raumfeld init functions as __maybe_unused
  ...
parents 5083c542 2cb58c01

Documentation/arm/pxa/mfp.txt

+13 −13
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ to this new MFP mechanism, here are several key points: 
     internal controllers like PWM, SSP and UART, with 128 internal signals

     which can be routed to external through one or more MFPs (e.g. GPIO<0>

     can be routed through either MFP_PIN_GPIO0 as well as MFP_PIN_GPIO0_2,

     see arch/arm/mach-pxa/mach/include/mfp-pxa300.h)

     see arch/arm/mach-pxa/mfp-pxa300.h)



  2. Alternate function configuration is removed from this GPIO controller,

     the remaining functions are pure GPIO-specific, i.e.
@@ -76,11 +76,11 @@ For board code writers, here are some guidelines: 


1. include ONE of the following header files in your <board>.c:



   - #include <mach/mfp-pxa25x.h>

   - #include <mach/mfp-pxa27x.h>

   - #include <mach/mfp-pxa300.h>

   - #include <mach/mfp-pxa320.h>

   - #include <mach/mfp-pxa930.h>

   - #include "mfp-pxa25x.h"

   - #include "mfp-pxa27x.h"

   - #include "mfp-pxa300.h"

   - #include "mfp-pxa320.h"

   - #include "mfp-pxa930.h"



   NOTE: only one file in your <board>.c, depending on the processors used,

   because pin configuration definitions may conflict in these file (i.e.
@@ -203,20 +203,20 @@ make them effective there-after. 
    1. Unified pin definitions - enum constants for all configurable pins

    2. processor-neutral bit definitions for a possible MFP configuration



  - arch/arm/mach-pxa/include/mach/mfp-pxa3xx.h

  - arch/arm/mach-pxa/mfp-pxa3xx.h



  for PXA3xx specific MFPR register bit definitions and PXA3xx common pin

  configurations



  - arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h

  - arch/arm/mach-pxa/mfp-pxa2xx.h



  for PXA2xx specific definitions and PXA25x/PXA27x common pin configurations



  - arch/arm/mach-pxa/include/mach/mfp-pxa25x.h

    arch/arm/mach-pxa/include/mach/mfp-pxa27x.h

    arch/arm/mach-pxa/include/mach/mfp-pxa300.h

    arch/arm/mach-pxa/include/mach/mfp-pxa320.h

    arch/arm/mach-pxa/include/mach/mfp-pxa930.h

  - arch/arm/mach-pxa/mfp-pxa25x.h

    arch/arm/mach-pxa/mfp-pxa27x.h

    arch/arm/mach-pxa/mfp-pxa300.h

    arch/arm/mach-pxa/mfp-pxa320.h

    arch/arm/mach-pxa/mfp-pxa930.h



  for processor specific definitions

Documentation/devicetree/bindings/arm/cpus.txt

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ nodes to be present and contain the properties described below. 
			    "allwinner,sun6i-a31"

			    "allwinner,sun8i-a23"

			    "arm,psci"

			    "arm,realview-smp"

			    "brcm,brahma-b15"

			    "marvell,armada-375-smp"

			    "marvell,armada-380-smp"

Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ Required properties: 


- samsung,syscon-phandle Contains the PMU system controller node

			(To access the ADC_PHY register on Exynos5250/5420/5800/3250)

Optional properties:

- has-touchscreen:	If present, indicates that a touchscreen is

			connected an usable.



Note: child nodes can be added for auto probing from device tree.

arch/arm/Kconfig

+4 −103
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ config ARM_PATCH_PHYS_VIRT 
	bool "Patch physical to virtual translations at runtime" if EMBEDDED

	default y

	depends on !XIP_KERNEL && MMU

	depends on !ARCH_REALVIEW || !SPARSEMEM

	help

	  Patch phys-to-virt and virt-to-phys translation functions at

	  boot and module load time according to the position of the
@@ -321,7 +320,7 @@ config ARCH_MMAP_RND_BITS_MAX 
#

choice

	prompt "ARM system type"

	default ARCH_VERSATILE if !MMU

	default ARM_SINGLE_ARMV7M if !MMU

	default ARCH_MULTIPLATFORM if MMU



config ARCH_MULTIPLATFORM
@@ -353,38 +352,6 @@ config ARM_SINGLE_ARMV7M 
	select SPARSE_IRQ

	select USE_OF



config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_TIMER_SP804

	select COMMON_CLK

	select COMMON_CLK_VERSATILE

	select GENERIC_CLOCKEVENTS

	select GPIO_PL061 if GPIOLIB

	select ICST

	select NEED_MACH_MEMORY_H

	select PLAT_VERSATILE

	select PLAT_VERSATILE_SCHED_CLOCK

	help

	  This enables support for ARM Ltd RealView boards.



config ARCH_VERSATILE

	bool "ARM Ltd. Versatile family"

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARM_AMBA

	select ARM_TIMER_SP804

	select ARM_VIC

	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_MACH_CLKDEV

	select ICST

	select PLAT_VERSATILE

	select PLAT_VERSATILE_CLOCK

	select PLAT_VERSATILE_SCHED_CLOCK

	select VERSATILE_FPGA_IRQ

	help

	  This enables support for ARM Ltd Versatile board.



config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
@@ -519,55 +486,15 @@ config ARCH_DOVE 
	select CPU_PJ4

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_PCI

	select MULTI_IRQ_HANDLER

	select MVEBU_MBUS

	select PINCTRL

	select PINCTRL_DOVE

	select PLAT_ORION_LEGACY

	help

	  Support for the Marvell Dove SoC 88AP510



config ARCH_MV78XX0

	bool "Marvell MV78xx0"

	select ARCH_REQUIRE_GPIOLIB

	select CPU_FEROCEON

	select GENERIC_CLOCKEVENTS

	select MVEBU_MBUS

	select PCI

	select PLAT_ORION_LEGACY

	help

	  Support for the following Marvell MV78xx0 series SoCs:

	  MV781x0, MV782x0.



config ARCH_ORION5X

	bool "Marvell Orion"

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select CPU_FEROCEON

	select GENERIC_CLOCKEVENTS

	select MVEBU_MBUS

	select PCI

	select PLAT_ORION_LEGACY

	select MULTI_IRQ_HANDLER

	help

	  Support for the following Marvell Orion 5x series SoCs:

	  Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),

	  Orion-2 (5281), Orion-1-90 (6183).



config ARCH_MMP

	bool "Marvell PXA168/910/MMP2"

	depends on MMU

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select GENERIC_ALLOCATOR

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select IRQ_DOMAIN

	select MULTI_IRQ_HANDLER

	select PINCTRL

	select PLAT_PXA

	select SPARSE_IRQ

	select PM_GENERIC_DOMAINS if PM

	help

	  Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line.

	  Support for the Marvell Dove SoC 88AP510



config ARCH_KS8695

	bool "Micrel/Kendin KS8695"
@@ -692,32 +619,6 @@ config ARCH_S3C24XX 
	  (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or the

	  Samsung SMDK2410 development board (and derivatives).



config ARCH_S3C64XX

	bool "Samsung S3C64XX"

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select ARM_VIC

	select ATAGS

	select CLKDEV_LOOKUP

	select CLKSRC_SAMSUNG_PWM

	select COMMON_CLK_SAMSUNG

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select HAVE_TCM

	select NO_IOPORT_MAP

	select PLAT_SAMSUNG

	select PM_GENERIC_DOMAINS if PM

	select S3C_DEV_NAND

	select S3C_GPIO_TRACK

	select SAMSUNG_ATAGS

	select SAMSUNG_WAKEMASK

	select SAMSUNG_WDT_RESET

	help

	  Samsung S3C64XX series based systems



config ARCH_DAVINCI

	bool "TI DaVinci"

	select ARCH_HAS_HOLES_MEMORYMODEL

arch/arm/Kconfig.debug

+236 −155

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE