diff --git a/rk356x/.dr4-rk3568.dtb.cmd b/rk356x/.dr4-rk3568.dtb.cmd index 53231e6..88ee0dd 100644 --- a/rk356x/.dr4-rk3568.dtb.cmd +++ b/rk356x/.dr4-rk3568.dtb.cmd @@ -27,7 +27,6 @@ deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb := \ arch/arm64/boot/dts/rockchip/rk356x/../rk3568-pinctrl.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/../rockchip-pinconf.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/../rk3568-linux.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-camera-mipi-gc2093-single-2lane.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \ diff --git a/rk356x/.dr4-rk3568.dtb.d.pre.tmp b/rk356x/.dr4-rk3568.dtb.d.pre.tmp index 4ffa353..c5d9819 100644 --- a/rk356x/.dr4-rk3568.dtb.d.pre.tmp +++ b/rk356x/.dr4-rk3568.dtb.d.pre.tmp @@ -23,6 +23,5 @@ dr4-rk3568.o: arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts \ arch/arm64/boot/dts/rockchip/rk356x/../rk3568-pinctrl.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/../rockchip-pinconf.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/../rk3568-linux.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-camera-mipi-gc2093-single-2lane.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi diff --git a/rk356x/.dr4-rk3568.dtb.dts.tmp b/rk356x/.dr4-rk3568.dtb.dts.tmp index b241e04..17f1ab2 100644 --- a/rk356x/.dr4-rk3568.dtb.dts.tmp +++ b/rk356x/.dr4-rk3568.dtb.dts.tmp @@ -1,6 +1,6 @@ -# 1 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" -# 1 "" -# 1 "" +# 0 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 0 "" +# 0 "" # 1 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" @@ -7849,7 +7849,7 @@ }; }; }; -# 3872 "arch/arm64/boot/dts/rockchip/rk356x/../rk3568.dtsi" 2 +# 3873 "arch/arm64/boot/dts/rockchip/rk356x/../rk3568.dtsi" 2 # 18 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 2 / { @@ -8817,113 +8817,6 @@ dsi1_panel: panel@0 { disable-win-move; }; # 13 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 - - -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-camera-mipi-gc2093-single-2lane.dtsi" 1 - -/ { - - - vcc_camera: vcc-camera-regulator { - compatible = "regulator-fixed"; - - - - - - - - regulator-name = "vcc_camera"; - enable-active-high; - regulator-always-on; - regulator-boot-on; - }; - - -}; - -&i2c4 { - status = "okay"; - gc2093: gc2093@37 { - compatible = "galaxycore,gc2093"; - status = "okay"; - reg = <0x37>; - clocks = <&cru 214>; - clock-names = "xvclk"; - power-domains = <&power 8>; -# 43 "arch/arm64/boot/dts/rockchip/rk356x/rp-camera-mipi-gc2093-single-2lane.dtsi" - rockchip,camera-module-index = <0>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "SIDB205300385-VA"; - rockchip,camera-module-lens-name = "default"; - port { - ucam_out0: endpoint { - remote-endpoint = <&mipi_in_ucam0>; - data-lanes = <1 2>; - }; - }; - }; -}; - - -&rkisp { - status = "okay"; -}; - -&rkisp_mmu { - status = "okay"; -}; - -&rkisp_vir0 { - status = "okay"; - - port { - #address-cells = <1>; - #size-cells = <0>; - - isp0_in: endpoint@0 { - reg = <0>; - remote-endpoint = <&csidphy_out>; - }; - }; -}; - -&csi2_dphy_hw { - status = "okay"; -}; - - - -&csi2_dphy1 { - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - mipi_in_ucam0: endpoint@1 { - reg = <1>; - remote-endpoint = <&ucam_out0>; - data-lanes = <1 2>; - }; - }; - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - csidphy_out: endpoint@0 { - reg = <0>; - remote-endpoint = <&isp0_in>; - }; - }; - }; -}; -# 16 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 # 24 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" # 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi" 1 @@ -9014,7 +8907,7 @@ dsi1_panel: panel@0 { thermal-zone = "soc-thermal"; threshold-temp = <60000>; running-time = <10000>; - status = "okay"; + status = "disabled"; }; rp_power{ @@ -9024,16 +8917,7 @@ dsi1_panel: panel@0 { pinctrl-name = "default"; pinctrl-0 = <&rp_power>; -# 112 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" - led { - gpio_num = <&gpio0 30 0>; - gpio_function = <3>; - }; - - - - - +# 121 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" otg_mode { gpio_num = <&gpio1 4 1>; gpio_function = <0>; @@ -9042,46 +8926,7 @@ dsi1_panel: panel@0 { gpio_num = <&gpio0 5 0>; gpio_function = <4>; }; - - hub_rst { - gpio_num = <&gpio0 8 0>; - gpio_function = <4>; - }; - usb_pwr0 { - gpio_num = <&gpio1 24 0>; - gpio_function = <4>; - }; - usb_pwr1 { - gpio_num = <&gpio1 25 0>; - gpio_function = <4>; - }; - usb_pwr2 { - gpio_num = <&gpio1 26 0>; - gpio_function = <4>; - }; - usb_pwr3 { - gpio_num = <&gpio1 28 0>; - gpio_function = <4>; - }; - usb_pwr4 { - gpio_num = <&gpio1 27 0>; - gpio_function = <4>; - }; - - spk_en { - gpio_num = <&gpio3 6 0>; - gpio_function = <4>; - }; - spk_mute { - gpio_num = <&gpio3 7 1>; - gpio_function = <4>; - }; - - vdd_3g { - gpio_num = <&gpio3 22 0>; - gpio_function = <4>; - }; - +# 169 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" }; rp_gpio{ @@ -9173,17 +9018,17 @@ dsi1_panel: panel@0 { vccio3-supply = <&vccio_sd>; vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; - vccio6-supply = <&vcc_3v3>; + vccio6-supply = <&vcc_1v8>; vccio7-supply = <&vcc_3v3>; }; &i2c3 { - status = "okay"; + status = "disabled"; }; &i2c5 { - status = "okay"; + status = "disabled"; rtc@51 { status = "okay"; compatible = "rtc,hym8563"; @@ -9192,38 +9037,38 @@ dsi1_panel: panel@0 { }; &uart3 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart3m1_xfer>; }; &uart4 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart4m0_xfer>; }; &uart5 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart5m0_xfer>; }; &uart6 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart6m1_xfer>; }; &uart7 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart7m1_xfer>; }; &uart8 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart8m0_xfer>; }; @@ -9244,7 +9089,7 @@ dsi1_panel: panel@0 { }; &video_phy1 { - status = "okay"; + status = "disabled"; }; diff --git a/rk356x/dr4-rk3568.dtb b/rk356x/dr4-rk3568.dtb index 53e4990..938f128 100644 Binary files a/rk356x/dr4-rk3568.dtb and b/rk356x/dr4-rk3568.dtb differ diff --git a/rk356x/dr4-rk3568.dts b/rk356x/dr4-rk3568.dts index e626f74..000ec4e 100755 --- a/rk356x/dr4-rk3568.dts +++ b/rk356x/dr4-rk3568.dts @@ -12,7 +12,7 @@ #include "../rk3568-linux.dtsi" /*************************camera***********************/ -#include "rp-camera-mipi-gc2093-single-2lane.dtsi" +// #include "rp-camera-mipi-gc2093-single-2lane.dtsi" /***************************************************/ @@ -85,7 +85,7 @@ thermal-zone = "soc-thermal"; threshold-temp = <60000>; //60C running-time = <10000>; //10s - status = "okay"; + status = "disabled"; }; rp_power{ @@ -109,10 +109,10 @@ * }; */ - led { //system led - gpio_num = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>; - gpio_function = <3>; - }; + // led { //system led + // gpio_num = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>; + // gpio_function = <3>; + // }; //fan { //fan // gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>; // gpio_function = <4>; @@ -127,44 +127,44 @@ gpio_function = <4>; }; - hub_rst { //usb hub - gpio_num = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - gpio_function = <4>; - }; - usb_pwr0 { //host0 power en - gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; - gpio_function = <4>; - }; - usb_pwr1 { //host1 power en - gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>; - gpio_function = <4>; - }; - usb_pwr2 { //host2 power en - gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; - gpio_function = <4>; - }; - usb_pwr3 { //host3 power en - gpio_num = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; - gpio_function = <4>; - }; - usb_pwr4 { //host4 power en - gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>; - gpio_function = <4>; - }; + // hub_rst { //usb hub + // gpio_num = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; + // gpio_function = <4>; + // }; + // usb_pwr0 { //host0 power en + // gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; + // gpio_function = <4>; + // }; + // usb_pwr1 { //host1 power en + // gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>; + // gpio_function = <4>; + // }; + // usb_pwr2 { //host2 power en + // gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + // gpio_function = <4>; + // }; + // usb_pwr3 { //host3 power en + // gpio_num = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; + // gpio_function = <4>; + // }; + // usb_pwr4 { //host4 power en + // gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>; + // gpio_function = <4>; + // }; - spk_en { //spk enable - gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; - gpio_function = <4>; - }; - spk_mute { //spk mute - gpio_num = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>; - gpio_function = <4>; - }; + // spk_en { //spk enable + // gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; + // gpio_function = <4>; + // }; + // spk_mute { //spk mute + // gpio_num = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>; + // gpio_function = <4>; + // }; - vdd_3g { //4G module power en - gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; - gpio_function = <4>; - }; + // vdd_3g { //4G module power en + // gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; + // gpio_function = <4>; + // }; }; @@ -264,17 +264,17 @@ vccio3-supply = <&vccio_sd>; vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; - vccio6-supply = <&vcc_3v3>; + vccio6-supply = <&vcc_1v8>; vccio7-supply = <&vcc_3v3>; }; &i2c3 { - status = "okay"; + status = "disabled"; }; &i2c5 { - status = "okay"; + status = "disabled"; rtc@51 { status = "okay"; compatible = "rtc,hym8563"; @@ -283,38 +283,38 @@ }; &uart3 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart3m1_xfer>; }; &uart4 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart4m0_xfer>; }; &uart5 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart5m0_xfer>; }; &uart6 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart6m1_xfer>; }; &uart7 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart7m1_xfer>; }; &uart8 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&uart8m0_xfer>; }; @@ -335,7 +335,7 @@ }; &video_phy1 { - status = "okay"; + status = "disabled"; }; /******** must be close,if not system no run ******/ diff --git a/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi b/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi index 7ecab47..977edeb 100755 --- a/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi +++ b/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi @@ -131,7 +131,7 @@ }; rk809_sound: rk809-sound { - status = "okay"; + status = "disabled"; compatible = "rockchip,multicodecs-card"; rockchip,card-name = "rockchip-rk809"; //hp-det-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;