ARM64: fsl-imx8qm-apalis*: Move SoM unrelated stuff to *eval.dtsi

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

2 files changed, 463 insertions, 325 deletions

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis-eval.dtsi
index f0bdb46fbbc2..c8dea232d24e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis-eval.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis-eval.dtsi
@@ -4,5 +4,466 @@
  */
 
 / {
+	aliases {
+		rtc0 = &rtc_i2c;
+		rtc1 = &rtc;
+	};
 
+	/* Apalis WAKE1_MICO */
+	gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio_keys>;
+
+		wakeup {
+			label = "Wake-Up";
+			gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_WAKEUP>;
+			debounce-interval = <10>;
+			wakeup-source;
+		};
+	};
+
+	reg_usb_host_vbus: regulator-usb-host-vbus {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_usbh_en>;
+		regulator-name = "VCC_USBH(2A|2C|2D|3|4)";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		/* Apalis USBH_EN */
+		gpio = <&gpio4 4 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&acm {
+	status = "okay";
+};
+
+&adc0 {
+	status = "okay";
+};
+
+&adc1 {
+	status = "okay";
+};
+
+&amix {
+	status = "okay";
+};
+
+&asrc0 {
+	status = "okay";
+};
+
+&backlight {
+	default-brightness-level = <4>;
+	brightness-levels = <0 45 63 88 119 158 203 255>;
+	pwms = <&lvds1_pwm 0 6666667 PWM_POLARITY_INVERTED>;
+	status = "okay";
+};
+
+&dpr1_channel1 {
+	status = "okay";
+};
+
+&dpr1_channel2 {
+	status = "okay";
+};
+
+&dpr1_channel3 {
+	status = "okay";
+};
+
+&dpr2_channel1 {
+	status = "okay";
+};
+
+&dpr2_channel2 {
+	status = "okay";
+};
+
+&dpr2_channel3 {
+	status = "okay";
+};
+
+&dpr3_channel1 {
+	status = "okay";
+};
+
+&dpr3_channel2 {
+	status = "okay";
+};
+
+&dpr3_channel3 {
+	status = "okay";
+};
+
+&dpr4_channel1 {
+	status = "okay";
+};
+
+&dpr4_channel2 {
+	status = "okay";
+};
+
+&dpr4_channel3 {
+	status = "okay";
+};
+
+&dpu1 {
+	status = "okay";
+};
+
+&dpu2 {
+	status = "okay";
+};
+
+&fec1 {
+	status = "okay";
+};
+
+&flexcan1 {
+	status = "okay";
+};
+
+&flexcan2 {
+	status = "okay";
+};
+
+&gpu_3d0 {
+	status = "okay";
+};
+
+&gpu_3d1 {
+	status = "okay";
+};
+
+&hdmi {
+	status = "okay";
+};
+
+/* Apalis I2C2 (DDC) */
+&i2c0 {
+	status = "okay";
+};
+
+/* Apalis I2C1 */
+&i2c2 {
+	status = "okay";
+
+	/* M41T0M6 real time clock on carrier board */
+	rtc_i2c: rtc@68 {
+		compatible = "st,m41t0";
+		reg = <0x68>;
+	};
+
+	atmel_mxt_ts: atmel_mxt_ts@4a {
+		compatible = "atmel,maxtouch";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_touch>;
+		reg = <0x4a>;
+		interrupt-parent = <&gpio4>;
+		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;    /* Apalis GPIO5 */
+		reset-gpios = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */
+		status = "okay";
+	};
+};
+
+/* Apalis I2C3 (CAM) */
+&i2c3 {
+	status = "okay";
+
+	ov5640_mipi: ov5640_mipi@3c {
+		compatible = "ovti,ov5640_mipi_v3";
+		clocks = <&clk IMX8QM_24MHZ>;
+		clock-names = "csi_mclk";
+		csi_id = <1>;
+		mclk = <24000000>;
+		mclk_source = <0>;
+		mipi_csi;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpio12>;
+		pwn-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+		reg = <0x3c>;
+		rst-gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
+		status = "okay";
+
+		port {
+			ov5640_ep: endpoint {
+				remote-endpoint = <&mipi_csi1_ep>;
+			};
+		};
+	};
+};
+
+&imx8_gpu_ss {
+	status = "okay";
+};
+
+&intmux_cm40 {
+	status = "okay";
+};
+
+&intmux_cm41 {
+	status = "okay";
+};
+
+&irqsteer_hdmi {
+	status = "okay";
+};
+
+&isi_0 {
+	status = "okay";
+};
+
+&isi_1 {
+	status = "okay";
+};
+
+&isi_2 {
+	status = "okay";
+};
+
+&isi_3 {
+	status = "okay";
+};
+
+&isi_4 {
+	status = "okay";
+};
+
+&isi_5 {
+	status = "okay";
+};
+
+&isi_6 {
+	status = "okay";
+};
+
+&isi_7 {
+	status = "okay";
+};
+
+&ldb2_phy {
+	status = "okay";
+};
+
+/* Apalis SPI1 */
+&lpspi0 {
+	status = "okay";
+};
+
+/* Apalis SPI2 */
+&lpspi2 {
+	status = "okay";
+};
+
+/* Apalis UART3 */
+&lpuart0 {
+	status = "okay";
+};
+
+/* Apalis UART1 */
+&lpuart1 {
+	status = "okay";
+};
+
+/* Apalis UART4 */
+&lpuart2 {
+	status = "okay";
+};
+
+/* Apalis UART2 */
+&lpuart3 {
+	status = "okay";
+};
+
+/* Apalis BKL1_PWM */
+&lvds1_pwm {
+	status = "okay";
+};
+
+&mipi_csi_1 {
+	status = "okay";
+};
+
+/* Apalis PCIE1 */
+&pciea{
+	status = "okay";
+};
+
+&pixel_combiner1 {
+	status = "okay";
+};
+
+&pixel_combiner2 {
+	status = "okay";
+};
+
+&prg1 {
+	status = "okay";
+};
+
+&prg2 {
+	status = "okay";
+};
+
+&prg3 {
+	status = "okay";
+};
+
+&prg4 {
+	status = "okay";
+};
+
+&prg5 {
+	status = "okay";
+};
+
+&prg6 {
+	status = "okay";
+};
+
+&prg7 {
+	status = "okay";
+};
+
+&prg8 {
+	status = "okay";
+};
+
+&prg9 {
+	status = "okay";
+};
+
+&prg10 {
+	status = "okay";
+};
+
+&prg11 {
+	status = "okay";
+};
+
+&prg12 {
+	status = "okay";
+};
+
+&prg13 {
+	status = "okay";
+};
+
+&prg14 {
+	status = "okay";
+};
+
+&prg15 {
+	status = "okay";
+};
+
+&prg16 {
+	status = "okay";
+};
+
+&prg17 {
+	status = "okay";
+};
+
+&prg18 {
+	status = "okay";
+};
+
+/* Apalis PWM3, MXM3 pin 6 */
+&pwm0 {
+	status = "okay";
+};
+
+/* Apalis PWM4, MXM3 pin 8 */
+&pwm1 {
+	status = "okay";
+};
+
+/* Apalis PWM1, MXM3 pin 2 */
+&pwm2 {
+	status = "okay";
+};
+
+/* Apalis PWM2, MXM3 pin 4 */
+&pwm3 {
+	status = "okay";
+};
+
+&rpmsg {
+	status = "okay";
+};
+
+&rpmsg1 {
+	status = "okay";
+};
+
+&sai1 {
+	status = "okay";
+};
+
+&sai6 {
+	status = "okay";
+};
+
+&sai7 {
+	status = "okay";
+};
+
+&sai_hdmi_tx {
+	status = "okay";
+};
+
+/* Apalis SATA1 */
+&sata {
+	status = "okay";
+};
+
+/* Apalis SPDIF1 */
+&spdif0 {
+	status = "okay";
+};
+
+&spdif1 {
+	status = "okay";
+};
+
+/* Apalis USBH2, Apalis USBH3 and on-module Wi-Fi via on-module HSIC Hub */
+&usbh1 {
+	vbus-supply = <&reg_usb_host_vbus>;
+	status = "okay";
+};
+
+/* Apalis USBO1 */
+&usbotg1 {
+	status = "okay";
+};
+
+/* Apalis USBH4 SuperSpeed */
+&usbotg3 {
+	cdns3,usbphy = <&usbphynop1>;
+	dr_mode = "host";
+	status = "okay";
+};
+
+/* Apalis MMC1 */
+&usdhc2 {
+	status = "okay";
+};
+
+/* Apalis SD1 */
+&usdhc3 {
+	status = "okay";
+};
+
+&vpu_decoder {
+	status = "okay";
+};
+
+&vpu_encoder {
+	status = "okay";
 };
\ No newline at end of file
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dtsi
index 80879a9c2853..a40b3e2bd905 100644
--- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dtsi
@@ -10,11 +10,6 @@
 	model = "Toradex Apalis iMX8QM";
 	compatible = "toradex,apalis-imx8qm", "fsl,imx8qm";
 
-	aliases {
-		rtc0 = &rtc_i2c;
-		rtc1 = &rtc;
-	};
-
 	chosen {
 		bootargs = "console=ttyLP1,115200 earlycon";
 		stdout-path = &lpuart1;
@@ -25,26 +20,7 @@
 		compatible = "pwm-backlight";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_gpio_bkl_on>;
-		brightness-levels = <0 45 63 88 119 158 203 255>;
-		default-brightness-level = <4>;
 		enable-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; /* Apalis BKL1_ON */
-		pwms = <&lvds1_pwm 0 6666667 PWM_POLARITY_INVERTED>;
-		status = "okay";
-	};
-
-	/* Apalis WAKE1_MICO */
-	gpio-keys {
-		compatible = "gpio-keys";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpio_keys>;
-
-		wakeup {
-			label = "Wake-Up";
-			gpios = <&gpio2 20 GPIO_ACTIVE_LOW>;
-			linux,code = <KEY_WAKEUP>;
-			debounce-interval = <10>;
-			wakeup-source;
-		};
 	};
 
 	pcie_sata_refclk: clock-generator {
@@ -95,18 +71,6 @@
 		regulator-max-microvolt = <1800000>;
 	};
 
-	reg_usb_host_vbus: regulator-usb-host-vbus {
-		compatible = "regulator-fixed";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_usbh_en>;
-		regulator-name = "VCC_USBH(2A|2C|2D|3|4)";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		enable-active-high;
-		/* Apalis USBH_EN */
-		gpio = <&gpio4 4 GPIO_ACTIVE_HIGH>;
-	};
-
 	gpio-fan {
 		compatible = "gpio-fan";
 		pinctrl-names = "default";
@@ -196,86 +160,19 @@
 	};
 };
 
