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

Pull ARM SoC cleanups from Arnd Bergmann:
 "The remaining cleanups for 3.19 are to a large part result of
  devicetree conversion nearing completion on two other platforms
  besides AT91:

   - Like AT91, Renesas shmobile is in the process to migrate to DT and
     multiplatform, but using a different approach of doing it one SoC
     at a time.  For 3.19, the r8a7791 platform and associated "Koelsch"
     board are considered complete and we remove the non-DT
     non-multiplatform support for this.

   - The ARM Versatile Express has supported DT and multiplatform for a
     long time, but we have still kept the legacy board files around,
     because not all drivers were fully working before.  We have finally
     taken the last step to remove the board files.

  Other changes in this branch are preparation for the later branches or
  just unrelated to the more interesting changes:

   - The dts files for arm64 get moved into per-vendor directories for a
     clearer structure.

   - Some dead code removal (zynq, exynos, davinci, imx)

   - Using pr_*() macros more consistently instead of printk(KERN_*) in
     some platform code"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (71 commits)
  ARM: zynq: Remove secondary_startup() declaration from header
  ARM: vexpress: Enable regulator framework when MMCI is in use
  ARM: vexpress: Remove non-DT code
  ARM: imx: Remove unneeded .map_io initialization
  ARM: dts: imx6qdl-sabresd: Fix the microphone route
  ARM: imx: refactor mxc_iomux_mode()
  ARM: imx: simplify clk_pllv3_prepare()
  ARM: imx6q: drop unnecessary semicolon
  ARM: imx: clean up machine mxc_arch_reset_init_dt reset init
  ARM: dts: imx6qdl-rex: Remove unneeded 'fsl,mode' property
  ARM: dts: imx6qdl-gw5x: Remove unneeded 'fsl,mode' property
  ARM: dts: imx6qdl-sabresd: Use IMX6QDL_CLK_CKO define
  ARM: at91: remove useless init_time for DT-only SoCs
  ARM: davinci: Remove redundant casts
  ARM: davinci: Use standard logging styles
  ARM: shmobile: r8a7779: Spelling/grammar s/entity/identity/, s/map/mapping/
  ARM: shmobile: sh7372: Spelling/grammar s/entity map/identity mapping/
  ARM: shmobile: sh73a0: Spelling/grammar s/entity map/identity mapping/
  ARM: EXYNOS: Remove unused static iomapping
  ARM: at91: fix build breakage due to legacy board removals
  ...

128 files changed, 904 insertions, 3125 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 92dbde801d9c..fd4515ca8358 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -350,6 +350,7 @@ config ARCH_REALVIEW
         select ICST
         select NEED_MACH_MEMORY_H
         select PLAT_VERSATILE
+        select PLAT_VERSATILE_SCHED_CLOCK
         help
           This enables support for ARM Ltd RealView boards.
 
@@ -365,6 +366,7 @@ config ARCH_VERSATILE
         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.
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 034a94904d69..c1785eec2cf7 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -312,8 +312,12 @@ $(INSTALL_TARGETS):
         $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
-dtbs dtbs_install: prepare scripts
-        $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $@
+
+dtbs: prepare scripts
+        $(Q)$(MAKE) $(build)=$(boot)/dts
+
+dtbs_install:
+        $(Q)$(MAKE) $(dtbinst)=$(boot)/dts
 
 # We use MRPROPER_FILES and CLEAN_FILES now
 archclean:
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 38c89cafa1ab..fe92f5df9d3c 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -376,25 +376,24 @@ dtb-$(CONFIG_ARCH_S5PV210) += s5pv210-aquila.dtb \
         s5pv210-smdkc110.dtb \
         s5pv210-smdkv210.dtb \
         s5pv210-torbreck.dtb
-dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += r7s72100-genmai.dtb \
+dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += \
+        r8a73a4-ape6evm.dtb \
+        r8a73a4-ape6evm-reference.dtb \
         r8a7740-armadillo800eva.dtb \
         r8a7778-bockw.dtb \
         r8a7778-bockw-reference.dtb \
         r8a7779-marzen.dtb \
-        r8a7791-koelsch.dtb \
         r8a7790-lager.dtb \
+        sh7372-mackerel.dtb \
         sh73a0-kzm9g.dtb \
-        sh73a0-kzm9g-reference.dtb \
-        r8a73a4-ape6evm.dtb \
-        r8a73a4-ape6evm-reference.dtb \
-        sh7372-mackerel.dtb
+        sh73a0-kzm9g-reference.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
         r7s72100-genmai.dtb \
         r8a7740-armadillo800eva.dtb \
+        r8a7779-marzen.dtb \
+        r8a7790-lager.dtb \
         r8a7791-henninger.dtb \
         r8a7791-koelsch.dtb \
-        r8a7790-lager.dtb \
-        r8a7779-marzen.dtb \
         r8a7794-alt.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_arria5_socdk.dtb \
         socfpga_cyclone5_socdk.dtb \
@@ -517,15 +516,7 @@ dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \
         dove-dove-db.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt6589-aquaris5.dtb
 
-targets += dtbs dtbs_install
-targets += $(dtb-y)
 endif
 
-# *.dtb used to be generated in the directory above. Clean out the
-# old build results so people don't accidentally use them.
-dtbs: $(addprefix $(obj)/, $(dtb-y))
-        $(Q)rm -f $(obj)/../*.dtb
-
-clean-files := *.dtb
-
-dtbs_install: $(addsuffix _dtbinst_, $(dtb-y))
+always          := $(dtb-y)
+clean-files     := *.dtb
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index 50ccd151091e..667d323e80a3 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -25,37 +25,7 @@
 
         chosen {
                 bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
-        };
-
-        reg_1p8v: regulator@0 {
-                compatible = "regulator-fixed";
-                regulator-name = "fixed-1.8V";
-                regulator-min-microvolt = <1800000>;
-                regulator-max-microvolt = <1800000>;
-                regulator-always-on;
-                regulator-boot-on;
-        };
-
-        reg_3p3v: regulator@1 {
-                compatible = "regulator-fixed";
-                regulator-name = "fixed-3.3V";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-                regulator-always-on;
-                regulator-boot-on;
-        };
-
-        lan9220@20000000 {
-                compatible = "smsc,lan9220", "smsc,lan9115";
-                reg = <0x20000000 0x10000>;
-                phy-mode = "mii";
-                interrupt-parent = <&gpio0>;
-                interrupts = <1 IRQ_TYPE_EDGE_RISING>;
-                reg-io-width = <4>;
-                smsc,irq-active-high;
-                smsc,irq-push-pull;
-                vddvario-supply = <&reg_1p8v>;
-                vdd33a-supply = <&reg_3p3v>;
+                stdout-path = &uart1;
         };
 
         gpio_keys {
@@ -92,4 +62,35 @@
                         gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
                 };
         };
+
+        reg_1p8v: regulator@0 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-1.8V";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        reg_3p3v: regulator@1 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-3.3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        lan9220@20000000 {
+                compatible = "smsc,lan9220", "smsc,lan9115";
+                reg = <0x20000000 0x10000>;
+                phy-mode = "mii";
+                interrupt-parent = <&gpio0>;
+                interrupts = <1 IRQ_TYPE_EDGE_RISING>;
+                reg-io-width = <4>;
+                smsc,irq-active-high;
+                smsc,irq-push-pull;
+                vddvario-supply = <&reg_1p8v>;
+                vdd33a-supply = <&reg_3p3v>;
+        };
 };
diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi
index 00eeed3721b6..cc7bfe0ba40a 100644
--- a/arch/arm/boot/dts/emev2.dtsi
+++ b/arch/arm/boot/dts/emev2.dtsi
@@ -55,7 +55,7 @@
                              <0 121 IRQ_TYPE_LEVEL_HIGH>;
         };
 
-        smu@e0110000 {
+        clocks@e0110000 {
                 compatible = "renesas,emev2-smu";
                 reg = <0xe0110000 0x10000>;
                 #address-cells = <2>;
@@ -129,7 +129,7 @@
                 };
         };
 
-        sti@e0180000 {
+        timer@e0180000 {
                 compatible = "renesas,em-sti";
                 reg = <0xe0180000 0x54>;
                 interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
@@ -137,7 +137,7 @@
                 clock-names = "sclk";
         };
 
-        uart@e1020000 {
+        uart0: serial@e1020000 {
                 compatible = "renesas,em-uart";
                 reg = <0xe1020000 0x38>;
                 interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
@@ -145,7 +145,7 @@
                 clock-names = "sclk";
         };
 
-        uart@e1030000 {
+        uart1: serial@e1030000 {
                 compatible = "renesas,em-uart";
                 reg = <0xe1030000 0x38>;
                 interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
@@ -153,7 +153,7 @@
                 clock-names = "sclk";
         };
 
-        uart@e1040000 {
+        uart2: serial@e1040000 {
                 compatible = "renesas,em-uart";
                 reg = <0xe1040000 0x38>;
                 interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;
@@ -161,7 +161,7 @@
                 clock-names = "sclk";
         };
 
-        uart@e1050000 {
+        uart3: serial@e1050000 {
                 compatible = "renesas,em-uart";
                 reg = <0xe1050000 0x38>;
                 interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
index d3c0bf5c84e3..b5756c21ea1d 100644
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
@@ -282,7 +282,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
index cade1bdc97e9..86f03c1b147c 100644
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
@@ -287,7 +287,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
index cf13239a1619..4a8d97f47759 100644
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
@@ -376,12 +376,10 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
 &ssi2 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-rex.dtsi b/arch/arm/boot/dts/imx6qdl-rex.dtsi
index df7bcf86c156..488a640796ac 100644
--- a/arch/arm/boot/dts/imx6qdl-rex.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-rex.dtsi
@@ -308,7 +308,6 @@
 };
 
 &ssi1 {
-        fsl,mode = "i2s-slave";
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index baf2f00d519a..5db4a2417d94 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -107,10 +107,8 @@
                         "Headphone Jack", "HPOUTR",
                         "Ext Spk", "SPKOUTL",
                         "Ext Spk", "SPKOUTR",
-                        "MICBIAS", "AMIC",
-                        "IN3R", "MICBIAS",
-                        "DMIC", "MICBIAS",
-                        "DMICDAT", "DMIC";
+                        "AMIC", "MICBIAS",
+                        "IN3R", "AMIC";
                 mux-int-port = <2>;
                 mux-ext-port = <3>;
         };
@@ -179,7 +177,7 @@
         codec: wm8962@1a {
                 compatible = "wlf,wm8962";
                 reg = <0x1a>;
-                clocks = <&clks 201>;
+                clocks = <&clks IMX6QDL_CLK_CKO>;
                 DCVDD-supply = <&reg_audio>;
                 DBVDD-supply = <&reg_audio>;
                 AVDD-supply = <&reg_audio>;
diff --git a/arch/arm/boot/dts/r7s72100-genmai.dts b/arch/arm/boot/dts/r7s72100-genmai.dts
index a3ed23c0a8f5..1518c5bcca33 100644
--- a/arch/arm/boot/dts/r7s72100-genmai.dts
+++ b/arch/arm/boot/dts/r7s72100-genmai.dts
@@ -21,7 +21,8 @@
         };
 
         chosen {
-                bootargs = "console=ttySC2,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                stdout-path = &scif2;
         };
 
         memory {
diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
index 801a556e264b..277e73c110e5 100644
--- a/arch/arm/boot/dts/r7s72100.dtsi
+++ b/arch/arm/boot/dts/r7s72100.dtsi
@@ -52,16 +52,6 @@
                         clock-output-names = "usb_x1";
                 };
 
-                /* Special CPG clocks */
-                cpg_clocks: cpg_clocks@fcfe0000 {
-                        #clock-cells = <1>;
-                        compatible = "renesas,r7s72100-cpg-clocks",
-                                     "renesas,rz-cpg-clocks";
-                        reg = <0xfcfe0000 0x18>;
-                        clocks = <&extal_clk>, <&usb_x1_clk>;
-                        clock-output-names = "pll", "i", "g";
-                };
-
                 /* Fixed factor clocks */
                 b_clk: b_clk {
                         #clock-cells = <0>;
@@ -88,6 +78,16 @@
                         clock-output-names = "p0";
                 };
 
+                /* Special CPG clocks */
+                cpg_clocks: cpg_clocks@fcfe0000 {
+                        #clock-cells = <1>;
+                        compatible = "renesas,r7s72100-cpg-clocks",
+                                     "renesas,rz-cpg-clocks";
+                        reg = <0xfcfe0000 0x18>;
+                        clocks = <&extal_clk>, <&usb_x1_clk>;
+                        clock-output-names = "pll", "i", "g";
+                };
+
                 /* MSTP clocks */
                 mstp3_clks: mstp3_clks@fcfe0420 {
                         #clock-cells = <1>;
@@ -148,97 +148,6 @@
                 };
         };
 
-        gic: interrupt-controller@e8201000 {
-                compatible = "arm,cortex-a9-gic";
-                #interrupt-cells = <3>;
-                #address-cells = <0>;
-                interrupt-controller;
-                reg = <0xe8201000 0x1000>,
-                        <0xe8202000 0x1000>;
-        };
-
-        i2c0: i2c@fcfee000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
-                reg = <0xfcfee000 0x44>;
-                interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 158 IRQ_TYPE_EDGE_RISING>,
-                             <0 159 IRQ_TYPE_EDGE_RISING>,
-                             <0 160 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 161 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 162 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 163 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 164 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&mstp9_clks R7S72100_CLK_I2C0>;
-                clock-frequency = <100000>;
-                status = "disabled";
-        };
-
-        i2c1: i2c@fcfee400 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
-                reg = <0xfcfee400 0x44>;
-                interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 166 IRQ_TYPE_EDGE_RISING>,
-                             <0 167 IRQ_TYPE_EDGE_RISING>,
-                             <0 168 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 169 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 170 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 171 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 172 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&mstp9_clks R7S72100_CLK_I2C1>;
-                clock-frequency = <100000>;
-                status = "disabled";
-        };
-
-        i2c2: i2c@fcfee800 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
-                reg = <0xfcfee800 0x44>;
-                interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 174 IRQ_TYPE_EDGE_RISING>,
-                             <0 175 IRQ_TYPE_EDGE_RISING>,
-                             <0 176 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 177 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 178 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 179 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 180 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&mstp9_clks R7S72100_CLK_I2C2>;
-                clock-frequency = <100000>;
-                status = "disabled";
-        };
-
-        i2c3: i2c@fcfeec00 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
-                reg = <0xfcfeec00 0x44>;
-                interrupts = <0 181 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 182 IRQ_TYPE_EDGE_RISING>,
-                             <0 183 IRQ_TYPE_EDGE_RISING>,
-                             <0 184 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 185 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 186 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 187 IRQ_TYPE_LEVEL_HIGH>,
-                             <0 188 IRQ_TYPE_LEVEL_HIGH>;
-                clocks = <&mstp9_clks R7S72100_CLK_I2C3>;
-                clock-frequency = <100000>;
-                status = "disabled";
-        };
-
-        mtu2: timer@fcff0000 {
-                compatible = "renesas,mtu2-r7s72100", "renesas,mtu2";
-                reg = <0xfcff0000 0x400>;
-                interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
-                interrupt-names = "tgi0a";
-                clocks = <&mstp3_clks R7S72100_CLK_MTU2>;
-                clock-names = "fck";
-                status = "disabled";
-        };
-
         scif0: serial@e8007000 {
                 compatible = "renesas,scif-r7s72100", "renesas,scif";
                 reg = <0xe8007000 64>;
@@ -404,4 +313,95 @@
                 #size-cells = <0>;
                 status = "disabled";
         };
+
+        gic: interrupt-controller@e8201000 {
+                compatible = "arm,cortex-a9-gic";
+                #interrupt-cells = <3>;
+                #address-cells = <0>;
+                interrupt-controller;
+                reg = <0xe8201000 0x1000>,
+                        <0xe8202000 0x1000>;
+        };
+
+        i2c0: i2c@fcfee000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
+                reg = <0xfcfee000 0x44>;
+                interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 158 IRQ_TYPE_EDGE_RISING>,
+                             <0 159 IRQ_TYPE_EDGE_RISING>,
+                             <0 160 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 161 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 162 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 163 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 164 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp9_clks R7S72100_CLK_I2C0>;
+                clock-frequency = <100000>;
+                status = "disabled";
+        };
+
+        i2c1: i2c@fcfee400 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
+                reg = <0xfcfee400 0x44>;
+                interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 166 IRQ_TYPE_EDGE_RISING>,
+                             <0 167 IRQ_TYPE_EDGE_RISING>,
+                             <0 168 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 169 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 170 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 171 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 172 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp9_clks R7S72100_CLK_I2C1>;
+                clock-frequency = <100000>;
+                status = "disabled";
+        };
+
+        i2c2: i2c@fcfee800 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
+                reg = <0xfcfee800 0x44>;
+                interrupts = <0 173 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 174 IRQ_TYPE_EDGE_RISING>,
+                             <0 175 IRQ_TYPE_EDGE_RISING>,
+                             <0 176 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 177 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 178 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 179 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 180 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp9_clks R7S72100_CLK_I2C2>;
+                clock-frequency = <100000>;
+                status = "disabled";
+        };
+
+        i2c3: i2c@fcfeec00 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,riic-r7s72100", "renesas,riic-rz";
+                reg = <0xfcfeec00 0x44>;
+                interrupts = <0 181 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 182 IRQ_TYPE_EDGE_RISING>,
+                             <0 183 IRQ_TYPE_EDGE_RISING>,
+                             <0 184 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 185 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 186 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 187 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 188 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp9_clks R7S72100_CLK_I2C3>;
+                clock-frequency = <100000>;
+                status = "disabled";
+        };
+
+        mtu2: timer@fcff0000 {
+                compatible = "renesas,mtu2-r7s72100", "renesas,mtu2";
+                reg = <0xfcff0000 0x400>;
+                interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "tgi0a";
+                clocks = <&mstp3_clks R7S72100_CLK_MTU2>;
+                clock-names = "fck";
+                status = "disabled";
+        };
 };
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
index a860f32bca27..2bcf69124a6a 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
@@ -21,7 +21,8 @@
         };
 
         chosen {
-                bootargs = "console=ttySC0,115200 ignore_loglevel rw";
+                bootargs = "ignore_loglevel rw";
+                stdout-path = &scifa0;
         };
 
         memory@40000000 {
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index ef152e384822..c17afef92e8d 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -30,18 +30,6 @@
                 };
         };
 
-        gic: interrupt-controller@f1001000 {
-                compatible = "arm,cortex-a15-gic";
-                #interrupt-cells = <3>;
-                #address-cells = <0>;
-                interrupt-controller;
-                reg = <0 0xf1001000 0 0x1000>,
-                        <0 0xf1002000 0 0x1000>,
-                        <0 0xf1004000 0 0x2000>,
-                        <0 0xf1006000 0 0x2000>;
-                interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
-        };
-
         timer {
                 compatible = "arm,armv7-timer";
                 interrupts = <1 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
@@ -50,6 +38,80 @@
                              <1 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
         };
 
+        dmac: dma-multiplexer {
+                compatible = "renesas,shdma-mux";
+                #dma-cells = <1>;
+                dma-channels = <20>;
+                dma-requests = <256>;
+                #address-cells = <2>;
+                #size-cells = <2>;
+                ranges;
+
+                dma0: dma-controller@e6700020 {
+                        compatible = "renesas,shdma-r8a73a4";
+                        reg = <0 0xe6700020 0 0x89e0>;
+                        interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH
+                                        0 200 IRQ_TYPE_LEVEL_HIGH
+                                        0 201 IRQ_TYPE_LEVEL_HIGH
+                                        0 202 IRQ_TYPE_LEVEL_HIGH
+                                        0 203 IRQ_TYPE_LEVEL_HIGH
+                                        0 204 IRQ_TYPE_LEVEL_HIGH
+                                        0 205 IRQ_TYPE_LEVEL_HIGH
+                                        0 206 IRQ_TYPE_LEVEL_HIGH
+                                        0 207 IRQ_TYPE_LEVEL_HIGH
+                                        0 208 IRQ_TYPE_LEVEL_HIGH
+                                        0 209 IRQ_TYPE_LEVEL_HIGH
+                                        0 210 IRQ_TYPE_LEVEL_HIGH
+                                        0 211 IRQ_TYPE_LEVEL_HIGH
+                                        0 212 IRQ_TYPE_LEVEL_HIGH
+                                        0 213 IRQ_TYPE_LEVEL_HIGH
+                                        0 214 IRQ_TYPE_LEVEL_HIGH
+                                        0 215 IRQ_TYPE_LEVEL_HIGH
+                                        0 216 IRQ_TYPE_LEVEL_HIGH
+                                        0 217 IRQ_TYPE_LEVEL_HIGH
+                                        0 218 IRQ_TYPE_LEVEL_HIGH
+                                        0 219 IRQ_TYPE_LEVEL_HIGH>;
+                        interrupt-names = "error",
+                                        "ch0", "ch1", "ch2", "ch3",
+                                        "ch4", "ch5", "ch6", "ch7",
+                                        "ch8", "ch9", "ch10", "ch11",
+                                        "ch12", "ch13", "ch14", "ch15",
+                                        "ch16", "ch17", "ch18", "ch19";
+                };
+        };
+
+        pfc: pfc@e6050000 {
+                compatible = "renesas,pfc-r8a73a4";
+                reg = <0 0xe6050000 0 0x9000>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                interrupts-extended =
+                        <&irqc0  0 0>, <&irqc0  1 0>, <&irqc0  2 0>, <&irqc0  3 0>,
+                        <&irqc0  4 0>, <&irqc0  5 0>, <&irqc0  6 0>, <&irqc0  7 0>,
+                        <&irqc0  8 0>, <&irqc0  9 0>, <&irqc0 10 0>, <&irqc0 11 0>,
+                        <&irqc0 12 0>, <&irqc0 13 0>, <&irqc0 14 0>, <&irqc0 15 0>,
+                        <&irqc0 16 0>, <&irqc0 17 0>, <&irqc0 18 0>, <&irqc0 19 0>,
+                        <&irqc0 20 0>, <&irqc0 21 0>, <&irqc0 22 0>, <&irqc0 23 0>,
+                        <&irqc0 24 0>, <&irqc0 25 0>, <&irqc0 26 0>, <&irqc0 27 0>,
+                        <&irqc0 28 0>, <&irqc0 29 0>, <&irqc0 30 0>, <&irqc0 31 0>,
+                        <&irqc1  0 0>, <&irqc1  1 0>, <&irqc1  2 0>, <&irqc1  3 0>,
+                        <&irqc1  4 0>, <&irqc1  5 0>, <&irqc1  6 0>, <&irqc1  7 0>,
+                        <&irqc1  8 0>, <&irqc1  9 0>, <&irqc1 10 0>, <&irqc1 11 0>,
+                        <&irqc1 12 0>, <&irqc1 13 0>, <&irqc1 14 0>, <&irqc1 15 0>,
+                        <&irqc1 16 0>, <&irqc1 17 0>, <&irqc1 18 0>, <&irqc1 19 0>,
+                        <&irqc1 20 0>, <&irqc1 21 0>, <&irqc1 22 0>, <&irqc1 23 0>,
+                        <&irqc1 24 0>, <&irqc1 25 0>;
+        };
+
+        i2c5: i2c@e60b0000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe60b0000 0 0x428>;
+                interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
         irqc0: interrupt-controller@e61c0000 {
                 compatible = "renesas,irqc-r8a73a4", "renesas,irqc";
                 #interrupt-cells = <2>;
@@ -122,48 +184,6 @@
                              <0 57 IRQ_TYPE_LEVEL_HIGH>;
         };
 
-        dmac: dma-multiplexer@0 {
-                compatible = "renesas,shdma-mux";
-                #dma-cells = <1>;
-                dma-channels = <20>;
-                dma-requests = <256>;
-                #address-cells = <2>;
-                #size-cells = <2>;
-                ranges;
-
-                dma0: dma-controller@e6700020 {
-                        compatible = "renesas,shdma-r8a73a4";
-                        reg = <0 0xe6700020 0 0x89e0>;
-                        interrupts = <0 220 IRQ_TYPE_LEVEL_HIGH
-                                        0 200 IRQ_TYPE_LEVEL_HIGH
-                                        0 201 IRQ_TYPE_LEVEL_HIGH
-                                        0 202 IRQ_TYPE_LEVEL_HIGH
-                                        0 203 IRQ_TYPE_LEVEL_HIGH
-                                        0 204 IRQ_TYPE_LEVEL_HIGH
-                                        0 205 IRQ_TYPE_LEVEL_HIGH
-                                        0 206 IRQ_TYPE_LEVEL_HIGH
-                                        0 207 IRQ_TYPE_LEVEL_HIGH
-                                        0 208 IRQ_TYPE_LEVEL_HIGH
-                                        0 209 IRQ_TYPE_LEVEL_HIGH
-                                        0 210 IRQ_TYPE_LEVEL_HIGH
-                                        0 211 IRQ_TYPE_LEVEL_HIGH
-                                        0 212 IRQ_TYPE_LEVEL_HIGH
-                                        0 213 IRQ_TYPE_LEVEL_HIGH
-                                        0 214 IRQ_TYPE_LEVEL_HIGH
-                                        0 215 IRQ_TYPE_LEVEL_HIGH
-                                        0 216 IRQ_TYPE_LEVEL_HIGH
-                                        0 217 IRQ_TYPE_LEVEL_HIGH
-                                        0 218 IRQ_TYPE_LEVEL_HIGH
-                                        0 219 IRQ_TYPE_LEVEL_HIGH>;
-                        interrupt-names = "error",
-                                        "ch0", "ch1", "ch2", "ch3",
-                                        "ch4", "ch5", "ch6", "ch7",
-                                        "ch8", "ch9", "ch10", "ch11",
-                                        "ch12", "ch13", "ch14", "ch15",
-                                        "ch16", "ch17", "ch18", "ch19";
-                };
-        };
-
         thermal@e61f0000 {
                 compatible = "renesas,thermal-r8a73a4", "renesas,rcar-thermal";
                 reg = <0 0xe61f0000 0 0x14>, <0 0xe61f0100 0 0x38>,
@@ -216,15 +236,6 @@
                 status = "disabled";
         };
 
