diff options
| author | Alice Sheng <alicesheng@google.com> | 2022-03-22 15:37:47 -0700 |
|---|---|---|
| committer | Alice Sheng <alicesheng@google.com> | 2022-03-22 22:41:28 +0000 |
| commit | e15cf34e897c8e479bf2455a194c7295e161500d (patch) | |
| tree | ed17242fd9e969fd8a5f330f0afa73d2ac1136ed | |
| parent | fd8ae270c9060175ebc2fecd6a0ec6bc8d7a854d (diff) | |
| download | devicetree-e15cf34e897c8e479bf2455a194c7295e161500d.tar.gz | |
Move ownership of nanohub-irq2 to decon
It will be used to signal Tilt To Wake to turn the display on as soon as
possible.
Bug: 222158397
Change-Id: I9f9a9753444279ba62a40ff86a77080f42cf2955
| -rw-r--r-- | r11_boe_display_lcd.dtsi | 17 | ||||
| -rw-r--r-- | r11_spi0_nanohub.dtsi | 3 | ||||
| -rw-r--r-- | r11_spi4_nanohub.dtsi | 3 |
3 files changed, 19 insertions, 4 deletions
diff --git a/r11_boe_display_lcd.dtsi b/r11_boe_display_lcd.dtsi index fa51b99..510e027 100644 --- a/r11_boe_display_lcd.dtsi +++ b/r11_boe_display_lcd.dtsi @@ -1,5 +1,12 @@ #include <dt-bindings/gpio/gpio.h> +&decon_f { + + pinctrl-names = "hw_te_on", "hw_te_off", "default"; + decon,ttw-gpio = <&gpa0 6 0>; + pinctrl-0 = <&ttw_irq &decon_f_te_on>; +}; + &dsim_0 { pinctrl-names = "default"; pinctrl-0 = <&disp_power &disp_reset &mux_sel &mux_oe>; @@ -54,6 +61,16 @@ }; +&pinctrl_0 { + ttw_irq: ttw-irq { + samsung,pins = "gpa0-6"; + samsung,pin-function = <EXYNOS_PIN_FUNC_F>; + samsung,pin-pud = <EXYNOS_PIN_PULL_UP>; + samsung,pin-con-pdn = <EXYNOS_PIN_PDN_INPUT>; + samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_UP>; + }; +}; + &pinctrl_2 { disp_power: disp-power { samsung,pins = "gpm14-0"; diff --git a/r11_spi0_nanohub.dtsi b/r11_spi0_nanohub.dtsi index de3a866..608e8a9 100644 --- a/r11_spi0_nanohub.dtsi +++ b/r11_spi0_nanohub.dtsi @@ -21,10 +21,9 @@ sensorhub,nreset-gpio = <&gpg3 0 0>; sensorhub,boot0-gpio = <&gpg7 2 0>; sensorhub,irq1-gpio = <&gpa0 7 0>; - sensorhub,irq2-gpio = <&gpa0 6 0>; sensorhub,spi-cs-gpio = <&gpm3 0 0>; pinctrl-names = "default"; - pinctrl-0 = <&sensorhub_spi0_nreset &sensorhub_spi0_boot0 &sensorhub_spi0_wakeup &sensorhub_spi0_irq1 &sensorhub_spi0_irq2 &sensorhub_spi0_cs>; + pinctrl-0 = <&sensorhub_spi0_nreset &sensorhub_spi0_boot0 &sensorhub_spi0_wakeup &sensorhub_spi0_irq1 &sensorhub_spi0_cs>; status = "disabled"; controller-data { diff --git a/r11_spi4_nanohub.dtsi b/r11_spi4_nanohub.dtsi index bc02a05..bc08446 100644 --- a/r11_spi4_nanohub.dtsi +++ b/r11_spi4_nanohub.dtsi @@ -23,10 +23,9 @@ sensorhub,nreset-gpio = <&gpg3 0 0>; sensorhub,boot0-gpio = <&gpg7 2 0>; sensorhub,irq1-gpio = <&gpa0 7 0>; - sensorhub,irq2-gpio = <&gpa0 6 0>; sensorhub,spi-cs-gpio = <&gpp4 3 0>; pinctrl-names = "default"; - pinctrl-0 = <&sensorhub_spi4_nreset &sensorhub_spi4_boot0 &sensorhub_spi4_wakeup &sensorhub_spi4_irq1 &sensorhub_spi4_irq2 &sensorhub_spi4_cs>; + pinctrl-0 = <&sensorhub_spi4_nreset &sensorhub_spi4_boot0 &sensorhub_spi4_wakeup &sensorhub_spi4_irq1 &sensorhub_spi4_cs>; status = "disabled"; controller-data { |