diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-18 18:17:24 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2024-02-18 18:17:24 -0800 |
| commit | 33d7f456c1492788b51b2aac3257f3cd85052234 (patch) | |
| tree | cec3773b618b31ba574dd3432d0170ffea066a88 | |
| parent | 46e0457b936a9edc85650bef0d48ad55a9ca0593 (diff) | |
| parent | 17f3c7799caa209f916a5e8a0bcdda8c151dda50 (diff) | |
| download | felix-android-gs-raviole-5.10-android15-beta.tar.gz | |
Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10android-15-beta-1_r0.5android-15-beta-1_r0.3android-gs-raviole-5.10-android15-dpandroid-gs-raviole-5.10-android15-betaandroid-gs-lynx-5.10-android15-dpandroid-gs-lynx-5.10-android15-beta
SBMerger: 605678113
Change-Id: Iac8a98a88231cf842968e96a4b38252404022daf
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | dts/gs201-felix-audio.dtsi | 2 | ||||
| -rw-r--r-- | dts/gs201-felix-nfc.dtsi | 1 | ||||
| -rw-r--r-- | dts/gs201-felix-wcharger.dtsi | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/dts/gs201-felix-audio.dtsi b/dts/gs201-felix-audio.dtsi index 9d30cca..1d92506 100644 --- a/dts/gs201-felix-audio.dtsi +++ b/dts/gs201-felix-audio.dtsi @@ -349,7 +349,6 @@ cs40l26a_haptics_2: cs40l26a@43 { compatible = "cirrus,cs40l26a"; reg = <0x43>; - dev-name = "cs40l26a"; /* sysfs folder name */ input-device-name = "cs40l26_input"; /* input device name */ pinctrl-names = "default"; @@ -380,7 +379,6 @@ cs40l26a_haptics_1: cs40l26a@42 { compatible = "cirrus,cs40l26a"; reg = <0x42>; - dev-name = "cs40l26a-dual"; /* sysfs folder name */ input-device-name = "cs40l26_dual_input"; /* input device name */ pinctrl-names = "default"; diff --git a/dts/gs201-felix-nfc.dtsi b/dts/gs201-felix-nfc.dtsi index dccf3d0..64622cf 100644 --- a/dts/gs201-felix-nfc.dtsi +++ b/dts/gs201-felix-nfc.dtsi @@ -32,7 +32,6 @@ st21nfc@08 { compatible = "st,st21nfc"; reg = <0x08>; - dev-name = "st21nfc"; pinctrl-names = "default"; pinctrl-0 = <&nfc_rst &nfc_pidle>; diff --git a/dts/gs201-felix-wcharger.dtsi b/dts/gs201-felix-wcharger.dtsi index 087b077..0abc40f 100644 --- a/dts/gs201-felix-wcharger.dtsi +++ b/dts/gs201-felix-wcharger.dtsi @@ -42,7 +42,6 @@ &hsi2c_15 { p9222@61 { - dev-name = "p9222"; compatible = "idt,p9222"; reg = <0x61>; status = "ok"; |