summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeila Lin <leilacy_lin@compal.corp-partner.google.com>2023-03-21 15:27:43 +0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-03-22 04:11:21 +0000
commit741775d08c46c5f68abed19861b8a0d6bb8fd722 (patch)
tree30a8136c2461e0356856e4bedfd012eeed7e231e
parent9456ed3bd2111b9e2e3b8cff02fb23da917864da (diff)
downloadchrome-ec-741775d08c46c5f68abed19861b8a0d6bb8fd722.tar.gz
uldren: Remove keyboard backlight gpio
Not support keyboard backlight, remove the gpio. BUG=b:271513530 BRANCH=None TEST=zmake build uldren success Change-Id: Iaaac920bbbe436353aa9c15ce0dc269a8ef2813e Signed-off-by: Leila Lin <leilacy_lin@compal.corp-partner.google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4354974 Reviewed-by: Peter Marheine <pmarheine@chromium.org> Tested-by: LeilaCY Lin <leilacy_lin@compal.corp-partner.google.com.test-google-a.com> Commit-Queue: LeilaCY Lin <leilacy_lin@compal.corp-partner.google.com.test-google-a.com>
-rw-r--r--zephyr/program/nissa/uldren/generated.dtsi4
-rw-r--r--zephyr/program/nissa/uldren/keyboard.dtsi13
-rw-r--r--zephyr/program/nissa/uldren/overlay.dtsi2
-rw-r--r--zephyr/program/nissa/uldren/project.conf3
4 files changed, 5 insertions, 17 deletions
diff --git a/zephyr/program/nissa/uldren/generated.dtsi b/zephyr/program/nissa/uldren/generated.dtsi
index d9da4f75f2..f02faec389 100644
--- a/zephyr/program/nissa/uldren/generated.dtsi
+++ b/zephyr/program/nissa/uldren/generated.dtsi
@@ -105,10 +105,6 @@
gpio_ec_wp_odl: ec_wp_odl {
gpios = <&gpioa 1 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
};
- gpio_en_kb_bl: en_kb_bl {
- gpios = <&gpioa 0 GPIO_OUTPUT>;
- enum-name = "GPIO_EN_KEYBOARD_BACKLIGHT";
- };
gpio_en_pp3300_s5: en_pp3300_s5 {
gpios = <&gpiob 6 GPIO_OUTPUT>;
enum-name = "GPIO_TEMP_SENSOR_POWER";
diff --git a/zephyr/program/nissa/uldren/keyboard.dtsi b/zephyr/program/nissa/uldren/keyboard.dtsi
index 117f5630fe..5248c4aaff 100644
--- a/zephyr/program/nissa/uldren/keyboard.dtsi
+++ b/zephyr/program/nissa/uldren/keyboard.dtsi
@@ -3,19 +3,6 @@
* found in the LICENSE file.
*/
-/ {
- kblight {
- compatible = "cros-ec,kblight-pwm";
- pwms = <&pwm6 6 PWM_KHZ(10) PWM_POLARITY_NORMAL>;
- };
-};
-
-&pwm6 {
- status = "okay";
- pinctrl-0 = <&pwm6_gpc0>;
- pinctrl-names = "default";
-};
-
&cros_kb_raw {
status = "okay";
/* No KSO2 (it's inverted and implemented by GPIO) */
diff --git a/zephyr/program/nissa/uldren/overlay.dtsi b/zephyr/program/nissa/uldren/overlay.dtsi
index c01d556bc8..ed1611eb58 100644
--- a/zephyr/program/nissa/uldren/overlay.dtsi
+++ b/zephyr/program/nissa/uldren/overlay.dtsi
@@ -295,8 +295,10 @@
<&gpio8 3 0>,
<&gpio8 5 0>,
<&gpio8 6 0>,
+ <&gpioa 0 0>,
<&gpiob 1 0>,
<&gpiob 7 0>,
+ <&gpioc 0 0>,
<&gpioc 6 0>,
<&gpioc 7 0>,
<&gpioe 4 0>,
diff --git a/zephyr/program/nissa/uldren/project.conf b/zephyr/program/nissa/uldren/project.conf
index 7766f70f0e..4b735e69ec 100644
--- a/zephyr/program/nissa/uldren/project.conf
+++ b/zephyr/program/nissa/uldren/project.conf
@@ -16,3 +16,6 @@ CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART=y
CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_CDP_SDP_ONLY=y
CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_DEFAULT_CDP=y
CONFIG_PLATFORM_EC_USB_PORT_POWER_SMART_INVERTED=y
+
+#Disable keyboard backlight
+CONFIG_PLATFORM_EC_KBLIGHT_ENABLE_PIN=n