Commit 8e73e367 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC cleanups from Olof Johansson:
 "This branch contains code cleanups, moves and removals for 3.12.

  There's a large number of various cleanups, and a nice net removal of
  13500 lines of code.

  Highlights worth mentioning are:

   - A series of patches from Stephen Boyd removing the ARM local timer
     API.
   - Move of Qualcomm MSM IOMMU code to drivers/iommu.
   - Samsung PWM driver cleanups from Tomasz Figa, removing legacy PWM
     driver and switching over to the drivers/pwm one.
   - Removal of some unusued auto-generated headers for OMAP2+ (PRM/CM).

  There's also a move of a header file out of include/linux/i2c/ to
  platform_data, where it really belongs.  It touches mostly ARM
  platform code for include changes so we took it through our tree"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
  ARM: OMAP2+: Add back the define for AM33XX_RST_GLOBAL_WARM_SW_MASK
  gpio: (gpio-pca953x) move header to linux/platform_data/
  arm: zynq: hotplug: Remove unreachable code
  ARM: SAMSUNG: Remove unnecessary exynos4_default_sdhci*()
  tegra: simplify use of devm_ioremap_resource
  ARM: SAMSUNG: Remove plat/regs-timer.h header
  ARM: SAMSUNG: Remove remaining uses of plat/regs-timer.h header
  ARM: SAMSUNG: Remove pwm-clock infrastructure
  ARM: SAMSUNG: Remove old PWM timer platform devices
  pwm: Remove superseded pwm-samsung-legacy driver
  ARM: SAMSUNG: Modify board files to use new PWM platform device
  ARM: SAMSUNG: Rework private data handling in dev-backlight
  pwm: Add new pwm-samsung driver
  ARM: mach-mvebu: remove redundant DT parsing and validation
  ARM: msm: Only compile io.c on platforms that use it
  iommu/msm: Move mach includes to iommu directory
  ARM: msm: Remove devices-iommu.c
  ARM: msm: Move mach/board.h contents to common.h
  ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
  ARM: msm: Remove TMR and TMR0 static mappings
  ...
parents d2f3e9eb 7323f219

arch/arm/Kconfig

+7 −17
Original line number Diff line number Diff line
@@ -631,6 +631,7 @@ config ARCH_MSM 
	bool "Qualcomm MSM"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_OF if OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	help
@@ -646,7 +647,7 @@ config ARCH_SHMOBILE 
	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if LOCAL_TIMERS

	select HAVE_ARM_TWD if SMP

	select HAVE_CLK

	select HAVE_MACH_CLKDEV

	select HAVE_SMP
@@ -701,7 +702,7 @@ config ARCH_S3C24XX 
	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_SAMSUNG_PWM

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG

	select HAVE_CLK
@@ -724,7 +725,7 @@ config ARCH_S3C64XX 
	select ARCH_REQUIRE_GPIOLIB

	select ARM_VIC

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_SAMSUNG_PWM

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG
@@ -740,7 +741,6 @@ config ARCH_S3C64XX 
	select SAMSUNG_ATAGS

	select SAMSUNG_CLKSRC

	select SAMSUNG_GPIOLIB_4BIT

	select SAMSUNG_IRQ_VIC_TIMER

	select SAMSUNG_WDT_RESET

	select USB_ARCH_HAS_OHCI

	help
