| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220331125818.3776912-5-fabiobaltieri@chromium.org>
Date: Thu, 31 Mar 2022 12:58:18 +0000
From: Fabio Baltieri <fabiobaltieri@...omium.org>
To: Benson Leung <bleung@...omium.org>,
Guenter Roeck <groeck@...omium.org>
Cc: Thierry Reding <thierry.reding@...il.com>,
Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>, Lee Jones <lee.jones@...aro.org>,
Rob Herring <robh+dt@...nel.org>,
chrome-platform@...ts.linux.dev, linux-pwm@...r.kernel.org,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Fabio Baltieri <fabiobaltieri@...omium.org>
Subject: [PATCH v2 4/4] arm64: dts: address cros-ec-pwm channels by type
Update various cros-ec-pwm board definitions to address the keyboard and
screen backlight PWM channels by type rather than channel number. This
makes the instance independent by the actual hardware configuration,
relying on the EC firmware to pick the right channel, and allows
dropping few dtsi overrides as a consequence.
Changed the node label used to cros_ec_pwm_type to avoid ambiguity about
the pwm cell meaning.
Signed-off-by: Fabio Baltieri <fabiobaltieri@...omium.org>
---
.../dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 4 ++--
arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 3 ++-
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 1 +
arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 4 ----
arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 +++++---
.../arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts | 6 ++++--
arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi | 6 ++++--
arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi | 3 ++-
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 6 ++++--
arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 4 ----
arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 4 +++-
arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 4 ----
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 1 +
13 files changed, 28 insertions(+), 26 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
index dec11a4eb59e..e2554a313deb 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts
@@ -15,13 +15,13 @@ pwmleds {
compatible = "pwm-leds";
keyboard_backlight: keyboard-backlight {
label = "cros_ec::kbd_backlight";
- pwms = <&cros_ec_pwm 0>;
+ pwms = <&cros_ec_pwm_type CROS_EC_PWM_DT_KB_LIGHT>;
max-brightness = <1023>;
};
};
};
-&cros_ec_pwm {
+&cros_ec_pwm_type {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi
index 8f7bf33f607d..f70c549bae93 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi
@@ -92,10 +92,11 @@ volume_up {
};
&cros_ec {
- cros_ec_pwm: ec-pwm {
+ cros_ec_pwm_type: ec-pwm {
compatible = "google,cros-ec-pwm";
#pwm-cells = <1>;
status = "disabled";
+ google,use-pwm-type;
};
};
diff --git a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
index 0f9480f91261..ff54687ab8bf 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi
@@ -7,6 +7,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mfd/cros_ec.h>
#include "mt8183.dtsi"
#include "mt6358.dtsi"
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
index c81805ef2250..aea7c66d95e0 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi
@@ -77,10 +77,6 @@ &ap_spi_fp {
status = "okay";
};
-&backlight {
- pwms = <&cros_ec_pwm 0>;
-};
-
&camcc {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
index 732e1181af48..56f398b05b7b 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
@@ -8,6 +8,7 @@
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/gpio-keys.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mfd/cros_ec.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include <dt-bindings/sound/sc7180-lpass.h>
@@ -316,7 +317,7 @@ backlight: backlight {
num-interpolated-steps = <64>;
default-brightness-level = <951>;
- pwms = <&cros_ec_pwm 1>;
+ pwms = <&cros_ec_pwm_type CROS_EC_PWM_DT_DISPLAY_LIGHT>;
enable-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
power-supply = <&ppvar_sys>;
pinctrl-names = "default";
@@ -354,7 +355,7 @@ pwmleds {
keyboard_backlight: keyboard-backlight {
status = "disabled";
label = "cros_ec::kbd_backlight";
- pwms = <&cros_ec_pwm 0>;
+ pwms = <&cros_ec_pwm_type CROS_EC_PWM_DT_KB_LIGHT>;
max-brightness = <1023>;
};
};
@@ -637,9 +638,10 @@ cros_ec: ec@0 {
pinctrl-0 = <&ap_ec_int_l>;
spi-max-frequency = <3000000>;
- cros_ec_pwm: pwm {
+ cros_ec_pwm_type: pwm {
compatible = "google,cros-ec-pwm";
#pwm-cells = <1>;
+ google,use-pwm-type;
};
i2c_tunnel: i2c-tunnel {
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts
index 1779d96c30f6..cc11de91cc2c 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-herobrine-r0.dts
@@ -11,6 +11,7 @@
#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h>
#include <dt-bindings/input/gpio-keys.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mfd/cros_ec.h>
#include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
@@ -336,7 +337,7 @@ pwmleds {
keyboard_backlight: keyboard-backlight {
status = "disabled";
label = "cros_ec::kbd_backlight";
- pwms = <&cros_ec_pwm 0>;
+ pwms = <&cros_ec_pwm_type CROS_EC_PWM_DT_KB_LIGHT>;
max-brightness = <1023>;
};
};
@@ -705,9 +706,10 @@ cros_ec: ec@0 {
pinctrl-0 = <&ap_ec_int_l>;
spi-max-frequency = <3000000>;
- cros_ec_pwm: pwm {
+ cros_ec_pwm_type: pwm {
compatible = "google,cros-ec-pwm";
#pwm-cells = <1>;
+ google,use-pwm-type;
};
i2c_tunnel: i2c-tunnel {
diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
index dc17f2079695..e5a041226db6 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine.dtsi
@@ -15,6 +15,7 @@
#include <dt-bindings/input/gpio-keys.h>
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mfd/cros_ec.h>
#include "sc7280-qcard.dtsi"
#include "sc7280-chrome-common.dtsi"
@@ -288,7 +289,7 @@ pwmleds {
keyboard_backlight: keyboard-backlight {
status = "disabled";
label = "cros_ec::kbd_backlight";
- pwms = <&cros_ec_pwm 0>;
+ pwms = <&cros_ec_pwm_type CROS_EC_PWM_DT_KB_LIGHT>;
max-brightness = <1023>;
};
};
@@ -421,9 +422,10 @@ cros_ec: ec@0 {
pinctrl-0 = <&ap_ec_int_l>;
spi-max-frequency = <3000000>;
- cros_ec_pwm: pwm {
+ cros_ec_pwm_type: pwm {
compatible = "google,cros-ec-pwm";
#pwm-cells = <1>;
+ google,use-pwm-type;
};
i2c_tunnel: i2c-tunnel {
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi
index a7c346aa3b02..a8c189328ae3 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp-ec-h1.dtsi
@@ -20,9 +20,10 @@ cros_ec: ec@0 {
pinctrl-0 = <&ap_ec_int_l>;
spi-max-frequency = <3000000>;
- cros_ec_pwm: pwm {
+ cros_ec_pwm_type: pwm {
compatible = "google,cros-ec-pwm";
#pwm-cells = <1>;
+ google,use-pwm-type;
};
i2c_tunnel: i2c-tunnel {
diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
index e7e4cc5936aa..600b8ea69a5d 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -6,6 +6,7 @@
*/
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mfd/cros_ec.h>
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
#include "sdm845.dtsi"
@@ -27,7 +28,7 @@ chosen {
backlight: backlight {
compatible = "pwm-backlight";
- pwms = <&cros_ec_pwm 0>;
+ pwms = <&cros_ec_pwm_type CROS_EC_PWM_DT_DISPLAY_LIGHT>;
enable-gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
power-supply = <&ppvar_sys>;
pinctrl-names = "default";
@@ -708,9 +709,10 @@ cros_ec: ec@0 {
pinctrl-0 = <&ec_ap_int_l>;
spi-max-frequency = <3000000>;
- cros_ec_pwm: pwm {
+ cros_ec_pwm_type: pwm {
compatible = "google,cros-ec-pwm";
#pwm-cells = <1>;
+ google,use-pwm-type;
};
i2c_tunnel: i2c-tunnel {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
index 31ebb4e5fd33..5a076c2564f6 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
@@ -55,10 +55,6 @@ trackpad: trackpad@15 {
};
};
-&backlight {
- pwms = <&cros_ec_pwm 0>;
-};
-
&cpu_alert0 {
temperature = <65000>;
};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
index 3355fb90fa54..fece0176a3d2 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
@@ -198,6 +198,7 @@ backlight: backlight {
power-supply = <&pp3300_disp>;
pinctrl-names = "default";
pinctrl-0 = <&bl_en>;
+ pwms = <&cros_ec_pwm_type CROS_EC_PWM_DT_DISPLAY_LIGHT>;
pwm-delay-us = <10000>;
};
@@ -462,9 +463,10 @@ ap_i2c_tp: &i2c5 {
};
&cros_ec {
- cros_ec_pwm: pwm {
+ cros_ec_pwm_type: pwm {
compatible = "google,cros-ec-pwm";
#pwm-cells = <1>;
+ google,use-pwm-type;
};
usbc_extcon1: extcon1 {
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
index 6863689df06f..e959a33af34b 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts
@@ -84,10 +84,6 @@ thermistor_ppvar_litcpu: thermistor-ppvar-litcpu {
};
};
-&backlight {
- pwms = <&cros_ec_pwm 1>;
-};
-
&gpio_keys {
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake_l>, <&cpu1_pen_eject>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index 162f08bca0d4..181159e9982d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -6,6 +6,7 @@
*/
#include <dt-bindings/input/input.h>
+#include <dt-bindings/mfd/cros_ec.h>
#include "rk3399.dtsi"
#include "rk3399-op1-opp.dtsi"
--
2.35.1.1021.g381101b075-goog
Powered by blists - more mailing lists