diff --git a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1h.dts b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1h.dts index e34a158a8377..a60f6f99e089 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1h.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-lubancat-1h.dts @@ -173,22 +173,101 @@ vin-supply = <&vdd_5v>; }; - mipi_dsi0_power: mipi-dsi0-power-regulator { + mipi_dsi1_power: mipi-dsi1-power-regulator { compatible = "regulator-fixed"; enable-active-high; gpio = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&mipi_dsi0_pwr_en>; - regulator-name = "mipi_dsi0_power"; + pinctrl-0 = <&mipi_dsi1_pwr_en>; + regulator-name = "mipi_dsi1_power"; regulator-always-on; }; - mipi_dsi1_power: mipi-dsi1-power-regulator { + vdd_cam_5v: vdd-cam0-5v-regulator { compatible = "regulator-fixed"; - regulator-name = "mipi_dsi0_power"; + regulator-name = "vdd_cam_5v"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam_pwr_en>; + enable-active-high; regulator-always-on; }; + cam_dovdd: cam_dovdd { + compatible = "regulator-fixed"; + regulator-name = "cam_dovdd"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vdd_cam_5v>; + }; + + cam_avdd: cam_avdd { + compatible = "regulator-fixed"; + regulator-name = "cam_avdd"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + vin-supply = <&vdd_cam_5v>; + }; + + cam_dvdd: cam_dvdd { + compatible = "regulator-fixed"; + regulator-name = "cam_dvdd"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + vin-supply = <&vdd_cam_5v>; + }; + + vdd_cam1_5v: vdd-cam1-5v-regulator { + compatible = "regulator-fixed"; + regulator-name = "vdd_cam1_5v"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cam1_pwr_en>; + enable-active-high; + regulator-always-on; + }; + + cam1_dovdd: cam1-dovdd { + compatible = "regulator-fixed"; + regulator-name = "cam1_dovdd"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vdd_cam1_5v>; + }; + + cam1_avdd: cam1-avdd { + compatible = "regulator-fixed"; + regulator-name = "cam1_avdd"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + vin-supply = <&vdd_cam1_5v>; + }; + + cam1_dvdd: cam1-dvdd { + compatible = "regulator-fixed"; + regulator-name = "cam1_dvdd"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + vin-supply = <&vdd_cam1_5v>; + }; + + leds: leds { status = "okay"; compatible = "gpio-leds"; @@ -330,46 +409,6 @@ default-brightness-level = <200>; }; - backlight2: backlight2 { - status = "disable"; - compatible = "pwm-backlight"; - pwms = <&pwm0 0 500000 0>; //2khz - brightness-levels = < - 0 1 2 3 4 5 6 7 - 8 9 10 11 12 13 14 15 - 16 17 18 19 20 21 22 23 - 24 25 26 27 28 29 30 31 - 32 33 34 35 36 37 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>; - }; - test-power { status = "okay"; }; @@ -824,6 +863,20 @@ }; }; +&i2c5 { + status = "okay"; + clock-frequency = <100000>; + + gt911_edp: gt911@5d { + status = "okay"; + compatible = "goodix,gt911"; + reg = <0x5d>; + interrupt-parent = <&gpio3>; + interrupts = ; + reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_LOW>; + irq-gpios = <&gpio3 RK_PB7 GPIO_ACTIVE_HIGH>; + }; +}; &i2c1 { status = "okay"; @@ -1177,6 +1230,17 @@ }; &pinctrl { + + cam { + cam_pwr_en: cam_pwr_en { + rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + cam1_pwr_en: cam1_pwr_en { + rockchip,pins = <3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + pmic { pmic_int: pmic_int { rockchip,pins = @@ -1230,17 +1294,11 @@ }; lcd { - mipi_dsi0_pwr_en: mipi-dsi0-pwr-en { + mipi_dsi1_pwr_en: mipi-dsi1-pwr-en { rockchip,pins = <3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>; }; }; - cam { - cam_pwr_en: cam-pwr-en { - rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - leds { sys_status_led_pin: sys-status-led-pin { rockchip,pins = <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;