Message ID | 20220630101930.v2.4.Ib74d333801972878b95f6e10ed81a8160e1a121d@changeid |
---|---|
State | Accepted |
Delegated to: | Patrick Delaunay |
Headers | show |
Series | [v2,01/10] i2c: stm32: add support for the st,stm32mp13 SOC | expand |
Hi Patrick On 6/30/22 10:20, Patrick Delaunay wrote: > Device tree alignment with Linux kernel v5.19-rc1 with: > - ARM: dts: stm32: add UserPA13 button on stm32mp135f-dk > - ARM: dts: stm32: add blue led (Linux heartbeat) on stm32mp135f-dk > - ARM: dts: stm32: add EXTI interrupt-parent to pinctrl node on stm32mp131 > - ARM: dts: stm32: enable RTC support on stm32mp135f-dk > - ARM: dts: stm32: add RTC node on stm32mp131 > - ARM: dts: stm32: fix pinctrl node name warnings (MPU soc) > > Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> > --- > > (no changes since v1) > > arch/arm/dts/stm32mp131.dtsi | 19 ++++++++++++++++++- > arch/arm/dts/stm32mp135f-dk.dts | 29 +++++++++++++++++++++++++++++ > 2 files changed, 47 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/dts/stm32mp131.dtsi b/arch/arm/dts/stm32mp131.dtsi > index 950e172e455..a30989f287e 100644 > --- a/arch/arm/dts/stm32mp131.dtsi > +++ b/arch/arm/dts/stm32mp131.dtsi > @@ -75,6 +75,12 @@ > compatible = "fixed-clock"; > clock-frequency = <99000000>; > }; > + > + clk_rtc_k: clk-rtc-k { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <32768>; > + }; > }; > > intc: interrupt-controller@a0021000 { > @@ -218,6 +224,15 @@ > status = "disabled"; > }; > > + rtc: rtc@5c004000 { > + compatible = "st,stm32mp1-rtc"; > + reg = <0x5c004000 0x400>; > + interrupts-extended = <&exti 19 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&clk_pclk4>, <&clk_rtc_k>; > + clock-names = "pclk", "rtc_ck"; > + status = "disabled"; > + }; > + > bsec: efuse@5c005000 { > compatible = "st,stm32mp13-bsec"; > reg = <0x5c005000 0x400>; > @@ -239,11 +254,13 @@ > * Break node order to solve dependency probe issue between > * pinctrl and exti. > */ > - pinctrl: pin-controller@50002000 { > + pinctrl: pinctrl@50002000 { > #address-cells = <1>; > #size-cells = <1>; > compatible = "st,stm32mp135-pinctrl"; > ranges = <0 0x50002000 0x8400>; > + interrupt-parent = <&exti>; > + st,syscfg = <&exti 0x60 0xff>; > pins-are-numbered; > > gpioa: gpio@50002000 { > diff --git a/arch/arm/dts/stm32mp135f-dk.dts b/arch/arm/dts/stm32mp135f-dk.dts > index ee100d108ea..09d6226d598 100644 > --- a/arch/arm/dts/stm32mp135f-dk.dts > +++ b/arch/arm/dts/stm32mp135f-dk.dts > @@ -6,6 +6,9 @@ > > /dts-v1/; > > +#include <dt-bindings/gpio/gpio.h> > +#include <dt-bindings/input/input.h> > +#include <dt-bindings/leds/common.h> > #include "stm32mp135.dtsi" > #include "stm32mp13xf.dtsi" > #include "stm32mp13-pinctrl.dtsi" > @@ -23,6 +26,28 @@ > reg = <0xc0000000 0x20000000>; > }; > > + gpio-keys { > + compatible = "gpio-keys"; > + > + user-pa13 { > + label = "User-PA13"; > + linux,code = <BTN_1>; > + gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; > + }; > + }; > + > + leds { > + compatible = "gpio-leds"; > + > + led-blue { > + function = LED_FUNCTION_HEARTBEAT; > + color = <LED_COLOR_ID_BLUE>; > + gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; > + linux,default-trigger = "heartbeat"; > + default-state = "off"; > + }; > + }; > + > vdd_sd: vdd-sd { > compatible = "regulator-fixed"; > regulator-name = "vdd_sd"; > @@ -37,6 +62,10 @@ > status = "okay"; > }; > > +&rtc { > + status = "okay"; > +}; > + > &sdmmc1 { > pinctrl-names = "default", "opendrain", "sleep"; > pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_clk_pins_a>; Reviewed-by: Patrice Chotard <patrice.chotard@foss.st.com> Thanks Patrice
diff --git a/arch/arm/dts/stm32mp131.dtsi b/arch/arm/dts/stm32mp131.dtsi index 950e172e455..a30989f287e 100644 --- a/arch/arm/dts/stm32mp131.dtsi +++ b/arch/arm/dts/stm32mp131.dtsi @@ -75,6 +75,12 @@ compatible = "fixed-clock"; clock-frequency = <99000000>; }; + + clk_rtc_k: clk-rtc-k { + #clock-cells = <0>; + compatible = "fixed-clock"; + clock-frequency = <32768>; + }; }; intc: interrupt-controller@a0021000 { @@ -218,6 +224,15 @@ status = "disabled"; }; + rtc: rtc@5c004000 { + compatible = "st,stm32mp1-rtc"; + reg = <0x5c004000 0x400>; + interrupts-extended = <&exti 19 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk_pclk4>, <&clk_rtc_k>; + clock-names = "pclk", "rtc_ck"; + status = "disabled"; + }; + bsec: efuse@5c005000 { compatible = "st,stm32mp13-bsec"; reg = <0x5c005000 0x400>; @@ -239,11 +254,13 @@ * Break node order to solve dependency probe issue between * pinctrl and exti. */ - pinctrl: pin-controller@50002000 { + pinctrl: pinctrl@50002000 { #address-cells = <1>; #size-cells = <1>; compatible = "st,stm32mp135-pinctrl"; ranges = <0 0x50002000 0x8400>; + interrupt-parent = <&exti>; + st,syscfg = <&exti 0x60 0xff>; pins-are-numbered; gpioa: gpio@50002000 { diff --git a/arch/arm/dts/stm32mp135f-dk.dts b/arch/arm/dts/stm32mp135f-dk.dts index ee100d108ea..09d6226d598 100644 --- a/arch/arm/dts/stm32mp135f-dk.dts +++ b/arch/arm/dts/stm32mp135f-dk.dts @@ -6,6 +6,9 @@ /dts-v1/; +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> #include "stm32mp135.dtsi" #include "stm32mp13xf.dtsi" #include "stm32mp13-pinctrl.dtsi" @@ -23,6 +26,28 @@ reg = <0xc0000000 0x20000000>; }; + gpio-keys { + compatible = "gpio-keys"; + + user-pa13 { + label = "User-PA13"; + linux,code = <BTN_1>; + gpios = <&gpioa 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led-blue { + function = LED_FUNCTION_HEARTBEAT; + color = <LED_COLOR_ID_BLUE>; + gpios = <&gpioa 14 GPIO_ACTIVE_LOW>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + }; + vdd_sd: vdd-sd { compatible = "regulator-fixed"; regulator-name = "vdd_sd"; @@ -37,6 +62,10 @@ status = "okay"; }; +&rtc { + status = "okay"; +}; + &sdmmc1 { pinctrl-names = "default", "opendrain", "sleep"; pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_clk_pins_a>;
Device tree alignment with Linux kernel v5.19-rc1 with: - ARM: dts: stm32: add UserPA13 button on stm32mp135f-dk - ARM: dts: stm32: add blue led (Linux heartbeat) on stm32mp135f-dk - ARM: dts: stm32: add EXTI interrupt-parent to pinctrl node on stm32mp131 - ARM: dts: stm32: enable RTC support on stm32mp135f-dk - ARM: dts: stm32: add RTC node on stm32mp131 - ARM: dts: stm32: fix pinctrl node name warnings (MPU soc) Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com> --- (no changes since v1) arch/arm/dts/stm32mp131.dtsi | 19 ++++++++++++++++++- arch/arm/dts/stm32mp135f-dk.dts | 29 +++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-)