2020-02-28 12:52:56

by Benjamin GAIGNARD

Subject: [PATCH] ARM: dts: stm32: Rename stmfx node names

Rename stmfx node names according to yaml description.

Signed-off-by: Benjamin Gaignard <[email protected]>
---
arch/arm/boot/dts/stm32746g-eval.dts | 2 +-
arch/arm/boot/dts/stm32mp157c-ev1.dts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts
index fcc804e3c158..4ea3f98dd275 100644
--- a/arch/arm/boot/dts/stm32746g-eval.dts
+++ b/arch/arm/boot/dts/stm32746g-eval.dts
@@ -165,7 +165,7 @@
interrupts = <8 IRQ_TYPE_EDGE_RISING>;
interrupt-parent = <&gpioi>;

- stmfx_pinctrl: stmfx-pin-controller {
+ stmfx_pinctrl: pinctrl {
compatible = "st,stmfx-0300-pinctrl";
gpio-controller;
#gpio-cells = <2>;
diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
index 228e35e16884..3f4668a43afe 100644
--- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
+++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
@@ -210,7 +210,7 @@
interrupt-parent = <&gpioi>;
vdd-supply = <&v3v3>;

- stmfx_pinctrl: stmfx-pin-controller {
+ stmfx_pinctrl: pinctrl {
compatible = "st,stmfx-0300-pinctrl";
gpio-controller;
#gpio-cells = <2>;
@@ -218,7 +218,7 @@
#interrupt-cells = <2>;
gpio-ranges = <&stmfx_pinctrl 0 0 24>;

- joystick_pins: joystick {
+ joystick_pins: joystick-pins {
pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4";
bias-pull-down;
};
--
2.15.0

2020-03-13 13:17:11

by Alexandre Torgue

Subject: Re: [PATCH] ARM: dts: stm32: Rename stmfx node names

Hi Benjamin

On 2/28/20 1:52 PM, Benjamin Gaignard wrote:
> Rename stmfx node names according to yaml description.
>
> Signed-off-by: Benjamin Gaignard <[email protected]>
> ---

Applied on stm32-next with commit title updated.

Thanks.
Alex

> arch/arm/boot/dts/stm32746g-eval.dts | 2 +-
> arch/arm/boot/dts/stm32mp157c-ev1.dts | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts
> index fcc804e3c158..4ea3f98dd275 100644
> --- a/arch/arm/boot/dts/stm32746g-eval.dts
> +++ b/arch/arm/boot/dts/stm32746g-eval.dts
> @@ -165,7 +165,7 @@
> interrupts = <8 IRQ_TYPE_EDGE_RISING>;
> interrupt-parent = <&gpioi>;
>
> - stmfx_pinctrl: stmfx-pin-controller {
> + stmfx_pinctrl: pinctrl {
> compatible = "st,stmfx-0300-pinctrl";
> gpio-controller;
> #gpio-cells = <2>;
> diff --git a/arch/arm/boot/dts/stm32mp157c-ev1.dts b/arch/arm/boot/dts/stm32mp157c-ev1.dts
> index 228e35e16884..3f4668a43afe 100644
> --- a/arch/arm/boot/dts/stm32mp157c-ev1.dts
> +++ b/arch/arm/boot/dts/stm32mp157c-ev1.dts
> @@ -210,7 +210,7 @@
> interrupt-parent = <&gpioi>;
> vdd-supply = <&v3v3>;
>
> - stmfx_pinctrl: stmfx-pin-controller {
> + stmfx_pinctrl: pinctrl {
> compatible = "st,stmfx-0300-pinctrl";
> gpio-controller;
> #gpio-cells = <2>;
> @@ -218,7 +218,7 @@
> #interrupt-cells = <2>;
> gpio-ranges = <&stmfx_pinctrl 0 0 24>;
>
> - joystick_pins: joystick {
> + joystick_pins: joystick-pins {
> pins = "gpio0", "gpio1", "gpio2", "gpio3", "gpio4";
> bias-pull-down;
> };
>