-&acm {
-	status = "okay";
-};
-
 &adc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_adc0>;
 	vref-supply = <&reg_vref_1v8>;
-	status = "okay";
 };
 
 &adc1 {
 	/* pinctrl handled by touchscreen above */
 	vref-supply = <&reg_vref_1v8>;
-	status = "okay";
-};
-
-&amix {
-	status = "okay";
 };
 
 &asrc0 {
 	fsl,asrc-rate = <48000>;
-	status = "okay";
-};
-
-&dpr1_channel1 {
-	status = "okay";
-};
-
-&dpr1_channel2 {
-	status = "okay";
-};
-
-&dpr1_channel3 {
-	status = "okay";
-};
-
-&dpr2_channel1 {
-	status = "okay";
-};
-
-&dpr2_channel2 {
-	status = "okay";
-};
-
-&dpr2_channel3 {
-	status = "okay";
-};
-
-&dpr3_channel1 {
-	status = "okay";
-};
-
-&dpr3_channel2 {
-	status = "okay";
-};
-
-&dpr3_channel3 {
-	status = "okay";
-};
-
-&dpr4_channel1 {
-	status = "okay";
-};
-
-&dpr4_channel2 {
-	status = "okay";
-};
-
-&dpr4_channel3 {
-	status = "okay";
-};
-
-&dpu1 {
-	status = "okay";
-};
-
-&dpu2 {
-	status = "okay";
 };
 
 /* Apalis GLAN */
