From 59dafb5ee1891f4783aee9f94f2208aa0459ead6 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Sun, 20 Dec 2020 13:25:27 +0200 Subject: Revert "arm64: dts: apalis-imx8x: enable USBH1" This reverts commit ce1e685adbd15203ca84c0be62cf752304e39df3. That commit seems for Apalis iMX8QM and should have not been applied for Apalis iMX8QXP. Signed-off-by: Oleksandr Suvorov --- arch/arm64/boot/dts/freescale/imx8qxp-apalis-eval.dtsi | 4 ---- arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-apalis-eval.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-apalis-eval.dtsi index d1ae7e18bee8..08b2a1db0861 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-apalis-eval.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qxp-apalis-eval.dtsi @@ -275,10 +275,6 @@ status = "okay"; }; -&usbh1 { - status = "okay"; -}; - /* Apalis USBO1 */ &usbotg1 { adp-disable; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi index eceee543e6c6..7847f51e18f6 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qxp-apalis.dtsi @@ -466,7 +466,7 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_dap1_gpios>, <&pinctrl_gpio3>, <&pinctrl_gpio4>, <&pinctrl_mmc1_gpios>, <&pinctrl_qspi0a_gpios>, <&pinctrl_sata1_act>, - <&pinctrl_gpio_usbh_oc_n>, <&pinctrl_usbo1oc>, <&pinctrl_wifi_sclk>; + <&pinctrl_usbo1oc>, <&pinctrl_wifi_sclk>; apalis-imx8qxp { /* Apalis AN1_ADC */ -- cgit v1.2.3