diff options
author | Arnd Bergmann <arnd@arndb.de> | 2023-10-13 23:44:11 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2023-10-13 23:44:11 +0300 |
commit | 4ec57f57bf752243498ef674f4baa6a0a82946cd (patch) | |
tree | 479b28d42536d17851bd4f42c047a0b0160a03c1 /arch/arm | |
parent | 46579e69c27b2f60461b6771637b91727af9989b (diff) | |
parent | b2e847012cbc5476b0fa93351f74ea623e43e9c8 (diff) | |
download | linux-4ec57f57bf752243498ef674f4baa6a0a82946cd.tar.xz |
Merge tag 'sti-dt-for-v6.7-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into soc/dt
STi DT for v6.7, round 1 :
stih418-b2264: leds and serial fixes
stih407: drop max-duty-cycle property
stih415/416: remove boards from yaml
stih407/410/418: add boards to yaml
* tag 'sti-dt-for-v6.7-round1' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
dt-bindings: arm: sti: add STi boards and remove stih415/stih416
dt-bindings: soc: sti: add STi platform syscon
ARM: dts: st: correct led level in stih418-b2264.dts
ARM: dts: st: move leds out of soc in stih418-b2264.dts
ARM: dts: st: correct serial alias in stih418-b2264.dts
ARM: dts: st: stih407: drop max-duty-cycle
Link: https://lore.kernel.org/r/e6b975f2-9936-465a-8253-6fcead974006@foss.st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/st/stih407-family.dtsi | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/st/stih418-b2264.dts | 16 |
2 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/st/stih407-family.dtsi b/arch/arm/boot/dts/st/stih407-family.dtsi index 3f58383a7b59..29302e74aa1d 100644 --- a/arch/arm/boot/dts/st/stih407-family.dtsi +++ b/arch/arm/boot/dts/st/stih407-family.dtsi @@ -111,7 +111,6 @@ regulator-min-microvolt = <784000>; regulator-max-microvolt = <1299000>; regulator-always-on; - max-duty-cycle = <255>; status = "okay"; }; diff --git a/arch/arm/boot/dts/st/stih418-b2264.dts b/arch/arm/boot/dts/st/stih418-b2264.dts index fc32a03073b6..fdc16e9f5822 100644 --- a/arch/arm/boot/dts/st/stih418-b2264.dts +++ b/arch/arm/boot/dts/st/stih418-b2264.dts @@ -69,19 +69,19 @@ }; aliases { - ttyAS0 = &sbc_serial0; + serial0 = &sbc_serial0; ethernet0 = ðernet0; }; - soc { - leds { - compatible = "gpio-leds"; - led-green { - gpios = <&pio1 3 GPIO_ACTIVE_HIGH>; - default-state = "off"; - }; + leds { + compatible = "gpio-leds"; + led-green { + gpios = <&pio1 3 GPIO_ACTIVE_LOW>; + default-state = "off"; }; + }; + soc { pin-controller-sbc@961f080 { gmac1 { rgmii1-0 { |