Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1363761 > unrolled thread

[PATCH 1/4] arm64: dts: marvell: Clean up armada-3720-db

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH 1/4] arm64: dts: marvell: Clean up armada-3720-db Andreas Färber <afaerber@suse.de> - 2016-03-23 23:30 +0100
    Re: [PATCH 1/4] arm64: dts: marvell: Clean up armada-3720-db Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-03-24 17:20 +0100
      Re: [PATCH 1/4] arm64: dts: marvell: Clean up armada-3720-db Andreas Färber <afaerber@suse.de> - 2016-03-24 17:50 +0100
        Re: [PATCH 1/4] arm64: dts: marvell: Clean up armada-3720-db Gregory CLEMENT <gregory.clement@free-electrons.com> - 2016-03-25 09:20 +0100

#1363761 — [PATCH 1/4] arm64: dts: marvell: Clean up armada-3720-db

Instead of duplicating the SoC's node hierarchy, including a bus node
named "internal-regs", reference the actually desired nodes by label,
like Berlin already does. Add labels where necessary.

Drop an inconsistent white line while at it.

Fixes: adbc3695d9e4 ("arm64: dts: add the Marvell Armada 3700 family and a development board")
Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 arch/arm64/boot/dts/marvell/armada-3720-db.dts | 35 +++++++++++---------------
 arch/arm64/boot/dts/marvell/armada-372x.dtsi   |  1 -
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi   |  4 +--
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 359050154511..48f97d14b057 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -60,27 +60,22 @@
 		device_type = "memory";
 		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
 	};
+};
 
-	soc {
-		internal-regs {
-			/*
-			* Exported on the micro USB connector CON32
-			* through an FTDI
-			*/
-			uart0: serial@12000 {
-				status = "okay";
-			};
-
-			/* CON31 */
-			usb3@58000 {
-				status = "okay";
-			};
+/* CON3 */
+&sata {
+	status = "okay";
+};
 
-			/* CON3 */
-			sata@e0000 {
-			       status = "okay";
-			};
-		};
-	};
+/*
+ * Exported on the micro USB connector CON32
+ * through an FTDI
+ */
+&uart0 {
+	status = "okay";
 };
 
+/* CON31 */
+&usb3 {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/marvell/armada-372x.dtsi b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
index f292a00ce97c..5120296596c2 100644
--- a/arch/arm64/boot/dts/marvell/armada-372x.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-372x.dtsi
@@ -59,5 +59,4 @@
 			enable-method = "psci";
 		};
 	};
-
 };
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index ba9df7ff2a72..4328c2408a8a 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -105,14 +105,14 @@
 				status = "disabled";
 			};
 
-			usb3@58000 {
+			usb3: usb3@58000 {
 				compatible = "generic-xhci";
 				reg = <0x58000 0x4000>;
 				interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
 				status = "disabled";
 			};
 
-			sata@e0000 {
+			sata: sata@e0000 {
 				compatible = "marvell,armada-3700-ahci";
 				reg = <0xe0000 0x2000>;
 				interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
-- 
2.6.2

[toc] | [next] | [standalone]

#1364306

Hi Andreas,
 
 On mer., mars 23 2016, Andreas Färber <afaerber@suse.de> wrote:

> Instead of duplicating the SoC's node hierarchy, including a bus node
> named "internal-regs", reference the actually desired nodes by label,
> like Berlin already does. Add labels where necessary.

We talked about this for the 3rd patch, but the conclusion will apply
here too. So we are going to use this solution for the mvebu 64bits. I
have just a minor remark.

>
> Drop an inconsistent white line while at it.
>
> Fixes: adbc3695d9e4 ("arm64: dts: add the Marvell Armada 3700 family and a development board")
> Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  arch/arm64/boot/dts/marvell/armada-3720-db.dts | 35 +++++++++++---------------
>  arch/arm64/boot/dts/marvell/armada-372x.dtsi   |  1 -
>  arch/arm64/boot/dts/marvell/armada-37xx.dtsi   |  4 +--
>  3 files changed, 17 insertions(+), 23 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> index 359050154511..48f97d14b057 100644
> --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
> @@ -60,27 +60,22 @@
>  		device_type = "memory";
>  		reg = <0x00000000 0x00000000 0x00000000 0x20000000>;
>  	};
> +};
>  
> -	soc {
> -		internal-regs {
> -			/*
> -			* Exported on the micro USB connector CON32
> -			* through an FTDI
> -			*/
> -			uart0: serial@12000 {
> -				status = "okay";
> -			};
> -
> -			/* CON31 */
> -			usb3@58000 {
> -				status = "okay";
> -			};
> +/* CON3 */
> +&sata {
> +	status = "okay";
> +};
>  
> -			/* CON3 */
> -			sata@e0000 {
> -			       status = "okay";
> -			};
> -		};
> -	};
> +/*
> + * Exported on the micro USB connector CON32
> + * through an FTDI
> + */

As the comment didn't start anymore from the middle of the line, we
could have it an a single line. We don't have to split in 2 lines.

Thanks,

Gregory

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[toc] | [prev] | [next] | [standalone]

#1364330

Hi Gregory,

Am 24.03.2016 um 17:11 schrieb Gregory CLEMENT:
>> +/*
>> + * Exported on the micro USB connector CON32
>> + * through an FTDI
>> + */
> 
> As the comment didn't start anymore from the middle of the line, we
> could have it an a single line. We don't have to split in 2 lines.

Sure. Should I change that along with 4/4 in a v2? It'll be after the
Easter holidays.

Regards,
Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)

[toc] | [prev] | [next] | [standalone]

#1364591

Hi Andreas,
 
 On jeu., mars 24 2016, Andreas Färber <afaerber@suse.de> wrote:

> Hi Gregory,
>
> Am 24.03.2016 um 17:11 schrieb Gregory CLEMENT:
>>> +/*
>>> + * Exported on the micro USB connector CON32
>>> + * through an FTDI
>>> + */
>> 
>> As the comment didn't start anymore from the middle of the line, we
>> could have it an a single line. We don't have to split in 2 lines.
>
> Sure. Should I change that along with 4/4 in a v2? It'll be after the
> Easter holidays.

Yes please and no problem for wiating for after the Easter holidays I
won't apply the patch on the mvebu branches before the release of the
v4.6-rc1.

Thanks,

Gregory

>
> Regards,
> Andreas
>
> -- 
> SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Felix Imendörffer, Jane Smithard, Graham Norton; HRB 21284 (AG Nürnberg)

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web