ARM: dts: Move .dts files to vendor sub-directories

The arm dts directory has grown to 1559 boards which makes it a bit
unwieldy to maintain and use. Past attempts stalled out due to plans to
move .dts files out of the kernel tree. Doing that is no longer planned
(any time soon at least), so let's go ahead and group .dts files by
vendors. This move aligns arm with arm64 .dts file structure.

There's no change to dtbs_install as the flat structure is maintained on
install.

The naming of vendor directories is roughly in this order of preference:
- Matching original and current SoC vendor prefix/name (e.g. ti, qcom)
- Current vendor prefix/name if still actively sold (SoCs which have
  been aquired) (e.g. nxp/imx)
- Existing platform name for older platforms not sold/maintained by any
  company (e.g. gemini, nspire)

The whole move was scripted with the exception of MAINTAINERS and a few
makefile fixups.

Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Michal Simek <michal.simek@amd.com> #Xilinx
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Neil Armstrong <neil.armstrong@linaro.org>
Acked-by: Paul Barker <paul.barker@sancloud.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Wei Xu <xuwei5@hisilicon.com> #hisilicon
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Nick Hawkins <nick.hawkins@hpe.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Acked-by: Peter Rosin <peda@axentia.se>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Sudeep Holla <sudeep.holla@arm.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com> #broadcom
Acked-by: Manivannan Sadhasivam <mani@kernel.org>
Reviewed-by: Jisheng Zhang <jszhang@kernel.org>
Acked-by: Patrice Chotard <patrice.chotard@foss.st.com>
Acked-by: Romain Perier <romain.perier@gmail.com>
Acked-by: Alexandre TORGUE <alexandre.torgue@st.com>
Acked-by: Shawn Guo <shawnguo@kernel.org>
Acked-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Acked-by: Enric Balletbo i Serra <eballetbo@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>

1 files changed, 0 insertions, 845 deletions

diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
deleted file mode 100644
index f97a57222101..000000000000
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ /dev/null
@@ -1,845 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-//
-// Device Tree Source for UniPhier PXs2 SoC
-//
-// Copyright (C) 2015-2016 Socionext Inc.
-//   Author: Masahiro Yamada <yamada.masahiro@socionext.com>
-
-#include <dt-bindings/gpio/uniphier-gpio.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/thermal/thermal.h>
-
-/ {
-	compatible = "socionext,uniphier-pxs2";
-	#address-cells = <1>;
-	#size-cells = <1>;
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu0: cpu@0 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a9";
-			reg = <0>;
-			clocks = <&sys_clk 32>;
-			enable-method = "psci";
-			next-level-cache = <&l2>;
-			operating-points-v2 = <&cpu_opp>;
-			#cooling-cells = <2>;
-		};
-
-		cpu1: cpu@1 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a9";
-			reg = <1>;
-			clocks = <&sys_clk 32>;
-			enable-method = "psci";
-			next-level-cache = <&l2>;
-			operating-points-v2 = <&cpu_opp>;
-			#cooling-cells = <2>;
-		};
-
-		cpu2: cpu@2 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a9";
-			reg = <2>;
-			clocks = <&sys_clk 32>;
-			enable-method = "psci";
-			next-level-cache = <&l2>;
-			operating-points-v2 = <&cpu_opp>;
-			#cooling-cells = <2>;
-		};
-
-		cpu3: cpu@3 {
-			device_type = "cpu";
-			compatible = "arm,cortex-a9";
-			reg = <3>;
-			clocks = <&sys_clk 32>;
-			enable-method = "psci";
-			next-level-cache = <&l2>;
-			operating-points-v2 = <&cpu_opp>;
-			#cooling-cells = <2>;
-		};
-	};
-
-	cpu_opp: opp-table {
-		compatible = "operating-points-v2";
-		opp-shared;
-
-		opp-100000000 {
-			opp-hz = /bits/ 64 <100000000>;
-			clock-latency-ns = <300>;
-		};
-		opp-150000000 {
-			opp-hz = /bits/ 64 <150000000>;
-			clock-latency-ns = <300>;
-		};
-		opp-200000000 {
-			opp-hz = /bits/ 64 <200000000>;
-			clock-latency-ns = <300>;
-		};
-		opp-300000000 {
-			opp-hz = /bits/ 64 <300000000>;
-			clock-latency-ns = <300>;
-		};
-		opp-400000000 {
-			opp-hz = /bits/ 64 <400000000>;
-			clock-latency-ns = <300>;
-		};
-		opp-600000000 {
-			opp-hz = /bits/ 64 <600000000>;
-			clock-latency-ns = <300>;
-		};
-		opp-800000000 {
-			opp-hz = /bits/ 64 <800000000>;
-			clock-latency-ns = <300>;
-		};
-		opp-1200000000 {
-			opp-hz = /bits/ 64 <1200000000>;
-			clock-latency-ns = <300>;
-		};
-	};
-
-	psci {
-		compatible = "arm,psci-0.2";
-		method = "smc";
-	};
-
-	clocks {
-		refclk: ref {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <25000000>;
-		};
-
-		arm_timer_clk: arm-timer {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <50000000>;
-		};
-	};
-
-	thermal-zones {
-		cpu-thermal {
-			polling-delay-passive = <250>;	/* 250ms */
-			polling-delay = <1000>;		/* 1000ms */
-			thermal-sensors = <&pvtctl>;
-
-			trips {
-				cpu_crit: cpu-crit {
-					temperature = <95000>;	/* 95C */
-					hysteresis = <2000>;
-					type = "critical";
-				};
-				cpu_alert: cpu-alert {
-					temperature = <85000>;	/* 85C */
-					hysteresis = <2000>;
-					type = "passive";
-				};
-			};
-
-			cooling-maps {
-				map {
-					trip = <&cpu_alert>;
-					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
-							 <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-				};
-			};
-		};
-	};
-
-	soc {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		interrupt-parent = <&intc>;
-
-		l2: cache-controller@500c0000 {
-			compatible = "socionext,uniphier-system-cache";
-			reg = <0x500c0000 0x2000>, <0x503c0100 0x8>,
-			      <0x506c0000 0x400>;
-			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 190 IRQ_TYPE_LEVEL_HIGH>,
-				     <GIC_SPI 191 IRQ_TYPE_LEVEL_HIGH>;
-			cache-unified;
-			cache-size = <(1280 * 1024)>;
-			cache-sets = <512>;
-			cache-line-size = <128>;
-			cache-level = <2>;
-		};
-
-		spi0: spi@54006000 {
-			compatible = "socionext,uniphier-scssi";
-			status = "disabled";
-			reg = <0x54006000 0x100>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_spi0>;
-			clocks = <&peri_clk 11>;
-			resets = <&peri_rst 11>;
-		};
-
-		spi1: spi@54006100 {
-			compatible = "socionext,uniphier-scssi";
-			status = "disabled";
-			reg = <0x54006100 0x100>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 216 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_spi1>;
-			clocks = <&peri_clk 12>;
-			resets = <&peri_rst 12>;
-		};
-
-		serial0: serial@54006800 {
-			compatible = "socionext,uniphier-uart";
-			status = "disabled";
-			reg = <0x54006800 0x40>;
-			interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_uart0>;
-			clocks = <&peri_clk 0>;
-			resets = <&peri_rst 0>;
-		};
-
-		serial1: serial@54006900 {
-			compatible = "socionext,uniphier-uart";
-			status = "disabled";
-			reg = <0x54006900 0x40>;
-			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_uart1>;
-			clocks = <&peri_clk 1>;
-			resets = <&peri_rst 1>;
-		};
-
-		serial2: serial@54006a00 {
-			compatible = "socionext,uniphier-uart";
-			status = "disabled";
-			reg = <0x54006a00 0x40>;
-			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_uart2>;
-			clocks = <&peri_clk 2>;
-			resets = <&peri_rst 2>;
-		};
-
-		serial3: serial@54006b00 {
-			compatible = "socionext,uniphier-uart";
-			status = "disabled";
-			reg = <0x54006b00 0x40>;
-			interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_uart3>;
-			clocks = <&peri_clk 3>;
-			resets = <&peri_rst 3>;
-		};
-
-		gpio: gpio@55000000 {
-			compatible = "socionext,uniphier-gpio";
-			reg = <0x55000000 0x200>;
-			interrupt-parent = <&aidet>;
-			interrupt-controller;
-			#interrupt-cells = <2>;
-			gpio-controller;
-			#gpio-cells = <2>;
-			gpio-ranges = <&pinctrl 0 0 0>,
-				      <&pinctrl 96 0 0>;
-			gpio-ranges-group-names = "gpio_range0",
-						  "gpio_range1";
-			ngpios = <232>;
-			socionext,interrupt-ranges = <0 48 16>, <16 154 5>,
-						     <21 217 3>;
-		};
-
-		audio@56000000 {
-			compatible = "socionext,uniphier-pxs2-aio";
-			reg = <0x56000000 0x80000>;
-			interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_ain1>,
-				    <&pinctrl_ain2>,
-				    <&pinctrl_ainiec1>,
-				    <&pinctrl_aout2>,
-				    <&pinctrl_aout3>,
-				    <&pinctrl_aoutiec1>,
-				    <&pinctrl_aoutiec2>;
-			clock-names = "aio";
-			clocks = <&sys_clk 40>;
-			reset-names = "aio";
-			resets = <&sys_rst 40>;
-			#sound-dai-cells = <1>;
-			socionext,syscon = <&soc_glue>;
-
-			i2s_port0: port@0 {
-				i2s_hdmi: endpoint {
-				};
-			};
-
-			i2s_port1: port@1 {
-				i2s_line: endpoint {
-				};
-			};
-
-			i2s_port2: port@2 {
-				i2s_aux: endpoint {
-				};
-			};
-
-			spdif_port0: port@3 {
-				spdif_hiecout1: endpoint {
-				};
-			};
-
-			spdif_port1: port@4 {
-				spdif_iecout1: endpoint {
-				};
-			};
-
-			comp_spdif_port0: port@5 {
-				comp_spdif_hiecout1: endpoint {
-				};
-			};
-
-			comp_spdif_port1: port@6 {
-				comp_spdif_iecout1: endpoint {
-				};
-			};
-		};
-
-		i2c0: i2c@58780000 {
-			compatible = "socionext,uniphier-fi2c";
-			status = "disabled";
-			reg = <0x58780000 0x80>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_i2c0>;
-			clocks = <&peri_clk 4>;
-			resets = <&peri_rst 4>;
-			clock-frequency = <100000>;
-		};
-
-		i2c1: i2c@58781000 {
-			compatible = "socionext,uniphier-fi2c";
-			status = "disabled";
-			reg = <0x58781000 0x80>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_i2c1>;
-			clocks = <&peri_clk 5>;
-			resets = <&peri_rst 5>;
-			clock-frequency = <100000>;
-		};
-
-		i2c2: i2c@58782000 {
-			compatible = "socionext,uniphier-fi2c";
-			status = "disabled";
-			reg = <0x58782000 0x80>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_i2c2>;
-			clocks = <&peri_clk 6>;
-			resets = <&peri_rst 6>;
-			clock-frequency = <100000>;
-		};
-
-		i2c3: i2c@58783000 {
-			compatible = "socionext,uniphier-fi2c";
-			status = "disabled";
-			reg = <0x58783000 0x80>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_i2c3>;
-			clocks = <&peri_clk 7>;
-			resets = <&peri_rst 7>;
-			clock-frequency = <100000>;
-		};
-
-		/* chip-internal connection for DMD */
-		i2c4: i2c@58784000 {
-			compatible = "socionext,uniphier-fi2c";
-			reg = <0x58784000 0x80>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&peri_clk 8>;
-			resets = <&peri_rst 8>;
-			clock-frequency = <400000>;
-		};
-
-		/* chip-internal connection for STM */
-		i2c5: i2c@58785000 {
-			compatible = "socionext,uniphier-fi2c";
-			reg = <0x58785000 0x80>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&peri_clk 9>;
-			resets = <&peri_rst 9>;
-			clock-frequency = <400000>;
-		};
-
-		/* chip-internal connection for HDMI */
-		i2c6: i2c@58786000 {
-			compatible = "socionext,uniphier-fi2c";
-			reg = <0x58786000 0x80>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&peri_clk 10>;
-			resets = <&peri_rst 10>;
-			clock-frequency = <400000>;
-		};
-
-		system_bus: system-bus@58c00000 {
-			compatible = "socionext,uniphier-system-bus";
-			status = "disabled";
-			reg = <0x58c00000 0x400>;
-			#address-cells = <2>;
-			#size-cells = <1>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_system_bus>;
-		};
-
-		smpctrl@59801000 {
-			compatible = "socionext,uniphier-smpctrl";
-			reg = <0x59801000 0x400>;
-		};
-
-		sdctrl: syscon@59810000 {
-			compatible = "socionext,uniphier-pxs2-sdctrl",
-				     "simple-mfd", "syscon";
-			reg = <0x59810000 0x400>;
-
-			sd_clk: clock-controller {
-				compatible = "socionext,uniphier-pxs2-sd-clock";
-				#clock-cells = <1>;
-			};
-
-			sd_rst: reset-controller {
-				compatible = "socionext,uniphier-pxs2-sd-reset";
-				#reset-cells = <1>;
-			};
-		};
-
-		syscon@59820000 {
-			compatible = "socionext,uniphier-pxs2-perictrl",
-				     "simple-mfd", "syscon";
-			reg = <0x59820000 0x200>;
-
-			peri_clk: clock-controller {
-				compatible = "socionext,uniphier-pxs2-peri-clock";
-				#clock-cells = <1>;
-			};
-
-			peri_rst: reset-controller {
-				compatible = "socionext,uniphier-pxs2-peri-reset";
-				#reset-cells = <1>;
-			};
-		};
-
-		emmc: mmc@5a000000 {
-			compatible = "socionext,uniphier-sd-v3.1.1";
-			status = "disabled";
-			reg = <0x5a000000 0x800>;
-			interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_emmc>;
-			clocks = <&sd_clk 1>;
-			reset-names = "host", "hw";
-			resets = <&sd_rst 1>, <&sd_rst 6>;
-			bus-width = <8>;
-			cap-mmc-highspeed;
-			cap-mmc-hw-reset;
-			non-removable;
-		};
-
-		sd: mmc@5a400000 {
-			compatible = "socionext,uniphier-sd-v3.1.1";
-			status = "disabled";
-			reg = <0x5a400000 0x800>;
-			interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default", "uhs";
-			pinctrl-0 = <&pinctrl_sd>;
-			pinctrl-1 = <&pinctrl_sd_uhs>;
-			clocks = <&sd_clk 0>;
-			reset-names = "host";
-			resets = <&sd_rst 0>;
-			bus-width = <4>;
-			cap-sd-highspeed;
-			sd-uhs-sdr12;
-			sd-uhs-sdr25;
-			sd-uhs-sdr50;
-			socionext,syscon-uhs-mode = <&sdctrl 0>;
-		};
-
-		soc_glue: syscon@5f800000 {
-			compatible = "socionext,uniphier-pxs2-soc-glue",
-				     "simple-mfd", "syscon";
-			reg = <0x5f800000 0x2000>;
-
-			pinctrl: pinctrl {
-				compatible = "socionext,uniphier-pxs2-pinctrl";
-			};
-		};
-
-		syscon@5f900000 {
-			compatible = "socionext,uniphier-pxs2-soc-glue-debug",
-				     "simple-mfd", "syscon";
-			reg = <0x5f900000 0x2000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0 0x5f900000 0x2000>;
-
-			efuse@100 {
-				compatible = "socionext,uniphier-efuse";
-				reg = <0x100 0x28>;
-			};
-
-			efuse@200 {
-				compatible = "socionext,uniphier-efuse";
-				reg = <0x200 0x58>;
-			};
-		};
-
-		xdmac: dma-controller@5fc10000 {
-			compatible = "socionext,uniphier-xdmac";
-			reg = <0x5fc10000 0x5300>;
-			interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
-			dma-channels = <16>;
-			#dma-cells = <2>;
-		};
-
-		aidet: interrupt-controller@5fc20000 {
-			compatible = "socionext,uniphier-pxs2-aidet";
-			reg = <0x5fc20000 0x200>;
-			interrupt-controller;
-			#interrupt-cells = <2>;
-		};
-
-		timer@60000200 {
-			compatible = "arm,cortex-a9-global-timer";
-			reg = <0x60000200 0x20>;
-			interrupts = <GIC_PPI 11
-				(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_HIGH)>;
-			clocks = <&arm_timer_clk>;
-		};
-
-		timer@60000600 {
-			compatible = "arm,cortex-a9-twd-timer";
-			reg = <0x60000600 0x20>;
-			interrupts = <GIC_PPI 13
-				(GIC_CPU_MASK_RAW(0xf) | IRQ_TYPE_LEVEL_HIGH)>;
-			clocks = <&arm_timer_clk>;
-		};
-
-		intc: interrupt-controller@60001000 {
-			compatible = "arm,cortex-a9-gic";
-			reg = <0x60001000 0x1000>,
-			      <0x60000100 0x100>;
-			#interrupt-cells = <3>;
-			interrupt-controller;
-		};
-
-		syscon@61840000 {
-			compatible = "socionext,uniphier-pxs2-sysctrl",
-				     "simple-mfd", "syscon";
-			reg = <0x61840000 0x10000>;
-
-			sys_clk: clock-controller {
-				compatible = "socionext,uniphier-pxs2-clock";
-				#clock-cells = <1>;
-			};
-
-			sys_rst: reset-controller {
-				compatible = "socionext,uniphier-pxs2-reset";
-				#reset-cells = <1>;
-			};
-
-			pvtctl: thermal-sensor {
-				compatible = "socionext,uniphier-pxs2-thermal";
-				interrupts = <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-				#thermal-sensor-cells = <0>;
-				socionext,tmod-calibration = <0x0f86 0x6844>;
-			};
-		};
-
-		eth: ethernet@65000000 {
-			compatible = "socionext,uniphier-pxs2-ave4";
-			status = "disabled";
-			reg = <0x65000000 0x8500>;
-			interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_ether_rgmii>;
-			clock-names = "ether";
-			clocks = <&sys_clk 6>;
-			reset-names = "ether";
-			resets = <&sys_rst 6>;
-			phy-mode = "rgmii-id";
-			local-mac-address = [00 00 00 00 00 00];
-			socionext,syscon-phy-mode = <&soc_glue 0>;
-
-			mdio: mdio {
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-		};
-
-		ahci: sata@65600000 {
-			compatible = "socionext,uniphier-pxs2-ahci",
-				     "generic-ahci";
-			status = "disabled";
-			reg = <0x65600000 0x10000>;
-			interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&sys_clk 28>;
-			resets = <&sys_rst 28>, <&ahci_rst 0>;
-			ports-implemented = <1>;
-			phys = <&ahci_phy>;
-		};
-
-		sata-controller@65700000 {
-			compatible = "socionext,uniphier-pxs2-ahci-glue",
-				     "simple-mfd";
-			reg = <0x65700000 0x100>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0 0x65700000 0x100>;
-
-			ahci_rst: reset-controller@0 {
-				compatible = "socionext,uniphier-pxs2-ahci-reset";
-				reg = <0x0 0x4>;
-				clock-names = "link";
-				clocks = <&sys_clk 28>;
-				reset-names = "link";
-				resets = <&sys_rst 28>;
-				#reset-cells = <1>;
-			};
-
-			ahci_phy: phy@10 {
-				compatible = "socionext,uniphier-pxs2-ahci-phy";
-				reg = <0x10 0x10>;
-				clock-names = "link";
-				clocks = <&sys_clk 28>;
-				reset-names = "link", "phy";
-				resets = <&sys_rst 28>, <&sys_rst 30>;
-				#phy-cells = <0>;
-			};
-		};
-
-		usb0: usb@65a00000 {
-			compatible = "socionext,uniphier-dwc3", "snps,dwc3";
-			status = "disabled";
-			reg = <0x65a00000 0xcd00>;
-			interrupt-names = "dwc_usb3";
-			interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>;
-			clock-names = "ref", "bus_early", "suspend";
-			clocks = <&sys_clk 14>, <&sys_clk 14>, <&sys_clk 14>;
-			resets = <&usb0_rst 15>;
-			phys = <&usb0_hsphy0>, <&usb0_hsphy1>,
-			       <&usb0_ssphy0>, <&usb0_ssphy1>;
-			dr_mode = "host";
-		};
-
-		usb-controller@65b00000 {
-			compatible = "socionext,uniphier-pxs2-dwc3-glue",
-				     "simple-mfd";
-			reg = <0x65b00000 0x400>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0 0x65b00000 0x400>;
-
-			usb0_rst: reset-controller@0 {
-				compatible = "socionext,uniphier-pxs2-usb3-reset";
-				reg = <0x0 0x4>;
-				#reset-cells = <1>;
-				clock-names = "link";
-				clocks = <&sys_clk 14>;
-				reset-names = "link";
-				resets = <&sys_rst 14>;
-			};
-
-			usb0_vbus0: regulator@100 {
-				compatible = "socionext,uniphier-pxs2-usb3-regulator";
-				reg = <0x100 0x10>;
-				clock-names = "link";
-				clocks = <&sys_clk 14>;
-				reset-names = "link";
-				resets = <&sys_rst 14>;
-			};
-
-			usb0_vbus1: regulator@110 {
-				compatible = "socionext,uniphier-pxs2-usb3-regulator";
-				reg = <0x110 0x10>;
-				clock-names = "link";
-				clocks = <&sys_clk 14>;
-				reset-names = "link";
-				resets = <&sys_rst 14>;
-			};
-
-			usb0_hsphy0: phy@200 {
-				compatible = "socionext,uniphier-pxs2-usb3-hsphy";
-				reg = <0x200 0x10>;
-				#phy-cells = <0>;
-				clock-names = "link", "phy";
-				clocks = <&sys_clk 14>, <&sys_clk 16>;
-				reset-names = "link", "phy";
-				resets = <&sys_rst 14>, <&sys_rst 16>;
-				vbus-supply = <&usb0_vbus0>;
-			};
-
-			usb0_hsphy1: phy@210 {
-				compatible = "socionext,uniphier-pxs2-usb3-hsphy";
-				reg = <0x210 0x10>;
-				#phy-cells = <0>;
-				clock-names = "link", "phy";
-				clocks = <&sys_clk 14>, <&sys_clk 16>;
-				reset-names = "link", "phy";
-				resets = <&sys_rst 14>, <&sys_rst 16>;
-				vbus-supply = <&usb0_vbus1>;
-			};
-
-			usb0_ssphy0: phy@300 {
-				compatible = "socionext,uniphier-pxs2-usb3-ssphy";
-				reg = <0x300 0x10>;
-				#phy-cells = <0>;
-				clock-names = "link", "phy";
-				clocks = <&sys_clk 14>, <&sys_clk 17>;
-				reset-names = "link", "phy";
-				resets = <&sys_rst 14>, <&sys_rst 17>;
-				vbus-supply = <&usb0_vbus0>;
-			};
-
-			usb0_ssphy1: phy@310 {
-				compatible = "socionext,uniphier-pxs2-usb3-ssphy";
-				reg = <0x310 0x10>;
-				#phy-cells = <0>;
-				clock-names = "link", "phy";
-				clocks = <&sys_clk 14>, <&sys_clk 18>;
-				reset-names = "link", "phy";
-				resets = <&sys_rst 14>, <&sys_rst 18>;
-				vbus-supply = <&usb0_vbus1>;
-			};
-		};
-
-		usb1: usb@65c00000 {
-			compatible = "socionext,uniphier-dwc3", "snps,dwc3";
-			status = "disabled";
-			reg = <0x65c00000 0xcd00>;
-			interrupt-names = "dwc_usb3";
-			interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>;
-			clock-names = "ref", "bus_early", "suspend";
-			clocks = <&sys_clk 15>, <&sys_clk 15>, <&sys_clk 15>;
-			resets = <&usb1_rst 15>;
-			phys = <&usb1_hsphy0>, <&usb1_hsphy1>, <&usb1_ssphy0>;
-			dr_mode = "host";
-		};
-
-		usb-controller@65d00000 {
-			compatible = "socionext,uniphier-pxs2-dwc3-glue",
-				     "simple-mfd";
-			reg = <0x65d00000 0x400>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges = <0 0x65d00000 0x400>;
-
-			usb1_rst: reset-controller@0 {
-				compatible = "socionext,uniphier-pxs2-usb3-reset";
-				reg = <0x0 0x4>;
-				#reset-cells = <1>;
-				clock-names = "link";
-				clocks = <&sys_clk 15>;
-				reset-names = "link";
-				resets = <&sys_rst 15>;
-			};
-
-			usb1_vbus0: regulator@100 {
-				compatible = "socionext,uniphier-pxs2-usb3-regulator";
-				reg = <0x100 0x10>;
-				clock-names = "link";
-				clocks = <&sys_clk 15>;
-				reset-names = "link";
-				resets = <&sys_rst 15>;
-			};
-
-			usb1_vbus1: regulator@110 {
-				compatible = "socionext,uniphier-pxs2-usb3-regulator";
-				reg = <0x110 0x10>;
-				clock-names = "link";
-				clocks = <&sys_clk 15>;
-				reset-names = "link";
-				resets = <&sys_rst 15>;
-			};
-
-			usb1_hsphy0: phy@200 {
-				compatible = "socionext,uniphier-pxs2-usb3-hsphy";
-				reg = <0x200 0x10>;
-				#phy-cells = <0>;
-				clock-names = "link", "phy";
-				clocks = <&sys_clk 15>, <&sys_clk 20>;
-				reset-names = "link", "phy";
-				resets = <&sys_rst 15>, <&sys_rst 20>;
-				vbus-supply = <&usb1_vbus0>;
-			};
-
-			usb1_hsphy1: phy@210 {
-				compatible = "socionext,uniphier-pxs2-usb3-hsphy";
-				reg = <0x210 0x10>;
-				#phy-cells = <0>;
-				clock-names = "link", "phy";
-				clocks = <&sys_clk 15>, <&sys_clk 20>;
-				reset-names = "link", "phy";
-				resets = <&sys_rst 15>, <&sys_rst 20>;
-				vbus-supply = <&usb1_vbus1>;
-			};
-
-			usb1_ssphy0: phy@300 {
-				compatible = "socionext,uniphier-pxs2-usb3-ssphy";
-				reg = <0x300 0x10>;
-				#phy-cells = <0>;
-				clock-names = "link", "phy";
-				clocks = <&sys_clk 15>, <&sys_clk 21>;
-				reset-names = "link", "phy";
-				resets = <&sys_rst 15>, <&sys_rst 21>;
-				vbus-supply = <&usb1_vbus0>;
-			};
-		};
-
-		nand: nand-controller@68000000 {
-			compatible = "socionext,uniphier-denali-nand-v5b";
-			status = "disabled";
-			reg-names = "nand_data", "denali_reg";
-			reg = <0x68000000 0x20>, <0x68100000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&pinctrl_nand>;
-			clock-names = "nand", "nand_x", "ecc";
-			clocks = <&sys_clk 2>, <&sys_clk 3>, <&sys_clk 3>;
-			reset-names = "nand", "reg";
-			resets = <&sys_rst 2>, <&sys_rst 2>;
-		};
-	};
-};
-
-#include "uniphier-pinctrl.dtsi"