diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi index cf067f8625af..8d759f1d74b2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi @@ -918,8 +918,8 @@ reg = <0x14>; pinctrl-names = "default"; pinctrl-0 = <&touch_gpio>; - goodix,rst-gpio = <&gpio0 RK_PB5 GPIO_ACTIVE_HIGH>; - goodix,irq-gpio = <&gpio0 RK_PB6 IRQ_TYPE_LEVEL_LOW>; + goodix,rst-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; + goodix,irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>; }; }; @@ -1084,7 +1084,7 @@ vmmc-supply = <&vcc3v3_sd>; vqmmc-supply = <&vccio_sd>; pinctrl-names = "default"; - pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd>; + pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd &sdmmc0_det>; status = "okay"; }; @@ -1103,11 +1103,6 @@ #sound-dai-cells = <0>; }; -&saradc { - status = "okay"; - vref-supply = <&vcc_1v8>; -}; - &usb2phy0 { status = "okay"; @@ -1186,13 +1181,3 @@ status = "okay"; }; -&sdhci { - bus-width = <8>; - cap-mmc-highspeed; - mmc-hs200-1_8v; - mmc-hs400-1_8v; - mmc-hs400-enhanced-strobe; - supports-emmc; - non-removable; - status = "okay"; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts index 6cb5578e8e02..035438649fae 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dts @@ -139,9 +139,8 @@ &dsi_panel { enable-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio3 RK_PB5 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_gpio>, <&lcd_rst_gpio>; + pinctrl-0 = <&lcd_enable_gpio>; }; &pinctrl { @@ -152,10 +151,6 @@ }; lcd { - lcd_rst_gpio: lcd-rst-gpio { - rockchip,pins = <3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - lcd_enable_gpio: lcd-enable-gpio { rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; };