From 4f226f7cdce78b1c64bef0f3d6b679aa48ea3717 Mon Sep 17 00:00:00 2001 From: Caesar Wang Date: Fri, 17 Jul 2020 11:11:56 +0800 Subject: [PATCH] ARM: dts: rk3288: update rk3288 linux board Signed-off-by: Caesar Wang Change-Id: I8da7ba913f0a5b835dae1a1af653a4574f4c70b5 --- arch/arm/boot/dts/rk3288-evb-rk808-linux.dts | 109 ++++++++++--------- arch/arm/boot/dts/rk3288-linux.dtsi | 28 ++++- 2 files changed, 87 insertions(+), 50 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts index b3ee4c161a86..9403e62b33ab 100644 --- a/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts +++ b/arch/arm/boot/dts/rk3288-evb-rk808-linux.dts @@ -46,46 +46,37 @@ / { compatible = "rockchip,rk3288-evb-rk808-linux", "rockchip,rk3288"; - backlight: backlight { - compatible = "pwm-backlight"; - 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 = <128>; - enable-gpios = <&gpio7 2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_en>; - pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>; + panel { + compatible = "simple-panel"; + backlight = <&backlight>; + enable-gpios = <&gpio7 RK_PA4 GPIO_ACTIVE_HIGH>; + prepare-delay-ms = <120>; + + display-timings { + native-mode = <&timing0>; + + timing0: timing0 { + clock-frequency = <200000000>; + hactive = <1536>; + vactive = <2048>; + hfront-porch = <12>; + hsync-len = <16>; + hback-porch = <48>; + vfront-porch = <8>; + vsync-len = <4>; + vback-porch = <8>; + hsync-active = <0>; + vsync-active = <0>; + de-active = <0>; + pixelclk-active = <0>; + }; + }; + + port { + panel_in_edp: endpoint { + remote-endpoint = <&edp_out_panel>; + }; + }; }; adc-keys { @@ -199,6 +190,13 @@ }; }; +&backlight { + enable-gpios = <&gpio7 RK_PA2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bl_en>; + pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>; +}; + &cpu0 { cpu0-supply = <&vdd_cpu>; }; @@ -213,23 +211,32 @@ }; &edp { + force-hpd; status = "okay"; -}; -&edp_panel { - compatible ="lg,lp079qx1-sp0v", "simple-panel"; - backlight = <&backlight>; - enable-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>; - enable-delay-ms = <120>; - pinctrl-0 = <&lcd_cs>; - power-supply = <&vcc_lcd>; - status = "okay"; + ports { + port@1 { + reg = <1>; + + edp_out_panel: endpoint { + remote-endpoint = <&panel_in_edp>; + }; + }; + }; }; &edp_phy { status = "okay"; }; +&edp_in_vopb { + status = "disabled"; +}; + +&edp_in_vopl { + status = "okay"; +}; + &gpu { status = "okay"; mali-supply = <&vdd_gpu>; @@ -571,6 +578,10 @@ }; &uart2 { + status = "disabled"; +}; + +&pwm0 { status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3288-linux.dtsi b/arch/arm/boot/dts/rk3288-linux.dtsi index 9ea9dfe09e60..4b760bee3145 100644 --- a/arch/arm/boot/dts/rk3288-linux.dtsi +++ b/arch/arm/boot/dts/rk3288-linux.dtsi @@ -8,7 +8,7 @@ / { chosen { - bootargs = "earlyprintk console=ttyFIQ0 rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait"; + bootargs = "earlycon=uart8250,mmio32,0xff690000 vmalloc=496M rw root=PARTUUID=614e0000-0000 rootfstype=ext4 rootwait"; }; /delete-node/ dmc@ff610000; @@ -101,6 +101,8 @@ method = "smc"; }; + /delete-node/ timer@ff810000; + display-subsystem { status = "okay"; @@ -181,10 +183,34 @@ compatible = "rockchip,rk3288-secure-efuse"; }; +&mpp_srv { + status = "okay"; +}; + +&hevc { + status = "okay"; +}; + +&hevc_mmu { + status = "okay"; +}; + &uart2 { status = "disabled"; }; +&vdpu { + status = "okay"; +}; + +&vepu { + status = "okay"; +}; + +&vpu_mmu { + status = "okay"; +}; + &video_phy { status = "okay"; };