summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2025-03-19 23:30:30 +0100
committerArnd Bergmann <arnd@arndb.de>2025-03-19 23:30:31 +0100
commit86ef293a1572977fd131b67ef9390270ec258000 (patch)
treed911069e569c3b2f18ddc60105c8ecdd0a53440f
parent7182f5fbd34f6e8e84852b0156aff29989dfd3ea (diff)
parent854a080f0b73ff966a813ec2dc53891831daa28d (diff)
Merge tag 'dt-cleanup-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt
Minor improvements inDTS for v6.15 1. ARM Cirrus EP7211: Align GPIO node name to match what bindings expect. 2. Loongson 2K1000: Drop incorrect spidev description, by pretending to have there something else. This will have impact on the users of DTS, because spidev will stop working, however no counter-proposals of fixing this or even explaining this were proposed for half a year after the patch was posted. Therefore drop incorrect hardware description, hoping affected users will come if proper one, if needed. * tag 'dt-cleanup-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt: loongarch: dts: remove non-existent DAC from 2k1000-ref ARM: dts: cirrus: ep7211: Align GPIO hog name with bindings Link: https://lore.kernel.org/r/20250316144221.18240-1-krzysztof.kozlowski@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/boot/dts/cirrus/ep7211-edb7211.dts2
-rw-r--r--arch/loongarch/boot/dts/loongson-2k1000-ref.dts5
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/cirrus/ep7211-edb7211.dts b/arch/arm/boot/dts/cirrus/ep7211-edb7211.dts
index 808cd5778e27..adc74243ed19 100644
--- a/arch/arm/boot/dts/cirrus/ep7211-edb7211.dts
+++ b/arch/arm/boot/dts/cirrus/ep7211-edb7211.dts
@@ -88,7 +88,7 @@
};
&portd {
- lcden {
+ lcden-hog {
gpio-hog;
gpios = <2 GPIO_ACTIVE_HIGH>;
output-high;
diff --git a/arch/loongarch/boot/dts/loongson-2k1000-ref.dts b/arch/loongarch/boot/dts/loongson-2k1000-ref.dts
index 23cf26cc3e5f..3514ea78f525 100644
--- a/arch/loongarch/boot/dts/loongson-2k1000-ref.dts
+++ b/arch/loongarch/boot/dts/loongson-2k1000-ref.dts
@@ -90,11 +90,6 @@
#address-cells = <1>;
#size-cells = <0>;
- spidev@0 {
- compatible = "rohm,dh2228fv";
- spi-max-frequency = <100000000>;
- reg = <0>;
- };
};
&ehci0 {