-        i2c5: i2c@e60b0000 {
-                #address-cells = <1>;
-                #size-cells = <0>;
-                compatible = "renesas,rmobile-iic";
-                reg = <0 0xe60b0000 0 0x428>;
-                interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;
-                status = "disabled";
-        };
-
         i2c6: i2c@e6550000 {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -252,20 +263,6 @@
                 status = "disabled";
         };
 
-        scifa0: serial@e6c40000 {
-                compatible = "renesas,scifa-r8a73a4", "renesas,scifa";
-                reg = <0 0xe6c40000 0 0x100>;
-                interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
-                status = "disabled";
-        };
-
-        scifa1: serial@e6c50000 {
-                compatible = "renesas,scifa-r8a73a4", "renesas,scifa";
-                reg = <0 0xe6c50000 0 0x100>;
-                interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
-                status = "disabled";
-        };
-
         scifb2: serial@e6c20000 {
                 compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
                 reg = <0 0xe6c20000 0 0x100>;
@@ -280,6 +277,20 @@
                 status = "disabled";
         };
 
+        scifa0: serial@e6c40000 {
+                compatible = "renesas,scifa-r8a73a4", "renesas,scifa";
+                reg = <0 0xe6c40000 0 0x100>;
+                interrupts = <0 144 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
+        scifa1: serial@e6c50000 {
+                compatible = "renesas,scifa-r8a73a4", "renesas,scifa";
+                reg = <0 0xe6c50000 0 0x100>;
+                interrupts = <0 145 IRQ_TYPE_LEVEL_HIGH>;
+                status = "disabled";
+        };
+
         scifb4: serial@e6ce0000 {
                 compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
                 reg = <0 0xe6ce0000 0 0x100>;
@@ -294,45 +305,6 @@
                 status = "disabled";
         };
 
-        mmcif0: mmc@ee200000 {
-                compatible = "renesas,sh-mmcif";
-                reg = <0 0xee200000 0 0x80>;
-                interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
-                reg-io-width = <4>;
-                status = "disabled";
-        };
-
-        mmcif1: mmc@ee220000 {
-                compatible = "renesas,sh-mmcif";
-                reg = <0 0xee220000 0 0x80>;
-                interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;
-                reg-io-width = <4>;
-                status = "disabled";
-        };
-
-        pfc: pfc@e6050000 {
-                compatible = "renesas,pfc-r8a73a4";
-                reg = <0 0xe6050000 0 0x9000>;
-                gpio-controller;
-                #gpio-cells = <2>;
-                interrupts-extended =
-                        <&irqc0  0 0>, <&irqc0  1 0>, <&irqc0  2 0>, <&irqc0  3 0>,
-                        <&irqc0  4 0>, <&irqc0  5 0>, <&irqc0  6 0>, <&irqc0  7 0>,
-                        <&irqc0  8 0>, <&irqc0  9 0>, <&irqc0 10 0>, <&irqc0 11 0>,
-                        <&irqc0 12 0>, <&irqc0 13 0>, <&irqc0 14 0>, <&irqc0 15 0>,
-                        <&irqc0 16 0>, <&irqc0 17 0>, <&irqc0 18 0>, <&irqc0 19 0>,
-                        <&irqc0 20 0>, <&irqc0 21 0>, <&irqc0 22 0>, <&irqc0 23 0>,
-                        <&irqc0 24 0>, <&irqc0 25 0>, <&irqc0 26 0>, <&irqc0 27 0>,
-                        <&irqc0 28 0>, <&irqc0 29 0>, <&irqc0 30 0>, <&irqc0 31 0>,
-                        <&irqc1  0 0>, <&irqc1  1 0>, <&irqc1  2 0>, <&irqc1  3 0>,
-                        <&irqc1  4 0>, <&irqc1  5 0>, <&irqc1  6 0>, <&irqc1  7 0>,
-                        <&irqc1  8 0>, <&irqc1  9 0>, <&irqc1 10 0>, <&irqc1 11 0>,
-                        <&irqc1 12 0>, <&irqc1 13 0>, <&irqc1 14 0>, <&irqc1 15 0>,
-                        <&irqc1 16 0>, <&irqc1 17 0>, <&irqc1 18 0>, <&irqc1 19 0>,
-                        <&irqc1 20 0>, <&irqc1 21 0>, <&irqc1 22 0>, <&irqc1 23 0>,
-                        <&irqc1 24 0>, <&irqc1 25 0>;
-        };
-
         sdhi0: sd@ee100000 {
                 compatible = "renesas,sdhi-r8a73a4";
                 reg = <0 0xee100000 0 0x100>;
@@ -356,4 +328,32 @@
                 cap-sd-highspeed;
                 status = "disabled";
         };
+
+        mmcif0: mmc@ee200000 {
+                compatible = "renesas,sh-mmcif";
+                reg = <0 0xee200000 0 0x80>;
+                interrupts = <0 169 IRQ_TYPE_LEVEL_HIGH>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        mmcif1: mmc@ee220000 {
+                compatible = "renesas,sh-mmcif";
+                reg = <0 0xee220000 0 0x80>;
+                interrupts = <0 170 IRQ_TYPE_LEVEL_HIGH>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        gic: interrupt-controller@f1001000 {
+                compatible = "arm,cortex-a15-gic";
+                #interrupt-cells = <3>;
+                #address-cells = <0>;
+                interrupt-controller;
+                reg = <0 0xf1001000 0 0x1000>,
+                        <0 0xf1002000 0 0x1000>,
+                        <0 0xf1004000 0 0x2000>,
+                        <0 0xf1006000 0 0x2000>;
+                interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
+        };
 };
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index effb7b46f131..2703428557fc 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -25,6 +25,7 @@
 
         chosen {
                 bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+                stdout-path = &scifa1;
         };
 
         memory {
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
index 3342c74c5de8..fba294905ff4 100644
--- a/arch/arm/boot/dts/r8a7778-bockw-reference.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -28,7 +28,8 @@
         };
 
         chosen {
-                bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+                bootargs = "ignore_loglevel root=/dev/nfs ip=dhcp rw";
+                stdout-path = &scif0;
         };
 
         memory {
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index c160404e4d40..e83d40e24bcd 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -25,6 +25,7 @@
 
         chosen {
                 bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
+                stdout-path = &scif2;
         };
 
         memory {
@@ -68,6 +69,78 @@
                         gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;
                 };
         };
+
+        vga-encoder {
+                compatible = "adi,adv7123";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                vga_enc_in: endpoint {
+                                        remote-endpoint = <&du_out_rgb0>;
+                                };
+                        };
+                        port@1 {
+                                reg = <1>;
+                                vga_enc_out: endpoint {
+                                        remote-endpoint = <&vga_in>;
+                                };
+                        };
+                };
+        };
+
+        vga {
+                compatible = "vga-connector";
+
+                port {
+                        vga_in: endpoint {
+                                remote-endpoint = <&vga_enc_out>;
+                        };
+                };
+        };
+
+        lvds-encoder {
+                compatible = "thine,thc63lvdm83d";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                lvds_enc_in: endpoint {
+                                        remote-endpoint = <&du_out_rgb1>;
+                                };
+                        };
+                        port@1 {
+                                reg = <1>;
+                                lvds_connector: endpoint {
+                                };
+                        };
+                };
+        };
+};
+
+&du {
+        pinctrl-0 = <&du_pins>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        ports {
+                port@0 {
+                        endpoint {
+                                remote-endpoint = <&vga_enc_in>;
+                        };
+                };
+                port@1 {
+                        endpoint {
+                                remote-endpoint = <&lvds_enc_in>;
+                        };
+                };
+        };
 };
 
 &irqpin0 {
@@ -83,6 +156,17 @@
 };
 
 &pfc {
+        du_pins: du {
+                du0 {
+                        renesas,groups = "du0_rgb888", "du0_sync_1", "du0_clk_out_0";
+                        renesas,function = "du0";
+                };
+                du1 {
+                        renesas,groups = "du1_rgb666", "du1_sync_1", "du1_clk_out";
+                        renesas,function = "du1";
+                };
+        };
+
         lan0_pins: lan0 {
                 intc {
                         renesas,groups = "intc_irq1_b";
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 7cfba9aa1b41..fda814ed191d 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -379,6 +379,30 @@
                 status = "disabled";
         };
 
+        du: display@fff80000 {
+                compatible = "renesas,du-r8a7779";
+                reg = <0 0xfff80000 0 0x40000>;
+                interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7779_CLK_DU>;
+                status = "disabled";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                du_out_rgb0: endpoint {
+                                };
+                        };
+                        port@1 {
+                                reg = <1>;
+                                du_out_rgb1: endpoint {
+                                };
+                        };
+                };
+        };
+
         clocks {
                 #address-cells = <1>;
                 #size-cells = <1>;
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 69098b906b39..acab2e153382 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -25,6 +25,7 @@
 
         chosen {
                 bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                stdout-path = &scifa0;
         };
 
         memory@40000000 {
@@ -144,6 +145,56 @@
                 states = <3300000 1
                           1800000 0>;
         };
+
+        vga-encoder {
+                compatible = "adi,adv7123";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                adv7123_in: endpoint {
+                                        remote-endpoint = <&du_out_rgb>;
+                                };
+                        };
+                        port@1 {
+                                reg = <1>;
+                                adv7123_out: endpoint {
+                                        remote-endpoint = <&vga_in>;
+                                };
+                        };
+                };
+        };
+
+        vga {
+                compatible = "vga-connector";
+
+                port {
+                        vga_in: endpoint {
+                                remote-endpoint = <&adv7123_out>;
+                        };
+                };
+        };
+};
+
+&du {
+        pinctrl-0 = <&du_pins>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        ports {
+                port@0 {
+                        endpoint {
+                                remote-endpoint = <&adv7123_in>;
+                        };
+                };
+                port@2 {
+                        lvds_connector: endpoint {
+                        };
+                };
+        };
 };
 
 &extal_clk {
@@ -151,9 +202,6 @@
 };
 
 &pfc {
-        pinctrl-0 = <&du_pins>;
-        pinctrl-names = "default";
-
         du_pins: du {
                 renesas,groups = "du_rgb666", "du_sync_1", "du_clk_out_0";
                 renesas,function = "du";
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index e20affe156c1..0c20c90d8c06 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -600,6 +600,96 @@
                 status = "disabled";
         };
 
+        vsp1@fe920000 {
+                compatible = "renesas,vsp1";
+                reg = <0 0xfe920000 0 0x8000>;
+                interrupts = <0 266 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7790_CLK_VSP1_R>;
+
+                renesas,has-sru;
+                renesas,#rpf = <5>;
+                renesas,#uds = <1>;
+                renesas,#wpf = <4>;
+        };
+
+        vsp1@fe928000 {
+                compatible = "renesas,vsp1";
+                reg = <0 0xfe928000 0 0x8000>;
+                interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7790_CLK_VSP1_S>;
+
+                renesas,has-lut;
+                renesas,has-sru;
+                renesas,#rpf = <5>;
+                renesas,#uds = <3>;
+                renesas,#wpf = <4>;
+        };
+
+        vsp1@fe930000 {
+                compatible = "renesas,vsp1";
+                reg = <0 0xfe930000 0 0x8000>;
+                interrupts = <0 246 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU0>;
+
+                renesas,has-lif;
+                renesas,has-lut;
+                renesas,#rpf = <4>;
+                renesas,#uds = <1>;
+                renesas,#wpf = <4>;
+        };
+
+        vsp1@fe938000 {
+                compatible = "renesas,vsp1";
+                reg = <0 0xfe938000 0 0x8000>;
+                interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7790_CLK_VSP1_DU1>;
+
+                renesas,has-lif;
+                renesas,has-lut;
+                renesas,#rpf = <4>;
+                renesas,#uds = <1>;
+                renesas,#wpf = <4>;
+        };
+
+        du: display@feb00000 {
+                compatible = "renesas,du-r8a7790";
+                reg = <0 0xfeb00000 0 0x70000>,
+                      <0 0xfeb90000 0 0x1c>,
+                      <0 0xfeb94000 0 0x1c>;
+                reg-names = "du", "lvds.0", "lvds.1";
+                interrupts = <0 256 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 268 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 269 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp7_clks R8A7790_CLK_DU0>,
+                         <&mstp7_clks R8A7790_CLK_DU1>,
+                         <&mstp7_clks R8A7790_CLK_DU2>,
+                         <&mstp7_clks R8A7790_CLK_LVDS0>,
+                         <&mstp7_clks R8A7790_CLK_LVDS1>;
+                clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1";
+                status = "disabled";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                du_out_rgb: endpoint {
+                                };
+                        };
+                        port@1 {
+                                reg = <1>;
+                                du_out_lvds0: endpoint {
+                                };
+                        };
+                        port@2 {
+                                reg = <2>;
+                                du_out_lvds1: endpoint {
+                                };
+                        };
+                };
+        };
+
         clocks {
                 #address-cells = <2>;
                 #size-cells = <2>;
diff --git a/arch/arm/boot/dts/r8a7791-henninger.dts b/arch/arm/boot/dts/r8a7791-henninger.dts
index f1b56de10205..0868899882e3 100644
--- a/arch/arm/boot/dts/r8a7791-henninger.dts
+++ b/arch/arm/boot/dts/r8a7791-henninger.dts
@@ -23,6 +23,7 @@
 
         chosen {
                 bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                stdout-path = &scif0;
         };
 
         memory@40000000 {
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 07550e775e80..924183817b02 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -25,7 +25,8 @@
         };
 
         chosen {
-                bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                stdout-path = &scif0;
         };
 
         memory@40000000 {
@@ -211,14 +212,24 @@
         };
 };
 
+&du {
+        pinctrl-0 = <&du_pins>;
+        pinctrl-names = "default";
+        status = "okay";
+
+        ports {
+                port@1 {
+                        lvds_connector: endpoint {
+                        };
+                };
+        };
+};
+
 &extal_clk {
         clock-frequency = <20000000>;
 };
 
 &pfc {
-        pinctrl-0 = <&du_pins>;
-        pinctrl-names = "default";
-
         i2c2_pins: i2c2 {
                 renesas,groups = "i2c2";
                 renesas,function = "i2c2";
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index e06c11fa8698..e4a7170f368b 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -637,6 +637,75 @@
                 status = "disabled";
         };
 
+        vsp1@fe928000 {
+                compatible = "renesas,vsp1";
+                reg = <0 0xfe928000 0 0x8000>;
+                interrupts = <0 267 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7791_CLK_VSP1_S>;
+
+                renesas,has-lut;
+                renesas,has-sru;
+                renesas,#rpf = <5>;
+                renesas,#uds = <3>;
+                renesas,#wpf = <4>;
+        };
+
+        vsp1@fe930000 {
+                compatible = "renesas,vsp1";
+                reg = <0 0xfe930000 0 0x8000>;
+                interrupts = <0 246 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7791_CLK_VSP1_DU0>;
+
+                renesas,has-lif;
+                renesas,has-lut;
+                renesas,#rpf = <4>;
+                renesas,#uds = <1>;
+                renesas,#wpf = <4>;
+        };
+
+        vsp1@fe938000 {
+                compatible = "renesas,vsp1";
+                reg = <0 0xfe938000 0 0x8000>;
+                interrupts = <0 247 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp1_clks R8A7791_CLK_VSP1_DU1>;
+
+                renesas,has-lif;
+                renesas,has-lut;
+                renesas,#rpf = <4>;
+                renesas,#uds = <1>;
+                renesas,#wpf = <4>;
+        };
+
+        du: display@feb00000 {
+                compatible = "renesas,du-r8a7791";
+                reg = <0 0xfeb00000 0 0x40000>,
+                      <0 0xfeb90000 0 0x1c>;
+                reg-names = "du", "lvds.0";
+                interrupts = <0 256 IRQ_TYPE_LEVEL_HIGH>,
+                             <0 268 IRQ_TYPE_LEVEL_HIGH>;
+                clocks = <&mstp7_clks R8A7791_CLK_DU0>,
+                         <&mstp7_clks R8A7791_CLK_DU1>,
+                         <&mstp7_clks R8A7791_CLK_LVDS0>;
+                clock-names = "du.0", "du.1", "lvds.0";
+                status = "disabled";
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        port@0 {
+                                reg = <0>;
+                                du_out_rgb: endpoint {
+                                };
+                        };
+                        port@1 {
+                                reg = <1>;
+                                du_out_lvds0: endpoint {
+                                };
+                        };
+                };
+        };
+
         clocks {
                 #address-cells = <2>;
                 #size-cells = <2>;
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 79d06ef017a0..8aec51268b7d 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -21,6 +21,7 @@
 
         chosen {
                 bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                stdout-path = &scif2;
         };
 
         memory@40000000 {
diff --git a/arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi b/arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
new file mode 100644
index 000000000000..65cb50f0c29f
--- /dev/null
+++ b/arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
@@ -0,0 +1,41 @@
+/*
+ * Common file for the AA104XD12 panel connected to Renesas R-Car boards
+ *
+ * Copyright (C) 2014 Renesas Electronics Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/ {
+        panel {
+                compatible = "mitsubishi,aa104xd12", "panel-dpi";
+
+                width-mm = <210>;
+                height-mm = <158>;
+
+                panel-timing {
+                        /* 1024x768 @65Hz */
+                        clock-frequency = <65000000>;
+                        hactive = <1024>;
+                        vactive = <768>;
+                        hsync-len = <136>;
+                        hfront-porch = <20>;
+                        hback-porch = <160>;
+                        vfront-porch = <3>;
+                        vback-porch = <29>;
+                        vsync-len = <6>;
+                };
+
+                port {
+                        panel_in: endpoint {
+                                remote-endpoint = <&lvds_connector>;
+                        };
+                };
+        };
+};
+
+&lvds_connector {
+        remote-endpoint = <&panel_in>;
+};
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 30ef97e99dc5..0dac0e66ccad 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -40,6 +40,7 @@
 
         chosen {
                 bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel rw";
+                stdout-path = &scifa4;
         };
 
         memory {
diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
deleted file mode 100644
index b33d19b7f134..000000000000
--- a/arch/arm/configs/koelsch_defconfig
+++ /dev/null
@@ -1,113 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_EMBEDDED=y
-CONFIG_PERF_EVENTS=y
-CONFIG_SLAB=y
-CONFIG_ARCH_SHMOBILE_LEGACY=y
-CONFIG_ARCH_R8A7791=y
-CONFIG_MACH_KOELSCH=y
-# CONFIG_SWP_EMULATE is not set
-CONFIG_CPU_BPREDICT_DISABLE=y
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_PCI=y
-CONFIG_PCI_RCAR_GEN2=y
-CONFIG_PCI_RCAR_GEN2_PCIE=y
-CONFIG_SMP=y
-CONFIG_SCHED_MC=y
-CONFIG_NR_CPUS=8
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_KEXEC=y
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-CONFIG_SATA_RCAR=y
-CONFIG_MTD=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_EEPROM_AT24=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-CONFIG_SH_ETH=y
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=20
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_SH_MOBILE=y
-CONFIG_I2C_RCAR=y
-CONFIG_SPI=y
-CONFIG_SPI_RSPI=y
-CONFIG_SPI_SH_MSIOF=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_RCAR=y
-# CONFIG_HWMON is not set
-CONFIG_THERMAL=y
-CONFIG_RCAR_THERMAL=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_DA9210=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=y
-CONFIG_SOC_CAMERA_PLATFORM=y
-CONFIG_VIDEO_RCAR_VIN=y
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-CONFIG_VIDEO_ADV7180=y
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_SDHI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-# CONFIG_IOMMU_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-# CONFIG_ARM_UNWIND is not set
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index d7346ad51043..c8201a93b54d 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -17,7 +17,6 @@ CONFIG_ARCH_R8A7779=y
 CONFIG_ARCH_R8A7790=y
 CONFIG_ARCH_R8A7791=y
 CONFIG_ARCH_R8A7794=y
-CONFIG_MACH_KOELSCH=y
 CONFIG_MACH_LAGER=y
 CONFIG_MACH_MARZEN=y
 # CONFIG_SWP_EMULATE is not set
diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index 3d225105e0d1..b6117bea9a6f 100644
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -11,6 +11,7 @@
  */
 
 #include <asm/system_misc.h>
+#include <asm/irq.h>
 #include <mach/hardware.h>
 
 #include "soc.h"
diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index bd7e56889b43..f25b9aec9c50 100644
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -10,6 +10,7 @@
  */
 
 #include <asm/system_misc.h>
+#include <asm/irq.h>
 #include <mach/cpu.h>
 #include <mach/at91_dbgu.h>
 #include <mach/hardware.h>
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 5623131c4f0b..f8f62fbaa915 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -80,8 +80,8 @@ static int da830_evm_usb_ocic_notify(da8xx_ocic_handler_t handler)
                                     IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                                     "OHCI over-current indicator", NULL);
                 if (error)
-                        printk(KERN_ERR "%s: could not request IRQ to watch "
-                               "over-current indicator changes\n", __func__);
+                        pr_err("%s: could not request IRQ to watch over-current indicator changes\n",
+                               __func__);
         } else
                 free_irq(irq, NULL);
 
@@ -145,8 +145,7 @@ static __init void da830_evm_usb_init(void)
         /* USB_REFCLKIN is not used. */
         ret = davinci_cfg_reg(DA830_USB0_DRVVBUS);
         if (ret)
-                pr_warning("%s: USB 2.0 PinMux setup failed: %d\n",
-                           __func__, ret);
+                pr_warn("%s: USB 2.0 PinMux setup failed: %d\n", __func__, ret);
         else {
                 /*
                  * TPS2065 switch @ 5V supplies 1 A (sustains 1.5 A),
@@ -154,37 +153,35 @@ static __init void da830_evm_usb_init(void)
                  */
                 ret = da8xx_register_usb20(1000, 3);
                 if (ret)
-                        pr_warning("%s: USB 2.0 registration failed: %d\n",
-                                   __func__, ret);
+                        pr_warn("%s: USB 2.0 registration failed: %d\n",
+                                __func__, ret);
         }
 
         ret = davinci_cfg_reg_list(da830_evm_usb11_pins);
         if (ret) {
-                pr_warning("%s: USB 1.1 PinMux setup failed: %d\n",
-                           __func__, ret);
+                pr_warn("%s: USB 1.1 PinMux setup failed: %d\n", __func__, ret);
                 return;
         }
 
         ret = gpio_request(ON_BD_USB_DRV, "ON_BD_USB_DRV");
         if (ret) {
-                printk(KERN_ERR "%s: failed to request GPIO for USB 1.1 port "
-                       "power control: %d\n", __func__, ret);
+                pr_err("%s: failed to request GPIO for USB 1.1 port power control: %d\n",
+                       __func__, ret);
                 return;
         }
         gpio_direction_output(ON_BD_USB_DRV, 0);
 
         ret = gpio_request(ON_BD_USB_OVC, "ON_BD_USB_OVC");
         if (ret) {
-                printk(KERN_ERR "%s: failed to request GPIO for USB 1.1 port "
-                       "over-current indicator: %d\n", __func__, ret);
+                pr_err("%s: failed to request GPIO for USB 1.1 port over-current indicator: %d\n",
+                       __func__, ret);
                 return;
         }
         gpio_direction_input(ON_BD_USB_OVC);
 
         ret = da8xx_register_usb11(&da830_evm_usb11_pdata);
         if (ret)
-                pr_warning("%s: USB 1.1 registration failed: %d\n",
-                           __func__, ret);
+                pr_warn("%s: USB 1.1 registration failed: %d\n", __func__, ret);
 }
 
 static const short da830_evm_mcasp1_pins[] = {
@@ -252,31 +249,29 @@ static inline void da830_evm_init_mmc(void)
 
         ret = davinci_cfg_reg_list(da830_evm_mmc_sd_pins);
         if (ret) {
-                pr_warning("da830_evm_init: mmc/sd mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: mmc/sd mux setup failed: %d\n", __func__, ret);
                 return;
         }
 
         ret = gpio_request(DA830_MMCSD_WP_PIN, "MMC WP");
         if (ret) {
-                pr_warning("da830_evm_init: can not open GPIO %d\n",
-                           DA830_MMCSD_WP_PIN);
+                pr_warn("%s: can not open GPIO %d\n",
+                        __func__, DA830_MMCSD_WP_PIN);
                 return;
         }
         gpio_direction_input(DA830_MMCSD_WP_PIN);
 
         ret = gpio_request(DA830_MMCSD_CD_PIN, "MMC CD\n");
         if (ret) {
-                pr_warning("da830_evm_init: can not open GPIO %d\n",
-                           DA830_MMCSD_CD_PIN);
+                pr_warn("%s: can not open GPIO %d\n",
+                        __func__, DA830_MMCSD_CD_PIN);
                 return;
         }
         gpio_direction_input(DA830_MMCSD_CD_PIN);
 
         ret = da8xx_register_mmcsd0(&da830_evm_mmc_config);
         if (ret) {
-                pr_warning("da830_evm_init: mmc/sd registration failed: %d\n",
-                                ret);
+                pr_warn("%s: mmc/sd registration failed: %d\n", __func__, ret);
                 gpio_free(DA830_MMCSD_WP_PIN);
         }
 }
@@ -404,23 +399,21 @@ static inline void da830_evm_init_nand(int mux_mode)
         int ret;
 
         if (HAS_MMC) {
-                pr_warning("WARNING: both MMC/SD and NAND are "
-                                "enabled, but they share AEMIF pins.\n"
-                                "\tDisable MMC/SD for NAND support.\n");
+                pr_warn("WARNING: both MMC/SD and NAND are enabled, but they share AEMIF pins\n"
+                        "\tDisable MMC/SD for NAND support\n");
                 return;
         }
 
         ret = davinci_cfg_reg_list(da830_evm_emif25_pins);
         if (ret)
-                pr_warning("da830_evm_init: emif25 mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: emif25 mux setup failed: %d\n", __func__, ret);
 
         ret = platform_device_register(&da830_evm_nand_device);
         if (ret)
-                pr_warning("da830_evm_init: NAND device not registered.\n");
+                pr_warn("%s: NAND device not registered\n", __func__);
 
         if (davinci_aemif_setup(&da830_evm_nand_device))
