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

8e73e367 · Linus Torvalds <[email protected]> · 2013-09-06 13:21:16 -07:00

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
  ...

Commit: 8e73e367f7dc50f1d1bc22a63e5764bb4eea9b48
Parents: d2f3e9eb · 7323f219

Merge commit. Changes below are compared with the first parent: d2f3e9eb.

Changes

168 files changed · +1312 −14806

File	Status	Add	Del	Content
arch/arm/Kconfig	modified	+7	−17	View file
arch/arm/Kconfig.debug	modified	+7	−2	View file
arch/arm/boot/dts/exynos4210.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/exynos4x12.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/exynos5250.dtsi	modified	+7	−7	View file
arch/arm/boot/dts/exynos5420.dtsi	modified	+1	−1	View file
arch/arm/boot/dts/exynos5440.dtsi	modified	+1	−1	View file
arch/arm/configs/exynos4_defconfig	deleted	+0	−68	View before deletion
arch/arm/include/asm/localtimer.h	deleted	+0	−34	View before deletion
arch/arm/mach-msm/include/mach/debug-macro.S → arch/arm/include/debug/msm.S	renamed	+30	−2	View file
arch/arm/kernel/smp.c	modified	+0	−87	View file
arch/arm/kernel/smp_twd.c	modified	+43	−21	View file
arch/arm/mach-at91/board-snapper9260.c	modified	+1	−1	View file
arch/arm/mach-davinci/board-da850-evm.c	modified	+1	−1	View file
arch/arm/mach-ep93xx/vision_ep9307.c	modified	+1	−1	View file
arch/arm/mach-exynos/common.h	modified	+0	−43	View file
arch/arm/mach-highbank/Kconfig	modified	+1	−1	View file
arch/arm/mach-imx/Kconfig	modified	+1	−1	View file
arch/arm/mach-imx/mach-imx27_visstrim_m10.c	modified	+1	−1	View file
arch/arm/mach-imx/mach-mxt_td60.c	modified	+1	−1	View file
arch/arm/mach-ks8695/board-acs5k.c	modified	+1	−1	View file
arch/arm/mach-mmp/ttc_dkb.c	modified	+1	−1	View file
arch/arm/mach-msm/Makefile	modified	+4	−5	View file
arch/arm/mach-msm/board-dt-8660.c	modified	+1	−3	View file
arch/arm/mach-msm/board-dt-8960.c	modified	+1	−2	View file
arch/arm/mach-msm/board-halibut.c	modified	+0	−1	View file
arch/arm/mach-msm/board-mahimahi.c	modified	+1	−1	View file
arch/arm/mach-msm/board-msm7x30.c	modified	+0	−1	View file
arch/arm/mach-msm/board-qsd8x50.c	modified	+0	−1	View file
arch/arm/mach-msm/board-sapphire.c	modified	+1	−1	View file
arch/arm/mach-msm/board-trout.c	modified	+0	−1	View file
arch/arm/mach-msm/board-trout.h	modified	+1	−1	View file
arch/arm/mach-msm/common.h	modified	+15	−3	View file
arch/arm/mach-msm/devices-iommu.c	deleted	+0	−912	View before deletion
arch/arm/mach-msm/devices-msm7x30.c	modified	+1	−1	View file
arch/arm/mach-msm/devices-qsd8x50.c	modified	+1	−1	View file
arch/arm/mach-msm/include/mach/board.h	deleted	+0	−38	View before deletion
arch/arm/mach-msm/include/mach/msm_iomap-8960.h	deleted	+0	−46	View before deletion
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h	deleted	+0	−53	View before deletion
arch/arm/mach-msm/include/mach/msm_iomap.h	modified	+0	−17	View file
arch/arm/mach-msm/include/mach/uncompress.h	deleted	+0	−63	View before deletion
arch/arm/mach-msm/io.c	modified	+22	−45	View file
arch/arm/mach-msm/timer.c	modified	+72	−69	View file
arch/arm/mach-mvebu/platsmp.c	modified	+1	−18	View file
arch/arm/mach-omap2/Kconfig	modified	+1	−2	View file
arch/arm/mach-omap2/board-am3517evm.c	modified	+1	−1	View file
arch/arm/mach-omap2/cm-regbits-24xx.h	modified	+0	−318	View file
arch/arm/mach-omap2/cm-regbits-33xx.h	modified	+0	−749	View file
arch/arm/mach-omap2/cm-regbits-34xx.h	modified	+0	−632	View file
arch/arm/mach-omap2/cm-regbits-44xx.h	modified	+0	−1558	View file
arch/arm/mach-omap2/cm-regbits-54xx.h	modified	+0	−1633	View file
arch/arm/mach-omap2/omap_hwmod_54xx_data.c	modified	+0	−1	View file
arch/arm/mach-omap2/powerdomains54xx_data.c	modified	+0	−1	View file
arch/arm/mach-omap2/prm-regbits-24xx.h	modified	+0	−247	View file
arch/arm/mach-omap2/prm-regbits-33xx.h	modified	+1	−306	View file
arch/arm/mach-omap2/prm-regbits-34xx.h	modified	+0	−481	View file
arch/arm/mach-omap2/prm-regbits-44xx.h	modified	+0	−2226	View file
arch/arm/mach-omap2/prm-regbits-54xx.h	deleted	+0	−2701	View before deletion
arch/arm/mach-omap2/timer.c	modified	+3	−3	View file
arch/arm/mach-pxa/cm-x300.c	modified	+1	−1	View file
arch/arm/mach-pxa/em-x270.c	modified	+1	−1	View file
arch/arm/mach-pxa/pcm990-baseboard.c	modified	+1	−1	View file
arch/arm/mach-pxa/spitz.c	modified	+1	−1	View file
arch/arm/mach-pxa/zeus.c	modified	+1	−1	View file
arch/arm/mach-pxa/zylonite_pxa300.c	modified	+1	−1	View file
arch/arm/mach-realview/Kconfig	modified	+4	−4	View file
arch/arm/mach-s3c24xx/Kconfig	modified	+0	−6	View file
arch/arm/mach-s3c24xx/clock-s3c2410.c	modified	+0	−1	View file
arch/arm/mach-s3c24xx/clock-s3c2412.c	modified	+0	−1	View file
arch/arm/mach-s3c24xx/clock-s3c2416.c	modified	+0	−2	View file
arch/arm/mach-s3c24xx/clock-s3c2443.c	modified	+0	−2	View file
arch/arm/mach-s3c24xx/common.c	modified	+27	−0	View file
arch/arm/mach-s3c24xx/include/mach/map.h	modified	+2	−0	View file
arch/arm/mach-s3c24xx/mach-h1940.c	modified	+2	−2	View file
arch/arm/mach-s3c24xx/mach-rx1950.c	modified	+2	−3	View file
arch/arm/mach-s3c64xx/Kconfig	modified	+0	−2	View file
arch/arm/mach-s3c64xx/clock.c	modified	+0	−2	View file
arch/arm/mach-s3c64xx/common.c	modified	+28	−4	View file
arch/arm/mach-s3c64xx/include/mach/irqs.h	modified	+0	−8	View file
arch/arm/mach-s3c64xx/include/mach/map.h	modified	+1	−0	View file
arch/arm/mach-s3c64xx/irq-pm.c	modified	+0	−2	View file
arch/arm/mach-s3c64xx/mach-crag6410.c	modified	+3	−3	View file
arch/arm/mach-s3c64xx/mach-hmt.c	modified	+2	−2	View file
arch/arm/mach-s3c64xx/mach-smartq.c	modified	+2	−2	View file
arch/arm/mach-s3c64xx/mach-smdk6410.c	modified	+3	−2	View file
arch/arm/mach-s5p64x0/Kconfig	modified	+0	−2	View file
arch/arm/mach-s5p64x0/clock-s5p6440.c	modified	+0	−2	View file
arch/arm/mach-s5p64x0/clock-s5p6450.c	modified	+0	−2	View file
arch/arm/mach-s5p64x0/common.c	modified	+27	−0	View file
arch/arm/mach-s5p64x0/include/mach/irqs.h	modified	+0	−2	View file
arch/arm/mach-s5p64x0/include/mach/map.h	modified	+1	−0	View file
arch/arm/mach-s5p64x0/mach-smdk6440.c	modified	+3	−2	View file
arch/arm/mach-s5p64x0/mach-smdk6450.c	modified	+3	−2	View file
arch/arm/mach-s5p64x0/pm.c	modified	+0	−3	View file
arch/arm/mach-s5pc100/Kconfig	modified	+0	−1	View file
arch/arm/mach-s5pc100/clock.c	modified	+0	−2	View file
arch/arm/mach-s5pc100/common.c	modified	+28	−0	View file
arch/arm/mach-s5pc100/include/mach/irqs.h	modified	+0	−2	View file
arch/arm/mach-s5pc100/include/mach/map.h	modified	+1	−0	View file
arch/arm/mach-s5pc100/mach-smdkc100.c	modified	+3	−2	View file
arch/arm/mach-s5pv210/Kconfig	modified	+0	−1	View file
arch/arm/mach-s5pv210/clock.c	modified	+0	−1	View file
arch/arm/mach-s5pv210/common.c	modified	+28	−0	View file
arch/arm/mach-s5pv210/include/mach/irqs.h	modified	+0	−2	View file
arch/arm/mach-s5pv210/include/mach/map.h	modified	+1	−0	View file
arch/arm/mach-s5pv210/mach-smdkv210.c	modified	+3	−2	View file
arch/arm/mach-s5pv210/pm.c	modified	+0	−10	View file
arch/arm/mach-shmobile/board-ape6evm.c	modified	+0	−2	View file
arch/arm/mach-shmobile/board-armadillo800eva.c	modified	+0	−9	View file
arch/arm/mach-shmobile/board-kzm9d.c	modified	+1	−1	View file
arch/arm/mach-shmobile/board-kzm9g-reference.c	modified	+0	−2	View file
arch/arm/mach-shmobile/board-lager.c	modified	+0	−2	View file
arch/arm/mach-shmobile/clock-emev2.c	modified	+1	−1	View file
arch/arm/mach-shmobile/include/mach/dma.h	deleted	+0	−1	View before deletion
arch/arm/mach-shmobile/include/mach/emev2.h	modified	+1	−1	View file
arch/arm/mach-shmobile/include/mach/r8a7778.h	modified	+0	−1	View file
arch/arm/mach-shmobile/setup-emev2.c	modified	+62	−291	View file
arch/arm/mach-shmobile/setup-r8a73a4.c	modified	+0	−2	View file
arch/arm/mach-shmobile/setup-r8a7740.c	modified	+11	−5	View file
arch/arm/mach-shmobile/setup-r8a7778.c	modified	+21	−51	View file
arch/arm/mach-shmobile/setup-r8a7779.c	modified	+1	−6	View file
arch/arm/mach-shmobile/setup-r8a7790.c	modified	+0	−7	View file
arch/arm/mach-shmobile/setup-sh7372.c	modified	+1	−6	View file
arch/arm/mach-shmobile/setup-sh73a0.c	modified	+7	−27	View file
arch/arm/mach-spear/Kconfig	modified	+1	−1	View file
arch/arm/mach-tegra/Kconfig	modified	+1	−1	View file
arch/arm/mach-ux500/Kconfig	modified	+1	−1	View file
arch/arm/mach-vexpress/Kconfig	modified	+1	−1	View file
arch/arm/mach-zynq/Kconfig	modified	+1	−1	View file
arch/arm/mach-zynq/hotplug.c	modified	+5	−50	View file
arch/arm/mach-zynq/slcr.c	modified	+17	−28	View file
arch/arm/plat-samsung/Kconfig	modified	+0	−14	View file
arch/arm/plat-samsung/Makefile	modified	+0	−3	View file
arch/arm/plat-samsung/dev-backlight.c	modified	+29	−32	View file
arch/arm/plat-samsung/devs.c	modified	+14	−28	View file
arch/arm/plat-samsung/include/plat/clock.h	modified	+0	−4	View file
arch/arm/plat-samsung/include/plat/devs.h	modified	+1	−0	View file
arch/arm/plat-samsung/include/plat/irq-vic-timer.h	deleted	+0	−13	View before deletion
arch/arm/plat-samsung/include/plat/irqs.h	modified	+0	−9	View file
arch/arm/plat-samsung/include/plat/pwm-clock.h	deleted	+0	−81	View before deletion
arch/arm/plat-samsung/include/plat/pwm-core.h	added	+22	−0	View file
arch/arm/plat-samsung/include/plat/regs-timer.h	deleted	+0	−124	View before deletion
arch/arm/plat-samsung/include/plat/samsung-time.h	modified	+0	−23	View file
arch/arm/plat-samsung/include/plat/sdhci.h	modified	+0	−38	View file
arch/arm/plat-samsung/irq-vic-timer.c	deleted	+0	−98	View before deletion
arch/arm/plat-samsung/pwm-clock.c	deleted	+0	−474	View before deletion
arch/arm/plat-samsung/s5p-irq.c	modified	+0	−4	View file
arch/arm/plat-samsung/samsung-time.c	deleted	+0	−394	View before deletion
arch/x86/platform/mrst/mrst.c	modified	+1	−1	View file
drivers/clocksource/Kconfig	modified	+0	−1	View file
drivers/clocksource/exynos_mct.c	modified	+42	−16	View file
drivers/clocksource/samsung_pwm_timer.c	modified	+59	−49	View file
drivers/clocksource/time-armada-370-xp.c	modified	+43	−49	View file
drivers/clocksource/timer-marco.c	modified	+53	−45	View file
drivers/gpio/gpio-pca953x.c	modified	+1	−1	View file
drivers/iommu/msm_iommu.c	modified	+2	−2	View file
arch/arm/mach-msm/include/mach/iommu.h → drivers/iommu/msm_iommu.h	renamed	+0	−0	View file
drivers/iommu/msm_iommu_dev.c	modified	+2	−2	View file
arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h → drivers/iommu/msm_iommu_hw-8xxx.h	renamed	+0	−0	View file
drivers/iommu/tegra-smmu.c	modified	+0	−2	View file
drivers/irqchip/exynos-combiner.c	modified	+1	−43	View file
drivers/memory/tegra20-mc.c	modified	+0	−2	View file
drivers/memory/tegra30-mc.c	modified	+0	−2	View file
drivers/pwm/pwm-samsung.c	modified	+487	−222	View file
drivers/video/msm/msm_fb.c	modified	+0	−1	View file
include/clocksource/samsung_pwm.h	modified	+7	−0	View file
include/linux/i2c/pca953x.h → include/linux/platform_data/pca953x.h	renamed	+0	−0	View file
include/linux/time-armada-370-xp.h	modified	+1	−3	View file

