* [PATCH v2 1/2] ARM: dts: rockchip: move rk3288-veryon display settings into a separate file @ 2019-07-11 22:34 ` Matthias Kaehlcke 0 siblings, 0 replies; 14+ messages in thread From: Matthias Kaehlcke @ 2019-07-11 22:34 UTC (permalink / raw) To: Heiko Stuebner, Rob Herring, Mark Rutland Cc: linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Matthias Kaehlcke, Douglas Anderson, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree-u79uwXL29TY76Z2rM5mHXA The chromebook .dtsi file contains common settings for veyron Chromebooks with eDP displays. Some veyron devices with a display aren't Chromebooks (e.g. 'tiger' aka 'AOpen Chromebase Mini'), move display related bits from the chromebook .dtsi into a separate file to avoid redundant DT settings. The new file is included from the chromebook .dtsi and can be included by non-Chromebook devices with a display. Signed-off-by: Matthias Kaehlcke <mka-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> --- Changes in v2: - rebased on v5.4-armsoc/dts32 (0d19541e3b45) --- .../boot/dts/rk3288-veyron-chromebook.dtsi | 115 +--------------- arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 124 ++++++++++++++++++ 2 files changed, 125 insertions(+), 114 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-veyron-edp.dtsi diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi index 6a28ce345ba0..ffb60f880b39 100644 --- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi @@ -10,6 +10,7 @@ #include <dt-bindings/input/input.h> #include "rk3288-veyron.dtsi" #include "rk3288-veyron-analog-audio.dtsi" +#include "rk3288-veyron-edp.dtsi" #include "rk3288-veyron-sdmmc.dtsi" / { @@ -18,50 +19,6 @@ i2c20 = &i2c_tunnel; }; - 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 RK_PA2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_en>; - pwms = <&pwm0 0 1000000 0>; - post-pwm-on-delay-ms = <10>; - pwm-off-delay-ms = <10>; - }; - gpio-charger { compatible = "gpio-charger"; charger-type = "mains"; @@ -85,35 +42,6 @@ }; }; - panel: panel { - compatible ="innolux,n116bge", "simple-panel"; - status = "okay"; - power-supply = <&vcc33_lcd>; - backlight = <&backlight>; - - panel-timing { - clock-frequency = <74250000>; - hactive = <1366>; - hfront-porch = <136>; - hback-porch = <60>; - hsync-len = <30>; - hsync-active = <0>; - vactive = <768>; - vfront-porch = <8>; - vback-porch = <12>; - vsync-len = <12>; - vsync-active = <0>; - }; - - ports { - panel_in: port { - panel_in_edp: endpoint { - remote-endpoint = <&edp_out_panel>; - }; - }; - }; - }; - /* A non-regulated voltage from power supply or battery */ vccsys: vccsys { compatible = "regulator-fixed"; @@ -155,33 +83,6 @@ }; }; -&edp { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&edp_hpd>; - - ports { - edp_out: port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - edp_out_panel: endpoint@0 { - reg = <0>; - remote-endpoint = <&panel_in_edp>; - }; - }; - }; -}; - -&edp_phy { - status = "okay"; -}; - -&pwm0 { - status = "okay"; -}; - &rk808 { vcc11-supply = <&vcc_5v>; @@ -234,14 +135,6 @@ }; }; -&vopl { - status = "okay"; -}; - -&vopl_mmu { - status = "okay"; -}; - &pinctrl { pinctrl-0 = < /* Common for sleep and wake, but no owners */ @@ -264,12 +157,6 @@ &bt_dev_wake_sleep >; - backlight { - bl_en: bl-en { - rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buttons { ap_lid_int_l: ap-lid-int-l { rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi new file mode 100644 index 000000000000..5d812e9e78aa --- /dev/null +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi @@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Google Veyron (and derivatives) fragment for the edp displays + * + * Copyright 2019 Google LLC + */ + +/ { + 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 RK_PA2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bl_en>; + pwms = <&pwm0 0 1000000 0>; + post-pwm-on-delay-ms = <10>; + pwm-off-delay-ms = <10>; + }; + + panel: panel { + compatible ="innolux,n116bge", "simple-panel"; + status = "okay"; + power-supply = <&vcc33_lcd>; + backlight = <&backlight>; + + panel-timing { + clock-frequency = <74250000>; + hactive = <1366>; + hfront-porch = <136>; + hback-porch = <60>; + hsync-len = <30>; + hsync-active = <0>; + vactive = <768>; + vfront-porch = <8>; + vback-porch = <12>; + vsync-len = <12>; + vsync-active = <0>; + }; + + ports { + panel_in: port { + panel_in_edp: endpoint { + remote-endpoint = <&edp_out_panel>; + }; + }; + }; + }; +}; + +&edp { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&edp_hpd>; + + ports { + edp_out: port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + edp_out_panel: endpoint@0 { + reg = <0>; + remote-endpoint = <&panel_in_edp>; + }; + }; + }; +}; + +&edp_phy { + status = "okay"; +}; + +&pinctrl { + backlight { + bl_en: bl-en { + rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&pwm0 { + status = "okay"; +}; + +&vopl { + status = "okay"; +}; + +&vopl_mmu { + status = "okay"; +}; -- 2.22.0.410.gd8fdbe21b5-goog ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 1/2] ARM: dts: rockchip: move rk3288-veryon display settings into a separate file @ 2019-07-11 22:34 ` Matthias Kaehlcke 0 siblings, 0 replies; 14+ messages in thread From: Matthias Kaehlcke @ 2019-07-11 22:34 UTC (permalink / raw) To: Heiko Stuebner, Rob Herring, Mark Rutland Cc: linux-rockchip, Matthias Kaehlcke, Douglas Anderson, linux-arm-kernel, devicetree The chromebook .dtsi file contains common settings for veyron Chromebooks with eDP displays. Some veyron devices with a display aren't Chromebooks (e.g. 'tiger' aka 'AOpen Chromebase Mini'), move display related bits from the chromebook .dtsi into a separate file to avoid redundant DT settings. The new file is included from the chromebook .dtsi and can be included by non-Chromebook devices with a display. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- Changes in v2: - rebased on v5.4-armsoc/dts32 (0d19541e3b45) --- .../boot/dts/rk3288-veyron-chromebook.dtsi | 115 +--------------- arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 124 ++++++++++++++++++ 2 files changed, 125 insertions(+), 114 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-veyron-edp.dtsi diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi index 6a28ce345ba0..ffb60f880b39 100644 --- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi @@ -10,6 +10,7 @@ #include <dt-bindings/input/input.h> #include "rk3288-veyron.dtsi" #include "rk3288-veyron-analog-audio.dtsi" +#include "rk3288-veyron-edp.dtsi" #include "rk3288-veyron-sdmmc.dtsi" / { @@ -18,50 +19,6 @@ i2c20 = &i2c_tunnel; }; - 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 RK_PA2 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_en>; - pwms = <&pwm0 0 1000000 0>; - post-pwm-on-delay-ms = <10>; - pwm-off-delay-ms = <10>; - }; - gpio-charger { compatible = "gpio-charger"; charger-type = "mains"; @@ -85,35 +42,6 @@ }; }; - panel: panel { - compatible ="innolux,n116bge", "simple-panel"; - status = "okay"; - power-supply = <&vcc33_lcd>; - backlight = <&backlight>; - - panel-timing { - clock-frequency = <74250000>; - hactive = <1366>; - hfront-porch = <136>; - hback-porch = <60>; - hsync-len = <30>; - hsync-active = <0>; - vactive = <768>; - vfront-porch = <8>; - vback-porch = <12>; - vsync-len = <12>; - vsync-active = <0>; - }; - - ports { - panel_in: port { - panel_in_edp: endpoint { - remote-endpoint = <&edp_out_panel>; - }; - }; - }; - }; - /* A non-regulated voltage from power supply or battery */ vccsys: vccsys { compatible = "regulator-fixed"; @@ -155,33 +83,6 @@ }; }; -&edp { - status = "okay"; - - pinctrl-names = "default"; - pinctrl-0 = <&edp_hpd>; - - ports { - edp_out: port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - edp_out_panel: endpoint@0 { - reg = <0>; - remote-endpoint = <&panel_in_edp>; - }; - }; - }; -}; - -&edp_phy { - status = "okay"; -}; - -&pwm0 { - status = "okay"; -}; - &rk808 { vcc11-supply = <&vcc_5v>; @@ -234,14 +135,6 @@ }; }; -&vopl { - status = "okay"; -}; - -&vopl_mmu { - status = "okay"; -}; - &pinctrl { pinctrl-0 = < /* Common for sleep and wake, but no owners */ @@ -264,12 +157,6 @@ &bt_dev_wake_sleep >; - backlight { - bl_en: bl-en { - rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buttons { ap_lid_int_l: ap-lid-int-l { rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi new file mode 100644 index 000000000000..5d812e9e78aa --- /dev/null +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi @@ -0,0 +1,124 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Google Veyron (and derivatives) fragment for the edp displays + * + * Copyright 2019 Google LLC + */ + +/ { + 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 RK_PA2 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bl_en>; + pwms = <&pwm0 0 1000000 0>; + post-pwm-on-delay-ms = <10>; + pwm-off-delay-ms = <10>; + }; + + panel: panel { + compatible ="innolux,n116bge", "simple-panel"; + status = "okay"; + power-supply = <&vcc33_lcd>; + backlight = <&backlight>; + + panel-timing { + clock-frequency = <74250000>; + hactive = <1366>; + hfront-porch = <136>; + hback-porch = <60>; + hsync-len = <30>; + hsync-active = <0>; + vactive = <768>; + vfront-porch = <8>; + vback-porch = <12>; + vsync-len = <12>; + vsync-active = <0>; + }; + + ports { + panel_in: port { + panel_in_edp: endpoint { + remote-endpoint = <&edp_out_panel>; + }; + }; + }; + }; +}; + +&edp { + status = "okay"; + + pinctrl-names = "default"; + pinctrl-0 = <&edp_hpd>; + + ports { + edp_out: port@1 { + reg = <1>; + #address-cells = <1>; + #size-cells = <0>; + edp_out_panel: endpoint@0 { + reg = <0>; + remote-endpoint = <&panel_in_edp>; + }; + }; + }; +}; + +&edp_phy { + status = "okay"; +}; + +&pinctrl { + backlight { + bl_en: bl-en { + rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; + +&pwm0 { + status = "okay"; +}; + +&vopl { + status = "okay"; +}; + +&vopl_mmu { + status = "okay"; +}; -- 2.22.0.410.gd8fdbe21b5-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings 2019-07-11 22:34 ` Matthias Kaehlcke @ 2019-07-11 22:34 ` Matthias Kaehlcke -1 siblings, 0 replies; 14+ messages in thread From: Matthias Kaehlcke @ 2019-07-11 22:34 UTC (permalink / raw) To: Heiko Stuebner, Rob Herring, Mark Rutland Cc: linux-rockchip, Matthias Kaehlcke, Douglas Anderson, linux-arm-kernel, devicetree veyron jaq, jerry, minnie and speedy have mostly redundant regulator and pinctrl configurations for the panel/backlight. Consolidate these pieces in the eDP .dtsi. Also change the default power supply for the panel to 'panel_regulator', instead of overriding it in all the board files. pinky is the only device that uses 'vcc33_lcd' (the prior default), so overwrite it in this case. pinky doesn't have a complete display configuration, to keep things as they were delete the common nodes that didn't exist previously in pinky's board file. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- Changes in v2: - rebased on v5.4-armsoc/dts32 (0d19541e3b45) --- arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 51 ++++++++++++++++++- arch/arm/boot/dts/rk3288-veyron-jaq.dts | 55 -------------------- arch/arm/boot/dts/rk3288-veyron-jerry.dts | 58 ---------------------- arch/arm/boot/dts/rk3288-veyron-minnie.dts | 51 ------------------- arch/arm/boot/dts/rk3288-veyron-pinky.dts | 17 +++++++ arch/arm/boot/dts/rk3288-veyron-speedy.dts | 58 ---------------------- 6 files changed, 67 insertions(+), 223 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi index 5d812e9e78aa..39f56d36a701 100644 --- a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi @@ -6,6 +6,40 @@ */ / { + backlight_regulator: backlight-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bl_pwr_en>; + regulator-name = "backlight_regulator"; + vin-supply = <&vcc33_sys>; + startup-delay-us = <15000>; + }; + + panel_regulator: panel-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&lcd_enable_h>; + regulator-name = "panel_regulator"; + startup-delay-us = <100000>; + vin-supply = <&vcc33_sys>; + }; + + vcc18_lcd: vcc18-lcd { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&avdd_1v8_disp_en>; + regulator-name = "vcc18_lcd"; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc18_wl>; + }; + backlight: backlight { compatible = "pwm-backlight"; brightness-levels = < @@ -48,12 +82,13 @@ pwms = <&pwm0 0 1000000 0>; post-pwm-on-delay-ms = <10>; pwm-off-delay-ms = <10>; + power-supply = <&backlight_regulator>; }; panel: panel { compatible ="innolux,n116bge", "simple-panel"; status = "okay"; - power-supply = <&vcc33_lcd>; + power-supply = <&panel_regulator>; backlight = <&backlight>; panel-timing { @@ -105,10 +140,24 @@ &pinctrl { backlight { + bl_pwr_en: bl_pwr_en { + rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + bl_en: bl-en { rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + lcd { + lcd_enable_h: lcd-en { + rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + avdd_1v8_disp_en: avdd-1v8-disp-en { + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &pwm0 { diff --git a/arch/arm/boot/dts/rk3288-veyron-jaq.dts b/arch/arm/boot/dts/rk3288-veyron-jaq.dts index fcd119168cb6..80386203e85b 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jaq.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jaq.dts @@ -16,40 +16,6 @@ "google,veyron-jaq-rev3", "google,veyron-jaq-rev2", "google,veyron-jaq-rev1", "google,veyron-jaq", "google,veyron", "rockchip,rk3288"; - - panel_regulator: panel-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_h>; - regulator-name = "panel_regulator"; - startup-delay-us = <100000>; - vin-supply = <&vcc33_sys>; - }; - - vcc18_lcd: vcc18-lcd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&avdd_1v8_disp_en>; - regulator-name = "vcc18_lcd"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc18_wl>; - }; - - backlight_regulator: backlight-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_pwr_en>; - regulator-name = "backlight_regulator"; - vin-supply = <&vcc33_sys>; - startup-delay-us = <15000>; - }; }; &backlight { @@ -87,11 +53,6 @@ 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>; - power-supply = <&backlight_regulator>; -}; - -&panel { - power-supply = <&panel_regulator>; }; &rk808 { @@ -343,12 +304,6 @@ }; &pinctrl { - backlight { - bl_pwr_en: bl_pwr_en { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -361,16 +316,6 @@ }; }; - lcd { - lcd_enable_h: lcd-en { - rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - avdd_1v8_disp_en: avdd-1v8-disp-en { - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pmic { dvs_1: dvs-1 { rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts index 164561f04c1d..a8f55aec09ee 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jerry.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jerry.dts @@ -18,48 +18,6 @@ "google,veyron-jerry-rev5", "google,veyron-jerry-rev4", "google,veyron-jerry-rev3", "google,veyron-jerry", "google,veyron", "rockchip,rk3288"; - - panel_regulator: panel-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_h>; - regulator-name = "panel_regulator"; - startup-delay-us = <100000>; - vin-supply = <&vcc33_sys>; - }; - - vcc18_lcd: vcc18-lcd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&avdd_1v8_disp_en>; - regulator-name = "vcc18_lcd"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc18_wl>; - }; - - backlight_regulator: backlight-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_pwr_en>; - regulator-name = "backlight_regulator"; - vin-supply = <&vcc33_sys>; - startup-delay-us = <15000>; - }; -}; - -&backlight { - power-supply = <&backlight_regulator>; -}; - -&panel { - power-supply= <&panel_regulator>; }; &rk808 { @@ -311,12 +269,6 @@ }; &pinctrl { - backlight { - bl_pwr_en: bl_pwr_en { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -329,16 +281,6 @@ }; }; - lcd { - lcd_enable_h: lcd-en { - rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - avdd_1v8_disp_en: avdd-1v8-disp-en { - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pmic { dvs_1: dvs-1 { rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts index 4cc7d3659484..2b0801a539c9 100644 --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts @@ -15,40 +15,6 @@ "google,veyron-minnie-rev0", "google,veyron-minnie", "google,veyron", "rockchip,rk3288"; - backlight_regulator: backlight-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_pwr_en>; - regulator-name = "backlight_regulator"; - vin-supply = <&vcc33_sys>; - startup-delay-us = <15000>; - }; - - panel_regulator: panel-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_h>; - regulator-name = "panel_regulator"; - startup-delay-us = <100000>; - vin-supply = <&vcc33_sys>; - }; - - vcc18_lcd: vcc18-lcd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&avdd_1v8_disp_en>; - regulator-name = "vcc18_lcd"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc18_wl>; - }; - volume_buttons: volume-buttons { compatible = "gpio-keys"; pinctrl-names = "default"; @@ -137,7 +103,6 @@ &panel { compatible = "auo,b101ean01", "simple-panel"; - power-supply= <&panel_regulator>; /delete-node/ panel-timing; @@ -411,12 +376,6 @@ }; &pinctrl { - backlight { - bl_pwr_en: bl_pwr_en { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -439,16 +398,6 @@ }; }; - lcd { - lcd_enable_h: lcd-en { - rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - avdd_1v8_disp_en: avdd-1v8-disp-en { - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pmic { dvs_1: dvs-1 { rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts index 9b6f4d9b03b6..06af58e37a4b 100644 --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts @@ -14,7 +14,14 @@ compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", "google,veyron", "rockchip,rk3288"; + /delete-node/backlight-regulator; + /delete-node/panel-regulator; /delete-node/emmc-pwrseq; + /delete-node/vcc18-lcd; +}; + +&backlight { + /delete-property/power-supply; }; &emmc { @@ -52,7 +59,17 @@ i2c-scl-rising-time-ns = <300>; }; +&panel { + power-supply= <&vcc33_lcd>; +}; + &pinctrl { + /delete-node/ lcd; + + backlight { + /delete-node/ bl_pwr_en; + }; + buttons { pwr_key_h: pwr-key-h { rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-veyron-speedy.dts b/arch/arm/boot/dts/rk3288-veyron-speedy.dts index 9b140db04456..2f2989bc3f9c 100644 --- a/arch/arm/boot/dts/rk3288-veyron-speedy.dts +++ b/arch/arm/boot/dts/rk3288-veyron-speedy.dts @@ -16,44 +16,6 @@ "google,veyron-speedy-rev5", "google,veyron-speedy-rev4", "google,veyron-speedy-rev3", "google,veyron-speedy-rev2", "google,veyron-speedy", "google,veyron", "rockchip,rk3288"; - - panel_regulator: panel-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_h>; - regulator-name = "panel_regulator"; - startup-delay-us = <100000>; - vin-supply = <&vcc33_sys>; - }; - - vcc18_lcd: vcc18-lcd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&avdd_1v8_disp_en>; - regulator-name = "vcc18_lcd"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc18_wl>; - }; - - backlight_regulator: backlight-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_pwr_en>; - regulator-name = "backlight_regulator"; - vin-supply = <&vcc33_sys>; - startup-delay-us = <15000>; - }; -}; - -&backlight { - power-supply = <&backlight_regulator>; }; &cpu_alert0 { @@ -83,10 +45,6 @@ temperature = <90000>; }; -&panel { - power-supply= <&panel_regulator>; -}; - &rk808 { pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; @@ -321,12 +279,6 @@ }; &pinctrl { - backlight { - bl_pwr_en: bl_pwr_en { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -339,16 +291,6 @@ }; }; - lcd { - lcd_enable_h: lcd-en { - rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - avdd_1v8_disp_en: avdd-1v8-disp-en { - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pmic { dvs_1: dvs-1 { rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; -- 2.22.0.410.gd8fdbe21b5-goog ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings @ 2019-07-11 22:34 ` Matthias Kaehlcke 0 siblings, 0 replies; 14+ messages in thread From: Matthias Kaehlcke @ 2019-07-11 22:34 UTC (permalink / raw) To: Heiko Stuebner, Rob Herring, Mark Rutland Cc: linux-rockchip, Matthias Kaehlcke, Douglas Anderson, linux-arm-kernel, devicetree veyron jaq, jerry, minnie and speedy have mostly redundant regulator and pinctrl configurations for the panel/backlight. Consolidate these pieces in the eDP .dtsi. Also change the default power supply for the panel to 'panel_regulator', instead of overriding it in all the board files. pinky is the only device that uses 'vcc33_lcd' (the prior default), so overwrite it in this case. pinky doesn't have a complete display configuration, to keep things as they were delete the common nodes that didn't exist previously in pinky's board file. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> --- Changes in v2: - rebased on v5.4-armsoc/dts32 (0d19541e3b45) --- arch/arm/boot/dts/rk3288-veyron-edp.dtsi | 51 ++++++++++++++++++- arch/arm/boot/dts/rk3288-veyron-jaq.dts | 55 -------------------- arch/arm/boot/dts/rk3288-veyron-jerry.dts | 58 ---------------------- arch/arm/boot/dts/rk3288-veyron-minnie.dts | 51 ------------------- arch/arm/boot/dts/rk3288-veyron-pinky.dts | 17 +++++++ arch/arm/boot/dts/rk3288-veyron-speedy.dts | 58 ---------------------- 6 files changed, 67 insertions(+), 223 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi index 5d812e9e78aa..39f56d36a701 100644 --- a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi @@ -6,6 +6,40 @@ */ / { + backlight_regulator: backlight-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bl_pwr_en>; + regulator-name = "backlight_regulator"; + vin-supply = <&vcc33_sys>; + startup-delay-us = <15000>; + }; + + panel_regulator: panel-regulator { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&lcd_enable_h>; + regulator-name = "panel_regulator"; + startup-delay-us = <100000>; + vin-supply = <&vcc33_sys>; + }; + + vcc18_lcd: vcc18-lcd { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&avdd_1v8_disp_en>; + regulator-name = "vcc18_lcd"; + regulator-always-on; + regulator-boot-on; + vin-supply = <&vcc18_wl>; + }; + backlight: backlight { compatible = "pwm-backlight"; brightness-levels = < @@ -48,12 +82,13 @@ pwms = <&pwm0 0 1000000 0>; post-pwm-on-delay-ms = <10>; pwm-off-delay-ms = <10>; + power-supply = <&backlight_regulator>; }; panel: panel { compatible ="innolux,n116bge", "simple-panel"; status = "okay"; - power-supply = <&vcc33_lcd>; + power-supply = <&panel_regulator>; backlight = <&backlight>; panel-timing { @@ -105,10 +140,24 @@ &pinctrl { backlight { + bl_pwr_en: bl_pwr_en { + rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; + }; + bl_en: bl-en { rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + lcd { + lcd_enable_h: lcd-en { + rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + avdd_1v8_disp_en: avdd-1v8-disp-en { + rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; }; &pwm0 { diff --git a/arch/arm/boot/dts/rk3288-veyron-jaq.dts b/arch/arm/boot/dts/rk3288-veyron-jaq.dts index fcd119168cb6..80386203e85b 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jaq.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jaq.dts @@ -16,40 +16,6 @@ "google,veyron-jaq-rev3", "google,veyron-jaq-rev2", "google,veyron-jaq-rev1", "google,veyron-jaq", "google,veyron", "rockchip,rk3288"; - - panel_regulator: panel-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_h>; - regulator-name = "panel_regulator"; - startup-delay-us = <100000>; - vin-supply = <&vcc33_sys>; - }; - - vcc18_lcd: vcc18-lcd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&avdd_1v8_disp_en>; - regulator-name = "vcc18_lcd"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc18_wl>; - }; - - backlight_regulator: backlight-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_pwr_en>; - regulator-name = "backlight_regulator"; - vin-supply = <&vcc33_sys>; - startup-delay-us = <15000>; - }; }; &backlight { @@ -87,11 +53,6 @@ 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>; - power-supply = <&backlight_regulator>; -}; - -&panel { - power-supply = <&panel_regulator>; }; &rk808 { @@ -343,12 +304,6 @@ }; &pinctrl { - backlight { - bl_pwr_en: bl_pwr_en { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -361,16 +316,6 @@ }; }; - lcd { - lcd_enable_h: lcd-en { - rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - avdd_1v8_disp_en: avdd-1v8-disp-en { - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pmic { dvs_1: dvs-1 { rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts index 164561f04c1d..a8f55aec09ee 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jerry.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jerry.dts @@ -18,48 +18,6 @@ "google,veyron-jerry-rev5", "google,veyron-jerry-rev4", "google,veyron-jerry-rev3", "google,veyron-jerry", "google,veyron", "rockchip,rk3288"; - - panel_regulator: panel-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_h>; - regulator-name = "panel_regulator"; - startup-delay-us = <100000>; - vin-supply = <&vcc33_sys>; - }; - - vcc18_lcd: vcc18-lcd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&avdd_1v8_disp_en>; - regulator-name = "vcc18_lcd"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc18_wl>; - }; - - backlight_regulator: backlight-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_pwr_en>; - regulator-name = "backlight_regulator"; - vin-supply = <&vcc33_sys>; - startup-delay-us = <15000>; - }; -}; - -&backlight { - power-supply = <&backlight_regulator>; -}; - -&panel { - power-supply= <&panel_regulator>; }; &rk808 { @@ -311,12 +269,6 @@ }; &pinctrl { - backlight { - bl_pwr_en: bl_pwr_en { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -329,16 +281,6 @@ }; }; - lcd { - lcd_enable_h: lcd-en { - rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - avdd_1v8_disp_en: avdd-1v8-disp-en { - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pmic { dvs_1: dvs-1 { rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts index 4cc7d3659484..2b0801a539c9 100644 --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts @@ -15,40 +15,6 @@ "google,veyron-minnie-rev0", "google,veyron-minnie", "google,veyron", "rockchip,rk3288"; - backlight_regulator: backlight-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_pwr_en>; - regulator-name = "backlight_regulator"; - vin-supply = <&vcc33_sys>; - startup-delay-us = <15000>; - }; - - panel_regulator: panel-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_h>; - regulator-name = "panel_regulator"; - startup-delay-us = <100000>; - vin-supply = <&vcc33_sys>; - }; - - vcc18_lcd: vcc18-lcd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&avdd_1v8_disp_en>; - regulator-name = "vcc18_lcd"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc18_wl>; - }; - volume_buttons: volume-buttons { compatible = "gpio-keys"; pinctrl-names = "default"; @@ -137,7 +103,6 @@ &panel { compatible = "auo,b101ean01", "simple-panel"; - power-supply= <&panel_regulator>; /delete-node/ panel-timing; @@ -411,12 +376,6 @@ }; &pinctrl { - backlight { - bl_pwr_en: bl_pwr_en { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -439,16 +398,6 @@ }; }; - lcd { - lcd_enable_h: lcd-en { - rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - avdd_1v8_disp_en: avdd-1v8-disp-en { - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pmic { dvs_1: dvs-1 { rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts index 9b6f4d9b03b6..06af58e37a4b 100644 --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts @@ -14,7 +14,14 @@ compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", "google,veyron", "rockchip,rk3288"; + /delete-node/backlight-regulator; + /delete-node/panel-regulator; /delete-node/emmc-pwrseq; + /delete-node/vcc18-lcd; +}; + +&backlight { + /delete-property/power-supply; }; &emmc { @@ -52,7 +59,17 @@ i2c-scl-rising-time-ns = <300>; }; +&panel { + power-supply= <&vcc33_lcd>; +}; + &pinctrl { + /delete-node/ lcd; + + backlight { + /delete-node/ bl_pwr_en; + }; + buttons { pwr_key_h: pwr-key-h { rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-veyron-speedy.dts b/arch/arm/boot/dts/rk3288-veyron-speedy.dts index 9b140db04456..2f2989bc3f9c 100644 --- a/arch/arm/boot/dts/rk3288-veyron-speedy.dts +++ b/arch/arm/boot/dts/rk3288-veyron-speedy.dts @@ -16,44 +16,6 @@ "google,veyron-speedy-rev5", "google,veyron-speedy-rev4", "google,veyron-speedy-rev3", "google,veyron-speedy-rev2", "google,veyron-speedy", "google,veyron", "rockchip,rk3288"; - - panel_regulator: panel-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_enable_h>; - regulator-name = "panel_regulator"; - startup-delay-us = <100000>; - vin-supply = <&vcc33_sys>; - }; - - vcc18_lcd: vcc18-lcd { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&avdd_1v8_disp_en>; - regulator-name = "vcc18_lcd"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc18_wl>; - }; - - backlight_regulator: backlight-regulator { - compatible = "regulator-fixed"; - enable-active-high; - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bl_pwr_en>; - regulator-name = "backlight_regulator"; - vin-supply = <&vcc33_sys>; - startup-delay-us = <15000>; - }; -}; - -&backlight { - power-supply = <&backlight_regulator>; }; &cpu_alert0 { @@ -83,10 +45,6 @@ temperature = <90000>; }; -&panel { - power-supply= <&panel_regulator>; -}; - &rk808 { pinctrl-names = "default"; pinctrl-0 = <&pmic_int_l>; @@ -321,12 +279,6 @@ }; &pinctrl { - backlight { - bl_pwr_en: bl_pwr_en { - rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; @@ -339,16 +291,6 @@ }; }; - lcd { - lcd_enable_h: lcd-en { - rockchip,pins = <7 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>; - }; - - avdd_1v8_disp_en: avdd-1v8-disp-en { - rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; - }; - }; - pmic { dvs_1: dvs-1 { rockchip,pins = <7 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; -- 2.22.0.410.gd8fdbe21b5-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings 2019-07-11 22:34 ` Matthias Kaehlcke @ 2019-07-24 21:46 ` Doug Anderson -1 siblings, 0 replies; 14+ messages in thread From: Doug Anderson @ 2019-07-24 21:46 UTC (permalink / raw) To: Matthias Kaehlcke Cc: Mark Rutland, devicetree, Heiko Stuebner, open list:ARM/Rockchip SoC..., Rob Herring, Linux ARM Hi, On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > index 4cc7d3659484..2b0801a539c9 100644 > --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts > +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > @@ -15,40 +15,6 @@ > "google,veyron-minnie-rev0", "google,veyron-minnie", > "google,veyron", "rockchip,rk3288"; > > - backlight_regulator: backlight-regulator { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&bl_pwr_en>; > - regulator-name = "backlight_regulator"; > - vin-supply = <&vcc33_sys>; > - startup-delay-us = <15000>; > - }; > - > - panel_regulator: panel-regulator { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&lcd_enable_h>; > - regulator-name = "panel_regulator"; > - startup-delay-us = <100000>; > - vin-supply = <&vcc33_sys>; > - }; > - > - vcc18_lcd: vcc18-lcd { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&avdd_1v8_disp_en>; > - regulator-name = "vcc18_lcd"; > - regulator-always-on; > - regulator-boot-on; > - vin-supply = <&vcc18_wl>; > - }; > - > volume_buttons: volume-buttons { > compatible = "gpio-keys"; > pinctrl-names = "default"; You forgot to remove the line: power-supply = <&backlight_regulator>; ...from minnie. > diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > index 9b6f4d9b03b6..06af58e37a4b 100644 > --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts > +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > @@ -14,7 +14,14 @@ > compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", > "google,veyron", "rockchip,rk3288"; > > + /delete-node/backlight-regulator; > + /delete-node/panel-regulator; > /delete-node/emmc-pwrseq; > + /delete-node/vcc18-lcd; > +}; > + > +&backlight { > + /delete-property/power-supply; > }; > > &emmc { > @@ -52,7 +59,17 @@ > i2c-scl-rising-time-ns = <300>; > }; > > +&panel { > + power-supply= <&vcc33_lcd>; Might as well put a space before the "="? > &pinctrl { > + /delete-node/ lcd; > + > + backlight { > + /delete-node/ bl_pwr_en; > + }; I general as the defender of "pinky", I'll let Heiko confirm he's OK with the color of this bikeshed. Sometimes a bit of repetition is preferred over a bunch of confusing /delete-node/ statements since those tend to make things harder to reason about in general. In this case I think things are cleaner after your patch but I won't say it's 100% clear cut. Other than nits I have double-checked this patch, so feel free to add my Reviewed-by after nits are fixed. -Doug ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings @ 2019-07-24 21:46 ` Doug Anderson 0 siblings, 0 replies; 14+ messages in thread From: Doug Anderson @ 2019-07-24 21:46 UTC (permalink / raw) To: Matthias Kaehlcke Cc: Mark Rutland, devicetree, Heiko Stuebner, open list:ARM/Rockchip SoC..., Rob Herring, Linux ARM Hi, On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > index 4cc7d3659484..2b0801a539c9 100644 > --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts > +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > @@ -15,40 +15,6 @@ > "google,veyron-minnie-rev0", "google,veyron-minnie", > "google,veyron", "rockchip,rk3288"; > > - backlight_regulator: backlight-regulator { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&bl_pwr_en>; > - regulator-name = "backlight_regulator"; > - vin-supply = <&vcc33_sys>; > - startup-delay-us = <15000>; > - }; > - > - panel_regulator: panel-regulator { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&lcd_enable_h>; > - regulator-name = "panel_regulator"; > - startup-delay-us = <100000>; > - vin-supply = <&vcc33_sys>; > - }; > - > - vcc18_lcd: vcc18-lcd { > - compatible = "regulator-fixed"; > - enable-active-high; > - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; > - pinctrl-names = "default"; > - pinctrl-0 = <&avdd_1v8_disp_en>; > - regulator-name = "vcc18_lcd"; > - regulator-always-on; > - regulator-boot-on; > - vin-supply = <&vcc18_wl>; > - }; > - > volume_buttons: volume-buttons { > compatible = "gpio-keys"; > pinctrl-names = "default"; You forgot to remove the line: power-supply = <&backlight_regulator>; ...from minnie. > diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > index 9b6f4d9b03b6..06af58e37a4b 100644 > --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts > +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > @@ -14,7 +14,14 @@ > compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", > "google,veyron", "rockchip,rk3288"; > > + /delete-node/backlight-regulator; > + /delete-node/panel-regulator; > /delete-node/emmc-pwrseq; > + /delete-node/vcc18-lcd; > +}; > + > +&backlight { > + /delete-property/power-supply; > }; > > &emmc { > @@ -52,7 +59,17 @@ > i2c-scl-rising-time-ns = <300>; > }; > > +&panel { > + power-supply= <&vcc33_lcd>; Might as well put a space before the "="? > &pinctrl { > + /delete-node/ lcd; > + > + backlight { > + /delete-node/ bl_pwr_en; > + }; I general as the defender of "pinky", I'll let Heiko confirm he's OK with the color of this bikeshed. Sometimes a bit of repetition is preferred over a bunch of confusing /delete-node/ statements since those tend to make things harder to reason about in general. In this case I think things are cleaner after your patch but I won't say it's 100% clear cut. Other than nits I have double-checked this patch, so feel free to add my Reviewed-by after nits are fixed. -Doug _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings 2019-07-24 21:46 ` Doug Anderson @ 2019-07-24 22:38 ` Heiko Stuebner -1 siblings, 0 replies; 14+ messages in thread From: Heiko Stuebner @ 2019-07-24 22:38 UTC (permalink / raw) To: Doug Anderson Cc: Mark Rutland, devicetree, Rob Herring, open list:ARM/Rockchip SoC..., Matthias Kaehlcke, Linux ARM Am Mittwoch, 24. Juli 2019, 23:46:30 CEST schrieb Doug Anderson: > Hi, > > On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > index 4cc7d3659484..2b0801a539c9 100644 > > --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > @@ -15,40 +15,6 @@ > > "google,veyron-minnie-rev0", "google,veyron-minnie", > > "google,veyron", "rockchip,rk3288"; > > > > - backlight_regulator: backlight-regulator { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&bl_pwr_en>; > > - regulator-name = "backlight_regulator"; > > - vin-supply = <&vcc33_sys>; > > - startup-delay-us = <15000>; > > - }; > > - > > - panel_regulator: panel-regulator { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&lcd_enable_h>; > > - regulator-name = "panel_regulator"; > > - startup-delay-us = <100000>; > > - vin-supply = <&vcc33_sys>; > > - }; > > - > > - vcc18_lcd: vcc18-lcd { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&avdd_1v8_disp_en>; > > - regulator-name = "vcc18_lcd"; > > - regulator-always-on; > > - regulator-boot-on; > > - vin-supply = <&vcc18_wl>; > > - }; > > - > > volume_buttons: volume-buttons { > > compatible = "gpio-keys"; > > pinctrl-names = "default"; > > You forgot to remove the line: > > power-supply = <&backlight_regulator>; > > ...from minnie. > > > > diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > index 9b6f4d9b03b6..06af58e37a4b 100644 > > --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > @@ -14,7 +14,14 @@ > > compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", > > "google,veyron", "rockchip,rk3288"; > > > > + /delete-node/backlight-regulator; > > + /delete-node/panel-regulator; > > /delete-node/emmc-pwrseq; > > + /delete-node/vcc18-lcd; > > +}; > > + > > +&backlight { > > + /delete-property/power-supply; > > }; > > > > &emmc { > > @@ -52,7 +59,17 @@ > > i2c-scl-rising-time-ns = <300>; > > }; > > > > +&panel { > > + power-supply= <&vcc33_lcd>; > > Might as well put a space before the "="? > > > > &pinctrl { > > + /delete-node/ lcd; > > + > > + backlight { > > + /delete-node/ bl_pwr_en; > > + }; > > I general as the defender of "pinky", I'll let Heiko confirm he's OK > with the color of this bikeshed. Sometimes a bit of repetition is > preferred over a bunch of confusing /delete-node/ statements since > those tend to make things harder to reason about in general. In this > case I think things are cleaner after your patch but I won't say it's > 100% clear cut. going this way with the delete-nodes looks good to me :-) ... pinky is the "odd" one in that, so I think it can carry the burden ... especially as you said, this really only affects me and my boardfarm at all ;-) . Heiko > > Other than nits I have double-checked this patch, so feel free to add > my Reviewed-by after nits are fixed. > > -Doug > ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings @ 2019-07-24 22:38 ` Heiko Stuebner 0 siblings, 0 replies; 14+ messages in thread From: Heiko Stuebner @ 2019-07-24 22:38 UTC (permalink / raw) To: Doug Anderson Cc: Mark Rutland, devicetree, Rob Herring, open list:ARM/Rockchip SoC..., Matthias Kaehlcke, Linux ARM Am Mittwoch, 24. Juli 2019, 23:46:30 CEST schrieb Doug Anderson: > Hi, > > On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > index 4cc7d3659484..2b0801a539c9 100644 > > --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > @@ -15,40 +15,6 @@ > > "google,veyron-minnie-rev0", "google,veyron-minnie", > > "google,veyron", "rockchip,rk3288"; > > > > - backlight_regulator: backlight-regulator { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&bl_pwr_en>; > > - regulator-name = "backlight_regulator"; > > - vin-supply = <&vcc33_sys>; > > - startup-delay-us = <15000>; > > - }; > > - > > - panel_regulator: panel-regulator { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&lcd_enable_h>; > > - regulator-name = "panel_regulator"; > > - startup-delay-us = <100000>; > > - vin-supply = <&vcc33_sys>; > > - }; > > - > > - vcc18_lcd: vcc18-lcd { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&avdd_1v8_disp_en>; > > - regulator-name = "vcc18_lcd"; > > - regulator-always-on; > > - regulator-boot-on; > > - vin-supply = <&vcc18_wl>; > > - }; > > - > > volume_buttons: volume-buttons { > > compatible = "gpio-keys"; > > pinctrl-names = "default"; > > You forgot to remove the line: > > power-supply = <&backlight_regulator>; > > ...from minnie. > > > > diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > index 9b6f4d9b03b6..06af58e37a4b 100644 > > --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > @@ -14,7 +14,14 @@ > > compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", > > "google,veyron", "rockchip,rk3288"; > > > > + /delete-node/backlight-regulator; > > + /delete-node/panel-regulator; > > /delete-node/emmc-pwrseq; > > + /delete-node/vcc18-lcd; > > +}; > > + > > +&backlight { > > + /delete-property/power-supply; > > }; > > > > &emmc { > > @@ -52,7 +59,17 @@ > > i2c-scl-rising-time-ns = <300>; > > }; > > > > +&panel { > > + power-supply= <&vcc33_lcd>; > > Might as well put a space before the "="? > > > > &pinctrl { > > + /delete-node/ lcd; > > + > > + backlight { > > + /delete-node/ bl_pwr_en; > > + }; > > I general as the defender of "pinky", I'll let Heiko confirm he's OK > with the color of this bikeshed. Sometimes a bit of repetition is > preferred over a bunch of confusing /delete-node/ statements since > those tend to make things harder to reason about in general. In this > case I think things are cleaner after your patch but I won't say it's > 100% clear cut. going this way with the delete-nodes looks good to me :-) ... pinky is the "odd" one in that, so I think it can carry the burden ... especially as you said, this really only affects me and my boardfarm at all ;-) . Heiko > > Other than nits I have double-checked this patch, so feel free to add > my Reviewed-by after nits are fixed. > > -Doug > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 14+ messages in thread
[parent not found: <CAD=FV=Wj4Fei6t-STjY_FJkDKQYys5PcVquBJcdRE3wUN=y3Yg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings 2019-07-24 21:46 ` Doug Anderson @ 2019-07-24 22:38 ` Matthias Kaehlcke -1 siblings, 0 replies; 14+ messages in thread From: Matthias Kaehlcke @ 2019-07-24 22:38 UTC (permalink / raw) To: Doug Anderson Cc: Mark Rutland, devicetree-u79uwXL29TY76Z2rM5mHXA, Heiko Stuebner, open list:ARM/Rockchip SoC..., Rob Herring, Linux ARM On Wed, Jul 24, 2019 at 02:46:30PM -0700, Doug Anderson wrote: > Hi, > > On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> wrote: > > > > diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > index 4cc7d3659484..2b0801a539c9 100644 > > --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > @@ -15,40 +15,6 @@ > > "google,veyron-minnie-rev0", "google,veyron-minnie", > > "google,veyron", "rockchip,rk3288"; > > > > - backlight_regulator: backlight-regulator { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&bl_pwr_en>; > > - regulator-name = "backlight_regulator"; > > - vin-supply = <&vcc33_sys>; > > - startup-delay-us = <15000>; > > - }; > > - > > - panel_regulator: panel-regulator { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&lcd_enable_h>; > > - regulator-name = "panel_regulator"; > > - startup-delay-us = <100000>; > > - vin-supply = <&vcc33_sys>; > > - }; > > - > > - vcc18_lcd: vcc18-lcd { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&avdd_1v8_disp_en>; > > - regulator-name = "vcc18_lcd"; > > - regulator-always-on; > > - regulator-boot-on; > > - vin-supply = <&vcc18_wl>; > > - }; > > - > > volume_buttons: volume-buttons { > > compatible = "gpio-keys"; > > pinctrl-names = "default"; > > You forgot to remove the line: > > power-supply = <&backlight_regulator>; > > ...from minnie. good catch, thanks! > > diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > index 9b6f4d9b03b6..06af58e37a4b 100644 > > --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > @@ -14,7 +14,14 @@ > > compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", > > "google,veyron", "rockchip,rk3288"; > > > > + /delete-node/backlight-regulator; > > + /delete-node/panel-regulator; > > /delete-node/emmc-pwrseq; > > + /delete-node/vcc18-lcd; > > +}; > > + > > +&backlight { > > + /delete-property/power-supply; > > }; > > > > &emmc { > > @@ -52,7 +59,17 @@ > > i2c-scl-rising-time-ns = <300>; > > }; > > > > +&panel { > > + power-supply= <&vcc33_lcd>; > > Might as well put a space before the "="? will do > > &pinctrl { > > + /delete-node/ lcd; > > + > > + backlight { > > + /delete-node/ bl_pwr_en; > > + }; > > I general as the defender of "pinky", I'll let Heiko confirm he's OK > with the color of this bikeshed. Sometimes a bit of repetition is > preferred over a bunch of confusing /delete-node/ statements since > those tend to make things harder to reason about in general. In this > case I think things are cleaner after your patch but I won't say it's > 100% clear cut. I agree that some repetition can be preferrable over /delete-node/ statements. In this case repetition is above my personal threshold, especially since I'm about to add another device with eDP display and would have to repeat the mostly redundant config yet another time. If Heiko prefer's the repetition so be it :) > Other than nits I have double-checked this patch, so feel free to add > my Reviewed-by after nits are fixed. Thanks for the review! ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings @ 2019-07-24 22:38 ` Matthias Kaehlcke 0 siblings, 0 replies; 14+ messages in thread From: Matthias Kaehlcke @ 2019-07-24 22:38 UTC (permalink / raw) To: Doug Anderson Cc: Mark Rutland, devicetree, Heiko Stuebner, open list:ARM/Rockchip SoC..., Rob Herring, Linux ARM On Wed, Jul 24, 2019 at 02:46:30PM -0700, Doug Anderson wrote: > Hi, > > On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > index 4cc7d3659484..2b0801a539c9 100644 > > --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts > > @@ -15,40 +15,6 @@ > > "google,veyron-minnie-rev0", "google,veyron-minnie", > > "google,veyron", "rockchip,rk3288"; > > > > - backlight_regulator: backlight-regulator { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio2 RK_PB4 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&bl_pwr_en>; > > - regulator-name = "backlight_regulator"; > > - vin-supply = <&vcc33_sys>; > > - startup-delay-us = <15000>; > > - }; > > - > > - panel_regulator: panel-regulator { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio7 RK_PB6 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&lcd_enable_h>; > > - regulator-name = "panel_regulator"; > > - startup-delay-us = <100000>; > > - vin-supply = <&vcc33_sys>; > > - }; > > - > > - vcc18_lcd: vcc18-lcd { > > - compatible = "regulator-fixed"; > > - enable-active-high; > > - gpio = <&gpio2 RK_PB5 GPIO_ACTIVE_HIGH>; > > - pinctrl-names = "default"; > > - pinctrl-0 = <&avdd_1v8_disp_en>; > > - regulator-name = "vcc18_lcd"; > > - regulator-always-on; > > - regulator-boot-on; > > - vin-supply = <&vcc18_wl>; > > - }; > > - > > volume_buttons: volume-buttons { > > compatible = "gpio-keys"; > > pinctrl-names = "default"; > > You forgot to remove the line: > > power-supply = <&backlight_regulator>; > > ...from minnie. good catch, thanks! > > diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > index 9b6f4d9b03b6..06af58e37a4b 100644 > > --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts > > @@ -14,7 +14,14 @@ > > compatible = "google,veyron-pinky-rev2", "google,veyron-pinky", > > "google,veyron", "rockchip,rk3288"; > > > > + /delete-node/backlight-regulator; > > + /delete-node/panel-regulator; > > /delete-node/emmc-pwrseq; > > + /delete-node/vcc18-lcd; > > +}; > > + > > +&backlight { > > + /delete-property/power-supply; > > }; > > > > &emmc { > > @@ -52,7 +59,17 @@ > > i2c-scl-rising-time-ns = <300>; > > }; > > > > +&panel { > > + power-supply= <&vcc33_lcd>; > > Might as well put a space before the "="? will do > > &pinctrl { > > + /delete-node/ lcd; > > + > > + backlight { > > + /delete-node/ bl_pwr_en; > > + }; > > I general as the defender of "pinky", I'll let Heiko confirm he's OK > with the color of this bikeshed. Sometimes a bit of repetition is > preferred over a bunch of confusing /delete-node/ statements since > those tend to make things harder to reason about in general. In this > case I think things are cleaner after your patch but I won't say it's > 100% clear cut. I agree that some repetition can be preferrable over /delete-node/ statements. In this case repetition is above my personal threshold, especially since I'm about to add another device with eDP display and would have to repeat the mostly redundant config yet another time. If Heiko prefer's the repetition so be it :) > Other than nits I have double-checked this patch, so feel free to add > my Reviewed-by after nits are fixed. Thanks for the review! _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: rockchip: move rk3288-veryon display settings into a separate file 2019-07-11 22:34 ` Matthias Kaehlcke @ 2019-07-24 21:19 ` Doug Anderson -1 siblings, 0 replies; 14+ messages in thread From: Doug Anderson @ 2019-07-24 21:19 UTC (permalink / raw) To: Matthias Kaehlcke Cc: Mark Rutland, devicetree, Heiko Stuebner, open list:ARM/Rockchip SoC..., Rob Herring, Linux ARM Hi, On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi > new file mode 100644 > index 000000000000..5d812e9e78aa > --- /dev/null > +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi > @@ -0,0 +1,124 @@ > +// SPDX-License-Identifier: GPL-2.0 Please allow MIT license: // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +&pinctrl { > + backlight { > + bl_en: bl-en { > + rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > +}; nit: convention on Rockchip device tree files is that all pinctrl stuff is at the bottom. Downstream I think I added comments about this but those didn't make it upstream. Also: why did you move "bl_en" here but not "edp_hpd"? -Doug ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: rockchip: move rk3288-veryon display settings into a separate file @ 2019-07-24 21:19 ` Doug Anderson 0 siblings, 0 replies; 14+ messages in thread From: Doug Anderson @ 2019-07-24 21:19 UTC (permalink / raw) To: Matthias Kaehlcke Cc: Mark Rutland, devicetree, Heiko Stuebner, open list:ARM/Rockchip SoC..., Rob Herring, Linux ARM Hi, On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi > new file mode 100644 > index 000000000000..5d812e9e78aa > --- /dev/null > +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi > @@ -0,0 +1,124 @@ > +// SPDX-License-Identifier: GPL-2.0 Please allow MIT license: // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +&pinctrl { > + backlight { > + bl_en: bl-en { > + rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; > + }; > + }; > +}; nit: convention on Rockchip device tree files is that all pinctrl stuff is at the bottom. Downstream I think I added comments about this but those didn't make it upstream. Also: why did you move "bl_en" here but not "edp_hpd"? -Doug _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: rockchip: move rk3288-veryon display settings into a separate file 2019-07-24 21:19 ` Doug Anderson @ 2019-07-24 22:28 ` Matthias Kaehlcke -1 siblings, 0 replies; 14+ messages in thread From: Matthias Kaehlcke @ 2019-07-24 22:28 UTC (permalink / raw) To: Doug Anderson Cc: Mark Rutland, devicetree, Heiko Stuebner, open list:ARM/Rockchip SoC..., Rob Herring, Linux ARM On Wed, Jul 24, 2019 at 02:19:35PM -0700, Doug Anderson wrote: > Hi, > > On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi > > new file mode 100644 > > index 000000000000..5d812e9e78aa > > --- /dev/null > > +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi > > @@ -0,0 +1,124 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > Please allow MIT license: > > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) ok > > +&pinctrl { > > + backlight { > > + bl_en: bl-en { > > + rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; > > + }; > > + }; > > +}; > > nit: convention on Rockchip device tree files is that all pinctrl > stuff is at the bottom. Downstream I think I added comments about > this but those didn't make it upstream. I'll move it to the bottom > Also: why did you move "bl_en" here but not "edp_hpd"? 'bl_en' is defined in rk3288-veyron-chromebook.dtsi, 'edp_hdp' in rk3288.dtsi of the SoC. ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH v2 1/2] ARM: dts: rockchip: move rk3288-veryon display settings into a separate file @ 2019-07-24 22:28 ` Matthias Kaehlcke 0 siblings, 0 replies; 14+ messages in thread From: Matthias Kaehlcke @ 2019-07-24 22:28 UTC (permalink / raw) To: Doug Anderson Cc: Mark Rutland, devicetree, Heiko Stuebner, open list:ARM/Rockchip SoC..., Rob Herring, Linux ARM On Wed, Jul 24, 2019 at 02:19:35PM -0700, Doug Anderson wrote: > Hi, > > On Thu, Jul 11, 2019 at 3:35 PM Matthias Kaehlcke <mka@chromium.org> wrote: > > > > diff --git a/arch/arm/boot/dts/rk3288-veyron-edp.dtsi b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi > > new file mode 100644 > > index 000000000000..5d812e9e78aa > > --- /dev/null > > +++ b/arch/arm/boot/dts/rk3288-veyron-edp.dtsi > > @@ -0,0 +1,124 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > Please allow MIT license: > > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) ok > > +&pinctrl { > > + backlight { > > + bl_en: bl-en { > > + rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; > > + }; > > + }; > > +}; > > nit: convention on Rockchip device tree files is that all pinctrl > stuff is at the bottom. Downstream I think I added comments about > this but those didn't make it upstream. I'll move it to the bottom > Also: why did you move "bl_en" here but not "edp_hpd"? 'bl_en' is defined in rk3288-veyron-chromebook.dtsi, 'edp_hdp' in rk3288.dtsi of the SoC. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-07-24 22:38 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-07-11 22:34 [PATCH v2 1/2] ARM: dts: rockchip: move rk3288-veryon display settings into a separate file Matthias Kaehlcke 2019-07-11 22:34 ` Matthias Kaehlcke 2019-07-11 22:34 ` [PATCH v2 2/2] ARM: dts: rockchip: consolidate veyron panel and backlight settings Matthias Kaehlcke 2019-07-11 22:34 ` Matthias Kaehlcke 2019-07-24 21:46 ` Doug Anderson 2019-07-24 21:46 ` Doug Anderson 2019-07-24 22:38 ` Heiko Stuebner 2019-07-24 22:38 ` Heiko Stuebner [not found] ` <CAD=FV=Wj4Fei6t-STjY_FJkDKQYys5PcVquBJcdRE3wUN=y3Yg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2019-07-24 22:38 ` Matthias Kaehlcke 2019-07-24 22:38 ` Matthias Kaehlcke 2019-07-24 21:19 ` [PATCH v2 1/2] ARM: dts: rockchip: move rk3288-veryon display settings into a separate file Doug Anderson 2019-07-24 21:19 ` Doug Anderson 2019-07-24 22:28 ` Matthias Kaehlcke 2019-07-24 22:28 ` Matthias Kaehlcke
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.