-                pr_warn("%s: Cannot configure AEMIF.\n", __func__);
+                pr_warn("%s: Cannot configure AEMIF\n", __func__);
 
         gpio_direction_output(mux_mode, 1);
 }
@@ -435,12 +428,11 @@ static inline void da830_evm_init_lcdc(int mux_mode)
 
         ret = davinci_cfg_reg_list(da830_lcdcntl_pins);
         if (ret)
-                pr_warning("da830_evm_init: lcdcntl mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: lcdcntl mux setup failed: %d\n", __func__, ret);
 
         ret = da8xx_register_lcdc(&sharp_lcd035q3dg01_pdata);
         if (ret)
-                pr_warning("da830_evm_init: lcd setup failed: %d\n", ret);
+                pr_warn("%s: lcd setup failed: %d\n", __func__, ret);
 
         gpio_direction_output(mux_mode, 0);
 }
@@ -598,22 +590,19 @@ static __init void da830_evm_init(void)
 
         ret = da830_register_gpio();
         if (ret)
-                pr_warn("da830_evm_init: GPIO init failed: %d\n", ret);
+                pr_warn("%s: GPIO init failed: %d\n", __func__, ret);
 
         ret = da830_register_edma(da830_edma_rsv);
         if (ret)
-                pr_warning("da830_evm_init: edma registration failed: %d\n",
-                                ret);
+                pr_warn("%s: edma registration failed: %d\n", __func__, ret);
 
         ret = davinci_cfg_reg_list(da830_i2c0_pins);
         if (ret)
-                pr_warning("da830_evm_init: i2c0 mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: i2c0 mux setup failed: %d\n", __func__, ret);
 
         ret = da8xx_register_i2c(0, &da830_evm_i2c_0_pdata);
         if (ret)
-                pr_warning("da830_evm_init: i2c0 registration failed: %d\n",
-                                ret);
+                pr_warn("%s: i2c0 registration failed: %d\n", __func__, ret);
 
         da830_evm_usb_init();
 
@@ -622,18 +611,16 @@ static __init void da830_evm_init(void)
 
         ret = davinci_cfg_reg_list(da830_cpgmac_pins);
         if (ret)
-                pr_warning("da830_evm_init: cpgmac mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: cpgmac mux setup failed: %d\n", __func__, ret);
 
         ret = da8xx_register_emac();
         if (ret)
-                pr_warning("da830_evm_init: emac registration failed: %d\n",
-                                ret);
+                pr_warn("%s: emac registration failed: %d\n", __func__, ret);
 
         ret = da8xx_register_watchdog();
         if (ret)
-                pr_warning("da830_evm_init: watchdog registration failed: %d\n",
-                                ret);
+                pr_warn("%s: watchdog registration failed: %d\n",
+                        __func__, ret);
 
         davinci_serial_init(da8xx_serial_device);
         i2c_register_board_info(1, da830_evm_i2c_devices,
@@ -641,8 +628,7 @@ static __init void da830_evm_init(void)
 
         ret = davinci_cfg_reg_list(da830_evm_mcasp1_pins);
         if (ret)
-                pr_warning("da830_evm_init: mcasp1 mux setup failed: %d\n",
-                                ret);
+                pr_warn("%s: mcasp1 mux setup failed: %d\n", __func__, ret);
 
         da8xx_register_mcasp(1, &da830_evm_snd_data);
 
@@ -650,18 +636,17 @@ static __init void da830_evm_init(void)
 
         ret = da8xx_register_rtc();
         if (ret)
-                pr_warning("da830_evm_init: rtc setup failed: %d\n", ret);
+                pr_warn("%s: rtc setup failed: %d\n", __func__, ret);
 
         ret = spi_register_board_info(da830evm_spi_info,
                                       ARRAY_SIZE(da830evm_spi_info));
         if (ret)
-                pr_warn("%s: spi info registration failed: %d\n", __func__,
-                        ret);
+                pr_warn("%s: spi info registration failed: %d\n",
+                        __func__, ret);
 
         ret = da8xx_register_spi_bus(0, ARRAY_SIZE(da830evm_spi_info));
         if (ret)
-                pr_warning("da830_evm_init: spi 0 registration failed: %d\n",
-                           ret);
+                pr_warn("%s: spi 0 registration failed: %d\n", __func__, ret);
 }
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index fa11415e906a..6b5a97da9fe3 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -452,8 +452,7 @@ static void da850_evm_ui_keys_init(unsigned gpio)
         for (i = 0; i < DA850_N_UI_PB; i++) {
                 button = &da850_evm_ui_keys[i];
                 button->code = KEY_F8 - i;
-                button->desc = (char *)
-                                da850_evm_ui_exp[DA850_EVM_UI_EXP_PB8 + i];
+                button->desc = da850_evm_ui_exp[DA850_EVM_UI_EXP_PB8 + i];
                 button->gpio = gpio + DA850_EVM_UI_EXP_PB8 + i;
         }
 }
@@ -628,15 +627,13 @@ static void da850_evm_bb_keys_init(unsigned gpio)
         struct gpio_keys_button *button;
 
         button = &da850_evm_bb_keys[0];
-        button->desc = (char *)
-                da850_evm_bb_exp[DA850_EVM_BB_EXP_USER_PB1];
+        button->desc = da850_evm_bb_exp[DA850_EVM_BB_EXP_USER_PB1];
         button->gpio = gpio + DA850_EVM_BB_EXP_USER_PB1;
 
         for (i = 0; i < DA850_N_BB_USER_SW; i++) {
                 button = &da850_evm_bb_keys[i + 1];
                 button->code = SW_LID + i;
-                button->desc = (char *)
-                                da850_evm_bb_exp[DA850_EVM_BB_EXP_USER_SW1 + i];
+                button->desc = da850_evm_bb_exp[DA850_EVM_BB_EXP_USER_SW1 + i];
                 button->gpio = gpio + DA850_EVM_BB_EXP_USER_SW1 + i;
         }
 }
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index e583e58b5e1e..1a0898c1c17e 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -767,9 +767,8 @@ static __init void davinci_evm_init(void)
 
         if (HAS_ATA) {
                 if (HAS_NAND || HAS_NOR)
-                        pr_warning("WARNING: both IDE and Flash are "
-                                "enabled, but they share AEMIF pins.\n"
-                                "\tDisable IDE for NAND/NOR support.\n");
+                        pr_warn("WARNING: both IDE and Flash are enabled, but they share AEMIF pins\n"
+                                "\tDisable IDE for NAND/NOR support\n");
                 davinci_init_ide();
         } else if (HAS_NAND || HAS_NOR) {
                 davinci_cfg_reg(DM644X_HPIEN_DISABLE);
@@ -780,13 +779,12 @@ static __init void davinci_evm_init(void)
                         platform_device_register(&davinci_evm_nandflash_device);
 
                         if (davinci_aemif_setup(&davinci_evm_nandflash_device))
-                                pr_warn("%s: Cannot configure AEMIF.\n",
+                                pr_warn("%s: Cannot configure AEMIF\n",
                                         __func__);
 
                         evm_leds[7].default_trigger = "nand-disk";
                         if (HAS_NOR)
-                                pr_warning("WARNING: both NAND and NOR flash "
-                                        "are enabled; disable one of them.\n");
+                                pr_warn("WARNING: both NAND and NOR flash are enabled; disable one of them.\n");
                 } else if (HAS_NOR)
                         platform_device_register(&davinci_evm_norflash_device);
         }
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 96fc00a167f5..8cfbfe084535 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -8,6 +8,8 @@
  * any kind, whether express or implied.
  */
 
+#define pr_fmt(fmt) "MityOMAPL138: " fmt
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/console.h>
@@ -107,7 +109,7 @@ static void mityomapl138_cpufreq_init(const char *partnum)
 
         ret = da850_register_cpufreq("pll0_sysclk3");
         if (ret)
-                pr_warning("cpufreq registration failed: %d\n", ret);
+                pr_warn("cpufreq registration failed: %d\n", ret);
 }
 #else
 static void mityomapl138_cpufreq_init(const char *partnum) { }
@@ -121,33 +123,31 @@ static void read_factory_config(struct memory_accessor *a, void *context)
 
         ret = a->read(a, (char *)&factory_config, 0, sizeof(factory_config));
         if (ret != sizeof(struct factory_config)) {
-                pr_warning("MityOMAPL138: Read Factory Config Failed: %d\n",
-                                ret);
+                pr_warn("Read Factory Config Failed: %d\n", ret);
                 goto bad_config;
         }
 
         if (factory_config.magic != FACTORY_CONFIG_MAGIC) {
-                pr_warning("MityOMAPL138: Factory Config Magic Wrong (%X)\n",
-                                factory_config.magic);
+                pr_warn("Factory Config Magic Wrong (%X)\n",
+                        factory_config.magic);
                 goto bad_config;
         }
 
         if (factory_config.version != FACTORY_CONFIG_VERSION) {
-                pr_warning("MityOMAPL138: Factory Config Version Wrong (%X)\n",
-                                factory_config.version);
+                pr_warn("Factory Config Version Wrong (%X)\n",
+                        factory_config.version);
                 goto bad_config;
         }
 
-        pr_info("MityOMAPL138: Found MAC = %pM\n", factory_config.mac);
+        pr_info("Found MAC = %pM\n", factory_config.mac);
         if (is_valid_ether_addr(factory_config.mac))
                 memcpy(soc_info->emac_pdata->mac_addr,
                         factory_config.mac, ETH_ALEN);
         else
-                pr_warning("MityOMAPL138: Invalid MAC found "
-                                "in factory config block\n");
+                pr_warn("Invalid MAC found in factory config block\n");
 
         partnum = factory_config.partnum;
-        pr_info("MityOMAPL138: Part Number = %s\n", partnum);
+        pr_info("Part Number = %s\n", partnum);
 
 bad_config:
         /* default maximum speed is valid for all platforms */
@@ -435,7 +435,7 @@ static void __init mityomapl138_setup_nand(void)
                                  ARRAY_SIZE(mityomapl138_devices));
 
         if (davinci_aemif_setup(&mityomapl138_nandflash_device))
-                pr_warn("%s: Cannot configure AEMIF.\n", __func__);
+                pr_warn("%s: Cannot configure AEMIF\n", __func__);
 }
 
 static const short mityomap_mii_pins[] = {
@@ -478,7 +478,7 @@ static void __init mityomapl138_config_emac(void)
         }
 
         if (ret) {
-                pr_warning("mii/rmii mux setup failed: %d\n", ret);
+                pr_warn("mii/rmii mux setup failed: %d\n", ret);
                 return;
         }
 
@@ -489,7 +489,7 @@ static void __init mityomapl138_config_emac(void)
 
         ret = da8xx_register_emac();
         if (ret)
-                pr_warning("emac registration failed: %d\n", ret);
+                pr_warn("emac registration failed: %d\n", ret);
 }
 
 static struct davinci_pm_config da850_pm_pdata = {
@@ -511,21 +511,21 @@ static void __init mityomapl138_init(void)
         /* for now, no special EDMA channels are reserved */
         ret = da850_register_edma(NULL);
         if (ret)
-                pr_warning("edma registration failed: %d\n", ret);
+                pr_warn("edma registration failed: %d\n", ret);
 
         ret = da8xx_register_watchdog();
         if (ret)
-                pr_warning("watchdog registration failed: %d\n", ret);
+                pr_warn("watchdog registration failed: %d\n", ret);
 
         davinci_serial_init(da8xx_serial_device);
 
         ret = da8xx_register_i2c(0, &mityomap_i2c_0_pdata);
         if (ret)
-                pr_warning("i2c0 registration failed: %d\n", ret);
+                pr_warn("i2c0 registration failed: %d\n", ret);
 
         ret = pmic_tps65023_init();
         if (ret)
-                pr_warning("TPS65023 PMIC init failed: %d\n", ret);
+                pr_warn("TPS65023 PMIC init failed: %d\n", ret);
 
         mityomapl138_setup_nand();
 
@@ -537,22 +537,21 @@ static void __init mityomapl138_init(void)
         ret = da8xx_register_spi_bus(1,
                                      ARRAY_SIZE(mityomapl138_spi_flash_info));
         if (ret)
-                pr_warning("spi 1 registration failed: %d\n", ret);
+                pr_warn("spi 1 registration failed: %d\n", ret);
 
         mityomapl138_config_emac();
 
         ret = da8xx_register_rtc();
         if (ret)
-                pr_warning("rtc setup failed: %d\n", ret);
+                pr_warn("rtc setup failed: %d\n", ret);
 
         ret = da8xx_register_cpuidle();
         if (ret)
-                pr_warning("cpuidle registration failed: %d\n", ret);
+                pr_warn("cpuidle registration failed: %d\n", ret);
 
         ret = da850_register_pm(&da850_pm_device);
         if (ret)
-                pr_warning("da850_evm_init: suspend registration failed: %d\n",
-                                ret);
+                pr_warn("suspend registration failed: %d\n", ret);
 }
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index bb680af98374..8fcdcf87c47c 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -183,9 +183,8 @@ static __init void davinci_ntosd2_init(void)
 
         if (HAS_ATA) {
                 if (HAS_NAND)
-                        pr_warning("WARNING: both IDE and Flash are "
-                                "enabled, but they share AEMIF pins.\n"
-                                "\tDisable IDE for NAND/NOR support.\n");
+                        pr_warn("WARNING: both IDE and Flash are enabled, but they share AEMIF pins\n"
+                                "\tDisable IDE for NAND/NOR support\n");
                 davinci_init_ide();
         } else if (HAS_NAND) {
                 davinci_cfg_reg(DM644X_HPIEN_DISABLE);
diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index 985e5fd00fb2..c70bb0a4dfb4 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -564,7 +564,7 @@ int davinci_set_refclk_rate(unsigned long rate)
 
         refclk = clk_get(NULL, "ref");
         if (IS_ERR(refclk)) {
-                pr_err("%s: failed to get reference clock.\n", __func__);
+                pr_err("%s: failed to get reference clock\n", __func__);
                 return PTR_ERR(refclk);
         }
 
diff --git a/arch/arm/mach-davinci/mux.c b/arch/arm/mach-davinci/mux.c
index f34a8dcdae2b..a8eb909a2b6c 100644
--- a/arch/arm/mach-davinci/mux.c
+++ b/arch/arm/mach-davinci/mux.c
@@ -15,6 +15,9 @@
  *
  * Copyright (C) 2008 Texas Instruments.
  */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/io.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
@@ -46,7 +49,7 @@ int __init_or_module davinci_cfg_reg(const unsigned long index)
         }
 
         if (index >= soc_info->pinmux_pins_num) {
-                printk(KERN_ERR "Invalid pin mux index: %lu (%lu)\n",
+                pr_err("Invalid pin mux index: %lu (%lu)\n",
                        index, soc_info->pinmux_pins_num);
                 dump_stack();
                 return -ENODEV;
@@ -55,7 +58,7 @@ int __init_or_module davinci_cfg_reg(const unsigned long index)
         cfg = &soc_info->pinmux_pins[index];
 
         if (cfg->name == NULL) {
-                printk(KERN_ERR "No entry for the specified index\n");
+                pr_err("No entry for the specified index\n");
                 return -ENODEV;
         }
 
@@ -82,15 +85,15 @@ int __init_or_module davinci_cfg_reg(const unsigned long index)
 
         if (warn) {
 #ifdef CONFIG_DAVINCI_MUX_WARNINGS
-                printk(KERN_WARNING "MUX: initialized %s\n", cfg->name);
+                pr_warn("initialized %s\n", cfg->name);
 #endif
         }
 
 #ifdef CONFIG_DAVINCI_MUX_DEBUG
         if (cfg->debug || warn) {
-                printk(KERN_WARNING "MUX: Setting register %s\n", cfg->name);
-                printk(KERN_WARNING "      %s (0x%08x) = 0x%08x -> 0x%08x\n",
-                       cfg->mux_reg_name, cfg->mux_reg, reg_orig, reg);
+                pr_warn("Setting register %s\n", cfg->name);
+                pr_warn("   %s (0x%08x) = 0x%08x -> 0x%08x\n",
+                        cfg->mux_reg_name, cfg->mux_reg, reg_orig, reg);
         }
 #endif
 
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c
index 24ad30f32ae3..160c9602f490 100644
--- a/arch/arm/mach-davinci/time.c
+++ b/arch/arm/mach-davinci/time.c
@@ -342,8 +342,6 @@ void __init davinci_timer_init(void)
         struct davinci_soc_info *soc_info = &davinci_soc_info;
         unsigned int clockevent_id;
         unsigned int clocksource_id;
-        static char err[] __initdata = KERN_ERR
-                "%s: can't register clocksource!\n";
         int i;
 
         clockevent_id = soc_info->timer_info->clockevent_id;
@@ -364,12 +362,12 @@ void __init davinci_timer_init(void)
 
                 /* Only bottom timers can use compare regs */
                 if (IS_TIMER_TOP(clockevent_id))
-                        pr_warning("davinci_timer_init: Invalid use"
-                                " of system timers.  Results unpredictable.\n");
+                        pr_warn("%s: Invalid use of system timers.  Results unpredictable.\n",
+                                __func__);
                 else if ((dtip[event_timer].cmp_off == 0)
                                 || (dtip[event_timer].cmp_irq == 0))
-                        pr_warning("davinci_timer_init:  Invalid timer instance"
-                                " setup.  Results unpredictable.\n");
+                        pr_warn("%s: Invalid timer instance setup.  Results unpredictable.\n",
+                                __func__);
                 else {
                         timers[TID_CLOCKEVENT].opts |= TIMER_OPTS_USE_COMPARE;
                         clockevent_davinci.features = CLOCK_EVT_FEAT_ONESHOT;
@@ -389,7 +387,8 @@ void __init davinci_timer_init(void)
         clocksource_davinci.name = id_to_name[clocksource_id];
         if (clocksource_register_hz(&clocksource_davinci,
                                     davinci_clock_tick_rate))
-                printk(err, clocksource_davinci.name);
+                pr_err("%s: can't register clocksource!\n",
+                       clocksource_davinci.name);
 
         sched_clock_register(davinci_read_sched_clock, 32,
                           davinci_clock_tick_rate);
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 27ae6144679c..d634de588d96 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -16,9 +16,6 @@ obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o
 
 obj-$(CONFIG_SMP)               += platsmp.o headsmp.o
 
-obj-$(CONFIG_HOTPLUG_CPU)       += hotplug.o
-CFLAGS_hotplug.o                += -march=armv7-a
-
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_exynos-smc.o             :=-Wa,-march=armv7-a$(plus_sec)
 
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 47b904b3b973..3d3e6af9d015 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -130,8 +130,6 @@ extern void exynos_cpu_resume(void);
 
 extern struct smp_operations exynos_smp_ops;
 
-extern void exynos_cpu_die(unsigned int cpu);
-
 /* PMU(Power Management Unit) support */
 
 #define PMU_TABLE_END   (-1U)
diff --git a/arch/arm/mach-exynos/exynos.c b/arch/arm/mach-exynos/exynos.c
index 6b283eb3202e..6de7cf5ef2b2 100644
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@ -41,41 +41,11 @@ static struct map_desc exynos4_iodesc[] __initdata = {
                 .length         = SZ_64K,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = (unsigned long)S3C_VA_TIMER,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_TIMER),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_WATCHDOG,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_WATCHDOG),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
                 .virtual        = (unsigned long)S5P_VA_SROMC,
                 .pfn            = __phys_to_pfn(EXYNOS4_PA_SROMC),
                 .length         = SZ_4K,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = (unsigned long)S5P_VA_SYSTIMER,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_SYSTIMER),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_COMBINER_BASE,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_COMBINER),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_GIC_CPU,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_GIC_CPU),
-                .length         = SZ_64K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S5P_VA_GIC_DIST,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_GIC_DIST),
-                .length         = SZ_64K,
-                .type           = MT_DEVICE,
-        }, {
                 .virtual        = (unsigned long)S5P_VA_CMU,
                 .pfn            = __phys_to_pfn(EXYNOS4_PA_CMU),
                 .length         = SZ_128K,
@@ -86,11 +56,6 @@ static struct map_desc exynos4_iodesc[] __initdata = {
                 .length         = SZ_8K,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = (unsigned long)S5P_VA_L2CC,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_L2CC),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
                 .virtual        = (unsigned long)S5P_VA_DMC0,
                 .pfn            = __phys_to_pfn(EXYNOS4_PA_DMC0),
                 .length         = SZ_64K,
@@ -100,11 +65,6 @@ static struct map_desc exynos4_iodesc[] __initdata = {
                 .pfn            = __phys_to_pfn(EXYNOS4_PA_DMC1),
                 .length         = SZ_64K,
                 .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_USB_HSPHY,
-                .pfn            = __phys_to_pfn(EXYNOS4_PA_HSPHY),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
         },
 };
 
@@ -115,16 +75,6 @@ static struct map_desc exynos5_iodesc[] __initdata = {
                 .length         = SZ_64K,
                 .type           = MT_DEVICE,
         }, {
-                .virtual        = (unsigned long)S3C_VA_TIMER,
-                .pfn            = __phys_to_pfn(EXYNOS5_PA_TIMER),
-                .length         = SZ_16K,
-                .type           = MT_DEVICE,
-        }, {
-                .virtual        = (unsigned long)S3C_VA_WATCHDOG,
-                .pfn            = __phys_to_pfn(EXYNOS5_PA_WATCHDOG),
-                .length         = SZ_4K,
-                .type           = MT_DEVICE,
-        }, {
                 .virtual        = (unsigned long)S5P_VA_SROMC,
                 .pfn            = __phys_to_pfn(EXYNOS5_PA_SROMC),
                 .length         = SZ_4K,
diff --git a/arch/arm/mach-exynos/hotplug.c b/arch/arm/mach-exynos/hotplug.c
deleted file mode 100644
index 4d86961a7957..000000000000
--- a/arch/arm/mach-exynos/hotplug.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- *  Cloned from linux/arch/arm/mach-realview/hotplug.c
- *
- *  Copyright (C) 2002 ARM Ltd.
- *  All Rights Reserved
- *
- * 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.
-*/
-
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/smp.h>
-#include <linux/io.h>
-
-#include <asm/cacheflush.h>
-#include <asm/cp15.h>
-#include <asm/smp_plat.h>
-
-#include "common.h"
-#include "regs-pmu.h"
-
-static inline void cpu_leave_lowpower(void)
-{
-        unsigned int v;
-
-        asm volatile(
-        "mrc    p15, 0, %0, c1, c0, 0\n"
-        "       orr     %0, %0, %1\n"
-        "       mcr     p15, 0, %0, c1, c0, 0\n"
-        "       mrc     p15, 0, %0, c1, c0, 1\n"
-        "       orr     %0, %0, %2\n"
-        "       mcr     p15, 0, %0, c1, c0, 1\n"
-          : "=&r" (v)
-          : "Ir" (CR_C), "Ir" (0x40)
-          : "cc");
-}
-
-static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
-{
-        u32 mpidr = cpu_logical_map(cpu);
-        u32 core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
-
-        for (;;) {
-
-                /* Turn the CPU off on next WFI instruction. */
-                exynos_cpu_power_down(core_id);
-
-                wfi();
-
-                if (pen_release == core_id) {
-                        /*
-                         * OK, proper wakeup, we're done
-                         */
-                        break;
-                }
-
-                /*
-                 * Getting here, means that we have come out of WFI without
-                 * having been woken up - this shouldn't happen
-                 *
-                 * Just note it happening - when we're woken, we can report
-                 * its occurrence.
-                 */
-                (*spurious)++;
-        }
-}
-
-/*
- * platform-specific code to shutdown a CPU
- *
- * Called with IRQs disabled
- */
-void __ref exynos_cpu_die(unsigned int cpu)
-{
-        int spurious = 0;
-
-        v7_exit_coherency_flush(louis);
-
-        platform_do_lowpower(cpu, &spurious);
-
-        /*
-         * bring this CPU back into the world of cache
-         * coherency, and then restore interrupts
-         */
-        cpu_leave_lowpower();
-
-        if (spurious)
-                pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);
-}
diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h
index f0b7e92bad6c..1ad3f496ef56 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -30,40 +30,17 @@
 #define EXYNOS4_PA_CMU                  0x10030000
 #define EXYNOS5_PA_CMU                  0x10010000
 
-#define EXYNOS4_PA_SYSTIMER             0x10050000
-
-#define EXYNOS4_PA_WATCHDOG             0x10060000
-#define EXYNOS5_PA_WATCHDOG             0x101D0000
-
 #define EXYNOS4_PA_DMC0                 0x10400000
 #define EXYNOS4_PA_DMC1                 0x10410000
 
-#define EXYNOS4_PA_COMBINER             0x10440000
-#define EXYNOS5_PA_COMBINER             0x10440000
-
-#define EXYNOS4_PA_GIC_CPU              0x10480000
-#define EXYNOS4_PA_GIC_DIST             0x10490000
-#define EXYNOS5_PA_GIC_CPU              0x10482000
-#define EXYNOS5_PA_GIC_DIST             0x10481000
-
 #define EXYNOS4_PA_COREPERI             0x10500000
 #define EXYNOS4_PA_L2CC                 0x10502000
 
 #define EXYNOS4_PA_SROMC                0x12570000
 #define EXYNOS5_PA_SROMC                0x12250000
 
-#define EXYNOS4_PA_HSPHY                0x125B0000
-
-#define EXYNOS4_PA_UART                 0x13800000
-#define EXYNOS5_PA_UART                 0x12C00000
-
-#define EXYNOS4_PA_TIMER                0x139D0000
-#define EXYNOS5_PA_TIMER                0x12DD0000
-
 /* Compatibility UART */
 
 #define EXYNOS5440_PA_UART0             0x000B0000
 
-#define S3C_VA_UARTx(x)                 (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
-
 #endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 41ae28d69e6f..9c6dd1451136 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -22,6 +22,7 @@
 #include <linux/of_address.h>
 
 #include <asm/cacheflush.h>
+#include <asm/cp15.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
 #include <asm/firmware.h>
@@ -33,6 +34,88 @@
 
 extern void exynos4_secondary_startup(void);
 