Only the first 600 diff lines are shown. Download the complete patch.

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5d1f570..bf79764 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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

View file

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 4137529..9762c84 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -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

View file

diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index b7f358a..53e2527 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -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

View file

diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 01da194..3aa2f06 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -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

View file

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 376090f..f2dfa6b 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -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>;

arch/arm/boot/dts/exynos5420.dtsi

View file

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 8c54c4b..9e90d1e 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -59,7 +59,7 @@
 		};
 	};
 
-	clock: clock-controller@0x10010000 {
+	clock: clock-controller@10010000 {
 		compatible = "samsung,exynos5420-clock";
 		reg = <0x10010000 0x30000>;
 		#clock-cells = <1>;

arch/arm/boot/dts/exynos5440.dtsi

View file

diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index 586134e..1b81f36 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -20,7 +20,7 @@
 		spi0 = &spi_0;
 	};
 
-	clock: clock-controller@0x160000 {
+	clock: clock-controller@160000 {
 		compatible = "samsung,exynos5440-clock";
 		reg = <0x160000 0x1000>;
 		#clock-cells = <1>;

arch/arm/configs/exynos4_defconfig

View before deletion

diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig
deleted file mode 100644
index bffe68e..0000000
--- a/arch/arm/configs/exynos4_defconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_EXYNOS=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=1
-CONFIG_MACH_SMDKC210=y
-CONFIG_MACH_ARMLEX4210=y
-CONFIG_MACH_UNIVERSAL_C210=y
-CONFIG_MACH_NURI=y
-CONFIG_MACH_ORIGEN=y
-CONFIG_MACH_SMDK4412=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
-# CONFIG_HWMON is not set
-# CONFIG_MFD_SUPPORT is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CRAMFS=y
-CONFIG_ROMFS_FS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_INFO=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_CRC_CCITT=y

arch/arm/include/asm/localtimer.h

View before deletion

diff --git a/arch/arm/include/asm/localtimer.h b/arch/arm/include/asm/localtimer.h
deleted file mode 100644
index f77ffc1..0000000
--- a/arch/arm/include/asm/localtimer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  arch/arm/include/asm/localtimer.h
- *
- *  Copyright (C) 2004-2005 ARM Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_ARM_LOCALTIMER_H
-#define __ASM_ARM_LOCALTIMER_H
-
-#include <linux/errno.h>
-
-struct clock_event_device;
-
-struct local_timer_ops {
-	int  (*setup)(struct clock_event_device *);
-	void (*stop)(struct clock_event_device *);
-};
-
-#ifdef CONFIG_LOCAL_TIMERS
-/*
- * Register a local timer driver
- */
-int local_timer_register(struct local_timer_ops *);
-#else
-static inline int local_timer_register(struct local_timer_ops *ops)
-{
-	return -ENXIO;
-}
-#endif
-
-#endif

arch/arm/include/debug/msm.S

View file

diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/include/debug/msm.S
similarity index 80%
rename from arch/arm/mach-msm/include/mach/debug-macro.S
rename to arch/arm/include/debug/msm.S
index 0e05f88..9166e1b 100644
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/msm.S
@@ -15,8 +15,36 @@
  *
  */
 
-#include <mach/hardware.h>
-#include <mach/msm_iomap.h>
+#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_QSD8X50)
+#define MSM_UART1_PHYS        0xA9A00000
+#define MSM_UART2_PHYS        0xA9B00000
+#define MSM_UART3_PHYS        0xA9C00000
+#elif defined(CONFIG_ARCH_MSM7X30)
+#define MSM_UART1_PHYS        0xACA00000
+#define MSM_UART2_PHYS        0xACB00000
+#define MSM_UART3_PHYS        0xACC00000
+#endif
+
+#if defined(CONFIG_DEBUG_MSM_UART1)
+#define MSM_DEBUG_UART_BASE	0xE1000000
+#define MSM_DEBUG_UART_PHYS	MSM_UART1_PHYS
+#elif defined(CONFIG_DEBUG_MSM_UART2)
+#define MSM_DEBUG_UART_BASE	0xE1000000
+#define MSM_DEBUG_UART_PHYS	MSM_UART2_PHYS
+#elif defined(CONFIG_DEBUG_MSM_UART3)
+#define MSM_DEBUG_UART_BASE	0xE1000000
+#define MSM_DEBUG_UART_PHYS	MSM_UART3_PHYS
+#endif
+
+#ifdef CONFIG_DEBUG_MSM8660_UART
+#define MSM_DEBUG_UART_BASE	0xF0040000
+#define MSM_DEBUG_UART_PHYS	0x19C40000
+#endif
+
+#ifdef CONFIG_DEBUG_MSM8960_UART
+#define MSM_DEBUG_UART_BASE	0xF0040000
+#define MSM_DEBUG_UART_PHYS	0x16440000
+#endif
 
 	.macro	addruart, rp, rv, tmp
 #ifdef MSM_DEBUG_UART_PHYS

arch/arm/kernel/smp.c

View file

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 92d10e5..72024ea 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -41,7 +41,6 @@
 #include <asm/sections.h>
 #include <asm/tlbflush.h>
 #include <asm/ptrace.h>
-#include <asm/localtimer.h>
 #include <asm/smp_plat.h>
 #include <asm/virt.h>
 #include <asm/mach/arch.h>
@@ -156,8 +155,6 @@ int platform_can_cpu_hotplug(void)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static void percpu_timer_stop(void);
-
 static int platform_cpu_kill(unsigned int cpu)
 {
 	if (smp_ops.cpu_kill)
@@ -201,11 +198,6 @@ int __cpu_disable(void)
 	migrate_irqs();
 
 	/*
-	 * Stop the local timer for this CPU.
-	 */
-	percpu_timer_stop();
-
-	/*
 	 * Flush user cache and TLB mappings, and then remove this CPU
 	 * from the vm mask set of all processes.
 	 *
@@ -326,8 +318,6 @@ static void smp_store_cpu_info(unsigned int cpuid)
 	store_cpu_topology(cpuid);
 }
 
-static void percpu_timer_setup(void);
-
 /*
  * This is the secondary CPU boot entry.  We're using this CPUs
  * idle thread stack, but a set of temporary page tables.
@@ -382,11 +372,6 @@ asmlinkage void secondary_start_kernel(void)
 	set_cpu_online(cpu, true);
 	complete(&cpu_running);
 
-	/*
-	 * Setup the percpu timer for this CPU.
-	 */
-	percpu_timer_setup();
-
 	local_irq_enable();
 	local_fiq_enable();
 
@@ -424,12 +409,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 		max_cpus = ncores;
 	if (ncores > 1 && max_cpus) {
 		/*
-		 * Enable the local timer or broadcast device for the
-		 * boot CPU, but only if we have more than one CPU.
-		 */
-		percpu_timer_setup();
-
-		/*
 		 * Initialise the present map, which describes the set of CPUs
 		 * actually populated at the present time. A platform should
 		 * re-initialize the map in the platforms smp_prepare_cpus()
@@ -505,11 +484,6 @@ u64 smp_irq_stat_cpu(unsigned int cpu)
 	return sum;
 }
 
-/*
- * Timer (local or broadcast) support
- */
-static DEFINE_PER_CPU(struct clock_event_device, percpu_clockevent);
-
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 void tick_broadcast(const struct cpumask *mask)
 {
@@ -517,67 +491,6 @@ void tick_broadcast(const struct cpumask *mask)
 }
 #endif
 
-static void broadcast_timer_set_mode(enum clock_event_mode mode,
-	struct clock_event_device *evt)
-{
-}
-
-static void broadcast_timer_setup(struct clock_event_device *evt)
-{
-	evt->name	= "dummy_timer";
-	evt->features	= CLOCK_EVT_FEAT_ONESHOT |
-			  CLOCK_EVT_FEAT_PERIODIC |
-			  CLOCK_EVT_FEAT_DUMMY;
-	evt->rating	= 100;
-	evt->mult	= 1;
-	evt->set_mode	= broadcast_timer_set_mode;
-
-	clockevents_register_device(evt);
-}
-
-static struct local_timer_ops *lt_ops;
-
-#ifdef CONFIG_LOCAL_TIMERS
-int local_timer_register(struct local_timer_ops *ops)
-{
-	if (!is_smp() || !setup_max_cpus)
-		return -ENXIO;
-
-	if (lt_ops)
-		return -EBUSY;
-
-	lt_ops = ops;
-	return 0;
-}
-#endif
-
-static void percpu_timer_setup(void)
-{
-	unsigned int cpu = smp_processor_id();
-	struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu);
-
-	evt->cpumask = cpumask_of(cpu);
-
-	if (!lt_ops || lt_ops->setup(evt))
-		broadcast_timer_setup(evt);
-}
-
-#ifdef CONFIG_HOTPLUG_CPU
-/*
- * The generic clock events code purposely does not stop the local timer
- * on CPU_DEAD/CPU_DEAD_FROZEN hotplug events, so we have to do it
- * manually here.
- */
-static void percpu_timer_stop(void)
-{
-	unsigned int cpu = smp_processor_id();
-	struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu);
-
-	if (lt_ops)
-		lt_ops->stop(evt);
-}
-#endif
-
 static DEFINE_RAW_SPINLOCK(stop_lock);
 
 /*

arch/arm/kernel/smp_twd.c

View file

diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 2595620..2985c9f 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/clk.h>
+#include <linux/cpu.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/err.h>
@@ -24,7 +25,6 @@
 
 #include <asm/smp_plat.h>
 #include <asm/smp_twd.h>
-#include <asm/localtimer.h>
 
 /* set up by the platform code */
 static void __iomem *twd_base;
@@ -33,7 +33,7 @@ static struct clk *twd_clk;
 static unsigned long twd_timer_rate;
 static DEFINE_PER_CPU(bool, percpu_setup_called);
 
-static struct clock_event_device __percpu **twd_evt;
+static struct clock_event_device __percpu *twd_evt;
 static int twd_ppi;
 
 static void twd_set_mode(enum clock_event_mode mode,
@@ -90,8 +90,10 @@ static int twd_timer_ack(void)
 	return 0;
 }
 
-static void twd_timer_stop(struct clock_event_device *clk)
+static void twd_timer_stop(void)
 {
+	struct clock_event_device *clk = __this_cpu_ptr(twd_evt);
+
 	twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);
 	disable_percpu_irq(clk->irq);
 }
@@ -106,7 +108,7 @@ static void twd_update_frequency(void *new_rate)
 {
 	twd_timer_rate = *((unsigned long *) new_rate);
 
-	clockevents_update_freq(*__this_cpu_ptr(twd_evt), twd_timer_rate);
+	clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate);
 }
 
 static int twd_rate_change(struct notifier_block *nb,
@@ -132,7 +134,7 @@ static struct notifier_block twd_clk_nb = {
 
 static int twd_clk_init(void)
 {
-	if (twd_evt && *__this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))