@@ -289,7 +186,6 @@
 	phy-mode = "rgmii";
 	phy-reset-duration = <10>;
 	phy-reset-gpios = <&gpio1 11 1>;
-	status = "okay";
 
 	mdio {
 		#address-cells = <1>;
@@ -309,7 +205,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_flexcan1>;
 	/* xceiver-supply = <&reg_can_stby>; */
-	status = "okay";
 };
 
 /* Apalis CAN2 */
@@ -319,15 +214,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_flexcan2>;
 	/* xceiver-supply = <&reg_can_stby>; */
-	status = "okay";
-};
-
-&gpu_3d0 {
-	status = "okay";
-};
-
-&gpu_3d1 {
-	status = "okay";
 };
 
 /* Apalis HDMI1 */
@@ -344,7 +230,6 @@
 	ddc-i2c-bus = <&i2c0>;
 	fsl,cec;
 	hdmi-ctrl-gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
-	status = "okay";
 };
 
 /* Apalis I2C2 (DDC) */
@@ -354,7 +239,6 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	clock-frequency = <100000>;
-	status = "okay";
 };
 
 /* On-module I2C */
@@ -406,24 +290,6 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	clock-frequency = <100000>;
-	status = "okay";
-
-	/* M41T0M6 real time clock on carrier board */
-	rtc_i2c: rtc@68 {
-		compatible = "st,m41t0";
-		reg = <0x68>;
-	};
-
-	atmel_mxt_ts: atmel_mxt_ts@4a {
-		compatible = "atmel,maxtouch";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_touch>;
-		reg = <0x4a>;
-		interrupt-parent = <&gpio4>;
-		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;    /* Apalis GPIO5 */
-		reset-gpios = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* Apalis GPIO6 */
-		status = "okay";
-	};
 };
 
 /* Apalis I2C3 (CAM) */
