summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIkjoon Jang <ikjn@google.com>2023-06-02 05:29:44 +0000
committerIkjoon Jang <ikjn@google.com>2023-06-08 16:58:15 +0000
commit2930e74f6d9e6087855554208f3ca1b4434bd916 (patch)
treeae77e9d3bfee129a8ad64f0b4b913f27f9c350de
parente2360436918e0af05842f84a19ebfb8f84033ddd (diff)
downloadeos-2930e74f6d9e6087855554208f3ca1b4434bd916.tar.gz
Remove uwb from eos
Remove kernel driver and device node from Eos. Bug: 285258766 Test: Boot and check device node Change-Id: I022d4982924999508c7b372e1b67bf48c52cfc4c
-rw-r--r--build.config.eos1
-rw-r--r--dts/google/eos-nff-v2.0.dtsi1
-rw-r--r--dts/google/eos-proto-v2.0.dtsi1
-rw-r--r--dts/google/eos-uwb-v1.dtsi69
-rw-r--r--dts/google/eos-uwb-v2.dtsi95
5 files changed, 0 insertions, 167 deletions
diff --git a/build.config.eos b/build.config.eos
index a04db82..4abcb85 100644
--- a/build.config.eos
+++ b/build.config.eos
@@ -49,6 +49,5 @@ private/google-modules/nanohub
private/google-modules/rotary-encoders/ots_pat9126
private/google-modules/sound/mcu_mic_codec
private/google-modules/nfc/nxp/snxxx
-private/google-modules/uwb/nxp/sr100
private/google-modules/touch/novatek_touch/nt38350
"
diff --git a/dts/google/eos-nff-v2.0.dtsi b/dts/google/eos-nff-v2.0.dtsi
index addc7b4..e94b218 100644
--- a/dts/google/eos-nff-v2.0.dtsi
+++ b/dts/google/eos-nff-v2.0.dtsi
@@ -6,7 +6,6 @@
#include "../google-dts-base/sw5100-mcu.dtsi"
#include "../google-dts-base/sw5100-nanohub.dtsi"
#include "eos-nfc-v2.dtsi"
-#include "eos-uwb-v2.dtsi"
#include "eos-crown.dtsi"
&mcu {
diff --git a/dts/google/eos-proto-v2.0.dtsi b/dts/google/eos-proto-v2.0.dtsi
index c7939b0..16cf5ad 100644
--- a/dts/google/eos-proto-v2.0.dtsi
+++ b/dts/google/eos-proto-v2.0.dtsi
@@ -6,7 +6,6 @@
#include "../google-dts-base/sw5100-mcu.dtsi"
#include "../google-dts-base/sw5100-nanohub.dtsi"
#include "eos-nfc-v2.dtsi"
-#include "eos-uwb-v2.dtsi"
#include "eos-crown.dtsi"
&mcu {
diff --git a/dts/google/eos-uwb-v1.dtsi b/dts/google/eos-uwb-v1.dtsi
deleted file mode 100644
index 0b2f438..0000000
--- a/dts/google/eos-uwb-v1.dtsi
+++ /dev/null
@@ -1,69 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-&qupv3_se3_spi {
- #address-cells = <1>;
- #size-cells = <0>;
-
- status = "ok";
- sr100@0 {
- compatible = "nxp,sr100";
- status = "ok";
- reg = <0>;
- spi-max-frequency = <16000000>;
- nxp,sr100-irq = <&tlmm 102 0x00>;
- nxp,sr100-ce = <&tlmm 101 0x00>;
- nxp,sr100-ri = <&tlmm 37 0x00>;
- nxp,sr100-dig-supply = <&L17A>;
- nxp,sr100-rf-supply = <&L16A>;
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&uwb_gpio_in_active &uwb_gpio_out_active>;
- pinctrl-1 = <&uwb_gpio_in_sleep &uwb_gpio_out_sleep>;
- };
-};
-
-&tlmm {
- uwb_pins {
- uwb_gpio_out_active: uwb-gpio-out-active {
- mux {
- pins = "gpio101", "gpio37";
- function = "gpio";
- };
- config {
- pins = "gpio101", "gpio37";
- drive-strength = <6>;
- bias-disable;
- };
- };
- uwb_gpio_out_sleep: uwb-gpio-out-sleep {
- mux {
- pins = "gpio101", "gpio37";
- function = "gpio";
- };
- config {
- pins = "gpio101", "gpio37";
- bias-pull-down;
- };
- };
- uwb_gpio_in_active: uwb-gpio-in-active {
- mux {
- pins = "gpio102";
- function = "gpio";
- };
- config {
- pins = "gpio102";
- bias-disable;
- input-enable;
- };
- };
- uwb_gpio_in_sleep: uwb-gpio-in-sleep {
- mux {
- pins = "gpio102";
- function = "gpio";
- };
- config {
- pins = "gpio102";
- bias-pull-down;
- };
- };
- };
-};
diff --git a/dts/google/eos-uwb-v2.dtsi b/dts/google/eos-uwb-v2.dtsi
deleted file mode 100644
index fa401f6..0000000
--- a/dts/google/eos-uwb-v2.dtsi
+++ /dev/null
@@ -1,95 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-&qupv3_se3_spi {
- #address-cells = <1>;
- #size-cells = <0>;
-
- status = "ok";
- pinctrl-1 = <&qupv3_se3_spi_sleep>, <&qupv3_se3_spi_cs_sleep>;
- srxxx@0 {
- compatible = "nxp,srxxx";
- status = "ok";
- reg = <0>;
- spi-max-frequency = <16000000>;
- nxp,sr1xx-irq = <&tlmm 56 0x00>;
- nxp,sr1xx-ce = <&tlmm 38 0x00>;
- nxp,sr1xx-ri = <&tlmm 37 0x00>;
- nxp,sr1xx-dig-supply = <&L17A>;
- nxp,sr1xx-rf-supply = <&L16A>;
- pinctrl-names = "default", "sleep";
- pinctrl-0 = <&uwb_gpio_in_active &uwb_gpio_out_active>;
- pinctrl-1 = <&uwb_gpio_in_sleep &uwb_gpio_out_sleep>;
- };
-};
-
-&qupv3_se3_spi_sleep {
- mux {
- pins = "gpio14", "gpio15", "gpio16";
- };
-
- config {
- pins = "gpio14", "gpio15", "gpio16";
- };
-};
-
-&qupv3_se3_spi_pins {
- qupv3_se3_spi_cs_sleep: qupv3_se3_spi_cs_sleep {
- mux {
- pins = "gpio17";
- function = "gpio";
- };
-
- config {
- pins = "gpio17";
- drive-strength = <6>;
- bias-pull-up;
- };
- };
-};
-
-&tlmm {
- uwb_pins {
- uwb_gpio_out_active: uwb-gpio-out-active {
- mux {
- pins = "gpio37", "gpio38";
- function = "gpio";
- };
- config {
- pins = "gpio37", "gpio38";
- drive-strength = <6>;
- bias-disable;
- };
- };
- uwb_gpio_out_sleep: uwb-gpio-out-sleep {
- mux {
- pins = "gpio37", "gpio38";
- function = "gpio";
- };
- config {
- pins = "gpio37", "gpio38";
- bias-pull-down;
- };
- };
- uwb_gpio_in_active: uwb-gpio-in-active {
- mux {
- pins = "gpio56";
- function = "gpio";
- };
- config {
- pins = "gpio56";
- bias-disable;
- input-enable;
- };
- };
- uwb_gpio_in_sleep: uwb-gpio-in-sleep {
- mux {
- pins = "gpio56";
- function = "gpio";
- };
- config {
- pins = "gpio56";
- bias-pull-down;
- };
- };
- };
-};