+/*
+ * Set or clear the USE_DELAYED_RESET_ASSERTION option, set on Exynos4 SoCs
+ * during hot-(un)plugging CPUx.
+ *
+ * The feature can be cleared safely during first boot of secondary CPU.
+ *
+ * Exynos4 SoCs require setting USE_DELAYED_RESET_ASSERTION during powering
+ * down a CPU so the CPU idle clock down feature could properly detect global
+ * idle state when CPUx is off.
+ */
+static void exynos_set_delayed_reset_assertion(u32 core_id, bool enable)
+{
+        if (soc_is_exynos4()) {
+                unsigned int tmp;
+
+                tmp = pmu_raw_readl(EXYNOS_ARM_CORE_OPTION(core_id));
+                if (enable)
+                        tmp |= S5P_USE_DELAYED_RESET_ASSERTION;
+                else
+                        tmp &= ~(S5P_USE_DELAYED_RESET_ASSERTION);
+                pmu_raw_writel(tmp, EXYNOS_ARM_CORE_OPTION(core_id));
+        }
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+static inline void cpu_leave_lowpower(u32 core_id)
+{
+        unsigned int v;
+
+        asm volatile(
+        "mrc    p15, 0, %0, c1, c0, 0\n"
+        "       orr     %0, %0, %1\n"
+        "       mcr     p15, 0, %0, c1, c0, 0\n"
+        "       mrc     p15, 0, %0, c1, c0, 1\n"
+        "       orr     %0, %0, %2\n"
+        "       mcr     p15, 0, %0, c1, c0, 1\n"
+          : "=&r" (v)
+          : "Ir" (CR_C), "Ir" (0x40)
+          : "cc");
+
+         exynos_set_delayed_reset_assertion(core_id, false);
+}
+
+static inline void platform_do_lowpower(unsigned int cpu, int *spurious)
+{
+        u32 mpidr = cpu_logical_map(cpu);
+        u32 core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+
+        for (;;) {
+
+                /* Turn the CPU off on next WFI instruction. */
+                exynos_cpu_power_down(core_id);
+
+                /*
+                 * Exynos4 SoCs require setting
+                 * USE_DELAYED_RESET_ASSERTION so the CPU idle
+                 * clock down feature could properly detect
+                 * global idle state when CPUx is off.
+                 */
+                exynos_set_delayed_reset_assertion(core_id, true);
+
+                wfi();
+
+                if (pen_release == core_id) {
+                        /*
+                         * OK, proper wakeup, we're done
+                         */
+                        break;
+                }
+
+                /*
+                 * Getting here, means that we have come out of WFI without
+                 * having been woken up - this shouldn't happen
+                 *
+                 * Just note it happening - when we're woken, we can report
+                 * its occurrence.
+                 */
+                (*spurious)++;
+        }
+}
+#endif /* CONFIG_HOTPLUG_CPU */
+
 /**
  * exynos_core_power_down : power down the specified cpu
  * @cpu : the cpu to power down
@@ -237,6 +320,9 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
                 udelay(10);
         }
 
+        /* No harm if this is called during first boot of secondary CPU */
+        exynos_set_delayed_reset_assertion(core_id, false);
+
         /*
          * now the secondary core is starting up let it run its
          * calibrations, then wait for it to finish
@@ -318,6 +404,33 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
         }
 }
 
+#ifdef CONFIG_HOTPLUG_CPU
+/*
+ * platform-specific code to shutdown a CPU
+ *
+ * Called with IRQs disabled
+ */
+static void exynos_cpu_die(unsigned int cpu)
+{
+        int spurious = 0;
+        u32 mpidr = cpu_logical_map(cpu);
+        u32 core_id = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+
+        v7_exit_coherency_flush(louis);
+
+        platform_do_lowpower(cpu, &spurious);
+
+        /*
+         * bring this CPU back into the world of cache
+         * coherency, and then restore interrupts
+         */
+        cpu_leave_lowpower(core_id);
+
+        if (spurious)
+                pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);
+}
+#endif /* CONFIG_HOTPLUG_CPU */
+
 struct smp_operations exynos_smp_ops __initdata = {
         .smp_init_cpus          = exynos_smp_init_cpus,
         .smp_prepare_cpus       = exynos_smp_prepare_cpus,
diff --git a/arch/arm/mach-exynos/regs-pmu.h b/arch/arm/mach-exynos/regs-pmu.h
index 96a1569262b5..4e9b4440e2bd 100644
--- a/arch/arm/mach-exynos/regs-pmu.h
+++ b/arch/arm/mach-exynos/regs-pmu.h
@@ -20,6 +20,7 @@
 
 #define S5P_USE_STANDBY_WFI0                    (1 << 16)
 #define S5P_USE_STANDBY_WFE0                    (1 << 24)
+#define S5P_USE_DELAYED_RESET_ASSERTION         BIT(12)
 
 #define EXYNOS_SWRESET                          0x0400
 #define EXYNOS5440_SWRESET                      0x00C4
@@ -106,6 +107,8 @@
                         (EXYNOS_ARM_CORE0_CONFIGURATION + (0x80 * (_nr)))
 #define EXYNOS_ARM_CORE_STATUS(_nr)             \
                         (EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x4)
+#define EXYNOS_ARM_CORE_OPTION(_nr)             \
+                        (EXYNOS_ARM_CORE_CONFIGURATION(_nr) + 0x8)
 
 #define EXYNOS_ARM_COMMON_CONFIGURATION         0x2500
 #define EXYNOS_COMMON_CONFIGURATION(_nr)        \
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 4e79da7c5e30..5951660d1bd2 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -145,7 +145,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
                 post_div_table[2].div = 1;
                 video_div_table[1].div = 1;
                 video_div_table[2].div = 1;
-        };
+        }
 
         clk[IMX6QDL_PLL1_BYPASS_SRC] = imx_clk_mux("pll1_bypass_src", base + 0x00, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
         clk[IMX6QDL_PLL2_BYPASS_SRC] = imx_clk_mux("pll2_bypass_src", base + 0x30, 14, 2, pll_bypass_src_sels, ARRAY_SIZE(pll_bypass_src_sels));
diff --git a/arch/arm/mach-imx/clk-pllv3.c b/arch/arm/mach-imx/clk-pllv3.c
index 57de74da0acf..0ad6e5442fd8 100644
--- a/arch/arm/mach-imx/clk-pllv3.c
+++ b/arch/arm/mach-imx/clk-pllv3.c
@@ -69,7 +69,6 @@ static int clk_pllv3_prepare(struct clk_hw *hw)
 {
         struct clk_pllv3 *pll = to_clk_pllv3(hw);
         u32 val;
-        int ret;
 
         val = readl_relaxed(pll->base);
         if (pll->powerup_set)
@@ -78,11 +77,7 @@ static int clk_pllv3_prepare(struct clk_hw *hw)
                 val &= ~BM_PLL_POWER;
         writel_relaxed(val, pll->base);
 
-        ret = clk_pllv3_wait_lock(pll);
-        if (ret)
-                return ret;
-
-        return 0;
+        return clk_pllv3_wait_lock(pll);
 }
 
 static void clk_pllv3_unprepare(struct clk_hw *hw)
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 66662a1e36de..3d383cb5e6d1 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -61,7 +61,6 @@ struct platform_device *mxc_register_gpio(char *name, int id,
 void mxc_set_cpu_type(unsigned int type);
 void mxc_restart(enum reboot_mode, const char *);
 void mxc_arch_reset_init(void __iomem *);
-void mxc_arch_reset_init_dt(void);
 int mx51_revision(void);
 int mx53_revision(void);
 void imx_set_aips(void __iomem *);
diff --git a/arch/arm/mach-imx/imx25-dt.c b/arch/arm/mach-imx/imx25-dt.c
index cf8032bae277..25defbdb06c4 100644
--- a/arch/arm/mach-imx/imx25-dt.c
+++ b/arch/arm/mach-imx/imx25-dt.c
@@ -17,13 +17,6 @@
 #include "common.h"
 #include "mx25.h"
 
-static void __init imx25_dt_init(void)
-{
-        mxc_arch_reset_init_dt();
-
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 static const char * const imx25_dt_board_compat[] __initconst = {
         "fsl,imx25",
         NULL
@@ -33,7 +26,5 @@ DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)")
         .map_io         = mx25_map_io,
         .init_early     = imx25_init_early,
         .init_irq       = mx25_init_irq,
-        .init_machine   = imx25_dt_init,
         .dt_compat      = imx25_dt_board_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
index dc8f1a6f45f2..bd42d1bd10af 100644
--- a/arch/arm/mach-imx/imx27-dt.c
+++ b/arch/arm/mach-imx/imx27-dt.c
@@ -22,8 +22,6 @@ static void __init imx27_dt_init(void)
 {
         struct platform_device_info devinfo = { .name = "cpufreq-dt", };
 
-        mxc_arch_reset_init_dt();
-
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
         platform_device_register_full(&devinfo);
@@ -40,5 +38,4 @@ DT_MACHINE_START(IMX27_DT, "Freescale i.MX27 (Device Tree Support)")
         .init_irq       = mx27_init_irq,
         .init_machine   = imx27_dt_init,
         .dt_compat      = imx27_dt_board_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c
index 418dbc82adc4..32100222a017 100644
--- a/arch/arm/mach-imx/imx31-dt.c
+++ b/arch/arm/mach-imx/imx31-dt.c
@@ -18,13 +18,6 @@
 #include "common.h"
 #include "mx31.h"
 
-static void __init imx31_dt_init(void)
-{
-        mxc_arch_reset_init_dt();
-
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 static const char * const imx31_dt_board_compat[] __initconst = {
         "fsl,imx31",
         NULL
@@ -40,7 +33,5 @@ DT_MACHINE_START(IMX31_DT, "Freescale i.MX31 (Device Tree Support)")
         .init_early     = imx31_init_early,
         .init_irq       = mx31_init_irq,
         .init_time      = imx31_dt_timer_init,
-        .init_machine   = imx31_dt_init,
         .dt_compat      = imx31_dt_board_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/imx35-dt.c b/arch/arm/mach-imx/imx35-dt.c
index 584fbe105579..e9396037235d 100644
--- a/arch/arm/mach-imx/imx35-dt.c
+++ b/arch/arm/mach-imx/imx35-dt.c
@@ -20,14 +20,6 @@
 #include "common.h"
 #include "mx35.h"
 
-static void __init imx35_dt_init(void)
-{
-        mxc_arch_reset_init_dt();
-
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             NULL, NULL);
-}
-
 static void __init imx35_irq_init(void)
 {
         imx_init_l2cache();
@@ -43,7 +35,5 @@ DT_MACHINE_START(IMX35_DT, "Freescale i.MX35 (Device Tree Support)")
         .map_io         = mx35_map_io,
         .init_early     = imx35_init_early,
         .init_irq       = imx35_irq_init,
-        .init_machine   = imx35_dt_init,
         .dt_compat      = imx35_dt_board_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/iomux-imx31.c b/arch/arm/mach-imx/iomux-imx31.c
index 1657fe64cd0f..d6a30753ca7c 100644
--- a/arch/arm/mach-imx/iomux-imx31.c
+++ b/arch/arm/mach-imx/iomux-imx31.c
@@ -44,9 +44,11 @@ static unsigned long mxc_pin_alloc_map[NB_PORTS * 32 / BITS_PER_LONG];
 /*
  * set the mode for a IOMUX pin.
  */
-int mxc_iomux_mode(unsigned int pin_mode)
+void mxc_iomux_mode(unsigned int pin_mode)
 {
-        u32 field, l, mode, ret = 0;
+        u32 field;
+        u32 l;
+        u32 mode;
         void __iomem *reg;
 
         reg = IOMUXSW_MUX_CTL + (pin_mode & IOMUX_REG_MASK);
@@ -61,8 +63,6 @@ int mxc_iomux_mode(unsigned int pin_mode)
         __raw_writel(l, reg);
 
         spin_unlock(&gpio_mux_lock);
-
-        return ret;
 }
 
 /*
diff --git a/arch/arm/mach-imx/iomux-mx3.h b/arch/arm/mach-imx/iomux-mx3.h
index f79f78a1c0ed..0a5adba61e0b 100644
--- a/arch/arm/mach-imx/iomux-mx3.h
+++ b/arch/arm/mach-imx/iomux-mx3.h
@@ -144,7 +144,7 @@ void mxc_iomux_set_gpr(enum iomux_gp_func, bool en);
  * It is called by the setup functions and should not be called directly anymore.
  * It is here visible for backward compatibility
  */
-int mxc_iomux_mode(unsigned int pin_mode);
+void mxc_iomux_mode(unsigned int pin_mode);
 
 #define IOMUX_PADNUM_MASK       0x1ff
 #define IOMUX_GPIONUM_SHIFT     9
diff --git a/arch/arm/mach-imx/mach-imx50.c b/arch/arm/mach-imx/mach-imx50.c
index b1e56a94a382..ecf58b9e974b 100644
--- a/arch/arm/mach-imx/mach-imx50.c
+++ b/arch/arm/mach-imx/mach-imx50.c
@@ -16,13 +16,6 @@
 
 #include "common.h"
 
-static void __init imx50_dt_init(void)
-{
-        mxc_arch_reset_init_dt();
-
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 static const char * const imx50_dt_board_compat[] __initconst = {
         "fsl,imx50",
         NULL
@@ -30,7 +23,5 @@ static const char * const imx50_dt_board_compat[] __initconst = {
 
 DT_MACHINE_START(IMX50_DT, "Freescale i.MX50 (Device Tree Support)")
         .init_irq       = tzic_init_irq,
-        .init_machine   = imx50_dt_init,
         .dt_compat      = imx50_dt_board_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-imx51.c b/arch/arm/mach-imx/mach-imx51.c
index 2c5fcaf8675b..b015129e4045 100644
--- a/arch/arm/mach-imx/mach-imx51.c
+++ b/arch/arm/mach-imx/mach-imx51.c
@@ -53,7 +53,6 @@ static void __init imx51_dt_init(void)
 {
         struct platform_device_info devinfo = { .name = "cpufreq-dt", };
 
-        mxc_arch_reset_init_dt();
         imx51_ipu_mipi_setup();
         imx_src_init();
 
@@ -78,5 +77,4 @@ DT_MACHINE_START(IMX51_DT, "Freescale i.MX51 (Device Tree Support)")
         .init_machine   = imx51_dt_init,
         .init_late      = imx51_init_late,
         .dt_compat      = imx51_dt_board_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c
index 03dd6ea13acc..18b5c5c136db 100644
--- a/arch/arm/mach-imx/mach-imx53.c
+++ b/arch/arm/mach-imx/mach-imx53.c
@@ -30,7 +30,6 @@ static void __init imx53_init_early(void)
 
 static void __init imx53_dt_init(void)
 {
-        mxc_arch_reset_init_dt();
         imx_src_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
@@ -54,5 +53,4 @@ DT_MACHINE_START(IMX53_DT, "Freescale i.MX53 (Device Tree Support)")
         .init_machine   = imx53_dt_init,
         .init_late      = imx53_init_late,
         .dt_compat      = imx53_dt_board_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index d51c6e99a2e9..5057d61298b7 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -268,8 +268,6 @@ static void __init imx6q_init_machine(void)
         imx_print_silicon_rev(cpu_is_imx6dl() ? "i.MX6DL" : "i.MX6Q",
                               imx_get_soc_revision());
 
-        mxc_arch_reset_init_dt();
-
         parent = imx_soc_device_init();
         if (parent == NULL)
                 pr_warn("failed to initialize soc device\n");
@@ -409,5 +407,4 @@ DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad/DualLite (Device Tree)")
         .init_machine   = imx6q_init_machine,
         .init_late      = imx6q_init_late,
         .dt_compat      = imx6q_dt_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index ed263a21d928..24bfaaf944c8 100644
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -48,8 +48,6 @@ static void __init imx6sl_init_machine(void)
 {
         struct device *parent;
 
-        mxc_arch_reset_init_dt();
-
         parent = imx_soc_device_init();
         if (parent == NULL)
                 pr_warn("failed to initialize soc device\n");
@@ -76,10 +74,8 @@ static const char * const imx6sl_dt_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)")
-        .map_io         = debug_ll_io_init,
         .init_irq       = imx6sl_init_irq,
         .init_machine   = imx6sl_init_machine,
         .init_late      = imx6sl_init_late,
         .dt_compat      = imx6sl_dt_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index 3de3b7369aef..4111c0fa8d09 100644
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -18,8 +18,6 @@ static void __init imx6sx_init_machine(void)
 {
         struct device *parent;
 
-        mxc_arch_reset_init_dt();
-
         parent = imx_soc_device_init();
         if (parent == NULL)
                 pr_warn("failed to initialize soc device\n");
@@ -53,10 +51,8 @@ static const char * const imx6sx_dt_compat[] __initconst = {
 };
 
 DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)")
-        .map_io         = debug_ll_io_init,
         .init_irq       = imx6sx_init_irq,
         .init_machine   = imx6sx_init_machine,
         .dt_compat      = imx6sx_dt_compat,
         .init_late      = imx6sx_init_late,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/mach-vf610.c b/arch/arm/mach-imx/mach-vf610.c
index ee7e57b752a7..c11ab6a1dc87 100644
--- a/arch/arm/mach-imx/mach-vf610.c
+++ b/arch/arm/mach-imx/mach-vf610.c
@@ -12,14 +12,6 @@
 #include <asm/mach/arch.h>
 #include <asm/hardware/cache-l2x0.h>
 
-#include "common.h"
-
-static void __init vf610_init_machine(void)
-{
-        mxc_arch_reset_init_dt();
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 static const char * const vf610_dt_compat[] __initconst = {
         "fsl,vf610",
         NULL,
@@ -28,7 +20,5 @@ static const char * const vf610_dt_compat[] __initconst = {
 DT_MACHINE_START(VYBRID_VF610, "Freescale Vybrid VF610 (Device Tree)")
         .l2c_aux_val    = 0,
         .l2c_aux_mask   = ~0,
-        .init_machine   = vf610_init_machine,
         .dt_compat      = vf610_dt_compat,
-        .restart        = mxc_restart,
 MACHINE_END
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c
index d14c33fd6b03..51c35013b673 100644
--- a/arch/arm/mach-imx/system.c
+++ b/arch/arm/mach-imx/system.c
@@ -89,21 +89,6 @@ void __init mxc_arch_reset_init(void __iomem *base)
                 clk_prepare(wdog_clk);
 }
 
-void __init mxc_arch_reset_init_dt(void)
-{
-        struct device_node *np;
-
-        np = of_find_compatible_node(NULL, NULL, "fsl,imx21-wdt");
-        wdog_base = of_iomap(np, 0);
-        WARN_ON(!wdog_base);
-
-        wdog_clk = of_clk_get(np, 0);
-        if (IS_ERR(wdog_clk))
-                pr_warn("%s: failed to get wdog clock\n", __func__);
-        else
-                clk_prepare(wdog_clk);
-}
-
 #ifdef CONFIG_CACHE_L2X0
 void __init imx_init_l2cache(void)
 {
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 21f457b56c01..0f2539550f1b 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -36,7 +36,6 @@ menuconfig ARCH_SHMOBILE_MULTI
         select NO_IOPORT_MAP
         select PINCTRL
         select ARCH_REQUIRE_GPIOLIB
-        select ARCH_HAS_OPP
 
 if ARCH_SHMOBILE_MULTI
 
@@ -73,11 +72,6 @@ config ARCH_R8A7794
 
 comment "Renesas ARM SoCs Board Type"
 
-config MACH_KOELSCH
-        bool "Koelsch board"
-        depends on ARCH_R8A7791
-        select MICREL_PHY if SH_ETH
-
 config MACH_LAGER
         bool "Lager board"
         depends on ARCH_R8A7790
@@ -145,14 +139,6 @@ config ARCH_R8A7790
         select MIGHT_HAVE_PCI
         select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
 
-config ARCH_R8A7791
-        bool "R-Car M2-W (R8A77910)"
-        select ARCH_RCAR_GEN2
-        select ARCH_WANT_OPTIONAL_GPIOLIB
-        select ARM_GIC
-        select MIGHT_HAVE_PCI
-        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
-
 comment "Renesas ARM SoCs Board Type"
 
 config MACH_APE6EVM
@@ -227,12 +213,6 @@ config MACH_LAGER
         select MICREL_PHY if SH_ETH
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
-config MACH_KOELSCH
-        bool "Koelsch board"
-        depends on ARCH_R8A7791
-        select USE_OF
-        select MICREL_PHY if SH_ETH
-
 config MACH_KZM9G
         bool "KZM-A9-GT board"
         depends on ARCH_SH73A0
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index e20f2786ec72..7d68eba53be3 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -19,8 +19,8 @@ obj-$(CONFIG_ARCH_EMEV2)	+= setup-emev2.o
 obj-$(CONFIG_ARCH_R7S72100)     += setup-r7s72100.o
 
 # Clock objects
-obj-y                           += clock.o
 ifndef CONFIG_COMMON_CLK
+obj-y                           += clock.o
 obj-$(CONFIG_ARCH_SH7372)       += clock-sh7372.o
 obj-$(CONFIG_ARCH_SH73A0)       += clock-sh73a0.o
 obj-$(CONFIG_ARCH_R8A73A4)      += clock-r8a73a4.o
@@ -28,7 +28,6 @@ obj-$(CONFIG_ARCH_R8A7740)	+= clock-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7778)      += clock-r8a7778.o
 obj-$(CONFIG_ARCH_R8A7779)      += clock-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)      += clock-r8a7790.o
-obj-$(CONFIG_ARCH_R8A7791)      += clock-r8a7791.o
 endif
 
 # CPU reset vector handling objects
@@ -57,7 +56,6 @@ obj-$(CONFIG_ARCH_SH7372)	+= entry-intc.o sleep-sh7372.o
 
 # Board objects
 ifdef CONFIG_ARCH_SHMOBILE_MULTI
-obj-$(CONFIG_MACH_KOELSCH)      += board-koelsch-reference.o
 obj-$(CONFIG_MACH_LAGER)        += board-lager-reference.o
 obj-$(CONFIG_MACH_MARZEN)       += board-marzen-reference.o
 else
@@ -69,7 +67,6 @@ obj-$(CONFIG_MACH_BOCKW_REFERENCE)	+= board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)       += board-marzen.o
 obj-$(CONFIG_MACH_LAGER)        += board-lager.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA)      += board-armadillo800eva.o
-obj-$(CONFIG_MACH_KOELSCH)      += board-koelsch.o
 obj-$(CONFIG_MACH_KZM9G)        += board-kzm9g.o
 obj-$(CONFIG_MACH_KZM9G_REFERENCE)      += board-kzm9g-reference.o
 endif
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index de9a23852fc8..57d00ed6ec0c 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -5,7 +5,6 @@ loadaddr-$(CONFIG_MACH_APE6EVM_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
 loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
-loadaddr-$(CONFIG_MACH_KOELSCH) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
 loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
 loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
index a6503d8c77de..004ed92ee598 100644
--- a/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index b222f68d55b7..66f67816a844 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index e70983534403..de95181c7de4 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -12,53 +12,48 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/err.h>
-#include <linux/kernel.h>
-#include <linux/input.h>
-#include <linux/platform_data/st1232_pdata.h>
-#include <linux/irq.h>
-#include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/gpio_keys.h>
-#include <linux/regulator/driver.h>
+#include <linux/i2c-gpio.h>
+#include <linux/input.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/mfd/tmio.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/pinctrl/machine.h>
+#include <linux/platform_data/st1232_pdata.h>
+#include <linux/platform_device.h>
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
+#include <linux/reboot.h>
+#include <linux/regulator/driver.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/gpio-regulator.h>
 #include <linux/regulator/machine.h>
 #include <linux/sh_eth.h>
-#include <linux/videodev2.h>
 #include <linux/usb/renesas_usbhs.h>
-#include <linux/mfd/tmio.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/sh_mmcif.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
-#include <linux/i2c-gpio.h>
-#include <linux/reboot.h>
+#include <linux/videodev2.h>
 
-#include <media/mt9t112.h>
-#include <media/sh_mobile_ceu.h>
-#include <media/soc_camera.h>
-#include <asm/page.h>
+#include <asm/hardware/cache-l2x0.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/time.h>
-#include <asm/hardware/cache-l2x0.h>
-#include <video/sh_mobile_lcdc.h>
-#include <video/sh_mobile_hdmi.h>
+#include <asm/page.h>
+#include <media/mt9t112.h>
+#include <media/sh_mobile_ceu.h>
+#include <media/soc_camera.h>
 #include <sound/sh_fsi.h>
 #include <sound/simple_card.h>
+#include <video/sh_mobile_hdmi.h>
+#include <video/sh_mobile_lcdc.h>
 
 #include "common.h"
 #include "irqs.h"
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
index 79c47847f200..d649ade4a202 100644
--- a/arch/arm/mach-shmobile/board-bockw-reference.c
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/of_platform.h>
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 1cf2c75dacfb..f27b5a833bf0 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -13,10 +13,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/mfd/tmio.h>
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
deleted file mode 100644
index 46aa540133d6..000000000000
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Koelsch board support - Reference DT implementation
- *
- * Copyright (C) 2013  Renesas Electronics Corporation
- * Copyright (C) 2013  Renesas Solutions Corp.
- * Copyright (C) 2013  Magnus Damm
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/kernel.h>
-#include <linux/of_platform.h>
-#include <linux/platform_data/rcar-du.h>
-
-#include <asm/mach/arch.h>
-
-#include "clock.h"
-#include "common.h"
-#include "irqs.h"
-#include "r8a7791.h"
-#include "rcar-gen2.h"
-
-/* DU */
-static struct rcar_du_encoder_data koelsch_du_encoders[] = {
-        {
-                .type = RCAR_DU_ENCODER_NONE,
-                .output = RCAR_DU_OUTPUT_LVDS0,
-                .connector.lvds.panel = {
-                        .width_mm = 210,
-                        .height_mm = 158,
-                        .mode = {
-                                .pixelclock = 65000000,
-                                .hactive = 1024,
-                                .hfront_porch = 20,
-                                .hback_porch = 160,
-                                .hsync_len = 136,
-                                .vactive = 768,
-                                .vfront_porch = 3,
-                                .vback_porch = 29,
-                                .vsync_len = 6,
-                        },
-                },
-        },
-};
-
-static struct rcar_du_platform_data koelsch_du_pdata = {
-        .encoders = koelsch_du_encoders,
-        .num_encoders = ARRAY_SIZE(koelsch_du_encoders),
-};
-
-static const struct resource du_resources[] __initconst = {
-        DEFINE_RES_MEM(0xfeb00000, 0x40000),
-        DEFINE_RES_MEM_NAMED(0xfeb90000, 0x1c, "lvds.0"),
-        DEFINE_RES_IRQ(gic_spi(256)),
-        DEFINE_RES_IRQ(gic_spi(268)),
-};
-
-static void __init koelsch_add_du_device(void)
-{
-        struct platform_device_info info = {
-                .name = "rcar-du-r8a7791",
-                .id = -1,
-                .res = du_resources,
-                .num_res = ARRAY_SIZE(du_resources),
-                .data = &koelsch_du_pdata,
-                .size_data = sizeof(koelsch_du_pdata),
-                .dma_mask = DMA_BIT_MASK(32),
-        };
-
-        platform_device_register_full(&info);
-}
-
-/*
- * This is a really crude hack to provide clkdev support to platform
- * devices until they get moved to DT.
- */
-static const struct clk_name clk_names[] __initconst = {
-        { "du0", "du.0", "rcar-du-r8a7791" },
-        { "du1", "du.1", "rcar-du-r8a7791" },
-        { "lvds0", "lvds.0", "rcar-du-r8a7791" },
-};
-
-static void __init koelsch_add_standard_devices(void)
-{
-        shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-
-        koelsch_add_du_device();
-}
-
-static const char * const koelsch_boards_compat_dt[] __initconst = {
-        "renesas,koelsch",
-        "renesas,koelsch-reference",
-        NULL,
-};
-
-DT_MACHINE_START(KOELSCH_DT, "koelsch")
-        .smp            = smp_ops(r8a7791_smp_ops),
-        .init_early     = shmobile_init_delay,
-        .init_time      = rcar_gen2_timer_init,
-        .init_machine   = koelsch_add_standard_devices,
-        .init_late      = shmobile_init_late,
-        .reserve        = rcar_gen2_reserve,
-        .dt_compat      = koelsch_boards_compat_dt,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
deleted file mode 100644
index 7111b5c1d67b..000000000000
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Koelsch board support
- *
- * Copyright (C) 2013  Renesas Electronics Corporation
- * Copyright (C) 2013-2014  Renesas Solutions Corp.
- * Copyright (C) 2013  Magnus Damm
- * Copyright (C) 2014  Cogent Embedded, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#include <linux/irq.h>
-#include <linux/kernel.h>
-#include <linux/leds.h>
-#include <linux/mfd/tmio.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/phy.h>
-#include <linux/pinctrl/machine.h>
-#include <linux/platform_data/gpio-rcar.h>
-#include <linux/platform_data/rcar-du.h>
-#include <linux/platform_device.h>
-#include <linux/regulator/driver.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/gpio-regulator.h>
-#include <linux/regulator/machine.h>
-#include <linux/sh_eth.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/rspi.h>
-#include <linux/spi/spi.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include "common.h"
-#include "irqs.h"
-#include "r8a7791.h"
-#include "rcar-gen2.h"
-
-/* DU */
-static struct rcar_du_encoder_data koelsch_du_encoders[] = {
-        {
-                .type = RCAR_DU_ENCODER_NONE,
-                .output = RCAR_DU_OUTPUT_LVDS0,
-                .connector.lvds.panel = {
-                        .width_mm = 210,
-                        .height_mm = 158,
-                        .mode = {
-                                .pixelclock = 65000000,
-                                .hactive = 1024,
-                                .hfront_porch = 20,
-                                .hback_porch = 160,
-                                .hsync_len = 136,
-                                .vactive = 768,
-                                .vfront_porch = 3,
-                                .vback_porch = 29,
-                                .vsync_len = 6,
-                        },
-                },
-        },
-};
-
-static const struct rcar_du_platform_data koelsch_du_pdata __initconst = {
-        .encoders = koelsch_du_encoders,
-        .num_encoders = ARRAY_SIZE(koelsch_du_encoders),
-};
-
-static const struct resource du_resources[] __initconst = {
-        DEFINE_RES_MEM(0xfeb00000, 0x40000),
-        DEFINE_RES_MEM_NAMED(0xfeb90000, 0x1c, "lvds.0"),
-        DEFINE_RES_IRQ(gic_spi(256)),
-        DEFINE_RES_IRQ(gic_spi(268)),
-};
-
-static void __init koelsch_add_du_device(void)
-{
-        struct platform_device_info info = {
-                .name = "rcar-du-r8a7791",
-                .id = -1,
-                .res = du_resources,
-                .num_res = ARRAY_SIZE(du_resources),
-                .data = &koelsch_du_pdata,
-                .size_data = sizeof(koelsch_du_pdata),
-                .dma_mask = DMA_BIT_MASK(32),
-        };
-
-        platform_device_register_full(&info);
-}
-
-/* Ether */
-static const struct sh_eth_plat_data ether_pdata __initconst = {
-        .phy                    = 0x1,
-        .phy_irq                = irq_pin(0),
-        .edmac_endian           = EDMAC_LITTLE_ENDIAN,
-        .phy_interface          = PHY_INTERFACE_MODE_RMII,
-        .ether_link_active_low  = 1,
-};
-
-static const struct resource ether_resources[] __initconst = {
-        DEFINE_RES_MEM(0xee700000, 0x400),
-        DEFINE_RES_IRQ(gic_spi(162)),
-};
-
-static const struct platform_device_info ether_info __initconst = {
-        .name           = "r8a7791-ether",
-        .id             = -1,
-        .res            = ether_resources,
-        .num_res        = ARRAY_SIZE(ether_resources),
-        .data           = &ether_pdata,
-        .size_data      = sizeof(ether_pdata),
-        .dma_mask       = DMA_BIT_MASK(32),
-};
-
-/* LEDS */
-static struct gpio_led koelsch_leds[] = {
-        {
-                .name           = "led8",
-                .gpio           = RCAR_GP_PIN(2, 21),
-                .default_state  = LEDS_GPIO_DEFSTATE_ON,
-        }, {
-                .name           = "led7",
-                .gpio           = RCAR_GP_PIN(2, 20),
-                .default_state  = LEDS_GPIO_DEFSTATE_ON,
-        }, {
-                .name           = "led6",
-                .gpio           = RCAR_GP_PIN(2, 19),
-                .default_state  = LEDS_GPIO_DEFSTATE_ON,
-        },
-};
-
-static const struct gpio_led_platform_data koelsch_leds_pdata __initconst = {
-        .leds           = koelsch_leds,
-        .num_leds       = ARRAY_SIZE(koelsch_leds),
-};
-
-/* GPIO KEY */
-#define GPIO_KEY(c, g, d, ...) \
-        { .code = c, .gpio = g, .desc = d, .active_low = 1, \
-          .wakeup = 1, .debounce_interval = 20 }
-
-static struct gpio_keys_button gpio_buttons[] = {
-        GPIO_KEY(KEY_4,         RCAR_GP_PIN(5, 3),      "SW2-pin4"),
-        GPIO_KEY(KEY_3,         RCAR_GP_PIN(5, 2),      "SW2-pin3"),
-        GPIO_KEY(KEY_2,         RCAR_GP_PIN(5, 1),      "SW2-pin2"),
-        GPIO_KEY(KEY_1,         RCAR_GP_PIN(5, 0),      "SW2-pin1"),
-        GPIO_KEY(KEY_G,         RCAR_GP_PIN(7, 6),      "SW36"),
-        GPIO_KEY(KEY_F,         RCAR_GP_PIN(7, 5),      "SW35"),
-        GPIO_KEY(KEY_E,         RCAR_GP_PIN(7, 4),      "SW34"),
-        GPIO_KEY(KEY_D,         RCAR_GP_PIN(7, 3),      "SW33"),
-        GPIO_KEY(KEY_C,         RCAR_GP_PIN(7, 2),      "SW32"),
-        GPIO_KEY(KEY_B,         RCAR_GP_PIN(7, 1),      "SW31"),
-        GPIO_KEY(KEY_A,         RCAR_GP_PIN(7, 0),      "SW30"),
-};
-
-static const struct gpio_keys_platform_data koelsch_keys_pdata __initconst = {
-        .buttons        = gpio_buttons,
-        .nbuttons       = ARRAY_SIZE(gpio_buttons),
-};
-
-/* QSPI */
-static const struct resource qspi_resources[] __initconst = {
-        DEFINE_RES_MEM(0xe6b10000, 0x1000),
-        DEFINE_RES_IRQ_NAMED(gic_spi(184), "mux"),
-};
-
-static const struct rspi_plat_data qspi_pdata __initconst = {
-        .num_chipselect = 1,
-};
-
-/* SPI Flash memory (Spansion S25FL512SAGMFIG11 64 MiB) */
-static struct mtd_partition spi_flash_part[] = {
-        {
-                .name           = "loader",
-                .offset         = 0x00000000,
-                .size           = 512 * 1024,
-                .mask_flags     = MTD_WRITEABLE,
-        },
-        {
-                .name           = "bootenv",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = 512 * 1024,
-                .mask_flags     = MTD_WRITEABLE,
-        },
-        {
-                .name           = "data",
-                .offset         = MTDPART_OFS_APPEND,
-                .size           = MTDPART_SIZ_FULL,
-        },
-};
-
-static const struct flash_platform_data spi_flash_data = {
-        .name           = "m25p80",
-        .parts          = spi_flash_part,
-        .nr_parts       = ARRAY_SIZE(spi_flash_part),
-        .type           = "s25fl512s",
-};
-
-static const struct spi_board_info spi_info[] __initconst = {
-        {
-                .modalias       = "m25p80",
-                .platform_data  = &spi_flash_data,
-                .mode           = SPI_MODE_0 | SPI_TX_QUAD | SPI_RX_QUAD,
-                .max_speed_hz   = 30000000,
-                .bus_num        = 0,
-                .chip_select    = 0,
-        },
-};
-
-/* SATA0 */
-static const struct resource sata0_resources[] __initconst = {
-        DEFINE_RES_MEM(0xee300000, 0x2000),
-        DEFINE_RES_IRQ(gic_spi(105)),
-};
-
-static const struct platform_device_info sata0_info __initconst = {
-        .name           = "sata-r8a7791",
-        .id             = 0,
-        .res            = sata0_resources,
-        .num_res        = ARRAY_SIZE(sata0_resources),
-        .dma_mask       = DMA_BIT_MASK(32),
-};
-
-/* I2C */
-static const struct resource i2c_resources[] __initconst = {
-        /* I2C0 */
-        DEFINE_RES_MEM(0xE6508000, 0x40),
-        DEFINE_RES_IRQ(gic_spi(287)),
-        /* I2C1 */
-        DEFINE_RES_MEM(0xE6518000, 0x40),
-        DEFINE_RES_IRQ(gic_spi(288)),
-        /* I2C2 */
-        DEFINE_RES_MEM(0xE6530000, 0x40),
-        DEFINE_RES_IRQ(gic_spi(286)),
-        /* I2C3 */
-        DEFINE_RES_MEM(0xE6540000, 0x40),
-        DEFINE_RES_IRQ(gic_spi(290)),
-        /* I2C4 */
-        DEFINE_RES_MEM(0xE6520000, 0x40),
-        DEFINE_RES_IRQ(gic_spi(19)),
-        /* I2C5 */
-        DEFINE_RES_MEM(0xE6528000, 0x40),
-        DEFINE_RES_IRQ(gic_spi(20)),
-};
-
-static void __init koelsch_add_i2c(unsigned idx)
-{
-        unsigned res_idx = idx * 2;
-
-        BUG_ON(res_idx >= ARRAY_SIZE(i2c_resources));
-
-        platform_device_register_simple("i2c-rcar_gen2", idx,
-                                        i2c_resources + res_idx, 2);
-}
-
-#define SDHI_REGULATOR(idx, vdd_pin, vccq_pin)                          \
-static struct regulator_consumer_supply vcc_sdhi##idx##_consumer =      \
-        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi." #idx);               \
-                                                                        \
-static struct regulator_init_data vcc_sdhi##idx##_init_data = {         \
-        .constraints = {                                                \
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,              \
-        },                                                              \
-        .consumer_supplies      = &vcc_sdhi##idx##_consumer,            \
-        .num_consumer_supplies  = 1,                                    \
-};                                                                      \
-                                                                        \
-static const struct fixed_voltage_config vcc_sdhi##idx##_info __initconst = {\
-        .supply_name    = "SDHI" #idx "Vcc",                            \
-        .microvolts     = 3300000,                                      \
-        .gpio           = vdd_pin,                                      \
-        .enable_high    = 1,                                            \
-        .init_data      = &vcc_sdhi##idx##_init_data,                   \
-};                                                                      \
-                                                                        \
-static struct regulator_consumer_supply vccq_sdhi##idx##_consumer =     \
-        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi." #idx);              \
-                                                                        \
-static struct regulator_init_data vccq_sdhi##idx##_init_data = {        \
-        .constraints = {                                                \
-                .input_uV       = 3300000,                              \
-                .min_uV         = 1800000,                              \
-                .max_uV         = 3300000,                              \
-                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |            \
-                                  REGULATOR_CHANGE_STATUS,              \
-        },                                                              \
-        .consumer_supplies      = &vccq_sdhi##idx##_consumer,           \
-        .num_consumer_supplies  = 1,                                    \
-};                                                                      \
-                                                                        \
-static struct gpio vccq_sdhi##idx##_gpio =                              \
-        { vccq_pin, GPIOF_OUT_INIT_HIGH, "vccq-sdhi" #idx };            \
-                                                                        \
-static struct gpio_regulator_state vccq_sdhi##idx##_states[] = {        \
-        { .value = 1800000, .gpios = 0 },                               \
-        { .value = 3300000, .gpios = 1 },                               \
-};                                                                      \
-                                                                        \
-static const struct gpio_regulator_config vccq_sdhi##idx##_info __initconst = {\
-        .supply_name    = "vqmmc",                                      \
-        .gpios          = &vccq_sdhi##idx##_gpio,                       \
-        .nr_gpios       = 1,                                            \
-        .states         = vccq_sdhi##idx##_states,                      \
-        .nr_states      = ARRAY_SIZE(vccq_sdhi##idx##_states),          \
-        .type           = REGULATOR_VOLTAGE,                            \
-        .init_data      = &vccq_sdhi##idx##_init_data,                  \
-};
-
-SDHI_REGULATOR(0, RCAR_GP_PIN(7, 17), RCAR_GP_PIN(2, 12));
-SDHI_REGULATOR(1, RCAR_GP_PIN(7, 18), RCAR_GP_PIN(2, 13));
-SDHI_REGULATOR(2, RCAR_GP_PIN(7, 19), RCAR_GP_PIN(2, 26));
-
-/* SDHI0 */
-static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
-        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
-                          MMC_CAP_POWER_OFF_CARD,
-        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
-};
-
-static struct resource sdhi0_resources[] __initdata = {
-        DEFINE_RES_MEM(0xee100000, 0x200),
-        DEFINE_RES_IRQ(gic_spi(165)),
-};
-
-/* SDHI1 */
-static struct sh_mobile_sdhi_info sdhi1_info __initdata = {
-        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
-                          MMC_CAP_POWER_OFF_CARD,
-        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
-};
-
-static struct resource sdhi1_resources[] __initdata = {
-        DEFINE_RES_MEM(0xee140000, 0x100),
-        DEFINE_RES_IRQ(gic_spi(167)),
-};
-
-/* SDHI2 */
-static struct sh_mobile_sdhi_info sdhi2_info __initdata = {
-        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
-                          MMC_CAP_POWER_OFF_CARD,
-        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT |
-                          TMIO_MMC_WRPROTECT_DISABLE,
-};
-
-static struct resource sdhi2_resources[] __initdata = {
-        DEFINE_RES_MEM(0xee160000, 0x100),
-        DEFINE_RES_IRQ(gic_spi(168)),
-};
-
-static const struct pinctrl_map koelsch_pinctrl_map[] = {
-        /* DU */
-        PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
-                                  "du_rgb666", "du"),
-        PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
-                                  "du_sync", "du"),
-        PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
-                                  "du_clk_out_0", "du"),
-        /* Ether */
-        PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791",
-                                  "eth_link", "eth"),
-        PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791",
-                                  "eth_mdio", "eth"),
-        PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791",
-                                  "eth_rmii", "eth"),
-        PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791",
-                                  "intc_irq0", "intc"),
-        /* QSPI */
-        PIN_MAP_MUX_GROUP_DEFAULT("qspi.0", "pfc-r8a7791",
-                                  "qspi_ctrl", "qspi"),
-        PIN_MAP_MUX_GROUP_DEFAULT("qspi.0", "pfc-r8a7791",
-                                  "qspi_data4", "qspi"),
-        /* SCIF0 (CN19: DEBUG SERIAL0) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7791",
-                                  "scif0_data_d", "scif0"),
-        /* SCIF1 (CN20: DEBUG SERIAL1) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7791",
-                                  "scif1_data_d", "scif1"),
-        /* I2C1 */
-        PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.1", "pfc-r8a7791",
-                                  "i2c1_e", "i2c1"),
-        /* I2C2 */
-        PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.2", "pfc-r8a7791",
-                                  "i2c2", "i2c2"),
-        /* I2C4 */
-        PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.4", "pfc-r8a7791",
-                                  "i2c4_c", "i2c4"),
-        /* SDHI0 */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7791",
-                                  "sdhi0_data4", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7791",
-                                  "sdhi0_ctrl", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7791",
-                                  "sdhi0_cd", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7791",
-                                  "sdhi0_wp", "sdhi0"),
-        /* SDHI2 */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a7791",
-                                  "sdhi1_data4", "sdhi1"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a7791",
-                                  "sdhi1_ctrl", "sdhi1"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a7791",
-                                  "sdhi1_cd", "sdhi1"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a7791",
-                                  "sdhi1_wp", "sdhi1"),
-        /* SDHI2 */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7791",
-                                  "sdhi2_data4", "sdhi2"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7791",
-                                  "sdhi2_ctrl", "sdhi2"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7791",
-                                  "sdhi2_cd", "sdhi2"),
-};
-
-static void __init koelsch_add_standard_devices(void)
-{
-        r8a7791_clock_init();
-        pinctrl_register_mappings(koelsch_pinctrl_map,
-                                  ARRAY_SIZE(koelsch_pinctrl_map));
-        r8a7791_pinmux_init();
-        r8a7791_add_standard_devices();
-        platform_device_register_full(&ether_info);
-        platform_device_register_data(NULL, "leds-gpio", -1,
-                                      &koelsch_leds_pdata,
-                                      sizeof(koelsch_leds_pdata));
-        platform_device_register_data(NULL, "gpio-keys", -1,
-                                      &koelsch_keys_pdata,
-                                      sizeof(koelsch_keys_pdata));
-        platform_device_register_resndata(NULL, "qspi", 0,
-                                          qspi_resources,
-                                          ARRAY_SIZE(qspi_resources),
-                                          &qspi_pdata, sizeof(qspi_pdata));
-        spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));
-
-        koelsch_add_du_device();
-
-        platform_device_register_full(&sata0_info);
-
-        koelsch_add_i2c(1);
-        koelsch_add_i2c(2);
-        koelsch_add_i2c(4);
-        koelsch_add_i2c(5);
-
-        platform_device_register_data(NULL, "reg-fixed-voltage", 0,
-                                      &vcc_sdhi0_info, sizeof(struct fixed_voltage_config));
-        platform_device_register_data(NULL, "reg-fixed-voltage", 1,
-                                      &vcc_sdhi1_info, sizeof(struct fixed_voltage_config));
-        platform_device_register_data(NULL, "reg-fixed-voltage", 2,
-                                      &vcc_sdhi2_info, sizeof(struct fixed_voltage_config));
-        platform_device_register_data(NULL, "gpio-regulator", 0,
-                                      &vccq_sdhi0_info, sizeof(struct gpio_regulator_config));
-        platform_device_register_data(NULL, "gpio-regulator", 1,
-                                      &vccq_sdhi1_info, sizeof(struct gpio_regulator_config));
-        platform_device_register_data(NULL, "gpio-regulator", 2,
-                                      &vccq_sdhi2_info, sizeof(struct gpio_regulator_config));
-
-        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 0,
-                                          sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
-                                          &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
-
-        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 1,
-                                          sdhi1_resources, ARRAY_SIZE(sdhi1_resources),
-                                          &sdhi1_info, sizeof(struct sh_mobile_sdhi_info));
-
-        platform_device_register_resndata(NULL, "sh_mobile_sdhi", 2,
-                                          sdhi2_resources, ARRAY_SIZE(sdhi2_resources),
-                                          &sdhi2_info, sizeof(struct sh_mobile_sdhi_info));
-
-}
-
-/*
- * Ether LEDs on the Koelsch board are named LINK and ACTIVE which corresponds
- * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
- * 14-15. We have to set them back to 01 from the default 00 value each time
- * the PHY is reset. It's also important because the PHY's LED0 signal is
- * connected to SoC's ETH_LINK signal and in the PHY's default mode it will
- * bounce on and off after each packet, which we apparently want to avoid.
- */
-static int koelsch_ksz8041_fixup(struct phy_device *phydev)
-{
-        u16 phyctrl1 = phy_read(phydev, 0x1e);
-
-        phyctrl1 &= ~0xc000;
-        phyctrl1 |= 0x4000;
-        return phy_write(phydev, 0x1e, phyctrl1);
-}
-
-static void __init koelsch_init(void)
-{
-        koelsch_add_standard_devices();
-
-        irq_set_irq_type(irq_pin(0), IRQ_TYPE_LEVEL_LOW);
-
-        if (IS_ENABLED(CONFIG_PHYLIB))
-                phy_register_fixup_for_id("r8a7791-ether-ff:01",
-                                          koelsch_ksz8041_fixup);
-}
-
-static const char * const koelsch_boards_compat_dt[] __initconst = {
-        "renesas,koelsch",
-        NULL,
-};
-
-DT_MACHINE_START(KOELSCH_DT, "koelsch")
-        .smp            = smp_ops(r8a7791_smp_ops),
-        .init_early     = shmobile_init_delay,
-        .init_time      = rcar_gen2_timer_init,
-        .init_machine   = koelsch_init,
-        .init_late      = shmobile_init_late,
-        .reserve        = rcar_gen2_reserve,
-        .dt_compat      = koelsch_boards_compat_dt,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index d9cdf9a97e23..f2ef759b6e96 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -14,10 +14,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/delay.h>
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 77e36fa0b142..7c9b63bdde9f 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -11,10 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/delay.h>
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index bc4b48357dde..fa06bdba61df 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -12,100 +12,17 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/of_platform.h>
-#include <linux/platform_data/rcar-du.h>
 
 #include <asm/mach/arch.h>
 