@@ -749,7 +749,7 @@ config ARCH_S3C64XX 
config ARCH_S5P64X0

	bool "Samsung S5P6440 S5P6450"

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_SAMSUNG_PWM

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG
@@ -768,7 +768,7 @@ config ARCH_S5PC100 
	bool "Samsung S5PC100"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_SAMSUNG_PWM

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG
@@ -788,7 +788,7 @@ config ARCH_S5PV210 
	select ARCH_HAS_HOLES_MEMORYMODEL

	select ARCH_SPARSEMEM_ENABLE

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CLKSRC_SAMSUNG_PWM

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GPIO_SAMSUNG
@@ -1594,16 +1594,6 @@ config ARM_PSCI 
	  0022A ("Power State Coordination Interface System Software on

	  ARM processors").



config LOCAL_TIMERS

	bool "Use local timer interrupts"

	depends on SMP

	default y

	help

	  Enable support for local timers on SMP platforms, rather then the

	  legacy IPI broadcast method.  Local timers allows the system

	  accounting to be spread across the timer interval, preventing a

	  "thundering herd" at every timer tick.



# The GPIO number here must be sorted by descending number. In case of

# a multiplatform kernel, we just want the highest value required by the

# selected platforms.

arch/arm/Kconfig.debug

+7 −2
Original line number Diff line number Diff line
@@ -895,6 +895,11 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX53_UART ||\

				 DEBUG_IMX6Q_UART || \

				 DEBUG_IMX6SL_UART

	default "debug/msm.S" if DEBUG_MSM_UART1 || \

				 DEBUG_MSM_UART2 || \

				 DEBUG_MSM_UART3 || \

				 DEBUG_MSM8660_UART || \

				 DEBUG_MSM8960_UART

	default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART

	default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1

	default "debug/sti.S" if DEBUG_STI_UART
@@ -1056,7 +1061,7 @@ config DEBUG_UART_8250_FLOW_CONTROL 


config DEBUG_UNCOMPRESS

	bool

	depends on ARCH_MULTIPLATFORM

	depends on ARCH_MULTIPLATFORM || ARCH_MSM

	default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \

		     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)

	help
@@ -1072,7 +1077,7 @@ config DEBUG_UNCOMPRESS 


config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM

	default "mach/uncompress.h"



config EARLY_PRINTK

arch/arm/boot/dts/exynos4210.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 
		};

	};



	clock: clock-controller@0x10030000 {

	clock: clock-controller@10030000 {

		compatible = "samsung,exynos4210-clock";

		reg = <0x10030000 0x20000>;

		#clock-cells = <1>;

arch/arm/boot/dts/exynos4x12.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
		pinctrl3 = &pinctrl_3;

	};



	clock: clock-controller@0x10030000 {

	clock: clock-controller@10030000 {

		compatible = "samsung,exynos4412-clock";

		reg = <0x10030000 0x20000>;

		#clock-cells = <1>;

arch/arm/boot/dts/exynos5250.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -68,17 +68,17 @@ 
		};

	};



	pd_gsc: gsc-power-domain@0x10044000 {

	pd_gsc: gsc-power-domain@10044000 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10044000 0x20>;

	};



	pd_mfc: mfc-power-domain@0x10044040 {

	pd_mfc: mfc-power-domain@10044040 {

		compatible = "samsung,exynos4210-pd";

		reg = <0x10044040 0x20>;

	};



	clock: clock-controller@0x10010000 {

	clock: clock-controller@10010000 {

		compatible = "samsung,exynos5250-clock";

		reg = <0x10010000 0x30000>;

		#clock-cells = <1>;
@@ -559,7 +559,7 @@ 
		};

	};



	gsc_0:  gsc@0x13e00000 {

	gsc_0:  gsc@13e00000 {

		compatible = "samsung,exynos5-gsc";

		reg = <0x13e00000 0x1000>;

		interrupts = <0 85 0>;
@@ -568,7 +568,7 @@ 
		clock-names = "gscl";

	};



	gsc_1:  gsc@0x13e10000 {

	gsc_1:  gsc@13e10000 {

		compatible = "samsung,exynos5-gsc";

		reg = <0x13e10000 0x1000>;

		interrupts = <0 86 0>;
@@ -577,7 +577,7 @@ 
		clock-names = "gscl";

	};



	gsc_2:  gsc@0x13e20000 {

	gsc_2:  gsc@13e20000 {

		compatible = "samsung,exynos5-gsc";

		reg = <0x13e20000 0x1000>;

		interrupts = <0 87 0>;
@@ -586,7 +586,7 @@ 
		clock-names = "gscl";

	};



	gsc_3:  gsc@0x13e30000 {

	gsc_3:  gsc@13e30000 {

		compatible = "samsung,exynos5-gsc";

		reg = <0x13e30000 0x1000>;

		interrupts = <0 88 0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE