From 7efde145ea76e501a675505517e445c1c834d018 Mon Sep 17 00:00:00 2001 From: CodeChenL <2540735020@qq.com> Date: Wed, 10 Apr 2024 19:49:09 +0800 Subject: [PATCH] fix: display backlight pwm polarity use macro variables --- .../radxa-cm3-io-jymx1013833281be-display.dts | 66 +-- .../radxa-cm3-io-radxa-10p1inch-display.dts | 66 +-- .../radxa-cm3-io-radxa-display-10fhd.dts | 66 +-- ...adxa-cm3i-io-edp-sharp-lq133t1jw01-lcd.dts | 2 +- .../radxa-cm3i-io-radxa-8inch-display.dts | 2 +- .../radxa-cm3i-io-radxa-display-10fhd.dts | 2 +- .../radxa-cm3i-io-radxa-display-10hd.dts | 2 +- .../overlays/rock-5a-radxa-display-10fhd.dts | 422 ++++++++---------- .../overlays/rock-5a-radxa-display-10hd.dts | 321 ++++++------- .../overlays/rock-5a-radxa-display-8hd.dts | 327 ++++++-------- 10 files changed, 583 insertions(+), 693 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-jymx1013833281be-display.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-jymx1013833281be-display.dts index 1b44912e..6d22162a 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-jymx1013833281be-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-jymx1013833281be-display.dts @@ -32,40 +32,40 @@ lcd0_backlight:lcd0-backlight { status = "okay"; compatible = "pwm-backlight"; - pwms = <&pwm13 0 25000 0>; + pwms = <&pwm13 0 25000 PWM_POLARITY_INVERTED>; brightness-levels = < - 255 254 253 252 251 250 249 248 - 247 246 245 244 243 242 241 240 - 239 238 237 236 235 234 233 232 - 231 230 229 228 227 226 225 224 - 223 222 221 220 219 218 217 216 - 215 214 213 212 211 210 209 208 - 207 206 205 204 203 202 201 200 - 199 198 197 196 195 194 193 192 - 191 190 189 188 187 186 185 184 - 183 182 181 180 179 178 177 176 - 175 174 173 172 171 170 169 168 - 167 166 165 164 163 162 161 160 - 159 158 157 156 155 154 153 152 - 151 150 149 148 147 146 145 144 - 143 142 141 140 139 138 137 136 - 135 134 133 132 131 130 129 128 - 127 126 125 124 123 122 121 120 - 119 118 117 116 115 114 113 112 - 111 110 109 108 107 106 105 104 - 103 102 101 100 99 98 97 96 - 95 94 93 92 91 90 89 88 - 87 86 85 84 83 82 81 80 - 79 78 77 76 75 74 73 72 - 71 70 69 68 67 66 65 64 - 63 62 61 60 59 58 57 56 - 55 54 53 52 51 50 49 48 - 47 46 45 44 43 42 41 40 - 39 38 38 37 37 36 36 35 - 35 34 34 33 33 32 32 31 - 31 30 30 29 29 28 28 27 - 27 26 26 25 25 24 24 23 - 23 22 22 21 21 20 20 0 + 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>; enable-gpios = <&gpio4 RK_PA3 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-10p1inch-display.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-10p1inch-display.dts index 31440e94..f4301e80 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-10p1inch-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-10p1inch-display.dts @@ -47,40 +47,40 @@ dsi1_backlight: dsi1-backlight { status = "okay"; compatible = "pwm-backlight"; - pwms = <&pwm2 0 25000 0>; + pwms = <&pwm2 0 25000 PWM_POLARITY_INVERTED>; brightness-levels = < - 255 254 253 252 251 250 249 248 - 247 246 245 244 243 242 241 240 - 239 238 237 236 235 234 233 232 - 231 230 229 228 227 226 225 224 - 223 222 221 220 219 218 217 216 - 215 214 213 212 211 210 209 208 - 207 206 205 204 203 202 201 200 - 199 198 197 196 195 194 193 192 - 191 190 189 188 187 186 185 184 - 183 182 181 180 179 178 177 176 - 175 174 173 172 171 170 169 168 - 167 166 165 164 163 162 161 160 - 159 158 157 156 155 154 153 152 - 151 150 149 148 147 146 145 144 - 143 142 141 140 139 138 137 136 - 135 134 133 132 131 130 129 128 - 127 126 125 124 123 122 121 120 - 119 118 117 116 115 114 113 112 - 111 110 109 108 107 106 105 104 - 103 102 101 100 99 98 97 96 - 95 94 93 92 91 90 89 88 - 87 86 85 84 83 82 81 80 - 79 78 77 76 75 74 73 72 - 71 70 69 68 67 66 65 64 - 63 62 61 60 59 58 57 56 - 55 54 53 52 51 50 49 48 - 47 46 45 44 43 42 41 40 - 39 38 38 37 37 36 36 35 - 35 34 34 33 33 32 32 31 - 31 30 30 29 29 28 28 27 - 27 26 26 25 25 24 24 23 - 23 22 22 21 21 20 20 0 + 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>; enable-gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-10fhd.dts index aa489207..c717e187 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3-io-radxa-display-10fhd.dts @@ -48,40 +48,40 @@ dsi1_backlight: dsi1-backlight { status = "okay"; compatible = "pwm-backlight"; - pwms = <&pwm2 0 25000 0>; + pwms = <&pwm2 0 25000 PWM_POLARITY_INVERTED>; brightness-levels = < - 255 254 253 252 251 250 249 248 - 247 246 245 244 243 242 241 240 - 239 238 237 236 235 234 233 232 - 231 230 229 228 227 226 225 224 - 223 222 221 220 219 218 217 216 - 215 214 213 212 211 210 209 208 - 207 206 205 204 203 202 201 200 - 199 198 197 196 195 194 193 192 - 191 190 189 188 187 186 185 184 - 183 182 181 180 179 178 177 176 - 175 174 173 172 171 170 169 168 - 167 166 165 164 163 162 161 160 - 159 158 157 156 155 154 153 152 - 151 150 149 148 147 146 145 144 - 143 142 141 140 139 138 137 136 - 135 134 133 132 131 130 129 128 - 127 126 125 124 123 122 121 120 - 119 118 117 116 115 114 113 112 - 111 110 109 108 107 106 105 104 - 103 102 101 100 99 98 97 96 - 95 94 93 92 91 90 89 88 - 87 86 85 84 83 82 81 80 - 79 78 77 76 75 74 73 72 - 71 70 69 68 67 66 65 64 - 63 62 61 60 59 58 57 56 - 55 54 53 52 51 50 49 48 - 47 46 45 44 43 42 41 40 - 39 38 38 37 37 36 36 35 - 35 34 34 33 33 32 32 31 - 31 30 30 29 29 28 28 27 - 27 26 26 25 25 24 24 23 - 23 22 22 21 21 20 20 0 + 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>; enable-gpios = <&gpio3 RK_PD7 GPIO_ACTIVE_HIGH>; diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-edp-sharp-lq133t1jw01-lcd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-edp-sharp-lq133t1jw01-lcd.dts index 605f82e3..94cd9363 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-edp-sharp-lq133t1jw01-lcd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-edp-sharp-lq133t1jw01-lcd.dts @@ -21,7 +21,7 @@ backlight_edp: backlight-edp { status = "okay"; compatible = "pwm-backlight"; - pwms = <&pwm0 0 25000 1>; + pwms = <&pwm0 0 25000 PWM_POLARITY_INVERTED>; brightness-levels = < 0 20 20 21 21 22 22 23 23 24 24 25 25 26 26 27 diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-8inch-display.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-8inch-display.dts index e04c1ef3..356f8488 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-8inch-display.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-8inch-display.dts @@ -44,7 +44,7 @@ backlight_dsi0: backlight-dsi0 { status = "okay"; compatible = "pwm-backlight"; - pwms = <&pwm6 0 25000 1>; + pwms = <&pwm6 0 25000 PWM_POLARITY_INVERTED>; brightness-levels = < 0 20 20 21 21 22 22 23 23 24 24 25 25 26 26 27 diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10fhd.dts index 4e742e09..77101d9b 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10fhd.dts @@ -45,7 +45,7 @@ backlight_dsi0: backlight-dsi0 { status = "okay"; compatible = "pwm-backlight"; - pwms = <&pwm6 0 25000 1>; + pwms = <&pwm6 0 25000 PWM_POLARITY_INVERTED>; brightness-levels = < 0 20 20 21 21 22 22 23 23 24 24 25 25 26 26 27 diff --git a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10hd.dts index 7da8d960..342e28d2 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/radxa-cm3i-io-radxa-display-10hd.dts @@ -46,7 +46,7 @@ backlight_dsi0: backlight-dsi0 { status = "okay"; compatible = "pwm-backlight"; - pwms = <&pwm6 0 25000 1>; + pwms = <&pwm6 0 25000 PWM_POLARITY_INVERTED>; brightness-levels = < 0 20 20 21 21 22 22 23 23 24 24 25 25 26 26 27 diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts index 39d11730..0356af8a 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10fhd.dts @@ -14,266 +14,230 @@ exclusive = "dsi0"; description = "Enable Radxa Display 10FHD."; }; +}; - fragment@0 { - target-path = "/"; - - __overlay__ { - vcc_tp: vcc-tp { - status = "okay"; - regulator-name = "vcc_tp"; - compatible = "regulator-fixed"; - gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>; - enable-active-low; - regulator-boot-on; - regulator-always-on; - }; - - vcc_lcd_mipi0: vcc-lcd-mipi0 { - status = "okay"; - compatible = "regulator-fixed"; - regulator-name = "vcc_lcd_mipi0"; - gpio = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; - enable-active-high; - regulator-boot-on; - regulator-always-on; - regulator-state-mem { - regulator-off-in-suspend; - }; - }; +&{/} { + vcc_tp: vcc-tp { + status = "okay"; + regulator-name = "vcc_tp"; + compatible = "regulator-fixed"; + gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>; + enable-active-low; + regulator-boot-on; + regulator-always-on; + }; - dsi0_backlight: dsi0-backlight { - status = "okay"; - compatible = "pwm-backlight"; - pwms = <&pwm10 0 25000 0>; - brightness-levels = < - 255 254 253 252 251 250 249 248 - 247 246 245 244 243 242 241 240 - 239 238 237 236 235 234 233 232 - 231 230 229 228 227 226 225 224 - 223 222 221 220 219 218 217 216 - 215 214 213 212 211 210 209 208 - 207 206 205 204 203 202 201 200 - 199 198 197 196 195 194 193 192 - 191 190 189 188 187 186 185 184 - 183 182 181 180 179 178 177 176 - 175 174 173 172 171 170 169 168 - 167 166 165 164 163 162 161 160 - 159 158 157 156 155 154 153 152 - 151 150 149 148 147 146 145 144 - 143 142 141 140 139 138 137 136 - 135 134 133 132 131 130 129 128 - 127 126 125 124 123 122 121 120 - 119 118 117 116 115 114 113 112 - 111 110 109 108 107 106 105 104 - 103 102 101 100 99 98 97 96 - 95 94 93 92 91 90 89 88 - 87 86 85 84 83 82 81 80 - 79 78 77 76 75 74 73 72 - 71 70 69 68 67 66 65 64 - 63 62 61 60 59 58 57 56 - 55 54 53 52 51 50 49 48 - 47 46 45 44 43 42 41 40 - 39 38 38 37 37 36 36 35 - 35 34 34 33 33 32 32 31 - 31 30 30 29 29 28 28 27 - 27 26 26 25 25 24 24 23 - 23 22 22 21 21 20 20 0 - >; - default-brightness-level = <200>; - enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&dsi0_backlight_en>; - }; + vcc_lcd_mipi0: vcc-lcd-mipi0 { + status = "okay"; + compatible = "regulator-fixed"; + regulator-name = "vcc_lcd_mipi0"; + gpio = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-boot-on; + regulator-always-on; + regulator-state-mem { + regulator-off-in-suspend; }; }; - fragment@1 { - target = <&pwm10>; - - __overlay__ { - status = "okay"; - pinctrl-names = "active"; - pinctrl-0 = <&pwm10m2_pins>; - }; + dsi0_backlight: dsi0-backlight { + status = "okay"; + compatible = "pwm-backlight"; + pwms = <&pwm10 0 25000 PWM_POLARITY_INVERTED>; + 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>; + enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dsi0_backlight_en>; }; +}; + +&pwm10 { + status = "okay"; + pinctrl-names = "active"; + pinctrl-0 = <&pwm10m2_pins>; +}; - fragment@2 { - target = <&dsi0>; +&dsi0 { + status = "okay"; + #address-cells = <1>; + #size-cells = <0>; + + dsi0_panel: panel@0 { + status = "okay"; + compatible = "simple-panel-dsi"; + reg = <0>; + backlight = <&dsi0_backlight>; + + vdd-supply = <&vcc_lcd_mipi0>; + vccio-supply = <&vcc_1v8_s0>; + reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dsi0_lcd_rst_gpio>; + + prepare-delay-ms = <120>; + reset-delay-ms = <120>; + init-delay-ms = <120>; + enable-delay-ms = <100>; + disable-delay-ms = <120>; + unprepare-delay-ms = <120>; + + width-mm = <62>; + height-mm = <110>; + + dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | + MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>; + dsi,format = ; + dsi,lanes = <4>; + + panel-init-sequence = [ + 05 78 01 11 + 05 00 01 29 + ]; + + panel-exit-sequence = [ + 05 00 01 28 + 05 00 01 10 + ]; + + display-timings { + native-mode = <&timing0>; + timing0: timing0 { + clock-frequency = <160000000>; + hactive = <1200>; + vactive = <1920>; + + vback-porch = <25>; + vfront-porch = <35>; + + hback-porch = <60>; + hfront-porch = <80>; + + hsync-len = <4>; + vsync-len = <4>; + + vsync-active = <0>; + hsync-active = <0>; + de-active = <0>; + pixelclk-active = <0>; + }; + }; - __overlay__ { - status = "okay"; + ports { #address-cells = <1>; #size-cells = <0>; - dsi0_panel: panel@0 { - status = "okay"; - compatible = "simple-panel-dsi"; + port@0 { reg = <0>; - backlight = <&dsi0_backlight>; - - vdd-supply = <&vcc_lcd_mipi0>; - vccio-supply = <&vcc_1v8_s0>; - reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&dsi0_lcd_rst_gpio>; - - prepare-delay-ms = <120>; - reset-delay-ms = <120>; - init-delay-ms = <120>; - enable-delay-ms = <100>; - disable-delay-ms = <120>; - unprepare-delay-ms = <120>; - - width-mm = <62>; - height-mm = <110>; - - dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | - MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>; - dsi,format = ; - dsi,lanes = <4>; - - panel-init-sequence = [ - 05 78 01 11 - 05 00 01 29 - ]; - - panel-exit-sequence = [ - 05 00 01 28 - 05 00 01 10 - ]; - - display-timings { - native-mode = <&timing0>; - timing0: timing0 { - clock-frequency = <160000000>; - hactive = <1200>; - vactive = <1920>; - - vback-porch = <25>; - vfront-porch = <35>; - - hback-porch = <60>; - hfront-porch = <80>; - - hsync-len = <4>; - vsync-len = <4>; - - vsync-active = <0>; - hsync-active = <0>; - de-active = <0>; - pixelclk-active = <0>; - }; - }; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - panel_in_dsi0: endpoint { - remote-endpoint = <&dsi0_out_panel>; - }; - }; - }; - }; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@1 { - reg = <1>; - dsi0_out_panel: endpoint { - remote-endpoint = <&panel_in_dsi0>; - }; + panel_in_dsi0: endpoint { + remote-endpoint = <&dsi0_out_panel>; }; }; }; }; - fragment@3 { - target = <&mipi_dcphy0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - __overlay__ { - status = "okay"; + port@1 { + reg = <1>; + dsi0_out_panel: endpoint { + remote-endpoint = <&panel_in_dsi0>; + }; }; }; +}; - fragment@4 { - target = <&route_dsi0>; - - __overlay__ { - status = "okay"; - connect = <&vp3_out_dsi0>; - }; - }; +&mipi_dcphy0 { + status = "okay"; +}; - fragment@5 { - target = <&dsi0_in_vp2>; +&route_dsi0 { + status = "okay"; + connect = <&vp3_out_dsi0>; +}; - __overlay__ { - status = "disabled"; - }; - }; +&dsi0_in_vp2 { + status = "disabled"; +}; - fragment@6 { - target = <&dsi0_in_vp3>; +&dsi0_in_vp3 { + status = "okay"; +}; - __overlay__ { - status = "okay"; - }; +&i2c5 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c5m2_xfer>; + clock-frequency = <400000>; + #address-cells = <1>; + #size-cells = <0>; + + gt9xx: gt9xx@14 { + status = "okay"; + compatible = "goodix,gt9xx"; + reg = <0x14>; + pinctrl-names = "default"; + pinctrl-0 = <>9xx_gpio>; + touch-gpio = <&gpio3 RK_PC6 IRQ_TYPE_LEVEL_HIGH>; + reset-gpio = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; + max-x = <1200>; + max-y = <1920>; + tp-size = <9271>; + tp-supply = <&vcc_tp>; }; +}; - fragment@7 { - target = <&i2c5>; - - __overlay__ { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c5m2_xfer>; - clock-frequency = <400000>; - #address-cells = <1>; - #size-cells = <0>; +&pinctrl { + dsi0-lcd { + dsi0_lcd_rst_gpio: dsi0-lcd-rst-gpio { + rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>; + }; - gt9xx: gt9xx@14 { - status = "okay"; - compatible = "goodix,gt9xx"; - reg = <0x14>; - pinctrl-names = "default"; - pinctrl-0 = <>9xx_gpio>; - touch-gpio = <&gpio3 RK_PC6 IRQ_TYPE_LEVEL_HIGH>; - reset-gpio = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; - max-x = <1200>; - max-y = <1920>; - tp-size = <9271>; - tp-supply = <&vcc_tp>; - }; + dsi0_backlight_en: dsi0-backlight-en { + rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; }; }; - fragment@8 { - target = <&pinctrl>; - - __overlay__ { - dsi0-lcd { - dsi0_lcd_rst_gpio: dsi0-lcd-rst-gpio { - rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - dsi0_backlight_en: dsi0-backlight-en { - rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - gt9xx { - gt9xx_gpio: gt9xx-gpio { - rockchip,pins = - <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>, - <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; + gt9xx { + gt9xx_gpio: gt9xx-gpio { + rockchip,pins = + <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>, + <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; }; }; }; diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10hd.dts index a77f68c4..8f1d349d 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-10hd.dts @@ -13,216 +13,179 @@ exclusive = "dsi0"; description = "Enable Radxa Display 10HD."; }; +}; - fragment@0 { - target-path = "/"; - - __overlay__ { - vcc_tp: vcc-tp { - status = "okay"; - compatible = "regulator-fixed"; - regulator-name = "vcc_tp"; - gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>; - enable-active-low; - regulator-boot-on; - regulator-always-on; - }; - - vcc_lcd_mipi0: vcc-lcd-mipi0 { - status = "okay"; - compatible = "regulator-fixed"; - regulator-name = "vcc_lcd_mipi0"; - gpio = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; - enable-active-high; - regulator-boot-on; - regulator-state-mem { - regulator-off-in-suspend; - }; - }; +&{/} { + vcc_tp: vcc-tp { + status = "okay"; + compatible = "regulator-fixed"; + regulator-name = "vcc_tp"; + gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>; + enable-active-low; + regulator-boot-on; + regulator-always-on; + }; - dsi0_backlight: dsi0-backlight { - status = "okay"; - compatible = "pwm-backlight"; - pwms = <&pwm10 0 25000 0>; - brightness-levels = < - 255 254 253 252 251 250 249 248 - 247 246 245 244 243 242 241 240 - 239 238 237 236 235 234 233 232 - 231 230 229 228 227 226 225 224 - 223 222 221 220 219 218 217 216 - 215 214 213 212 211 210 209 208 - 207 206 205 204 203 202 201 200 - 199 198 197 196 195 194 193 192 - 191 190 189 188 187 186 185 184 - 183 182 181 180 179 178 177 176 - 175 174 173 172 171 170 169 168 - 167 166 165 164 163 162 161 160 - 159 158 157 156 155 154 153 152 - 151 150 149 148 147 146 145 144 - 143 142 141 140 139 138 137 136 - 135 134 133 132 131 130 129 128 - 127 126 125 124 123 122 121 120 - 119 118 117 116 115 114 113 112 - 111 110 109 108 107 106 105 104 - 103 102 101 100 99 98 97 96 - 95 94 93 92 91 90 89 88 - 87 86 85 84 83 82 81 80 - 79 78 77 76 75 74 73 72 - 71 70 69 68 67 66 65 64 - 63 62 61 60 59 58 57 56 - 55 54 53 52 51 50 49 48 - 47 46 45 44 43 42 41 40 - 39 38 38 37 37 36 36 35 - 35 34 34 33 33 32 32 31 - 31 30 30 29 29 28 28 27 - 27 26 26 25 25 24 24 23 - 23 22 22 21 21 20 20 0 - >; - default-brightness-level = <200>; - enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&dsi0_backlight_en>; - }; + vcc_lcd_mipi0: vcc-lcd-mipi0 { + status = "okay"; + compatible = "regulator-fixed"; + regulator-name = "vcc_lcd_mipi0"; + gpio = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-boot-on; + regulator-state-mem { + regulator-off-in-suspend; }; }; - fragment@1 { - target = <&pwm10>; - - __overlay__ { - status = "okay"; - pinctrl-names = "active"; - pinctrl-0 = <&pwm10m2_pins>; - }; + dsi0_backlight: dsi0-backlight { + status = "okay"; + compatible = "pwm-backlight"; + pwms = <&pwm10 0 25000 PWM_POLARITY_INVERTED>; + 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>; + enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dsi0_backlight_en>; }; +}; - fragment@2 { - target = <&dsi0>; +&pwm10 { + status = "okay"; + pinctrl-names = "active"; + pinctrl-0 = <&pwm10m2_pins>; +}; - __overlay__ { - status = "okay"; - rockchip,lane-rate = <480>; +&dsi0 { + status = "okay"; + rockchip,lane-rate = <480>; + #address-cells = <1>; + #size-cells = <0>; + + dsi0_panel: panel@0 { + status = "okay"; + compatible = "radxa,display-10hd-ad001"; + reg = <0>; + backlight = <&dsi0_backlight>; + + vdd-supply = <&vcc_lcd_mipi0>; + vccio-supply = <&vcc_1v8_s0>; + reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dsi0_lcd_rst_gpio>; + + ports { #address-cells = <1>; #size-cells = <0>; - dsi0_panel: panel@0 { - status = "okay"; - compatible = "radxa,display-10hd-ad001"; + port@0 { reg = <0>; - backlight = <&dsi0_backlight>; - - vdd-supply = <&vcc_lcd_mipi0>; - vccio-supply = <&vcc_1v8_s0>; - reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&dsi0_lcd_rst_gpio>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - panel_in_dsi0: endpoint { - remote-endpoint = <&dsi0_out_panel>; - }; - }; - }; - }; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@1 { - reg = <1>; - dsi0_out_panel: endpoint { - remote-endpoint = <&panel_in_dsi0>; - }; + panel_in_dsi0: endpoint { + remote-endpoint = <&dsi0_out_panel>; }; }; }; }; - fragment@3 { - target = <&mipi_dcphy0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - __overlay__ { - status = "okay"; + port@1 { + reg = <1>; + dsi0_out_panel: endpoint { + remote-endpoint = <&panel_in_dsi0>; + }; }; }; +}; - fragment@4 { - target = <&route_dsi0>; - - __overlay__ { - status = "okay"; - connect = <&vp3_out_dsi0>; - }; - }; +&mipi_dcphy0 { + status = "okay"; +}; - fragment@5 { - target = <&dsi0_in_vp2>; +&route_dsi0 { + status = "okay"; + connect = <&vp3_out_dsi0>; +}; - __overlay__ { - status = "disabled"; - }; - }; +&dsi0_in_vp2 { + status = "disabled"; +}; - fragment@6 { - target = <&dsi0_in_vp3>; +&dsi0_in_vp3 { + status = "okay"; +}; - __overlay__ { - status = "okay"; - }; +&i2c5 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c5m2_xfer>; + clock-frequency = <400000>; + #address-cells = <1>; + #size-cells = <0>; + + focaltech: focaltech@38 { + status = "okay"; + compatible = "focaltech,fts"; + reg = <0x38>; + pinctrl-names = "default"; + pinctrl-0 = <&focaltech_gpio>; + focaltech,irq-gpio = <&gpio3 RK_PC6 IRQ_TYPE_LEVEL_LOW>; + focaltech,reset-gpio = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; + focaltech,display-coords = <0 0 799 1279>; }; +}; - fragment@7 { - target = <&i2c5>; - - __overlay__ { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c5m2_xfer>; - clock-frequency = <400000>; - #address-cells = <1>; - #size-cells = <0>; +&pinctrl { + dsi0-lcd { + dsi0_lcd_rst_gpio: dsi0-lcd-rst-gpio { + rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>; + }; - focaltech: focaltech@38 { - status = "okay"; - compatible = "focaltech,fts"; - reg = <0x38>; - pinctrl-names = "default"; - pinctrl-0 = <&focaltech_gpio>; - focaltech,irq-gpio = <&gpio3 RK_PC6 IRQ_TYPE_LEVEL_LOW>; - focaltech,reset-gpio = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; - focaltech,display-coords = <0 0 799 1279>; - }; + dsi0_backlight_en: dsi0-backlight-en { + rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; }; }; - fragment@8 { - target = <&pinctrl>; - - __overlay__ { - dsi0-lcd { - dsi0_lcd_rst_gpio: dsi0-lcd-rst-gpio { - rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - dsi0_backlight_en: dsi0-backlight-en { - rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - focaltech { - focaltech_gpio: focaltech-gpio { - rockchip,pins = - <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>, - <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; + focaltech { + focaltech_gpio: focaltech-gpio { + rockchip,pins = + <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; }; }; }; - diff --git a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-8hd.dts b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-8hd.dts index 830e7bbd..e9721b79 100644 --- a/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-8hd.dts +++ b/arch/arm64/boot/dts/rockchip/overlays/rock-5a-radxa-display-8hd.dts @@ -13,219 +13,182 @@ exclusive = "dsi0"; description = "Enable Radxa Display 8HD."; }; +}; - fragment@0 { - target-path = "/"; - - __overlay__ { - vcc_tp: vcc-tp { - status = "okay"; - compatible = "regulator-fixed"; - regulator-name = "vcc_tp"; - gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>; - enable-active-low; - regulator-boot-on; - regulator-always-on; - }; - - vcc_lcd_mipi0: vcc-lcd-mipi0 { - status = "okay"; - compatible = "regulator-fixed"; - regulator-name = "vcc_lcd_mipi0"; - gpio = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; - enable-active-high; - regulator-boot-on; - regulator-state-mem { - regulator-off-in-suspend; - }; - }; +&{/} { + vcc_tp: vcc-tp { + status = "okay"; + compatible = "regulator-fixed"; + regulator-name = "vcc_tp"; + gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>; + enable-active-low; + regulator-boot-on; + regulator-always-on; + }; - dsi0_backlight: dsi0-backlight { - status = "okay"; - compatible = "pwm-backlight"; - pwms = <&pwm10 0 25000 0>; - brightness-levels = < - 255 254 253 252 251 250 249 248 - 247 246 245 244 243 242 241 240 - 239 238 237 236 235 234 233 232 - 231 230 229 228 227 226 225 224 - 223 222 221 220 219 218 217 216 - 215 214 213 212 211 210 209 208 - 207 206 205 204 203 202 201 200 - 199 198 197 196 195 194 193 192 - 191 190 189 188 187 186 185 184 - 183 182 181 180 179 178 177 176 - 175 174 173 172 171 170 169 168 - 167 166 165 164 163 162 161 160 - 159 158 157 156 155 154 153 152 - 151 150 149 148 147 146 145 144 - 143 142 141 140 139 138 137 136 - 135 134 133 132 131 130 129 128 - 127 126 125 124 123 122 121 120 - 119 118 117 116 115 114 113 112 - 111 110 109 108 107 106 105 104 - 103 102 101 100 99 98 97 96 - 95 94 93 92 91 90 89 88 - 87 86 85 84 83 82 81 80 - 79 78 77 76 75 74 73 72 - 71 70 69 68 67 66 65 64 - 63 62 61 60 59 58 57 56 - 55 54 53 52 51 50 49 48 - 47 46 45 44 43 42 41 40 - 39 38 38 37 37 36 36 35 - 35 34 34 33 33 32 32 31 - 31 30 30 29 29 28 28 27 - 27 26 26 25 25 24 24 23 - 23 22 22 21 21 20 20 0 - >; - default-brightness-level = <200>; - enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&dsi0_backlight_en>; - }; + vcc_lcd_mipi0: vcc-lcd-mipi0 { + status = "okay"; + compatible = "regulator-fixed"; + regulator-name = "vcc_lcd_mipi0"; + gpio = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; + enable-active-high; + regulator-boot-on; + regulator-state-mem { + regulator-off-in-suspend; }; }; - fragment@1 { - target = <&pwm10>; - - __overlay__ { - status = "okay"; - pinctrl-names = "active"; - pinctrl-0 = <&pwm10m2_pins>; - }; + dsi0_backlight: dsi0-backlight { + status = "okay"; + compatible = "pwm-backlight"; + pwms = <&pwm10 0 25000 PWM_POLARITY_INVERTED>; + 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>; + enable-gpios = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dsi0_backlight_en>; }; +}; - fragment@2 { - target = <&dsi0>; +&pwm10 { + status = "okay"; + pinctrl-names = "active"; + pinctrl-0 = <&pwm10m2_pins>; +}; - __overlay__ { - status = "okay"; - rockchip,lane-rate = <480>; +&dsi0 { + status = "okay"; + rockchip,lane-rate = <480>; + #address-cells = <1>; + #size-cells = <0>; + + dsi0_panel: panel@0 { + status = "okay"; + compatible ="radxa,display-8hd"; + reg = <0>; + backlight = <&dsi0_backlight>; + + vdd-supply = <&vcc_lcd_mipi0>; + vccio-supply = <&vcc_1v8_s0>; + reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&dsi0_lcd_rst_gpio>; + + ports { #address-cells = <1>; #size-cells = <0>; - dsi0_panel: panel@0 { - status = "okay"; - compatible ="radxa,display-8hd"; + port@0 { reg = <0>; - backlight = <&dsi0_backlight>; - - vdd-supply = <&vcc_lcd_mipi0>; - vccio-supply = <&vcc_1v8_s0>; - reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&dsi0_lcd_rst_gpio>; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - panel_in_dsi0: endpoint { - remote-endpoint = <&dsi0_out_panel>; - }; - }; - }; - }; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@1 { - reg = <1>; - dsi0_out_panel: endpoint { - remote-endpoint = <&panel_in_dsi0>; - }; + panel_in_dsi0: endpoint { + remote-endpoint = <&dsi0_out_panel>; }; }; }; }; - fragment@3 { - target = <&mipi_dcphy0>; + ports { + #address-cells = <1>; + #size-cells = <0>; - __overlay__ { - status = "okay"; + port@1 { + reg = <1>; + dsi0_out_panel: endpoint { + remote-endpoint = <&panel_in_dsi0>; + }; }; }; +}; - fragment@4 { - target = <&route_dsi0>; - - __overlay__ { - status = "okay"; - connect = <&vp3_out_dsi0>; - }; - }; +&mipi_dcphy0 { + status = "okay"; +}; - fragment@5 { - target = <&dsi0_in_vp2>; +&route_dsi0 { + status = "okay"; + connect = <&vp3_out_dsi0>; +}; - __overlay__ { - status = "disabled"; - }; - }; +&dsi0_in_vp2 { + status = "disabled"; +}; - fragment@6 { - target = <&dsi0_in_vp3>; +&dsi0_in_vp3 { + status = "okay"; +}; - __overlay__ { - status = "okay"; - }; +&i2c5 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&i2c5m2_xfer>; + clock-frequency = <400000>; + #address-cells = <1>; + #size-cells = <0>; + + gt9xx: gt9xx@14 { + status = "okay"; + compatible = "goodix,gt9xx"; + reg = <0x14>; + pinctrl-names = "default"; + pinctrl-0 = <>9xx_gpio>; + touch-gpio = <&gpio3 RK_PC6 IRQ_TYPE_LEVEL_HIGH>; + reset-gpio = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; + max-x = <800>; + max-y = <1280>; + tp-size = <9112>; + tp-supply = <&vcc_tp>; }; +}; - fragment@7 { - target = <&i2c5>; - - __overlay__ { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c5m2_xfer>; - clock-frequency = <400000>; - #address-cells = <1>; - #size-cells = <0>; +&pinctrl { + dsi0-lcd { + dsi0_lcd_rst_gpio: dsi0-lcd-rst-gpio { + rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>; + }; - gt9xx: gt9xx@14 { - status = "okay"; - compatible = "goodix,gt9xx"; - reg = <0x14>; - pinctrl-names = "default"; - pinctrl-0 = <>9xx_gpio>; - touch-gpio = <&gpio3 RK_PC6 IRQ_TYPE_LEVEL_HIGH>; - reset-gpio = <&gpio3 RK_PC5 GPIO_ACTIVE_HIGH>; - max-x = <800>; - max-y = <1280>; - tp-size = <9112>; - tp-supply = <&vcc_tp>; - }; + dsi0_backlight_en: dsi0-backlight-en { + rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; }; }; - fragment@8 { - target = <&pinctrl>; - - __overlay__ { - dsi0-lcd { - dsi0_lcd_rst_gpio: dsi0-lcd-rst-gpio { - rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_up>; - }; - - dsi0_backlight_en: dsi0-backlight-en { - rockchip,pins = <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - gt9xx { - gt9xx_gpio: gt9xx-gpio { - rockchip,pins = - <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>, - <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; + gt9xx { + gt9xx_gpio: gt9xx-gpio { + rockchip,pins = + <3 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; }; }; }; -