-#include "clock.h"
 #include "common.h"
-#include "irqs.h"
 #include "r8a7790.h"
 #include "rcar-gen2.h"
 
-/* DU */
-static struct rcar_du_encoder_data lager_du_encoders[] = {
-        {
-                .type = RCAR_DU_ENCODER_VGA,
-                .output = RCAR_DU_OUTPUT_DPAD0,
-        }, {
-                .type = RCAR_DU_ENCODER_NONE,
-                .output = RCAR_DU_OUTPUT_LVDS1,
-                .connector.lvds.panel = {
-                        .width_mm = 210,
-                        .height_mm = 158,
-                        .mode = {
-                                .pixelclock = 65000000,
-                                .hactive = 1024,
-                                .hfront_porch = 20,
-                                .hback_porch = 160,
-                                .hsync_len = 136,
-                                .vactive = 768,
-                                .vfront_porch = 3,
-                                .vback_porch = 29,
-                                .vsync_len = 6,
-                        },
-                },
-        },
-};
-
-static struct rcar_du_platform_data lager_du_pdata = {
-        .encoders = lager_du_encoders,
-        .num_encoders = ARRAY_SIZE(lager_du_encoders),
-};
-
-static const struct resource du_resources[] __initconst = {
-        DEFINE_RES_MEM(0xfeb00000, 0x70000),
-        DEFINE_RES_MEM_NAMED(0xfeb90000, 0x1c, "lvds.0"),
-        DEFINE_RES_MEM_NAMED(0xfeb94000, 0x1c, "lvds.1"),
-        DEFINE_RES_IRQ(gic_spi(256)),
-        DEFINE_RES_IRQ(gic_spi(268)),
-        DEFINE_RES_IRQ(gic_spi(269)),
-};
-
-static void __init lager_add_du_device(void)
-{
-        struct platform_device_info info = {
-                .name = "rcar-du-r8a7790",
-                .id = -1,
-                .res = du_resources,
-                .num_res = ARRAY_SIZE(du_resources),
-                .data = &lager_du_pdata,
-                .size_data = sizeof(lager_du_pdata),
-                .dma_mask = DMA_BIT_MASK(32),
-        };
-
-        platform_device_register_full(&info);
-}
-
-/*
- * This is a really crude hack to provide clkdev support to platform
- * devices until they get moved to DT.
- */
-static const struct clk_name clk_names[] __initconst = {
-        { "du0", "du.0", "rcar-du-r8a7790" },
-        { "du1", "du.1", "rcar-du-r8a7790" },
-        { "du2", "du.2", "rcar-du-r8a7790" },
-        { "lvds0", "lvds.0", "rcar-du-r8a7790" },
-        { "lvds1", "lvds.1", "rcar-du-r8a7790" },
-};
-
-static void __init lager_add_standard_devices(void)
-{
-        shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-
-        lager_add_du_device();
-}
-
 static const char *lager_boards_compat_dt[] __initdata = {
         "renesas,lager",
         "renesas,lager-reference",
@@ -116,7 +33,6 @@ DT_MACHINE_START(LAGER_DT, "lager")
         .smp            = smp_ops(r8a7790_smp_ops),
         .init_early     = shmobile_init_delay,
         .init_time      = rcar_gen2_timer_init,
-        .init_machine   = lager_add_standard_devices,
         .init_late      = shmobile_init_late,
         .reserve        = rcar_gen2_reserve,
         .dt_compat      = lager_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 571327b1c942..b47262afb240 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -13,10 +13,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/gpio.h>
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index ca5d34b92aa7..ed1087031c5d 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -16,10 +16,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 38d9cdd26587..b15eb923263f 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -13,10 +13,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/clk/shmobile.h>
@@ -26,7 +22,6 @@
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 
-#include "clock.h"
 #include "common.h"
 #include "irqs.h"
 #include "r8a7779.h"
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index ce33d7825c49..994dc7d86ae2 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -13,10 +13,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-shmobile/clock-r8a73a4.c b/arch/arm/mach-shmobile/clock-r8a73a4.c
index c2330ea1802c..1cf44dc6d718 100644
--- a/arch/arm/mach-shmobile/clock-r8a73a4.c
+++ b/arch/arm/mach-shmobile/clock-r8a73a4.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/init.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index 19df9cb30495..9cac8247c72b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 67980a08a601..e8510c35558c 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -17,10 +17,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 /*
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index c51f9db3f66f..fa8ab2cc9187 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <linux/bitops.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index f62265200592..f9bbc5f0a9a1 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/init.h>
 #include <linux/io.h>
diff --git a/arch/arm/mach-shmobile/clock-r8a7791.c b/arch/arm/mach-shmobile/clock-r8a7791.c
deleted file mode 100644
index 453b23129cfa..000000000000
--- a/arch/arm/mach-shmobile/clock-r8a7791.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * r8a7791 clock framework support
- *
- * Copyright (C) 2013  Renesas Electronics Corporation
- * Copyright (C) 2013  Renesas Solutions Corp.
- * Copyright (C) 2013  Magnus Damm
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/sh_clk.h>
-#include <linux/clkdev.h>
-#include "clock.h"
-#include "common.h"
-#include "rcar-gen2.h"
-
-/*
- *   MD         EXTAL           PLL0    PLL1    PLL3
- * 14 13 19     (MHz)           *1      *1
- *---------------------------------------------------
- * 0  0  0      15 x 1          x172/2  x208/2  x106
- * 0  0  1      15 x 1          x172/2  x208/2  x88
- * 0  1  0      20 x 1          x130/2  x156/2  x80
- * 0  1  1      20 x 1          x130/2  x156/2  x66
- * 1  0  0      26 / 2          x200/2  x240/2  x122
- * 1  0  1      26 / 2          x200/2  x240/2  x102
- * 1  1  0      30 / 2          x172/2  x208/2  x106
- * 1  1  1      30 / 2          x172/2  x208/2  x88
- *
- * *1 : Table 7.6 indicates VCO ouput (PLLx = VCO/2)
- *      see "p1 / 2" on R8A7791_CLOCK_ROOT() below
- */
-
-#define CPG_BASE 0xe6150000
-#define CPG_LEN 0x1000
-
-#define SMSTPCR0        0xE6150130
-#define SMSTPCR1        0xE6150134
-#define SMSTPCR2        0xe6150138
-#define SMSTPCR3        0xE615013C
-#define SMSTPCR5        0xE6150144
-#define SMSTPCR7        0xe615014c
-#define SMSTPCR8        0xE6150990
-#define SMSTPCR9        0xE6150994
-#define SMSTPCR10       0xE6150998
-#define SMSTPCR11       0xE615099C
-
-#define MSTPSR1         IOMEM(0xe6150038)
-#define MSTPSR2         IOMEM(0xe6150040)
-#define MSTPSR3         IOMEM(0xe6150048)
-#define MSTPSR5         IOMEM(0xe615003c)
-#define MSTPSR7         IOMEM(0xe61501c4)
-#define MSTPSR8         IOMEM(0xe61509a0)
-#define MSTPSR9         IOMEM(0xe61509a4)
-#define MSTPSR11        IOMEM(0xe61509ac)
-
-#define SDCKCR          0xE6150074
-#define SD1CKCR         0xE6150078
-#define SD2CKCR         0xE615026c
-#define MMC0CKCR        0xE6150240
-#define MMC1CKCR        0xE6150244
-#define SSPCKCR         0xE6150248
-#define SSPRSCKCR       0xE615024C
-
-static struct clk_mapping cpg_mapping = {
-        .phys   = CPG_BASE,
-        .len    = CPG_LEN,
-};
-
-static struct clk extal_clk = {
-        /* .rate will be updated on r8a7791_clock_init() */
-        .mapping        = &cpg_mapping,
-};
-
-static struct sh_clk_ops followparent_clk_ops = {
-        .recalc = followparent_recalc,
-};
-
-static struct clk main_clk = {
-        /* .parent will be set r8a73a4_clock_init */
-        .ops    = &followparent_clk_ops,
-};
-
-/*
- * clock ratio of these clock will be updated
- * on r8a7791_clock_init()
- */
-SH_FIXED_RATIO_CLK_SET(pll1_clk,                main_clk,       1, 1);
-SH_FIXED_RATIO_CLK_SET(pll3_clk,                main_clk,       1, 1);
-SH_FIXED_RATIO_CLK_SET(qspi_clk,                pll1_clk,       1, 1);
-
-/* fixed ratio clock */
-SH_FIXED_RATIO_CLK_SET(extal_div2_clk,          extal_clk,      1, 2);
-SH_FIXED_RATIO_CLK_SET(cp_clk,                  extal_clk,      1, 2);
-
-SH_FIXED_RATIO_CLK_SET(pll1_div2_clk,           pll1_clk,       1, 2);
-SH_FIXED_RATIO_CLK_SET(hp_clk,                  pll1_clk,       1, 12);
-SH_FIXED_RATIO_CLK_SET(p_clk,                   pll1_clk,       1, 24);
-SH_FIXED_RATIO_CLK_SET(rclk_clk,                pll1_clk,       1, (48 * 1024));
-SH_FIXED_RATIO_CLK_SET(mp_clk,                  pll1_div2_clk,  1, 15);
-SH_FIXED_RATIO_CLK_SET(zg_clk,                  pll1_clk,       1, 3);
-SH_FIXED_RATIO_CLK_SET(zx_clk,                  pll1_clk,       1, 3);
-SH_FIXED_RATIO_CLK_SET(zs_clk,                  pll1_clk,       1, 6);
-
-static struct clk *main_clks[] = {
-        &extal_clk,
-        &extal_div2_clk,
-        &main_clk,
-        &pll1_clk,
-        &pll1_div2_clk,
-        &pll3_clk,
-        &hp_clk,
-        &p_clk,
-        &qspi_clk,
-        &rclk_clk,
-        &mp_clk,
-        &cp_clk,
-        &zg_clk,
-        &zx_clk,
-        &zs_clk,
-};
-
-/* SDHI (DIV4) clock */
-static int divisors[] = { 2, 3, 4, 6, 8, 12, 16, 18, 24, 0, 36, 48, 10 };
-
-static struct clk_div_mult_table div4_div_mult_table = {
-        .divisors = divisors,
-        .nr_divisors = ARRAY_SIZE(divisors),
-};
-
-static struct clk_div4_table div4_table = {
-        .div_mult_table = &div4_div_mult_table,
-};
-
-enum {
-        DIV4_SDH, DIV4_SD0,
-        DIV4_NR
-};
-
-static struct clk div4_clks[DIV4_NR] = {
-        [DIV4_SDH] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 8, 0x0dff, CLK_ENABLE_ON_INIT),
-        [DIV4_SD0] = SH_CLK_DIV4(&pll1_clk, SDCKCR, 4, 0x1df0, CLK_ENABLE_ON_INIT),
-};
-
-/* DIV6 clocks */
-enum {
-        DIV6_SD1, DIV6_SD2,
-        DIV6_NR
-};
-
-static struct clk div6_clks[DIV6_NR] = {
-        [DIV6_SD1]      = SH_CLK_DIV6(&pll1_div2_clk, SD1CKCR, 0),
-        [DIV6_SD2]      = SH_CLK_DIV6(&pll1_div2_clk, SD2CKCR, 0),
-};
-
-/* MSTP */
-enum {
-        MSTP1108, MSTP1107, MSTP1106,
-        MSTP931, MSTP930, MSTP929, MSTP928, MSTP927, MSTP925,
-        MSTP917,
-        MSTP815, MSTP814,
-        MSTP813,
-        MSTP811, MSTP810, MSTP809,
-        MSTP726, MSTP724, MSTP723, MSTP721, MSTP720,
-        MSTP719, MSTP718, MSTP715, MSTP714,
-        MSTP522,
-        MSTP314, MSTP312, MSTP311,
-        MSTP216, MSTP207, MSTP206,
-        MSTP204, MSTP203, MSTP202,
-        MSTP124,
-        MSTP_NR
-};
-
-static struct clk mstp_clks[MSTP_NR] = {
-        [MSTP1108] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR11, 8, MSTPSR11, 0), /* SCIFA5 */
-        [MSTP1107] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR11, 7, MSTPSR11, 0), /* SCIFA4 */
-        [MSTP1106] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR11, 6, MSTPSR11, 0), /* SCIFA3 */
-        [MSTP931] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 31, MSTPSR9, 0), /* I2C0 */
-        [MSTP930] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 30, MSTPSR9, 0), /* I2C1 */
-        [MSTP929] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 29, MSTPSR9, 0), /* I2C2 */
-        [MSTP928] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 28, MSTPSR9, 0), /* I2C3 */
-        [MSTP927] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 27, MSTPSR9, 0), /* I2C4 */
-        [MSTP925] = SH_CLK_MSTP32_STS(&hp_clk, SMSTPCR9, 25, MSTPSR9, 0), /* I2C5 */
-        [MSTP917] = SH_CLK_MSTP32_STS(&qspi_clk, SMSTPCR9, 17, MSTPSR9, 0), /* QSPI */
-        [MSTP815] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 15, MSTPSR8, 0), /* SATA0 */
-        [MSTP814] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR8, 14, MSTPSR8, 0), /* SATA1 */
-        [MSTP813] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR8, 13, MSTPSR8, 0), /* Ether */
-        [MSTP811] = SH_CLK_MSTP32_STS(&zg_clk, SMSTPCR8, 11, MSTPSR8, 0), /* VIN0 */
-        [MSTP810] = SH_CLK_MSTP32_STS(&zg_clk, SMSTPCR8, 10, MSTPSR8, 0), /* VIN1 */
-        [MSTP809] = SH_CLK_MSTP32_STS(&zg_clk, SMSTPCR8, 9, MSTPSR8, 0), /* VIN2 */
-        [MSTP726] = SH_CLK_MSTP32_STS(&zx_clk, SMSTPCR7, 26, MSTPSR7, 0), /* LVDS0 */
-        [MSTP724] = SH_CLK_MSTP32_STS(&zx_clk, SMSTPCR7, 24, MSTPSR7, 0), /* DU0 */
-        [MSTP723] = SH_CLK_MSTP32_STS(&zx_clk, SMSTPCR7, 23, MSTPSR7, 0), /* DU1 */
-        [MSTP721] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR7, 21, MSTPSR7, 0), /* SCIF0 */
-        [MSTP720] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR7, 20, MSTPSR7, 0), /* SCIF1 */
-        [MSTP719] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR7, 19, MSTPSR7, 0), /* SCIF2 */
-        [MSTP718] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR7, 18, MSTPSR7, 0), /* SCIF3 */
-        [MSTP715] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR7, 15, MSTPSR7, 0), /* SCIF4 */
-        [MSTP714] = SH_CLK_MSTP32_STS(&p_clk, SMSTPCR7, 14, MSTPSR7, 0), /* SCIF5 */
-        [MSTP522] = SH_CLK_MSTP32_STS(&extal_clk, SMSTPCR5, 22, MSTPSR5, 0), /* Thermal */
-        [MSTP314] = SH_CLK_MSTP32_STS(&div4_clks[DIV4_SD0], SMSTPCR3, 14, MSTPSR3, 0), /* SDHI0 */
-        [MSTP312] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD1], SMSTPCR3, 12, MSTPSR3, 0), /* SDHI1 */
-        [MSTP311] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_SD2], SMSTPCR3, 11, MSTPSR3, 0), /* SDHI2 */
-        [MSTP216] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 16, MSTPSR2, 0), /* SCIFB2 */
-        [MSTP207] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 7, MSTPSR2, 0), /* SCIFB1 */
-        [MSTP206] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 6, MSTPSR2, 0), /* SCIFB0 */
-        [MSTP204] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 4, MSTPSR2, 0), /* SCIFA0 */
-        [MSTP203] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 3, MSTPSR2, 0), /* SCIFA1 */
-        [MSTP202] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR2, 2, MSTPSR2, 0), /* SCIFA2 */
-        [MSTP124] = SH_CLK_MSTP32_STS(&rclk_clk, SMSTPCR1, 24, MSTPSR1, 0), /* CMT0 */
-};
-
-static struct clk_lookup lookups[] = {
-
-        /* main clocks */
-        CLKDEV_CON_ID("extal",          &extal_clk),
-        CLKDEV_CON_ID("extal_div2",     &extal_div2_clk),
-        CLKDEV_CON_ID("main",           &main_clk),
-        CLKDEV_CON_ID("pll1",           &pll1_clk),
-        CLKDEV_CON_ID("pll1_div2",      &pll1_div2_clk),
-        CLKDEV_CON_ID("pll3",           &pll3_clk),
-        CLKDEV_CON_ID("zg",             &zg_clk),
-        CLKDEV_CON_ID("zs",             &zs_clk),
-        CLKDEV_CON_ID("hp",             &hp_clk),
-        CLKDEV_CON_ID("p",              &p_clk),
-        CLKDEV_CON_ID("qspi",           &qspi_clk),
-        CLKDEV_CON_ID("rclk",           &rclk_clk),
-        CLKDEV_CON_ID("mp",             &mp_clk),
-        CLKDEV_CON_ID("cp",             &cp_clk),
-        CLKDEV_CON_ID("peripheral_clk", &hp_clk),
-
-        /* MSTP */
-        CLKDEV_ICK_ID("lvds.0", "rcar-du-r8a7791", &mstp_clks[MSTP726]),
-        CLKDEV_ICK_ID("du.0", "rcar-du-r8a7791", &mstp_clks[MSTP724]),
-        CLKDEV_ICK_ID("du.1", "rcar-du-r8a7791", &mstp_clks[MSTP723]),
-        CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */
-        CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]), /* SCIFA1 */
-        CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP206]), /* SCIFB0 */
-        CLKDEV_DEV_ID("sh-sci.3", &mstp_clks[MSTP207]), /* SCIFB1 */
-        CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]), /* SCIFB2 */
-        CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP202]), /* SCIFA2 */
-        CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP721]), /* SCIF0 */
-        CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]), /* SCIF1 */
-        CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP719]), /* SCIF2 */
-        CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP718]), /* SCIF3 */
-        CLKDEV_DEV_ID("sh-sci.10", &mstp_clks[MSTP715]), /* SCIF4 */
-        CLKDEV_DEV_ID("sh-sci.11", &mstp_clks[MSTP714]), /* SCIF5 */
-        CLKDEV_DEV_ID("sh-sci.12", &mstp_clks[MSTP1106]), /* SCIFA3 */
-        CLKDEV_DEV_ID("sh-sci.13", &mstp_clks[MSTP1107]), /* SCIFA4 */
-        CLKDEV_DEV_ID("sh-sci.14", &mstp_clks[MSTP1108]), /* SCIFA5 */
-        CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]),
-        CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP312]),
-        CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP311]),
-        CLKDEV_ICK_ID("fck", "sh-cmt-48-gen2.0", &mstp_clks[MSTP124]),
-        CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),
-        CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
-        CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),
-        CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),
-        CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),
-        CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]),
-        CLKDEV_DEV_ID("i2c-rcar_gen2.4", &mstp_clks[MSTP927]),
-        CLKDEV_DEV_ID("i2c-rcar_gen2.5", &mstp_clks[MSTP925]),
-        CLKDEV_DEV_ID("r8a7791-ether", &mstp_clks[MSTP813]), /* Ether */
-        CLKDEV_DEV_ID("r8a7791-vin.0", &mstp_clks[MSTP811]),
-        CLKDEV_DEV_ID("r8a7791-vin.1", &mstp_clks[MSTP810]),
-        CLKDEV_DEV_ID("r8a7791-vin.2", &mstp_clks[MSTP809]),
-        CLKDEV_DEV_ID("sata-r8a7791.0", &mstp_clks[MSTP815]),
-        CLKDEV_DEV_ID("sata-r8a7791.1", &mstp_clks[MSTP814]),
-};
-
-#define R8A7791_CLOCK_ROOT(e, m, p0, p1, p30, p31)              \
-        extal_clk.rate  = e * 1000 * 1000;                      \
-        main_clk.parent = m;                                    \
-        SH_CLK_SET_RATIO(&pll1_clk_ratio, p1 / 2, 1);           \
-        if (mode & MD(19))                                      \
-                SH_CLK_SET_RATIO(&pll3_clk_ratio, p31, 1);      \
-        else                                                    \
-                SH_CLK_SET_RATIO(&pll3_clk_ratio, p30, 1)
-
-
-void __init r8a7791_clock_init(void)
-{
-        u32 mode = rcar_gen2_read_mode_pins();
-        int k, ret = 0;
-
-        switch (mode & (MD(14) | MD(13))) {
-        case 0:
-                R8A7791_CLOCK_ROOT(15, &extal_clk, 172, 208, 106, 88);
-                break;
-        case MD(13):
-                R8A7791_CLOCK_ROOT(20, &extal_clk, 130, 156, 80, 66);
-                break;
-        case MD(14):
-                R8A7791_CLOCK_ROOT(26, &extal_div2_clk, 200, 240, 122, 102);
-                break;
-        case MD(13) | MD(14):
-                R8A7791_CLOCK_ROOT(30, &extal_div2_clk, 172, 208, 106, 88);
-                break;
-        }
-
-        if ((mode & (MD(3) | MD(2) | MD(1))) == MD(2))
-                SH_CLK_SET_RATIO(&qspi_clk_ratio, 1, 16);
-        else
-                SH_CLK_SET_RATIO(&qspi_clk_ratio, 1, 20);
-
-        for (k = 0; !ret && (k < ARRAY_SIZE(main_clks)); k++)
-                ret = clk_register(main_clks[k]);
-
-        if (!ret)
-                ret = sh_clk_div4_register(div4_clks, DIV4_NR, &div4_table);
-
-        if (!ret)
-                ret = sh_clk_div6_register(div6_clks, DIV6_NR);
-
-        if (!ret)
-                ret = sh_clk_mstp_register(mstp_clks, MSTP_NR);
-
-        clkdev_add_table(lookups, ARRAY_SIZE(lookups));
-
-        if (!ret)
-                shmobile_clk_init();
-        else
-                goto epanic;
-
-        return;
-
-epanic:
-        panic("failed to setup r8a7791 clocks\n");
-}
diff --git a/arch/arm/mach-shmobile/clock-sh7372.c b/arch/arm/mach-shmobile/clock-sh7372.c
index 7071676145c4..3bc92f46060e 100644
--- a/arch/arm/mach-shmobile/clock-sh7372.c
+++ b/arch/arm/mach-shmobile/clock-sh7372.c
@@ -11,10 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index 02a6f45a0b9e..6b4c1f313cc9 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -11,10 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <linux/init.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c
index 806f94038cc4..34f056fc3756 100644
--- a/arch/arm/mach-shmobile/clock.c
+++ b/arch/arm/mach-shmobile/clock.c
@@ -14,41 +14,13 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
+
+#include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-
-#ifdef CONFIG_COMMON_CLK
-#include <linux/clk.h>
-#include <linux/clkdev.h>
-#include "clock.h"
-
-void __init shmobile_clk_workaround(const struct clk_name *clks,
-                                    int nr_clks, bool enable)
-{
-        const struct clk_name *clkn;
-        struct clk *clk;
-        unsigned int i;
-
-        for (i = 0; i < nr_clks; ++i) {
-                clkn = clks + i;
-                clk = clk_get(NULL, clkn->clk);
-                if (!IS_ERR(clk)) {
-                        clk_register_clkdev(clk, clkn->con_id, clkn->dev_id);
-                        if (enable)
-                                clk_prepare_enable(clk);
-                        clk_put(clk);
-                }
-        }
-}
-
-#else /* CONFIG_COMMON_CLK */
 #include <linux/sh_clk.h>
