Skip to content

Commit d527a65

Browse files
committed
Merge tag 'dt-cleanup-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt
Minor improvements in ARM DTS for v6.14 1. Marvell: Use un-deprecated hp-det-gpios (no ABI impact expected). 2. SoCFPGA: Drop spidev devices which are not properly described in DTS, but are using some other compatibles. This was part of wider tree effort to fix such incorrect hardware descriptions. Important: Dropping this device node will have user-visible impact: spidev device will not register. * tag 'dt-cleanup-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt: ARM: dts: socfpga: remove non-existent DAC from CycloneV devkit ARM: dts: marvell: mmp2-olpc-xo-1-75: Switch to {hp,mic}-det-gpios Link: https://lore.kernel.org/r/20241231132847.135814-2-krzysztof.kozlowski@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 9254773 + ba9dfa7 commit d527a65

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

arch/arm/boot/dts/intel/socfpga/socfpga_cyclone5_socdk.dts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,6 @@
151151

152152
&spi0 {
153153
status = "okay";
154-
155-
spidev@0 {
156-
compatible = "rohm,dh2228fv";
157-
reg = <0>;
158-
spi-max-frequency = <1000000>;
159-
};
160154
};
161155

162156
&usb1 {

arch/arm/boot/dts/marvell/mmp2-olpc-xo-1-75.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@
113113
"Headphones", "HPOR",
114114
"MIC2", "Mic Jack";
115115
widgets = "Headphone", "Headphones", "Microphone", "Mic Jack";
116-
hp-det-gpio = <&gpio 97 GPIO_ACTIVE_HIGH>;
117-
mic-det-gpio = <&gpio 96 GPIO_ACTIVE_HIGH>;
116+
hp-det-gpios = <&gpio 97 GPIO_ACTIVE_HIGH>;
117+
mic-det-gpios = <&gpio 96 GPIO_ACTIVE_HIGH>;
118118
};
119119

120120
soc {

0 commit comments

Comments
 (0)