@@ -433,41 +299,6 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	clock-frequency = <100000>;
-	status = "okay";
-
-	ov5640_mipi: ov5640_mipi@3c {
-		compatible = "ovti,ov5640_mipi_v3";
-		clocks = <&clk IMX8QM_24MHZ>;
-		clock-names = "csi_mclk";
-		csi_id = <1>;
-		mclk = <24000000>;
-		mclk_source = <0>;
-		mipi_csi;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpio12>;
-		pwn-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
-		reg = <0x3c>;
-		rst-gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
-		status = "okay";
-
-		port {
-			ov5640_ep: endpoint {
-				remote-endpoint = <&mipi_csi1_ep>;
-			};
-		};
-	};
-};
-
-&imx8_gpu_ss {
-	status = "okay";
-};
-
-&intmux_cm40 {
-	status = "okay";
-};
-
-&intmux_cm41 {
-	status = "okay";
 };
 
 &iomuxc {
@@ -1218,46 +1049,6 @@
 	};
 };
 
-&irqsteer_hdmi {
-	status = "okay";
-};
-
-&isi_0 {
-	status = "okay";
-};
-
-&isi_1 {
-	status = "okay";
-};
-
-&isi_2 {
-	status = "okay";
-};
-
-&isi_3 {
-	status = "okay";
-};
-
-&isi_4 {
-	status = "okay";
-};
-
-&isi_5 {
-	status = "okay";
-};
-
-&isi_6 {
-	status = "okay";
-};
-
-&isi_7 {
-	status = "okay";
-};
-
-&ldb2_phy {
-	status = "okay";
-};
-
 &ldb2 {
 	status = "okay";
 
@@ -1283,7 +1074,6 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	dma-names = "no","no";
-	status = "okay";
 
 	spidev0: spi@0 {
 		compatible = "toradex,evalspi";
@@ -1299,7 +1089,6 @@
 	#address-cells = <1>;
 	#size-cells = <0>;
 	dma-names = "no","no";
-	status = "okay";
 
 	spidev1: spi@0 {
 		compatible = "toradex,evalspi";
@@ -1312,28 +1101,24 @@
 &lpuart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_lpuart0>;
-	status = "okay";
 };
 
 /* Apalis UART1 */
 &lpuart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_lpuart1>;
-	status = "okay";
 };
 
 /* Apalis UART4 */
 &lpuart2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_lpuart2>;
-	status = "okay";
 };
 
 /* Apalis UART2 */
 &lpuart3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_lpuart3>;
-	status = "okay";
 };
 
 /* Apalis BKL1_PWM */
@@ -1341,14 +1126,12 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm_bkl>;
 	#pwm-cells = <3>;
-	status = "okay";
 };
 
 &mipi_csi_1 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	/delete-property/virtual-channel;
-	status = "okay";
 
 	/* Camera 0 MIPI CSI-2 (CSIS1) */
 	port@1 {
@@ -1375,7 +1158,6 @@
 	fsl,max-link-speed = <1>;
 	reset-gpio = <&gpio0 30 GPIO_ACTIVE_LOW>;
 	vpcie-supply = <&reg_pcie_switch>;
-	status = "okay";
 };
 
 /* On-module Wi-Fi */
@@ -1408,92 +1190,11 @@
 	debug_console;
 };
 
-&pixel_combiner1 {
-	status = "okay";
-};
-
-&pixel_combiner2 {
-	status = "okay";
-};
-
-&prg1 {
-	status = "okay";
-};
-
-&prg2 {
-	status = "okay";
-};
-
-&prg3 {
-	status = "okay";
-};
-
-&prg4 {
-	status = "okay";
-};
-
-&prg5 {
-	status = "okay";
-};
-
-&prg6 {
-	status = "okay";
-};
-
-&prg7 {
-	status = "okay";
-};
-
-&prg8 {
-	status = "okay";
-};
-
-&prg9 {
-	status = "okay";
-};
-
-&prg10 {
-	status = "okay";
-};
-
-&prg11 {
-	status = "okay";
-};
-
-&prg12 {
-	status = "okay";
-};
-
-&prg13 {
-	status = "okay";
-};
-
-&prg14 {
-	status = "okay";
-};
-
-&prg15 {
-	status = "okay";
-};
-
-&prg16 {
-	status = "okay";
-};
-
-&prg17 {
-	status = "okay";
-};
-
-&prg18 {
-	status = "okay";
-};
-
 /* Apalis PWM3, MXM3 pin 6 */
 &pwm0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm0>;
 	#pwm-cells = <3>;