-#include <linux/export.h>
+
 #include "clock.h"
 #include "common.h"
 
@@ -84,5 +56,3 @@ void __clk_put(struct clk *clk)
 {
 }
 EXPORT_SYMBOL(__clk_put);
-
-#endif /* CONFIG_COMMON_CLK */
diff --git a/arch/arm/mach-shmobile/clock.h b/arch/arm/mach-shmobile/clock.h
index 31b6417463e6..cf3552ea1019 100644
--- a/arch/arm/mach-shmobile/clock.h
+++ b/arch/arm/mach-shmobile/clock.h
@@ -1,19 +1,6 @@
 #ifndef CLOCK_H
 #define CLOCK_H
 
-#ifdef CONFIG_COMMON_CLK
-/* temporary clock configuration helper for platform devices */
-
-struct clk_name {
-        const char *clk;
-        const char *con_id;
-        const char *dev_id;
-};
-
-void shmobile_clk_workaround(const struct clk_name *clks, int nr_clks,
-                             bool enable);
-
-#else /* CONFIG_COMMON_CLK */
 /* legacy clock implementation */
 
 struct clk;
@@ -52,5 +39,4 @@ do {			\
         (p)->div = d;   \
 } while (0)
 
-#endif /* CONFIG_COMMON_CLK */
 #endif
diff --git a/arch/arm/mach-shmobile/console.c b/arch/arm/mach-shmobile/console.c
index f2e79f2376e1..e329ccbd0a67 100644
--- a/arch/arm/mach-shmobile/console.c
+++ b/arch/arm/mach-shmobile/console.c
@@ -11,10 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S
index f45dde701d7b..69df8bfac167 100644
--- a/arch/arm/mach-shmobile/headsmp-scu.S
+++ b/arch/arm/mach-shmobile/headsmp-scu.S
@@ -12,11 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #include <linux/linkage.h>
diff --git a/arch/arm/mach-shmobile/intc-sh7372.c b/arch/arm/mach-shmobile/intc-sh7372.c
index e2af00b1bd9d..1ccf49cb485f 100644
--- a/arch/arm/mach-shmobile/intc-sh7372.c
+++ b/arch/arm/mach-shmobile/intc-sh7372.c
@@ -11,10 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-shmobile/intc-sh73a0.c b/arch/arm/mach-shmobile/intc-sh73a0.c
index 44457a94897b..9e3618028acc 100644
--- a/arch/arm/mach-shmobile/intc-sh73a0.c
+++ b/arch/arm/mach-shmobile/intc-sh73a0.c
@@ -11,10 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-shmobile/r8a7740.h b/arch/arm/mach-shmobile/r8a7740.h
index f369b4b0863d..ca7805ad7ea3 100644
--- a/arch/arm/mach-shmobile/r8a7740.h
+++ b/arch/arm/mach-shmobile/r8a7740.h
@@ -10,10 +10,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __ASM_R8A7740_H__
diff --git a/arch/arm/mach-shmobile/r8a7778.h b/arch/arm/mach-shmobile/r8a7778.h
index f4076a50e970..f64fedb1f2cc 100644
--- a/arch/arm/mach-shmobile/r8a7778.h
+++ b/arch/arm/mach-shmobile/r8a7778.h
@@ -11,10 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #ifndef __ASM_R8A7778_H__
 #define __ASM_R8A7778_H__
@@ -71,7 +67,6 @@ extern void r8a7778_add_standard_devices_dt(void);
 extern void r8a7778_add_dt_devices(void);
 
 extern void r8a7778_init_late(void);
-extern void r8a7778_init_delay(void);
 extern void r8a7778_init_irq_dt(void);
 extern void r8a7778_clock_init(void);
 extern void r8a7778_init_irq_extpin(int irlm);
diff --git a/arch/arm/mach-shmobile/r8a7791.h b/arch/arm/mach-shmobile/r8a7791.h
index c1bf7abefa5a..6cf11eb69d10 100644
--- a/arch/arm/mach-shmobile/r8a7791.h
+++ b/arch/arm/mach-shmobile/r8a7791.h
@@ -1,9 +1,6 @@
 #ifndef __ASM_R8A7791_H__
 #define __ASM_R8A7791_H__
 
-void r8a7791_add_standard_devices(void);
-void r8a7791_clock_init(void);
-void r8a7791_pinmux_init(void);
 void r8a7791_pm_init(void);
 extern struct smp_operations r8a7791_smp_ops;
 
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index b06a9e8f59a5..aad97be9cbe1 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -11,10 +11,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index 4122104359f9..171174777b6f 100644
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 53f40b70680d..b88b88a40a3c 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/irq.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 8894e1b7ab0e..fe15dd26d15d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 85fe016d6a87..45bd3588fa15 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -13,10 +13,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/kernel.h>
@@ -572,11 +568,6 @@ void __init r8a7778_init_irq_extpin(int irlm)
                         &irqpin_platform_data, sizeof(irqpin_platform_data));
 }
 
-void __init r8a7778_init_delay(void)
-{
-        shmobile_init_delay();
-}
-
 #ifdef CONFIG_USE_OF
 #define INT2SMSKCR0     0x82288 /* 0xfe782288 */
 #define INT2SMSKCR1     0x8228c /* 0xfe78228c */
@@ -608,7 +599,7 @@ static const char *r8a7778_compat_dt[] __initdata = {
 };
 
 DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
