* [PATCH 1/2] ARM: dts: at91: nattis: drop three indentation levels
2018-08-31 20:44 [PATCH 0/2] ARM: dts: at91: nattis/tse850: drop 3 indentation levels Peter Rosin
@ 2018-08-31 20:44 ` Peter Rosin
2018-08-31 20:44 ` [PATCH 2/2] ARM: dts: at91: tse850: " Peter Rosin
2018-09-03 14:19 ` [PATCH 0/2] ARM: dts: at91: nattis/tse850: drop 3 " Alexandre Belloni
2 siblings, 0 replies; 4+ messages in thread
From: Peter Rosin @ 2018-08-31 20:44 UTC (permalink / raw)
To: linux-kernel
Cc: Peter Rosin, Nicolas Ferre, Alexandre Belloni, Rob Herring,
Mark Rutland, linux-arm-kernel, devicetree
Make use of the recently added &pinctrl and &watchdog labels. This
makes the whole file consistent and knowledge of the ahb/apb structure
is hidden.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 72 ++++++++++++-----------------
1 file changed, 30 insertions(+), 42 deletions(-)
diff --git a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
index 97e972aefac2..911d2c7c1500 100644
--- a/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
+++ b/arch/arm/boot/dts/at91-nattis-2-natte-2.dts
@@ -16,48 +16,6 @@
compatible = "axentia,nattis-2", "axentia,natte-2", "axentia,linea",
"atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";
- ahb {
- apb {
- pinctrl@fffff200 {
- nattis {
- pinctrl_usba_vbus: usba_vbus {
- atmel,pins =
- <AT91_PIOD 28
- AT91_PERIPH_GPIO
- AT91_PINCTRL_DEGLITCH>;
- };
-
- pinctrl_mmc0_cd: mmc0_cd {
- atmel,pins =
- <AT91_PIOD 5
- AT91_PERIPH_GPIO
- AT91_PINCTRL_PULL_UP_DEGLITCH>;
- };
-
- pinctrl_lvds_prlud0: lvds_prlud0 {
- atmel,pins =
- <AT91_PIOA 21
- AT91_PERIPH_GPIO
- (AT91_PINCTRL_OUTPUT |
- AT91_PINCTRL_OUTPUT_VAL(0))>;
- };
-
- pinctrl_lvds_hipow0: lvds_hipow0 {
- atmel,pins =
- <AT91_PIOA 23
- AT91_PERIPH_GPIO
- (AT91_PINCTRL_OUTPUT |
- AT91_PINCTRL_OUTPUT_VAL(0))>;
- };
- };
- };
-
- watchdog@fffffe40 {
- status = "okay";
- };
- };
- };
-
gpio-keys {
compatible = "gpio-keys";
@@ -183,6 +141,36 @@
};
};
+&pinctrl {
+ nattis {
+ pinctrl_usba_vbus: usba_vbus {
+ atmel,pins = <AT91_PIOD 28 AT91_PERIPH_GPIO
+ AT91_PINCTRL_DEGLITCH>;
+ };
+
+ pinctrl_mmc0_cd: mmc0_cd {
+ atmel,pins = <AT91_PIOD 5 AT91_PERIPH_GPIO
+ AT91_PINCTRL_PULL_UP_DEGLITCH>;
+ };
+
+ pinctrl_lvds_prlud0: lvds_prlud0 {
+ atmel,pins = <AT91_PIOA 21 AT91_PERIPH_GPIO
+ (AT91_PINCTRL_OUTPUT |
+ AT91_PINCTRL_OUTPUT_VAL(0))>;
+ };
+
+ pinctrl_lvds_hipow0: lvds_hipow0 {
+ atmel,pins = <AT91_PIOA 23 AT91_PERIPH_GPIO
+ (AT91_PINCTRL_OUTPUT |
+ AT91_PINCTRL_OUTPUT_VAL(0))>;
+ };
+ };
+};
+
+&watchdog {
+ status = "okay";
+};
+
&i2c0 {
status = "okay";
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] ARM: dts: at91: tse850: drop three indentation levels
2018-08-31 20:44 [PATCH 0/2] ARM: dts: at91: nattis/tse850: drop 3 indentation levels Peter Rosin
2018-08-31 20:44 ` [PATCH 1/2] ARM: dts: at91: nattis: drop three " Peter Rosin
@ 2018-08-31 20:44 ` Peter Rosin
2018-09-03 14:19 ` [PATCH 0/2] ARM: dts: at91: nattis/tse850: drop 3 " Alexandre Belloni
2 siblings, 0 replies; 4+ messages in thread
From: Peter Rosin @ 2018-08-31 20:44 UTC (permalink / raw)
To: linux-kernel
Cc: Peter Rosin, Nicolas Ferre, Alexandre Belloni, Rob Herring,
Mark Rutland, linux-arm-kernel, devicetree
Make use of the recently added &pinctrl and &watchdog labels. This
makes the whole file consistent and knowledge of the ahb/apb structure
is hidden.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
arch/arm/boot/dts/at91-tse850-3.dts | 32 +++++++++++++-------------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/arch/arm/boot/dts/at91-tse850-3.dts b/arch/arm/boot/dts/at91-tse850-3.dts
index 2fbec69d9cd6..fe8876eaf917 100644
--- a/arch/arm/boot/dts/at91-tse850-3.dts
+++ b/arch/arm/boot/dts/at91-tse850-3.dts
@@ -16,25 +16,6 @@
compatible = "axentia,tse850v3", "axentia,linea",
"atmel,sama5d31", "atmel,sama5d3", "atmel,sama5";
- ahb {
- apb {
- pinctrl@fffff200 {
- tse850 {
- pinctrl_usba_vbus: usba-vbus {
- atmel,pins =
- <AT91_PIOC 31
- AT91_PERIPH_GPIO
- AT91_PINCTRL_DEGLITCH>;
- };
- };
- };
-
- watchdog@fffffe40 {
- status = "okay";
- };
- };
- };
-
sck: oscillator {
compatible = "fixed-clock";
@@ -253,6 +234,19 @@
};
};
+&pinctrl {
+ tse850 {
+ pinctrl_usba_vbus: usba-vbus {
+ atmel,pins = <AT91_PIOC 31 AT91_PERIPH_GPIO
+ AT91_PINCTRL_DEGLITCH>;
+ };
+ };
+};
+
+&watchdog {
+ status = "okay";
+};
+
&usart0 {
status = "okay";
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] ARM: dts: at91: nattis/tse850: drop 3 indentation levels
2018-08-31 20:44 [PATCH 0/2] ARM: dts: at91: nattis/tse850: drop 3 indentation levels Peter Rosin
2018-08-31 20:44 ` [PATCH 1/2] ARM: dts: at91: nattis: drop three " Peter Rosin
2018-08-31 20:44 ` [PATCH 2/2] ARM: dts: at91: tse850: " Peter Rosin
@ 2018-09-03 14:19 ` Alexandre Belloni
2 siblings, 0 replies; 4+ messages in thread
From: Alexandre Belloni @ 2018-09-03 14:19 UTC (permalink / raw)
To: Peter Rosin
Cc: linux-kernel, Nicolas Ferre, Rob Herring, Mark Rutland,
linux-arm-kernel, devicetree
On 31/08/2018 22:44:01+0200, Peter Rosin wrote:
> Hi!
>
> I just noticed that the pinctrl and watchdog nodes in sama5d3.dtsi have
> gained labels, something which I have had a plan to add myself at some
> point. But now that they are here, I just have to make use of them...
>
> Cheers,
> Peter
>
> Peter Rosin (2):
> ARM: dts: at91: nattis: drop three indentation levels
> ARM: dts: at91: tse850: drop three indentation levels
>
Both applied, thanks.
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread