diff --git a/rk356x/.dr4-rk3568.dtb.cmd b/rk356x/.dr4-rk3568.dtb.cmd index af35459..4430bd9 100644 --- a/rk356x/.dr4-rk3568.dtb.cmd +++ b/rk356x/.dr4-rk3568.dtb.cmd @@ -28,16 +28,8 @@ deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb := \ 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-adc-key.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-can0-m0-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-can1-m1-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-can2-m0-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie2x1.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie3x2.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rk3568-sata1.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/lcd-gpio-dr4-rk3568.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb) diff --git a/rk356x/.dr4-rk3568.dtb.d.pre.tmp b/rk356x/.dr4-rk3568.dtb.d.pre.tmp index 3dec90f..6a61702 100644 --- a/rk356x/.dr4-rk3568.dtb.d.pre.tmp +++ b/rk356x/.dr4-rk3568.dtb.d.pre.tmp @@ -24,13 +24,5 @@ dr4-rk3568.o: arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts \ 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-adc-key.dtsi \ arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-can0-m0-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-can1-m1-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rp-can2-m0-rk3568.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie2x1.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie3x2.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/rk3568-sata1.dtsi \ - arch/arm64/boot/dts/rockchip/rk356x/lcd-gpio-dr4-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 7bacb95..1c429f2 100644 --- a/rk356x/.dr4-rk3568.dtb.dts.tmp +++ b/rk356x/.dr4-rk3568.dtb.dts.tmp @@ -8916,49 +8916,7 @@ dsi1_panel: panel@0 { }; }; # 17 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 - - - - -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-adc-key.dtsi" 1 -/ { - - adc_keys: adc-keys { - compatible = "adc-keys"; - io-channels = <&saradc 0>; - io-channel-names = "buttons"; - keyup-threshold-microvolt = <1800000>; - poll-interval = <100>; - - vol-up-key { - label = "volume up"; - linux,code = <115>; - press-threshold-microvolt = <1750>; - }; - - vol-down-key { - label = "volume down"; - linux,code = <114>; - press-threshold-microvolt = <297500>; - }; - - menu-key { - label = "menu"; - linux,code = <139>; - press-threshold-microvolt = <980000>; - }; - - back-key { - label = "back"; - linux,code = <158>; - press-threshold-microvolt = <1305500>; - }; - }; -}; -# 22 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 - - - +# 25 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" # 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi" 1 &gmac1 { @@ -9037,382 +8995,6 @@ dsi1_panel: panel@0 { }; }; # 27 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 - - - -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-can0-m0-rk3568.dtsi" 1 - - -&can0 { - compatible = "rockchip,rk3568-can-2.0"; - assigned-clocks = <&cru 321>; - assigned-clock-rates = <150000000>; - pinctrl-names = "default"; - pinctrl-0 = <&can0m0_pins>; - status = "okay"; -}; - -&i2c1 { - - status = "disabled"; -}; -# 31 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-can1-m1-rk3568.dtsi" 1 - - -&can1 { - compatible = "rockchip,rk3568-can-2.0"; - assigned-clocks = <&cru 323>; - assigned-clock-rates = <150000000>; - pinctrl-names = "default"; - pinctrl-0 = <&can1m1_pins>; - status = "okay"; -}; -# 32 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-can2-m0-rk3568.dtsi" 1 - - -&can2 { - compatible = "rockchip,rk3568-can-2.0"; - assigned-clocks = <&cru 325>; - assigned-clock-rates = <150000000>; - pinctrl-names = "default"; - pinctrl-0 = <&can2m0_pins>; - status = "okay"; -}; -# 33 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 - - - -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie2x1.dtsi" 1 - - - - -/ { - vcc3v3_pcie: gpio-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_pcie"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - - - - - startup-delay-us = <5000>; - vin-supply = <&dc_12v>; - }; - -}; - - -&combphy2_psq { - status = "okay"; -}; - -&sata2 { - status = "disabled"; -}; - -&pcie2x1 { - - - - - vpcie3v3-supply = <&vcc3v3_pcie>; - status = "okay"; -}; -# 37 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie3x2.dtsi" 1 - - - - -/ { - vcc3v3_pcie3: gpio-regulator-pcie3 { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_pcie3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - - - - - startup-delay-us = <5000>; - vin-supply = <&dc_12v>; - }; -}; - -&pcie30phy { - status = "okay"; -}; - -&pcie3x2 { - - - - - status = "okay"; - vpcie3v3-supply = <&vcc3v3_pcie3>; -}; -# 38 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 - - - -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-sata1.dtsi" 1 - - - - - - -&usbhost_dwc3 { - - phys = <&u2phy0_host>; -}; - -&combphy1_usq { - status = "okay"; -}; - -&sata1 { - status = "okay"; -}; -# 42 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 - - - - -# 1 "arch/arm64/boot/dts/rockchip/rk356x/lcd-gpio-dr4-rk3568.dtsi" 1 - -/ { - backlight4: backlight { - compatible = "pwm-backlight"; - pwms = <&pwm4 0 25000 0>; - brightness-levels = < - 0 20 20 21 21 22 22 23 - 23 24 24 25 25 26 26 27 - 27 28 28 29 29 30 30 31 - 31 32 32 33 33 34 34 35 - 35 36 36 37 37 38 38 39 - 40 41 42 43 44 45 46 47 - 48 49 50 51 52 53 54 55 - 56 57 58 59 60 61 62 63 - 64 65 66 67 68 69 70 71 - 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 - 88 89 90 91 92 93 94 95 - 96 97 98 99 100 101 102 103 - 104 105 106 107 108 109 110 111 - 112 113 114 115 116 117 118 119 - 120 121 122 123 124 125 126 127 - 128 129 130 131 132 133 134 135 - 136 137 138 139 140 141 142 143 - 144 145 146 147 148 149 150 151 - 152 153 154 155 156 157 158 159 - 160 161 162 163 164 165 166 167 - 168 169 170 171 172 173 174 175 - 176 177 178 179 180 181 182 183 - 184 185 186 187 188 189 190 191 - 192 193 194 195 196 197 198 199 - 200 201 202 203 204 205 206 207 - 208 209 210 211 212 213 214 215 - 216 217 218 219 220 221 222 223 - 224 225 226 227 228 229 230 231 - 232 233 234 235 236 237 238 239 - 240 241 242 243 244 245 246 247 - 248 249 250 251 252 253 254 255 - >; - default-brightness-level = <200>; - }; - - backlight5: backlight5 { - compatible = "pwm-backlight"; - pwms = <&pwm5 0 25000 1>; - brightness-levels = < - 0 20 20 21 21 22 22 23 - 23 24 24 25 25 26 26 27 - 27 28 28 29 29 30 30 31 - 31 32 32 33 33 34 34 35 - 35 36 36 37 37 38 38 39 - 40 41 42 43 44 45 46 47 - 48 49 50 51 52 53 54 55 - 56 57 58 59 60 61 62 63 - 64 65 66 67 68 69 70 71 - 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 - 88 89 90 91 92 93 94 95 - 96 97 98 99 100 101 102 103 - 104 105 106 107 108 109 110 111 - 112 113 114 115 116 117 118 119 - 120 121 122 123 124 125 126 127 - 128 129 130 131 132 133 134 135 - 136 137 138 139 140 141 142 143 - 144 145 146 147 148 149 150 151 - 152 153 154 155 156 157 158 159 - 160 161 162 163 164 165 166 167 - 168 169 170 171 172 173 174 175 - 176 177 178 179 180 181 182 183 - 184 185 186 187 188 189 190 191 - 192 193 194 195 196 197 198 199 - 200 201 202 203 204 205 206 207 - 208 209 210 211 212 213 214 215 - 216 217 218 219 220 221 222 223 - 224 225 226 227 228 229 230 231 - 232 233 234 235 236 237 238 239 - 240 241 242 243 244 245 246 247 - 248 249 250 251 252 253 254 255 - >; - default-brightness-level = <200>; - }; - - backlight10: backlight10 { - compatible = "pwm-backlight"; - pwms = <&pwm10 0 25000 0>; - brightness-levels = < - 0 20 20 21 21 22 22 23 - 23 24 24 25 25 26 26 27 - 27 28 28 29 29 30 30 31 - 31 32 32 33 33 34 34 35 - 35 36 36 37 37 38 38 39 - 40 41 42 43 44 45 46 47 - 48 49 50 51 52 53 54 55 - 56 57 58 59 60 61 62 63 - 64 65 66 67 68 69 70 71 - 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 - 88 89 90 91 92 93 94 95 - 96 97 98 99 100 101 102 103 - 104 105 106 107 108 109 110 111 - 112 113 114 115 116 117 118 119 - 120 121 122 123 124 125 126 127 - 128 129 130 131 132 133 134 135 - 136 137 138 139 140 141 142 143 - 144 145 146 147 148 149 150 151 - 152 153 154 155 156 157 158 159 - 160 161 162 163 164 165 166 167 - 168 169 170 171 172 173 174 175 - 176 177 178 179 180 181 182 183 - 184 185 186 187 188 189 190 191 - 192 193 194 195 196 197 198 199 - 200 201 202 203 204 205 206 207 - 208 209 210 211 212 213 214 215 - 216 217 218 219 220 221 222 223 - 224 225 226 227 228 229 230 231 - 232 233 234 235 236 237 238 239 - 240 241 242 243 244 245 246 247 - 248 249 250 251 252 253 254 255 - >; - default-brightness-level = <200>; - }; -}; - - -&pwm4 { - status = "okay"; -}; - -&pwm5 { - status = "okay"; -}; - -&pwm10 { - status = "okay"; -}; - - -&dsi0_panel { - power-supply = <&vcc3v3_lcd0_n>; - enable-gpios = <&gpio4 26 0>; - reset-gpios = <&gpio3 5 1>; - pinctrl-names = "default"; - pinctrl-0 = <&mipi0_pins>; - backlight = <&backlight4>; -}; - - -&dsi1_panel { - status = "disabled"; -}; - - -&lvds_panel { - power-supply = <&vcc3v3_lcd0_n>; - enable-gpios = <&gpio4 26 0>; - - pinctrl-names = "default"; - pinctrl-0 = <&mipi0_pins>; - backlight = <&backlight4>; -}; - - -&edp_panel { - power-supply = <&vcc3v3_lcd0_n>; - pinctrl-names = "default"; - pinctrl-0 = <&edp_pins>; - enable-gpios = <&gpio0 6 0>; - backlight = <&backlight4>; -}; - - - -&vcc3v3_lcd0_n { - - /delete-property/ gpio; - enable-active-high; -}; - - -&i2c3 { - gt9xx: goodix_ts@5d { - - pinctrl-names = "default"; - pinctrl-0 = <&goodix_pins>; - goodix_rst_gpio = <&gpio3 3 0>; - goodix_irq_gpio = <&gpio3 4 2>; - - status = "disabled"; - }; - gt1x: goodix_gt1x@5d { - - pinctrl-names = "default"; - pinctrl-0 = <&goodix_pins>; - goodix,rst-gpio = <&gpio3 3 0>; - goodix,irq-gpio = <&gpio3 4 2>; - - status = "disabled"; - }; -}; - -&pinctrl { - lcd_pins { - mipi0_pins: mipi1-pins { - rockchip,pins = - - <4 26 0 &pcfg_pull_none>, - - <3 5 0 &pcfg_pull_none>; - }; - edp_pins: edp-pins { - rockchip,pins = - - <0 6 0 &pcfg_pull_none>; - }; - }; - - goodix { - goodix_pins: goodix-pins { - rockchip,pins = - - <3 3 0 &pcfg_pull_none>, - - <3 4 0 &pcfg_pull_up>; - }; - }; -}; -# 47 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 # 79 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" /{ model = "dr4-rk3568"; @@ -9674,25 +9256,7 @@ dsi1_panel: panel@0 { status = "disabled"; }; -# 392 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" -&edp_panel { - backlight = <&backlight10>; -}; -# 404 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" -&gmac1 { - tx_delay = <0x49>; - rx_delay = <0x29>; - status = "okay"; -}; - -&gmac0 { - tx_delay = <0x49>; - rx_delay = <0x29>; - status = "okay"; -}; - - - +# 418 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" &rk_headset { pinctrl-0 = <&hp_det>; headset_gpio = <&gpio2 27 0>; @@ -9741,56 +9305,7 @@ dsi1_panel: panel@0 { BT,wake_host_irq = <&gpio0 28 0>; status = "disabled"; }; - - - - -&vcc3v3_pcie { - - - - - /delete-property/ gpio; -}; - -&pcie2x1 { - status = "disabled"; - - reset-gpios = <&gpio1 10 0>; -}; - - - - -&pcie3x2 { - status = "disabled"; - reset-gpios = <&gpio2 30 0>; - vpcie3v3-supply = <&vcc3v3_pcie3>; -}; - -&vcc3v3_pcie3 { - pinctrl-names = "default"; - pinctrl-0 = <&pcie3_3v3>; - gpio = <&gpio3 2 0>; - - startup-delay-us = <8000>; -}; - - -&vcc_camera { - gpio = <&gpio2 17 0>; - pinctrl-names = "default"; - pinctrl-0 = <&camera_en>; -}; -&gc2093 { - pinctrl-names = "default"; - pinctrl-0 = <&cif_clk>; - pinctrl-1 = <&camera_ctl>; - pwdn-gpios = <&gpio3 23 0>; - reset-gpios = <&gpio2 9 1>; -}; - - +# 516 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" &pinctrl { rp_pins { rp_power: rp-power { @@ -9830,21 +9345,7 @@ dsi1_panel: panel@0 { <3 2 0 &pcfg_pull_none>; }; }; - - camera-pins { - camera_en: camera-en { - rockchip,pins = - - <2 17 0 &pcfg_pull_none>; - }; - camera_ctl: camera-ctl { - rockchip,pins = - - <3 23 0 &pcfg_pull_none>, - - <2 8 0 &pcfg_pull_none>; - }; - }; +# 570 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" }; diff --git a/rk356x/dr4-rk3568.dtb b/rk356x/dr4-rk3568.dtb index e3c2873..19be78d 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 e2e1e32..6a8eb8d 100755 --- a/rk356x/dr4-rk3568.dts +++ b/rk356x/dr4-rk3568.dts @@ -18,7 +18,7 @@ /*************************adc key***********************/ -#include "rp-adc-key.dtsi" +// #include "rp-adc-key.dtsi" /***************************************************/ /*************************gmac***********************/ @@ -27,23 +27,23 @@ /***************************************************/ /*************************CAN**********************/ -#include "rp-can0-m0-rk3568.dtsi" -#include "rp-can1-m1-rk3568.dtsi" -#include "rp-can2-m0-rk3568.dtsi" +// #include "rp-can0-m0-rk3568.dtsi" +// #include "rp-can1-m1-rk3568.dtsi" +// #include "rp-can2-m0-rk3568.dtsi" /**************************************************/ /*********************PCIE**************************/ -#include "rk3568-pcie2x1.dtsi" -#include "rk3568-pcie3x2.dtsi" +// #include "rk3568-pcie2x1.dtsi" +// #include "rk3568-pcie3x2.dtsi" /***************************************************/ /*************************SATA***********************/ -#include "rk3568-sata1.dtsi" +// #include "rk3568-sata1.dtsi" /***************************************************/ -#include "lcd-gpio-dr4-rk3568.dtsi" //gpio config for lcd +// #include "lcd-gpio-dr4-rk3568.dtsi" //gpio config for lcd /****** LCD config reference **/ /** single HDMI */ @@ -364,54 +364,54 @@ * and if mutiple lcd used, we just use the backlight5, backlight10. */ /** LCD configuration */ -#if defined(RP_SINGLE_LCD) +// #if defined(RP_SINGLE_LCD) - #if defined(RP_MIPI02LVDS) - &dsi0_panel { - enable-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_LOW>; //raw interface is inverse, so set to low - }; - #if defined(RP_DUALLVDS) - // dual lvds donot need invert - &backlight4 { - pwms = <&pwm5 0 25000 0>; - }; - #else - //pwm and enable pin may be inverted if use mipi to single lvds - &backlight4 { - pwms = <&pwm5 0 25000 1>; - }; - #endif +// #if defined(RP_MIPI02LVDS) +// &dsi0_panel { +// enable-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_LOW>; //raw interface is inverse, so set to low +// }; +// #if defined(RP_DUALLVDS) +// // dual lvds donot need invert +// &backlight4 { +// pwms = <&pwm5 0 25000 0>; +// }; +// #else +// //pwm and enable pin may be inverted if use mipi to single lvds +// &backlight4 { +// pwms = <&pwm5 0 25000 1>; +// }; +// #endif - #elif defined(RP_EDP_USED) - &backlight4 { - pwms = <&pwm10 0 25000 0>; - }; - #endif +// #elif defined(RP_EDP_USED) +// &backlight4 { +// pwms = <&pwm10 0 25000 0>; +// }; +// #endif -#else -&edp_panel { - backlight = <&backlight10>; -}; - #ifdef RP_MIPI02LVDS - &dsi0_panel { - backlight = <&backlight5>; - }; - #endif -#endif +// #else +// &edp_panel { +// backlight = <&backlight10>; +// }; +// #ifdef RP_MIPI02LVDS +// &dsi0_panel { +// backlight = <&backlight5>; +// }; +// #endif +// #endif /** Ethernet config*/ -&gmac1 { - tx_delay = <0x49>; - rx_delay = <0x29>; - status = "okay"; -}; +// &gmac1 { +// tx_delay = <0x49>; +// rx_delay = <0x29>; +// status = "okay"; +// }; -&gmac0 { - tx_delay = <0x49>; - rx_delay = <0x29>; - status = "okay"; -}; +// &gmac0 { +// tx_delay = <0x49>; +// rx_delay = <0x29>; +// status = "okay"; +// }; /** headphone detect pin */ @@ -467,50 +467,50 @@ /** pcie2x1 */ -&vcc3v3_pcie { - /** - * delete for gpio used to be bt_wake_host - * and the vcc3v3_pcie need not control on our board. - */ - /delete-property/ gpio; -}; +// &vcc3v3_pcie { +// /** +// * delete for gpio used to be bt_wake_host +// * and the vcc3v3_pcie need not control on our board. +// */ +// /delete-property/ gpio; +// }; -&pcie2x1 { - status = "disabled"; +// &pcie2x1 { +// status = "disabled"; - reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; -}; +// reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; +// }; /** pcie3x2 */ -&pcie3x2 { - status = "disabled"; - reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; - vpcie3v3-supply = <&vcc3v3_pcie3>; -}; +// &pcie3x2 { +// status = "disabled"; +// reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; +// vpcie3v3-supply = <&vcc3v3_pcie3>; +// }; -&vcc3v3_pcie3 { - pinctrl-names = "default"; - pinctrl-0 = <&pcie3_3v3>; - gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; +// &vcc3v3_pcie3 { +// pinctrl-names = "default"; +// pinctrl-0 = <&pcie3_3v3>; +// gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; - startup-delay-us = <8000>; //5000 is faild -}; +// startup-delay-us = <8000>; //5000 is faild +// }; /** mipi camera config */ -&vcc_camera { - gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&camera_en>; -}; -&gc2093 { - pinctrl-names = "default"; - pinctrl-0 = <&cif_clk>; - pinctrl-1 = <&camera_ctl>; - pwdn-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>; - reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; -}; +// &vcc_camera { +// gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; +// pinctrl-names = "default"; +// pinctrl-0 = <&camera_en>; +// }; +// &gc2093 { +// pinctrl-names = "default"; +// pinctrl-0 = <&cif_clk>; +// pinctrl-1 = <&camera_ctl>; +// pwdn-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>; +// reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; +// }; &pinctrl { @@ -553,20 +553,20 @@ }; }; - camera-pins { - camera_en: camera-en { - rockchip,pins = - /** gc2093 camera en */ - <2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; - }; - camera_ctl: camera-ctl { - rockchip,pins = - /** gc2093 camera power down */ - <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>, - /** gc2093 camera reset */ - <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; + // camera-pins { + // camera_en: camera-en { + // rockchip,pins = + // /** gc2093 camera en */ + // <2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; + // }; + // camera_ctl: camera-ctl { + // rockchip,pins = + // /** gc2093 camera power down */ + // <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>, + // /** gc2093 camera reset */ + // <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; + // }; + // }; };