-        .init_early     = r8a7778_init_delay,
+        .init_early     = shmobile_init_delay,
         .init_irq       = r8a7778_init_irq_dt,
         .init_late      = shmobile_init_late,
         .dt_compat      = r8a7778_compat_dt,
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 136078ab9407..645d7cca6238 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -13,10 +13,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -52,14 +48,14 @@
 #include "r8a7779.h"
 
 static struct map_desc r8a7779_io_desc[] __initdata = {
-        /* 2M entity map for 0xf0000000 (MPCORE) */
+        /* 2M identity mapping for 0xf0000000 (MPCORE) */
         {
                 .virtual        = 0xf0000000,
                 .pfn            = __phys_to_pfn(0xf0000000),
                 .length         = SZ_2M,
                 .type           = MT_DEVICE_NONSHARED
         },
-        /* 16M entity map for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */
+        /* 16M identity mapping for 0xfexxxxxx (DMAC-S/HPBREG/INTC2/LRAM/DBSC) */
         {
                 .virtual        = 0xfe000000,
                 .pfn            = __phys_to_pfn(0xfe000000),
@@ -683,7 +679,7 @@ void __init r8a7779_add_early_devices(void)
 
         /* Early serial console setup is not included here due to
          * memory map collisions. The SCIF serial ports in r8a7779
-         * are difficult to entity map 1:1 due to collision with the
+         * are difficult to identity map 1:1 due to collision with the
          * virtual memory range used by the coherent DMA code on ARM.
          *
          * Anyone wanting to debug early can remove UPF_IOREMAP from
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 877fdeb985d0..ec7d97dca4de 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/irq.h>
diff --git a/arch/arm/mach-shmobile/setup-r8a7791.c b/arch/arm/mach-shmobile/setup-r8a7791.c
index 35d78639244f..ef8eb3af586d 100644
--- a/arch/arm/mach-shmobile/setup-r8a7791.c
+++ b/arch/arm/mach-shmobile/setup-r8a7791.c
@@ -13,198 +13,16 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/irq.h>
-#include <linux/kernel.h>
-#include <linux/of_platform.h>
-#include <linux/platform_data/gpio-rcar.h>
-#include <linux/platform_data/irq-renesas-irqc.h>
-#include <linux/serial_sci.h>
-#include <linux/sh_timer.h>
+#include <linux/init.h>
 
 #include <asm/mach/arch.h>
 
 #include "common.h"
-#include "irqs.h"
 #include "r8a7791.h"
 #include "rcar-gen2.h"
 
-static const struct resource pfc_resources[] __initconst = {
-        DEFINE_RES_MEM(0xe6060000, 0x250),
-};
-
-#define r8a7791_register_pfc()                                          \
-        platform_device_register_simple("pfc-r8a7791", -1, pfc_resources, \
-                                        ARRAY_SIZE(pfc_resources))
-
-#define R8A7791_GPIO(idx, base, nr)                                     \
-static const struct resource r8a7791_gpio##idx##_resources[] __initconst = { \
-        DEFINE_RES_MEM((base), 0x50),                                   \
-        DEFINE_RES_IRQ(gic_spi(4 + (idx))),                             \
-};                                                                      \
-                                                                        \
-static const struct gpio_rcar_config                                    \
-r8a7791_gpio##idx##_platform_data __initconst = {                       \
-        .gpio_base      = 32 * (idx),                                   \
-        .irq_base       = 0,                                            \
-        .number_of_pins = (nr),                                         \
-        .pctl_name      = "pfc-r8a7791",                                \
-        .has_both_edge_trigger = 1,                                     \
-};                                                                      \
-
-R8A7791_GPIO(0, 0xe6050000, 32);
-R8A7791_GPIO(1, 0xe6051000, 32);
-R8A7791_GPIO(2, 0xe6052000, 32);
-R8A7791_GPIO(3, 0xe6053000, 32);
-R8A7791_GPIO(4, 0xe6054000, 32);
-R8A7791_GPIO(5, 0xe6055000, 32);
-R8A7791_GPIO(6, 0xe6055400, 32);
-R8A7791_GPIO(7, 0xe6055800, 26);
-
-#define r8a7791_register_gpio(idx)                                      \
-        platform_device_register_resndata(NULL, "gpio_rcar", idx,       \
-                r8a7791_gpio##idx##_resources,                          \
-                ARRAY_SIZE(r8a7791_gpio##idx##_resources),              \
-                &r8a7791_gpio##idx##_platform_data,                     \
-                sizeof(r8a7791_gpio##idx##_platform_data))
-
-void __init r8a7791_pinmux_init(void)
-{
-        r8a7791_register_pfc();
-        r8a7791_register_gpio(0);
-        r8a7791_register_gpio(1);
-        r8a7791_register_gpio(2);
-        r8a7791_register_gpio(3);
-        r8a7791_register_gpio(4);
-        r8a7791_register_gpio(5);
-        r8a7791_register_gpio(6);
-        r8a7791_register_gpio(7);
-}
-
-#define __R8A7791_SCIF(scif_type, index, baseaddr, irq)                 \
-static struct plat_sci_port scif##index##_platform_data = {             \
-        .type           = scif_type,                                    \
-        .flags          = UPF_BOOT_AUTOCONF | UPF_IOREMAP,              \
-        .scscr          = SCSCR_RE | SCSCR_TE,                          \
-};                                                                      \
-                                                                        \
-static struct resource scif##index##_resources[] = {                    \
-        DEFINE_RES_MEM(baseaddr, 0x100),                                \
-        DEFINE_RES_IRQ(irq),                                            \
-}
-
-#define R8A7791_SCIF(index, baseaddr, irq)                              \
-        __R8A7791_SCIF(PORT_SCIF, index, baseaddr, irq)
-
-#define R8A7791_SCIFA(index, baseaddr, irq)                             \
-        __R8A7791_SCIF(PORT_SCIFA, index, baseaddr, irq)
-
-#define R8A7791_SCIFB(index, baseaddr, irq)                             \
-        __R8A7791_SCIF(PORT_SCIFB, index, baseaddr, irq)
-
-R8A7791_SCIFA(0,  0xe6c40000, gic_spi(144)); /* SCIFA0 */
-R8A7791_SCIFA(1,  0xe6c50000, gic_spi(145)); /* SCIFA1 */
-R8A7791_SCIFB(2,  0xe6c20000, gic_spi(148)); /* SCIFB0 */
-R8A7791_SCIFB(3,  0xe6c30000, gic_spi(149)); /* SCIFB1 */
-R8A7791_SCIFB(4,  0xe6ce0000, gic_spi(150)); /* SCIFB2 */
-R8A7791_SCIFA(5,  0xe6c60000, gic_spi(151)); /* SCIFA2 */
-R8A7791_SCIF(6,   0xe6e60000, gic_spi(152)); /* SCIF0 */
-R8A7791_SCIF(7,   0xe6e68000, gic_spi(153)); /* SCIF1 */
-R8A7791_SCIF(8,   0xe6e58000, gic_spi(22)); /* SCIF2 */
-R8A7791_SCIF(9,   0xe6ea8000, gic_spi(23)); /* SCIF3 */
-R8A7791_SCIF(10,  0xe6ee0000, gic_spi(24)); /* SCIF4 */
-R8A7791_SCIF(11,  0xe6ee8000, gic_spi(25)); /* SCIF5 */
-R8A7791_SCIFA(12, 0xe6c70000, gic_spi(29)); /* SCIFA3 */
-R8A7791_SCIFA(13, 0xe6c78000, gic_spi(30)); /* SCIFA4 */
-R8A7791_SCIFA(14, 0xe6c80000, gic_spi(31)); /* SCIFA5 */
-
-#define r8a7791_register_scif(index)                                           \
-        platform_device_register_resndata(NULL, "sh-sci", index,               \
-                                          scif##index##_resources,             \
-                                          ARRAY_SIZE(scif##index##_resources), \
-                                          &scif##index##_platform_data,        \
-                                          sizeof(scif##index##_platform_data))
-
-static struct sh_timer_config cmt0_platform_data = {
-        .channels_mask = 0x60,
-};
-
-static struct resource cmt0_resources[] = {
-        DEFINE_RES_MEM(0xffca0000, 0x1004),
-        DEFINE_RES_IRQ(gic_spi(142)),
-};
-
-#define r8a7791_register_cmt(idx)                                       \
-        platform_device_register_resndata(NULL, "sh-cmt-48-gen2",       \
-                                          idx, cmt##idx##_resources,    \
-                                          ARRAY_SIZE(cmt##idx##_resources), \
-                                          &cmt##idx##_platform_data,    \
-                                          sizeof(struct sh_timer_config))
-
-static struct renesas_irqc_config irqc0_data = {
-        .irq_base = irq_pin(0), /* IRQ0 -> IRQ9 */
-};
-
-static struct resource irqc0_resources[] = {
-        DEFINE_RES_MEM(0xe61c0000, 0x200), /* IRQC Event Detector Block_0 */
-        DEFINE_RES_IRQ(gic_spi(0)), /* IRQ0 */
-        DEFINE_RES_IRQ(gic_spi(1)), /* IRQ1 */
-        DEFINE_RES_IRQ(gic_spi(2)), /* IRQ2 */
-        DEFINE_RES_IRQ(gic_spi(3)), /* IRQ3 */
-        DEFINE_RES_IRQ(gic_spi(12)), /* IRQ4 */
-        DEFINE_RES_IRQ(gic_spi(13)), /* IRQ5 */
-        DEFINE_RES_IRQ(gic_spi(14)), /* IRQ6 */
-        DEFINE_RES_IRQ(gic_spi(15)), /* IRQ7 */
-        DEFINE_RES_IRQ(gic_spi(16)), /* IRQ8 */
-        DEFINE_RES_IRQ(gic_spi(17)), /* IRQ9 */
-};
-
-#define r8a7791_register_irqc(idx)                                      \
-        platform_device_register_resndata(NULL, "renesas_irqc",         \
-                                          idx, irqc##idx##_resources,   \
-                                          ARRAY_SIZE(irqc##idx##_resources), \
-                                          &irqc##idx##_data,            \
-                                          sizeof(struct renesas_irqc_config))
-
-static const struct resource thermal_resources[] __initconst = {
-        DEFINE_RES_MEM(0xe61f0000, 0x14),
-        DEFINE_RES_MEM(0xe61f0100, 0x38),
-        DEFINE_RES_IRQ(gic_spi(69)),
-};
-
-#define r8a7791_register_thermal()                                      \
-        platform_device_register_simple("rcar_thermal", -1,             \
-                                        thermal_resources,              \
-                                        ARRAY_SIZE(thermal_resources))
-
-void __init r8a7791_add_standard_devices(void)
-{
-        r8a7791_register_scif(0);
-        r8a7791_register_scif(1);
-        r8a7791_register_scif(2);
-        r8a7791_register_scif(3);
-        r8a7791_register_scif(4);
-        r8a7791_register_scif(5);
-        r8a7791_register_scif(6);
-        r8a7791_register_scif(7);
-        r8a7791_register_scif(8);
-        r8a7791_register_scif(9);
-        r8a7791_register_scif(10);
-        r8a7791_register_scif(11);
-        r8a7791_register_scif(12);
-        r8a7791_register_scif(13);
-        r8a7791_register_scif(14);
-        r8a7791_register_cmt(0);
-        r8a7791_register_irqc(0);
-        r8a7791_register_thermal();
-}
-
-#ifdef CONFIG_USE_OF
 static const char *r8a7791_boards_compat_dt[] __initdata = {
         "renesas,r8a7791",
         NULL,
@@ -218,4 +36,3 @@ DT_MACHINE_START(R8A7791_DT, "Generic R8A7791 (Flattened Device Tree)")
         .reserve        = rcar_gen2_reserve,
         .dt_compat      = r8a7791_boards_compat_dt,
 MACHINE_END
-#endif /* CONFIG_USE_OF */
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 42d5b4308923..a669377aea57 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <linux/clk/shmobile.h>
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index d646c8d12423..ca2b80b9bc90 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -47,7 +43,7 @@
 #include "sh7372.h"
 
 static struct map_desc sh7372_io_desc[] __initdata = {
-        /* create a 1:1 entity map for 0xe6xxxxxx
+        /* create a 1:1 identity mapping for 0xe6xxxxxx
          * used by CPGA, INTC and PFC.
          */
         {
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 328657d011d5..1ff4bd65e647 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -13,10 +13,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -46,7 +42,7 @@
 #include "sh73a0.h"
 
 static struct map_desc sh73a0_io_desc[] __initdata = {
-        /* create a 1:1 entity map for 0xe6xxxxxx
+        /* create a 1:1 identity mapping for 0xe6xxxxxx
          * used by CPGA, INTC and PFC.
          */
         {
@@ -760,17 +756,12 @@ void __init sh73a0_add_standard_devices(void)
                             ARRAY_SIZE(sh73a0_late_devices));
 }
 
-void __init sh73a0_init_delay(void)
-{
-        shmobile_init_delay();
-}
-
 /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
 void __init __weak sh73a0_register_twd(void) { }
 
 void __init sh73a0_earlytimer_init(void)
 {
-        sh73a0_init_delay();
+        shmobile_init_delay();
         sh73a0_clock_init();
         shmobile_earlytimer_init();
         sh73a0_register_twd();
@@ -803,7 +794,7 @@ static const char *sh73a0_boards_compat_dt[] __initdata = {
 DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
         .smp            = smp_ops(sh73a0_smp_ops),
         .map_io         = sh73a0_map_io,
-        .init_early     = sh73a0_init_delay,
+        .init_early     = shmobile_init_delay,
         .init_machine   = sh73a0_add_standard_devices_dt,
         .init_late      = shmobile_init_late,
         .dt_compat      = sh73a0_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/sh73a0.h b/arch/arm/mach-shmobile/sh73a0.h
index 359b582dc270..f037c64b14fc 100644
--- a/arch/arm/mach-shmobile/sh73a0.h
+++ b/arch/arm/mach-shmobile/sh73a0.h
@@ -71,7 +71,6 @@ enum {
 #define SH73A0_PINT0_IRQ(irq) ((irq) + 700)
 #define SH73A0_PINT1_IRQ(irq) ((irq) + 732)
 
-extern void sh73a0_init_delay(void);
 extern void sh73a0_init_irq(void);
 extern void sh73a0_init_irq_dt(void);
 extern void sh73a0_map_io(void);
diff --git a/arch/arm/mach-shmobile/sleep-sh7372.S b/arch/arm/mach-shmobile/sleep-sh7372.S
index 9782862899e8..146b8de16432 100644
--- a/arch/arm/mach-shmobile/sleep-sh7372.S
+++ b/arch/arm/mach-shmobile/sleep-sh7372.S
@@ -22,11 +22,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR /PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #include <linux/linkage.h>
diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index 6ff1df1df9a7..baff3b5efed8 100644
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 3100e355c3fd..3f761f839043 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index 22d8f87b23e9..c16dbfe9836c 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -12,10 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index 87c6be1e79bd..1081b763e0f3 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -12,11 +12,6 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
  */
 #include <linux/platform_device.h>
 #include <linux/clocksource.h>
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index b2cfba16c4e8..d6b16d9a7838 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -16,6 +16,7 @@ menuconfig ARCH_VEXPRESS
         select POWER_RESET
         select POWER_RESET_VEXPRESS
         select POWER_SUPPLY
+        select REGULATOR if MMC_ARMMMCI
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select VEXPRESS_CONFIG
         select VEXPRESS_SYSCFG
@@ -49,9 +50,6 @@ config ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA
           build a working kernel, you must also enable relevant core
           tile support or Flattened Device Tree based support options.
 
-config ARCH_VEXPRESS_CA9X4
-        bool "Versatile Express Cortex-A9x4 tile"
-
 config ARCH_VEXPRESS_DCSCB
         bool "Dual Cluster System Control Block (DCSCB) support"
         depends on MCPM
diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile
index fc649bc09d0c..f5c1006dd6a1 100644
--- a/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@ -1,11 +1,10 @@
 #
 # Makefile for the linux kernel.
 #
-ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := \
         -I$(srctree)/arch/arm/plat-versatile/include
 
 obj-y                                   := v2m.o
-obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)       += ct-ca9x4.o
 obj-$(CONFIG_ARCH_VEXPRESS_DCSCB)       += dcscb.o      dcscb_setup.o
 CFLAGS_dcscb.o                          += -march=armv7-a
 CFLAGS_REMOVE_dcscb.o                   = -pg
diff --git a/arch/arm/mach-vexpress/core.h b/arch/arm/mach-vexpress/core.h
index 152fad91b3ae..2a11d3ac8c68 100644
--- a/arch/arm/mach-vexpress/core.h
+++ b/arch/arm/mach-vexpress/core.h
@@ -1,12 +1,5 @@
-/* 2MB large area for motherboard's peripherals static mapping */
-#define V2M_PERIPH 0xf8000000
-
-/* Tile's peripherals static mappings should start here */
-#define V2T_PERIPH 0xf8200000
-
 bool vexpress_smp_init_ops(void);
 
-extern struct smp_operations    vexpress_smp_ops;
 extern struct smp_operations    vexpress_smp_dt_ops;
 
 extern void vexpress_cpu_die(unsigned int cpu);
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c
deleted file mode 100644
index 27bea049380a..000000000000
--- a/arch/arm/mach-vexpress/ct-ca9x4.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Versatile Express Core Tile Cortex A9x4 Support
- */
-#include <linux/init.h>
-#include <linux/gfp.h>
-#include <linux/device.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/clcd.h>
-#include <linux/platform_data/video-clcd-versatile.h>
-#include <linux/clkdev.h>
-#include <linux/vexpress.h>
-#include <linux/irqchip/arm-gic.h>
-
-#include <asm/hardware/arm_timer.h>
-#include <asm/hardware/cache-l2x0.h>
-#include <asm/smp_scu.h>
-#include <asm/smp_twd.h>
-
-#include <mach/ct-ca9x4.h>
-
-#include <asm/hardware/timer-sp.h>
-
-#include <asm/mach/map.h>
-#include <asm/mach/time.h>
-
-#include "core.h"
-
-#include <mach/motherboard.h>
-#include <mach/irqs.h>
-
-static struct map_desc ct_ca9x4_io_desc[] __initdata = {
-        {
-                .virtual        = V2T_PERIPH,
-                .pfn            = __phys_to_pfn(CT_CA9X4_MPIC),
-                .length         = SZ_8K,
-                .type           = MT_DEVICE,
-        },
-};
-
-static void __init ct_ca9x4_map_io(void)
-{
-        iotable_init(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
-}
-
-static void __init ca9x4_l2_init(void)
-{
-#ifdef CONFIG_CACHE_L2X0
-        void __iomem *l2x0_base = ioremap(CT_CA9X4_L2CC, SZ_4K);
-
-        if (l2x0_base) {
-                /* set RAM latencies to 1 cycle for this core tile. */
-                writel(0, l2x0_base + L310_TAG_LATENCY_CTRL);
-                writel(0, l2x0_base + L310_DATA_LATENCY_CTRL);
-
-                l2x0_init(l2x0_base, 0x00400000, 0xfe0fffff);
-        } else {
-                pr_err("L2C: unable to map L2 cache controller\n");
-        }
-#endif
-}
-
-#ifdef CONFIG_HAVE_ARM_TWD
-static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, A9_MPCORE_TWD, IRQ_LOCALTIMER);
-
-static void __init ca9x4_twd_init(void)
-{
-        int err = twd_local_timer_register(&twd_local_timer);
-        if (err)
-                pr_err("twd_local_timer_register failed %d\n", err);
-}
-#else
-#define ca9x4_twd_init()        do {} while(0)
-#endif
-
-static void __init ct_ca9x4_init_irq(void)
-{
-        gic_init(0, 29, ioremap(A9_MPCORE_GIC_DIST, SZ_4K),
-                 ioremap(A9_MPCORE_GIC_CPU, SZ_256));
-        ca9x4_twd_init();
-        ca9x4_l2_init();
-}
-
-static int ct_ca9x4_clcd_setup(struct clcd_fb *fb)
-{
-        unsigned long framesize = 1024 * 768 * 2;
-
-        fb->panel = versatile_clcd_get_panel("XVGA");
-        if (!fb->panel)
-                return -EINVAL;
-
-        return versatile_clcd_setup_dma(fb, framesize);
-}
-
-static struct clcd_board ct_ca9x4_clcd_data = {
-        .name           = "CT-CA9X4",
-        .caps           = CLCD_CAP_5551 | CLCD_CAP_565,
-        .check          = clcdfb_check,
-        .decode         = clcdfb_decode,
-        .setup          = ct_ca9x4_clcd_setup,
-        .mmap           = versatile_clcd_mmap_dma,
-        .remove         = versatile_clcd_remove_dma,
-};
-
-static AMBA_AHB_DEVICE(clcd, "ct:clcd", 0, CT_CA9X4_CLCDC, IRQ_CT_CA9X4_CLCDC, &ct_ca9x4_clcd_data);
-static AMBA_APB_DEVICE(dmc, "ct:dmc", 0, CT_CA9X4_DMC, IRQ_CT_CA9X4_DMC, NULL);
-static AMBA_APB_DEVICE(smc, "ct:smc", 0, CT_CA9X4_SMC, IRQ_CT_CA9X4_SMC, NULL);
-static AMBA_APB_DEVICE(gpio, "ct:gpio", 0, CT_CA9X4_GPIO, IRQ_CT_CA9X4_GPIO, NULL);
-
-static struct amba_device *ct_ca9x4_amba_devs[] __initdata = {
-        &clcd_device,
-        &dmc_device,
-        &smc_device,
-        &gpio_device,
-};
-
-static struct resource pmu_resources[] = {
-        [0] = {
-                .start  = IRQ_CT_CA9X4_PMU_CPU0,
-                .end    = IRQ_CT_CA9X4_PMU_CPU0,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [1] = {
-                .start  = IRQ_CT_CA9X4_PMU_CPU1,
-                .end    = IRQ_CT_CA9X4_PMU_CPU1,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = IRQ_CT_CA9X4_PMU_CPU2,
-                .end    = IRQ_CT_CA9X4_PMU_CPU2,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = IRQ_CT_CA9X4_PMU_CPU3,
-                .end    = IRQ_CT_CA9X4_PMU_CPU3,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device pmu_device = {
-        .name           = "arm-pmu",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(pmu_resources),
-        .resource       = pmu_resources,
-};
-
-static struct clk_lookup osc1_lookup = {
-        .dev_id         = "ct:clcd",
-};
-
-static struct platform_device osc1_device = {
-        .name           = "vexpress-osc",
-        .id             = 1,
-        .num_resources  = 1,
-        .resource       = (struct resource []) {
-                VEXPRESS_RES_FUNC(0xf, 1),
-        },
-        .dev.platform_data = &osc1_lookup,
-};
-
-static void __init ct_ca9x4_init(void)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(ct_ca9x4_amba_devs); i++)
-                amba_device_register(ct_ca9x4_amba_devs[i], &iomem_resource);
-
-        platform_device_register(&pmu_device);
-        vexpress_syscfg_device_register(&osc1_device);
-}
-
-#ifdef CONFIG_SMP
-static void *ct_ca9x4_scu_base __initdata;
-
-static void __init ct_ca9x4_init_cpu_map(void)
-{
-        int i, ncores;
-
-        ct_ca9x4_scu_base = ioremap(A9_MPCORE_SCU, SZ_128);
-        if (WARN_ON(!ct_ca9x4_scu_base))
-                return;
-
-        ncores = scu_get_core_count(ct_ca9x4_scu_base);
-
-        if (ncores > nr_cpu_ids) {
-                pr_warn("SMP: %u cores greater than maximum (%u), clipping\n",
-                        ncores, nr_cpu_ids);
-                ncores = nr_cpu_ids;
-        }
-
-        for (i = 0; i < ncores; ++i)
-                set_cpu_possible(i, true);
-}
-
-static void __init ct_ca9x4_smp_enable(unsigned int max_cpus)
-{
-        scu_enable(ct_ca9x4_scu_base);
-}
-#endif
-
-struct ct_desc ct_ca9x4_desc __initdata = {
-        .id             = V2M_CT_ID_CA9,
-        .name           = "CA9x4",
-        .map_io         = ct_ca9x4_map_io,
-        .init_irq       = ct_ca9x4_init_irq,
-        .init_tile      = ct_ca9x4_init,
-#ifdef CONFIG_SMP
-        .init_cpu_map   = ct_ca9x4_init_cpu_map,
-        .smp_enable     = ct_ca9x4_smp_enable,
-#endif
-};
diff --git a/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h b/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
deleted file mode 100644
index 84acf8439d4b..000000000000
--- a/arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef __MACH_CT_CA9X4_H
-#define __MACH_CT_CA9X4_H
-
-/*
- * Physical base addresses
- */
-#define CT_CA9X4_CLCDC          (0x10020000)
-#define CT_CA9X4_AXIRAM         (0x10060000)
-#define CT_CA9X4_DMC            (0x100e0000)
-#define CT_CA9X4_SMC            (0x100e1000)
-#define CT_CA9X4_SCC            (0x100e2000)
-#define CT_CA9X4_SP804_TIMER    (0x100e4000)
-#define CT_CA9X4_SP805_WDT      (0x100e5000)
-#define CT_CA9X4_TZPC           (0x100e6000)
-#define CT_CA9X4_GPIO           (0x100e8000)
-#define CT_CA9X4_FASTAXI        (0x100e9000)
-#define CT_CA9X4_SLOWAXI        (0x100ea000)
-#define CT_CA9X4_TZASC          (0x100ec000)
-#define CT_CA9X4_CORESIGHT      (0x10200000)
-#define CT_CA9X4_MPIC           (0x1e000000)
-#define CT_CA9X4_SYSTIMER       (0x1e004000)
-#define CT_CA9X4_SYSWDT         (0x1e007000)
-#define CT_CA9X4_L2CC           (0x1e00a000)
-
-#define A9_MPCORE_SCU           (CT_CA9X4_MPIC + 0x0000)
-#define A9_MPCORE_GIC_CPU       (CT_CA9X4_MPIC + 0x0100)
-#define A9_MPCORE_GIT           (CT_CA9X4_MPIC + 0x0200)
-#define A9_MPCORE_TWD           (CT_CA9X4_MPIC + 0x0600)
-#define A9_MPCORE_GIC_DIST      (CT_CA9X4_MPIC + 0x1000)
-
-/*
- * Interrupts.  Those in {} are for AMBA devices
- */
-#define IRQ_CT_CA9X4_CLCDC      { 76 }
-#define IRQ_CT_CA9X4_DMC        { 0 }
-#define IRQ_CT_CA9X4_SMC        { 77, 78 }
-#define IRQ_CT_CA9X4_TIMER0     80
-#define IRQ_CT_CA9X4_TIMER1     81
-#define IRQ_CT_CA9X4_GPIO       { 82 }
-#define IRQ_CT_CA9X4_PMU_CPU0   92
-#define IRQ_CT_CA9X4_PMU_CPU1   93
-#define IRQ_CT_CA9X4_PMU_CPU2   94
-#define IRQ_CT_CA9X4_PMU_CPU3   95
-
-extern struct ct_desc ct_ca9x4_desc;
-
-#endif
diff --git a/arch/arm/mach-vexpress/include/mach/hardware.h b/arch/arm/mach-vexpress/include/mach/hardware.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/arch/arm/mach-vexpress/include/mach/hardware.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
diff --git a/arch/arm/mach-vexpress/include/mach/irqs.h b/arch/arm/mach-vexpress/include/mach/irqs.h
deleted file mode 100644
index f8f7f782eb55..000000000000
--- a/arch/arm/mach-vexpress/include/mach/irqs.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define IRQ_LOCALTIMER          29
-#define IRQ_LOCALWDOG           30
-
-#ifndef CONFIG_SPARSE_IRQ
-#define NR_IRQS 256
-#endif
diff --git a/arch/arm/mach-vexpress/include/mach/motherboard.h b/arch/arm/mach-vexpress/include/mach/motherboard.h
deleted file mode 100644
index 68abc8b72781..000000000000
--- a/arch/arm/mach-vexpress/include/mach/motherboard.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef __MACH_MOTHERBOARD_H
-#define __MACH_MOTHERBOARD_H
-
-/*
- * Physical addresses, offset from V2M_PA_CS0-3
- */
-#define V2M_NOR0                (V2M_PA_CS0)
-#define V2M_NOR1                (V2M_PA_CS1)
-#define V2M_SRAM                (V2M_PA_CS2)
-#define V2M_VIDEO_SRAM          (V2M_PA_CS3 + 0x00000000)
-#define V2M_LAN9118             (V2M_PA_CS3 + 0x02000000)
-#define V2M_ISP1761             (V2M_PA_CS3 + 0x03000000)
-
-/*
- * Physical addresses, offset from V2M_PA_CS7
- */
-#define V2M_SYSREGS             (V2M_PA_CS7 + 0x00000000)
-#define V2M_SYSCTL              (V2M_PA_CS7 + 0x00001000)
-#define V2M_SERIAL_BUS_PCI      (V2M_PA_CS7 + 0x00002000)
-
-#define V2M_AACI                (V2M_PA_CS7 + 0x00004000)
-#define V2M_MMCI                (V2M_PA_CS7 + 0x00005000)
-#define V2M_KMI0                (V2M_PA_CS7 + 0x00006000)
-#define V2M_KMI1                (V2M_PA_CS7 + 0x00007000)
-
-#define V2M_UART0               (V2M_PA_CS7 + 0x00009000)
-#define V2M_UART1               (V2M_PA_CS7 + 0x0000a000)
-#define V2M_UART2               (V2M_PA_CS7 + 0x0000b000)
-#define V2M_UART3               (V2M_PA_CS7 + 0x0000c000)
-
-#define V2M_WDT                 (V2M_PA_CS7 + 0x0000f000)
-
-#define V2M_TIMER01             (V2M_PA_CS7 + 0x00011000)
-#define V2M_TIMER23             (V2M_PA_CS7 + 0x00012000)
-
-#define V2M_SERIAL_BUS_DVI      (V2M_PA_CS7 + 0x00016000)
-#define V2M_RTC                 (V2M_PA_CS7 + 0x00017000)
-
-#define V2M_CF                  (V2M_PA_CS7 + 0x0001a000)
-#define V2M_CLCD                (V2M_PA_CS7 + 0x0001f000)
-
-
-/*
- * Interrupts.  Those in {} are for AMBA devices
- */
-#define IRQ_V2M_WDT             { (32 + 0) }
-#define IRQ_V2M_TIMER0          (32 + 2)
-#define IRQ_V2M_TIMER1          (32 + 2)
-#define IRQ_V2M_TIMER2          (32 + 3)
-#define IRQ_V2M_TIMER3          (32 + 3)
-#define IRQ_V2M_RTC             { (32 + 4) }
-#define IRQ_V2M_UART0           { (32 + 5) }
-#define IRQ_V2M_UART1           { (32 + 6) }
-#define IRQ_V2M_UART2           { (32 + 7) }
-#define IRQ_V2M_UART3           { (32 + 8) }
-#define IRQ_V2M_MMCI            { (32 + 9), (32 + 10) }
-#define IRQ_V2M_AACI            { (32 + 11) }
-#define IRQ_V2M_KMI0            { (32 + 12) }
-#define IRQ_V2M_KMI1            { (32 + 13) }
-#define IRQ_V2M_CLCD            { (32 + 14) }
-#define IRQ_V2M_LAN9118         (32 + 15)
-#define IRQ_V2M_ISP1761         (32 + 16)
-#define IRQ_V2M_PCIE            (32 + 17)
-
-
-/*
- * Core tile IDs
- */
-#define V2M_CT_ID_CA9           0x0c000191
-#define V2M_CT_ID_UNSUPPORTED   0xff000191
-#define V2M_CT_ID_MASK          0xff000fff
-
-struct ct_desc {
-        u32                     id;
-        const char              *name;
-        void                    (*map_io)(void);
-        void                    (*init_early)(void);
-        void                    (*init_irq)(void);
-        void                    (*init_tile)(void);
-#ifdef CONFIG_SMP
-        void                    (*init_cpu_map)(void);
-        void                    (*smp_enable)(unsigned int);
-#endif
-};
-
-extern struct ct_desc *ct_desc;
-
-#endif
diff --git a/arch/arm/mach-vexpress/platsmp.c b/arch/arm/mach-vexpress/platsmp.c
index a1f3804fd5a5..83188cf1875d 100644
--- a/arch/arm/mach-vexpress/platsmp.c
+++ b/arch/arm/mach-vexpress/platsmp.c
@@ -19,48 +19,10 @@
 #include <asm/smp_scu.h>
 #include <asm/mach/map.h>
 
-#include <mach/motherboard.h>
-
 #include <plat/platsmp.h>
 
 #include "core.h"
 
-/*
- * Initialise the CPU possible map early - this describes the CPUs
- * which may be present or become present in the system.
- */
-static void __init vexpress_smp_init_cpus(void)
-{
-        ct_desc->init_cpu_map();
-}
-
-static void __init vexpress_smp_prepare_cpus(unsigned int max_cpus)
-{
-        /*
-         * Initialise the present map, which describes the set of CPUs
-         * actually populated at the present time.
-         */
-        ct_desc->smp_enable(max_cpus);
-
-        /*
-         * Write the address of secondary startup into the
-         * system-wide flags register. The boot monitor waits
-         * until it receives a soft interrupt, and then the
-         * secondary CPU branches to this address.
-         */
-        vexpress_flags_set(virt_to_phys(versatile_secondary_startup));
-}
-
-struct smp_operations __initdata vexpress_smp_ops = {
-        .smp_init_cpus          = vexpress_smp_init_cpus,
-        .smp_prepare_cpus       = vexpress_smp_prepare_cpus,
-        .smp_secondary_init     = versatile_secondary_init,
-        .smp_boot_secondary     = versatile_boot_secondary,
-#ifdef CONFIG_HOTPLUG_CPU
-        .cpu_die                = vexpress_cpu_die,
-#endif
-};
-
 bool __init vexpress_smp_init_ops(void)
 {
 #ifdef CONFIG_MCPM
@@ -79,8 +41,6 @@ bool __init vexpress_smp_init_ops(void)
         return false;
 }
 
-#if defined(CONFIG_OF)
-
 static const struct of_device_id vexpress_smp_dt_scu_match[] __initconst = {
         { .compatible = "arm,cortex-a5-scu", },
         { .compatible = "arm,cortex-a9-scu", },
@@ -112,5 +72,3 @@ struct smp_operations __initdata vexpress_smp_dt_ops = {
         .cpu_die                = vexpress_cpu_die,
 #endif
 };
-
-#endif
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 6ff681a24ba7..a0400f4cca89 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -1,380 +1,7 @@
-/*
- * Versatile Express V2M Motherboard Support
- */
-#include <linux/device.h>
-#include <linux/amba/bus.h>
-#include <linux/amba/mmci.h>
-#include <linux/io.h>
-#include <linux/smp.h>
-#include <linux/init.h>
-#include <linux/of_address.h>
-#include <linux/of_fdt.h>
-#include <linux/of_irq.h>
-#include <linux/of_platform.h>
-#include <linux/platform_device.h>
-#include <linux/ata_platform.h>
-#include <linux/smsc911x.h>
-#include <linux/spinlock.h>
-#include <linux/usb/isp1760.h>
-#include <linux/mtd/physmap.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/machine.h>
-#include <linux/vexpress.h>
-#include <linux/clkdev.h>
-
-#include <asm/mach-types.h>
-#include <asm/sizes.h>
 #include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/time.h>
-#include <asm/hardware/arm_timer.h>
-#include <asm/hardware/cache-l2x0.h>
-#include <asm/hardware/timer-sp.h>
-
-#include <mach/ct-ca9x4.h>
-#include <mach/motherboard.h>
-
-#include <plat/sched_clock.h>
-#include <plat/platsmp.h>
 
 #include "core.h"
 
-#define V2M_PA_CS0      0x40000000
-#define V2M_PA_CS1      0x44000000
-#define V2M_PA_CS2      0x48000000
-#define V2M_PA_CS3      0x4c000000
-#define V2M_PA_CS7      0x10000000
-
-static struct map_desc v2m_io_desc[] __initdata = {
-        {
-                .virtual        = V2M_PERIPH,
-                .pfn            = __phys_to_pfn(V2M_PA_CS7),
-                .length         = SZ_128K,
-                .type           = MT_DEVICE,
-        },
-};
-
-static void __init v2m_sp804_init(void __iomem *base, unsigned int irq)
-{
-        if (WARN_ON(!base || irq == NO_IRQ))
-                return;
-
-        sp804_clocksource_init(base + TIMER_2_BASE, "v2m-timer1");
-        sp804_clockevents_init(base + TIMER_1_BASE, irq, "v2m-timer0");
-}
-
-
-static struct resource v2m_pcie_i2c_resource = {
-        .start  = V2M_SERIAL_BUS_PCI,
-        .end    = V2M_SERIAL_BUS_PCI + SZ_4K - 1,
-        .flags  = IORESOURCE_MEM,
-};
-
-static struct platform_device v2m_pcie_i2c_device = {
-        .name           = "versatile-i2c",
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = &v2m_pcie_i2c_resource,
-};
-
-static struct resource v2m_ddc_i2c_resource = {
-        .start  = V2M_SERIAL_BUS_DVI,
-        .end    = V2M_SERIAL_BUS_DVI + SZ_4K - 1,
-        .flags  = IORESOURCE_MEM,
-};
-
-static struct platform_device v2m_ddc_i2c_device = {
-        .name           = "versatile-i2c",
-        .id             = 1,
-        .num_resources  = 1,
-        .resource       = &v2m_ddc_i2c_resource,
-};
-
-static struct resource v2m_eth_resources[] = {
-        {
-                .start  = V2M_LAN9118,
-                .end    = V2M_LAN9118 + SZ_64K - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_V2M_LAN9118,
-                .end    = IRQ_V2M_LAN9118,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct smsc911x_platform_config v2m_eth_config = {
-        .flags          = SMSC911X_USE_32BIT,
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
-        .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-};
-
-static struct platform_device v2m_eth_device = {
-        .name           = "smsc911x",
-        .id             = -1,
-        .resource       = v2m_eth_resources,
-        .num_resources  = ARRAY_SIZE(v2m_eth_resources),
-        .dev.platform_data = &v2m_eth_config,
-};
-
-static struct regulator_consumer_supply v2m_eth_supplies[] = {
-        REGULATOR_SUPPLY("vddvario", "smsc911x"),
-        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
-};
-
-static struct resource v2m_usb_resources[] = {
-        {
-                .start  = V2M_ISP1761,
-                .end    = V2M_ISP1761 + SZ_128K - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = IRQ_V2M_ISP1761,
-                .end    = IRQ_V2M_ISP1761,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct isp1760_platform_data v2m_usb_config = {
-        .is_isp1761             = true,
-        .bus_width_16           = false,
-        .port1_otg              = true,
-        .analog_oc              = false,
-        .dack_polarity_high     = false,
-        .dreq_polarity_high     = false,
-};
-
-static struct platform_device v2m_usb_device = {
-        .name           = "isp1760",
-        .id             = -1,
-        .resource       = v2m_usb_resources,
-        .num_resources  = ARRAY_SIZE(v2m_usb_resources),
-        .dev.platform_data = &v2m_usb_config,
-};
-
-static struct physmap_flash_data v2m_flash_data = {
-        .width          = 4,
-};
-
-static struct resource v2m_flash_resources[] = {
-        {
-                .start  = V2M_NOR0,
-                .end    = V2M_NOR0 + SZ_64M - 1,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = V2M_NOR1,
-                .end    = V2M_NOR1 + SZ_64M - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device v2m_flash_device = {
-        .name           = "physmap-flash",
-        .id             = -1,
-        .resource       = v2m_flash_resources,
-        .num_resources  = ARRAY_SIZE(v2m_flash_resources),
-        .dev.platform_data = &v2m_flash_data,
-};
-
-static struct pata_platform_info v2m_pata_data = {
-        .ioport_shift   = 2,
-};
-
-static struct resource v2m_pata_resources[] = {
-        {
-                .start  = V2M_CF,
-                .end    = V2M_CF + 0xff,
-                .flags  = IORESOURCE_MEM,
-        }, {
-                .start  = V2M_CF + 0x100,
-                .end    = V2M_CF + SZ_4K - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device v2m_cf_device = {
-        .name           = "pata_platform",
-        .id             = -1,
-        .resource       = v2m_pata_resources,
-        .num_resources  = ARRAY_SIZE(v2m_pata_resources),
-        .dev.platform_data = &v2m_pata_data,
-};
-
-static struct mmci_platform_data v2m_mmci_data = {
-        .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
-        .status         = vexpress_get_mci_cardin,
-        .gpio_cd        = -1,
-        .gpio_wp        = -1,
-};
-
-static struct resource v2m_sysreg_resources[] = {
-        {
-                .start  = V2M_SYSREGS,
-                .end    = V2M_SYSREGS + 0xfff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device v2m_sysreg_device = {
-        .name           = "vexpress-sysreg",
-        .id             = -1,
-        .resource       = v2m_sysreg_resources,
-        .num_resources  = ARRAY_SIZE(v2m_sysreg_resources),
-};
-
-static struct platform_device v2m_muxfpga_device = {
-        .name           = "vexpress-muxfpga",
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = (struct resource []) {
-                VEXPRESS_RES_FUNC(0, 7),
-        }
-};
-
-static struct platform_device v2m_shutdown_device = {
-        .name           = "vexpress-shutdown",
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = (struct resource []) {
-                VEXPRESS_RES_FUNC(0, 8),
-        }
-};
-
-static struct platform_device v2m_reboot_device = {
-        .name           = "vexpress-reboot",
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = (struct resource []) {
-                VEXPRESS_RES_FUNC(0, 9),
-        }
-};
-
-static struct platform_device v2m_dvimode_device = {
-        .name           = "vexpress-dvimode",
-        .id             = 0,
-        .num_resources  = 1,
-        .resource       = (struct resource []) {
-                VEXPRESS_RES_FUNC(0, 11),
-        }
-};
-
-static AMBA_APB_DEVICE(aaci,  "mb:aaci",  0, V2M_AACI, IRQ_V2M_AACI, NULL);
-static AMBA_APB_DEVICE(mmci,  "mb:mmci",  0, V2M_MMCI, IRQ_V2M_MMCI, &v2m_mmci_data);
-static AMBA_APB_DEVICE(kmi0,  "mb:kmi0",  0, V2M_KMI0, IRQ_V2M_KMI0, NULL);
-static AMBA_APB_DEVICE(kmi1,  "mb:kmi1",  0, V2M_KMI1, IRQ_V2M_KMI1, NULL);
-static AMBA_APB_DEVICE(uart0, "mb:uart0", 0, V2M_UART0, IRQ_V2M_UART0, NULL);
-static AMBA_APB_DEVICE(uart1, "mb:uart1", 0, V2M_UART1, IRQ_V2M_UART1, NULL);
-static AMBA_APB_DEVICE(uart2, "mb:uart2", 0, V2M_UART2, IRQ_V2M_UART2, NULL);
-static AMBA_APB_DEVICE(uart3, "mb:uart3", 0, V2M_UART3, IRQ_V2M_UART3, NULL);
-static AMBA_APB_DEVICE(wdt,   "mb:wdt",   0, V2M_WDT, IRQ_V2M_WDT, NULL);
-static AMBA_APB_DEVICE(rtc,   "mb:rtc",   0, V2M_RTC, IRQ_V2M_RTC, NULL);
-
-static struct amba_device *v2m_amba_devs[] __initdata = {
-        &aaci_device,
-        &mmci_device,
-        &kmi0_device,
-        &kmi1_device,
-        &uart0_device,
-        &uart1_device,
-        &uart2_device,
-        &uart3_device,
-        &wdt_device,
-        &rtc_device,
-};
-
-static void __init v2m_timer_init(void)
-{
-        vexpress_clk_init(ioremap(V2M_SYSCTL, SZ_4K));
-        v2m_sp804_init(ioremap(V2M_TIMER01, SZ_4K), IRQ_V2M_TIMER0);
-}
-
-static void __init v2m_init_early(void)
-{
-        if (ct_desc->init_early)
-                ct_desc->init_early();
-        versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), 24000000);
-}
-
-struct ct_desc *ct_desc;
-
-static struct ct_desc *ct_descs[] __initdata = {
-#ifdef CONFIG_ARCH_VEXPRESS_CA9X4
-        &ct_ca9x4_desc,
-#endif
-};
-
-static void __init v2m_populate_ct_desc(void)
-{
-        int i;
-        u32 current_tile_id;
-
-        ct_desc = NULL;
-        current_tile_id = vexpress_get_procid(VEXPRESS_SITE_MASTER)
-                                & V2M_CT_ID_MASK;
-
-        for (i = 0; i < ARRAY_SIZE(ct_descs) && !ct_desc; ++i)
-                if (ct_descs[i]->id == current_tile_id)
-                        ct_desc = ct_descs[i];
-
-        if (!ct_desc)
-                panic("vexpress: this kernel does not support core tile ID 0x%08x when booting via ATAGs.\n"
-                      "You may need a device tree blob or a different kernel to boot on this board.\n",
-                      current_tile_id);
-}
-
-static void __init v2m_map_io(void)
-{
-        iotable_init(v2m_io_desc, ARRAY_SIZE(v2m_io_desc));
-        vexpress_sysreg_early_init(ioremap(V2M_SYSREGS, SZ_4K));
-        v2m_populate_ct_desc();
-        ct_desc->map_io();
-}
-
-static void __init v2m_init_irq(void)
-{
-        ct_desc->init_irq();
-}
-
-static void __init v2m_init(void)
-{
-        int i;
-
-        regulator_register_fixed(0, v2m_eth_supplies,
-                        ARRAY_SIZE(v2m_eth_supplies));
-
-        platform_device_register(&v2m_sysreg_device);
-        platform_device_register(&v2m_pcie_i2c_device);
-        platform_device_register(&v2m_ddc_i2c_device);
-        platform_device_register(&v2m_flash_device);
-        platform_device_register(&v2m_cf_device);
-        platform_device_register(&v2m_eth_device);
-        platform_device_register(&v2m_usb_device);
-
-        for (i = 0; i < ARRAY_SIZE(v2m_amba_devs); i++)
-                amba_device_register(v2m_amba_devs[i], &iomem_resource);
-
-        vexpress_syscfg_device_register(&v2m_muxfpga_device);
-        vexpress_syscfg_device_register(&v2m_shutdown_device);
-        vexpress_syscfg_device_register(&v2m_reboot_device);
-        vexpress_syscfg_device_register(&v2m_dvimode_device);
-
-        ct_desc->init_tile();
-}
-
-MACHINE_START(VEXPRESS, "ARM-Versatile Express")
-        .atag_offset    = 0x100,
-        .smp            = smp_ops(vexpress_smp_ops),
-        .map_io         = v2m_map_io,
-        .init_early     = v2m_init_early,
-        .init_irq       = v2m_init_irq,
-        .init_time      = v2m_timer_init,
-        .init_machine   = v2m_init,
-MACHINE_END
-
-static void __init v2m_dt_init(void)
-{
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 static const char * const v2m_dt_match[] __initconst = {
         "arm,vexpress",
         NULL,
@@ -386,5 +13,4 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
         .l2c_aux_mask   = 0xfe0fffff,
         .smp            = smp_ops(vexpress_smp_dt_ops),
         .smp_init       = smp_init_ops(vexpress_smp_init_ops),
-        .init_machine   = v2m_dt_init,
 MACHINE_END
diff --git a/arch/arm/mach-zynq/Makefile b/arch/arm/mach-zynq/Makefile
index c85fb3f7d5cd..b03a97eb7501 100644
--- a/arch/arm/mach-zynq/Makefile
+++ b/arch/arm/mach-zynq/Makefile
@@ -4,6 +4,4 @@
 
 # Common support
 obj-y                           := common.o slcr.o pm.o
-CFLAGS_REMOVE_hotplug.o         =-march=armv6k
-CFLAGS_hotplug.o                =-Wa,-march=armv7-a -mcpu=cortex-a9
 obj-$(CONFIG_SMP)               += headsmp.o platsmp.o
diff --git a/arch/arm/mach-zynq/common.h b/arch/arm/mach-zynq/common.h
index 2bc71273c73c..382c60e9aa16 100644
--- a/arch/arm/mach-zynq/common.h
+++ b/arch/arm/mach-zynq/common.h
@@ -29,7 +29,6 @@ extern void zynq_slcr_cpu_state_write(int cpu, bool die);
 extern u32 zynq_slcr_get_device_id(void);
 
 #ifdef CONFIG_SMP
-extern void secondary_startup(void);
 extern char zynq_secondary_trampoline;
 extern char zynq_secondary_trampoline_jump;
 extern char zynq_secondary_trampoline_end;
diff --git a/arch/arm/mach-zynq/hotplug.c b/arch/arm/mach-zynq/hotplug.c
deleted file mode 100644
index b685c89f11e4..000000000000
--- a/arch/arm/mach-zynq/hotplug.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (C) 2012-2013 Xilinx
- *
- * based on linux/arch/arm/mach-realview/hotplug.c
- *
- * Copyright (C) 2002 ARM Ltd.
- * All Rights Reserved
- *
- * 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.
- */
-#include <asm/proc-fns.h>
-
diff --git a/arch/arm/plat-samsung/include/plat/map-s5p.h b/arch/arm/plat-samsung/include/plat/map-s5p.h
index f5b9d3ff9cd4..f5cf2bd208e0 100644
--- a/arch/arm/plat-samsung/include/plat/map-s5p.h
+++ b/arch/arm/plat-samsung/include/plat/map-s5p.h
@@ -15,43 +15,22 @@
 
 #define S5P_VA_CHIPID           S3C_ADDR(0x02000000)
 #define S5P_VA_CMU              S3C_ADDR(0x02100000)
-#define S5P_VA_GPIO             S3C_ADDR(0x02200000)
-#define S5P_VA_GPIO1            S5P_VA_GPIO
-#define S5P_VA_GPIO2            S3C_ADDR(0x02240000)
-#define S5P_VA_GPIO3            S3C_ADDR(0x02280000)
 
-#define S5P_VA_SYSRAM           S3C_ADDR(0x02400000)
-#define S5P_VA_SYSRAM_NS        S3C_ADDR(0x02410000)
 #define S5P_VA_DMC0             S3C_ADDR(0x02440000)
 #define S5P_VA_DMC1             S3C_ADDR(0x02480000)
 #define S5P_VA_SROMC            S3C_ADDR(0x024C0000)
 
-#define S5P_VA_SYSTIMER         S3C_ADDR(0x02500000)
-#define S5P_VA_L2CC             S3C_ADDR(0x02600000)
-
-#define S5P_VA_COMBINER_BASE    S3C_ADDR(0x02700000)
-#define S5P_VA_COMBINER(x)      (S5P_VA_COMBINER_BASE + ((x) >> 2) * 0x10)
-
 #define S5P_VA_COREPERI_BASE    S3C_ADDR(0x02800000)
 #define S5P_VA_COREPERI(x)      (S5P_VA_COREPERI_BASE + (x))
 #define S5P_VA_SCU              S5P_VA_COREPERI(0x0)
 #define S5P_VA_TWD              S5P_VA_COREPERI(0x600)
 
-#define S5P_VA_GIC_CPU          S3C_ADDR(0x02810000)
-#define S5P_VA_GIC_DIST         S3C_ADDR(0x02820000)
-
 #define VA_VIC(x)               (S3C_VA_IRQ + ((x) * 0x10000))
 #define VA_VIC0                 VA_VIC(0)
 #define VA_VIC1                 VA_VIC(1)
 #define VA_VIC2                 VA_VIC(2)
 #define VA_VIC3                 VA_VIC(3)
 
-#define S5P_VA_UART(x)          (S3C_VA_UART + ((x) * S3C_UART_OFFSET))
-#define S5P_VA_UART0            S5P_VA_UART(0)
-#define S5P_VA_UART1            S5P_VA_UART(1)
-#define S5P_VA_UART2            S5P_VA_UART(2)
-#define S5P_VA_UART3            S5P_VA_UART(3)
-
 #ifndef S3C_UART_OFFSET
 #define S3C_UART_OFFSET         (0x400)
 #endif
diff --git a/arch/arm/plat-versatile/Kconfig b/arch/arm/plat-versatile/Kconfig
index a301ca2c7d00..49b8ef91584a 100644
--- a/arch/arm/plat-versatile/Kconfig
+++ b/arch/arm/plat-versatile/Kconfig
@@ -4,6 +4,6 @@ config PLAT_VERSATILE_CLOCK
         bool
 
 config PLAT_VERSATILE_SCHED_CLOCK
-        def_bool y
+        bool
 
 endif