-	status = "okay";
 };
 
 /* Apalis PWM4, MXM3 pin 8 */
@@ -1501,7 +1202,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm1>;
 	#pwm-cells = <3>;
-	status = "okay";
 };
 
 /* Apalis PWM1, MXM3 pin 2 */
@@ -1509,7 +1209,6 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm2>;
 	#pwm-cells = <3>;
-	status = "okay";
 };
 
 /* Apalis PWM2, MXM3 pin 4 */
@@ -1517,25 +1216,22 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pwm3>;
 	#pwm-cells = <3>;
-	status = "okay";
 };
 
-&rpmsg{
+&rpmsg {
 	/*
 	 * 64K for one rpmsg instance:
 	 */
 	reg = <0x0 0x90000000 0x0 0x20000>;
 	vdev-nums = <2>;
-	status = "okay";
 };
 
-&rpmsg1{
+&rpmsg1 {
 	/*
 	 * 64K for one rpmsg instance:
 	 */
 	reg = <0x0 0x90100000 0x0 0x20000>;
 	vdev-nums = <2>;
-	status = "okay";
 };
 
 &sai1 {
@@ -1547,7 +1243,6 @@
 	#sound-dai-cells = <0>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_sai1>;
-	status = "okay";
 };
 
 &sai6 {
@@ -1590,7 +1285,6 @@
 	assigned-clock-parents = <&clk IMX8QM_AUD_ACM_AUD_PLL_CLK0_CLK>;
 	assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>;
 	fsl,sai-asynchronous;
-	status = "okay";
 };
 
 /* Apalis SATA1 */
@@ -1606,7 +1300,6 @@
 	clock-names = "sata", "sata_ref", "epcs_tx", "epcs_rx",
 		      "phy_pclk0", "phy_pclk1", "phy_apbclk", "sata_ext";
 	ext_osc = <1>;
-	status = "okay";
 };
 
 /* Apalis SPDIF1 */
@@ -1617,7 +1310,6 @@
 			<&clk IMX8QM_AUD_ACM_AUD_PLL_CLK0_DIV>,
 			<&clk IMX8QM_AUD_ACM_AUD_REC_CLK0_DIV>;
 	assigned-clock-rates = <786432000>, <49152000>, <12288000>;
-	status = "okay";
 };
 
 &spdif1 {
@@ -1625,7 +1317,6 @@
 			<&clk IMX8QM_AUD_ACM_AUD_PLL_CLK0_DIV>,
 			<&clk IMX8QM_AUD_ACM_AUD_REC_CLK0_DIV>;
 	assigned-clock-rates = <786432000>, <49152000>, <12288000>;
-	status = "okay";
 };
 
 &thermal_zones {
@@ -1677,8 +1368,6 @@
 	disable-over-current;
 	hnp-disable;
 	srp-disable;
-	vbus-supply = <&reg_usb_host_vbus>;
-	status = "okay";
 };
 
 /* Apalis USBO1 */
@@ -1690,20 +1379,12 @@
 	hnp-disable;
 	power-polarity-active-high;
 	srp-disable;
-	status = "okay";
 };
 
 &usbphynop1 {
 	vbus-regulator = <&reg_usb_host_vbus>;
 };
 
-/* Apalis USBH4 SuperSpeed */
-&usbotg3 {
-	cdns3,usbphy = <&usbphynop1>;
-	dr_mode = "host";
-	status = "okay";
-};
-
 /* On-module eMMC */
 &usdhc1 {
 	pinctrl-names = "default", "state_100mhz", "state_200mhz";
@@ -1723,7 +1404,6 @@
 	pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_mmc1_cd>;
 	bus-width = <8>;
 	cd-gpios = <&gpio2 9 GPIO_ACTIVE_LOW>; /* Apalis MMC1_CD# */
-	status = "okay";
 };
 
 /* Apalis SD1 */
@@ -1734,15 +1414,12 @@
 	pinctrl-2 = <&pinctrl_usdhc3_200mhz>, <&pinctrl_sd1_cd>;
 	bus-width = <4>;
 	cd-gpios = <&gpio4 12 GPIO_ACTIVE_LOW>; /* Apalis SD1_CD# */
-	status = "okay";
 };
 
 &vpu_decoder {
 	core_type = <2>;
-	status = "okay";
 };
 
 &vpu_encoder {
 	core_type = <2>;
-	status = "okay";
 };