diff options
author | Alice Sheng <alicesheng@google.com> | 2021-06-09 21:05:41 -0700 |
---|---|---|
committer | Alice Sheng <alicesheng@google.com> | 2021-06-10 13:23:56 -0700 |
commit | c2f942cc9cbe5edfebae7d7911865e76e2872f94 (patch) | |
tree | c144f5d2344278d7029f8916fdee19e106a1866b | |
parent | 10d4425c754a1433b97bb03f4516f1d768b499b1 (diff) | |
download | devicetree-c2f942cc9cbe5edfebae7d7911865e76e2872f94.tar.gz |
Enable WLC authentication for EVT1.1+
Bug: 190677341
Change-Id: Ic3acfdaa48aefd247351f98dbfed1796e28eba1c
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | r11_evt11_btwifi_overlay.dts | 68 | ||||
-rw-r--r-- | r11_evt11_overlay.dts | 73 | ||||
-rw-r--r-- | r11_evt1_wlc.dtsi | 7 |
4 files changed, 149 insertions, 1 deletions
@@ -11,6 +11,8 @@ dtbo-y += r11_proto1_btwifi_overlay.dtbo dtbo-y += r11_proto11_no_nfc_overlay.dtbo dtbo-y += r11_evt1_overlay.dtbo dtbo-y += r11_evt1_btwifi_overlay.dtbo +dtbo-y += r11_evt11_overlay.dtbo +dtbo-y += r11_evt11_btwifi_overlay.dtbo always := $(dtb-y) $(dtbo-y) subdir-y := $(dts-dirs) diff --git a/r11_evt11_btwifi_overlay.dts b/r11_evt11_btwifi_overlay.dts new file mode 100644 index 0000000..0a4d6d1 --- /dev/null +++ b/r11_evt11_btwifi_overlay.dts @@ -0,0 +1,68 @@ +/* + * Google R11 DTSO file + * + * Copyright 2020 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +/plugin/; + +#include <dt-bindings/clock/exynos9110.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/interrupt-controller/exynos9110.h> + +#include "r11_evt1_battery.dtsi" +#include "r11_evt1_sound.dtsi" +#include "r11_evt1_speaker.dtsi" + +/ { + compatible = "google,r11"; + board_id = <0x010203>; + board_rev = <0x010100>; + + fragment@common { + target-path = "/"; + __overlay__ { + model = "Google R11 BtWifi Evt1"; + }; + }; +}; + +&panel_0 { + ddi_id = <0x1>; + lcd_info = <&wf012fbm>; +}; + +&pat9126 { + status = "ok"; +}; + +&proto1_cs40l25 { + status = "ok"; +}; + +&evt11_hl6111 { + status = "ok"; + halo,auth-gpio= <&gpm21 0 0>; +}; + +&novatek { + status = "ok"; +}; + +&sensorhub_spi4 { + status = "ok"; +}; + +&ese_spi0 { + status = "ok"; +}; diff --git a/r11_evt11_overlay.dts b/r11_evt11_overlay.dts new file mode 100644 index 0000000..293ba5a --- /dev/null +++ b/r11_evt11_overlay.dts @@ -0,0 +1,73 @@ +/* + * Google R11 DTSO file + * + * Copyright 2020 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 and + * only version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +/dts-v1/; +/plugin/; + +#include <dt-bindings/clock/exynos9110.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/interrupt-controller/exynos9110.h> + +#include "r11_evt1_battery.dtsi" +#include "r11_evt1_sound.dtsi" +#include "r11_evt1_speaker.dtsi" + +/ { + compatible = "google,r11"; + board_id = <0x010103>; + board_rev = <0x010100>; + + fragment@common { + target-path = "/"; + __overlay__ { + model = "Google R11 Evt1"; + }; + }; +}; + +&panel_0 { + ddi_id = <0x1>; + lcd_info = <&wf012fbm>; +}; + +&pat9126 { + status = "ok"; +}; + +&proto1_cs40l25 { + status = "ok"; +}; + +&evt1_hl6111 { + status = "ok"; + halo,auth-gpio= <&gpm21 0 0>; +}; + +&novatek { + status = "ok"; +}; + +&sensorhub_spi4 { + status = "ok"; +}; + +&ese_spi0 { + status = "ok"; +}; + +&ldo16_reg { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; +}; diff --git a/r11_evt1_wlc.dtsi b/r11_evt1_wlc.dtsi index 075a62c..55adb9e 100644 --- a/r11_evt1_wlc.dtsi +++ b/r11_evt1_wlc.dtsi @@ -20,7 +20,7 @@ halo,temp-limit = <0x17>; // default pinctrl-names = "default"; - pinctrl-0 = <&evt1_wlc_irq &evt1_wlc_det>; + pinctrl-0 = <&evt1_wlc_irq &evt1_wlc_det &evt1_wlc_auth>; }; }; @@ -38,4 +38,9 @@ samsung,pin-function = <EXYNOS_PIN_FUNC_F>; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; }; + evt1_wlc_auth: evt1-wlc-auth { + samsung,pins = "gpm21-0"; + samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>; + samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; + }; }; |