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

Groups > linux.kernel > #1563950 > unrolled thread

[PATCH 00/18] ARM64: meson: DT cleanups

Back to article view | Back to linux.kernel

Contents

  [PATCH 00/18] ARM64: meson: DT cleanups Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 06/18] ARM64: dts: meson-gxm-nexbox-a1: Drop UART comment Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 06/18] ARM64: dts: meson-gxm-nexbox-a1: Drop UART comment Neil Armstrong <narmstrong@baylibre.com> - 2017-01-23 10:00 +0100
    [PATCH 15/18] ARM64: dts: meson-gxl: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 01/18] Documentation: devicetree: amlogic: Reorder boards Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 01/18] Documentation: devicetree: amlogic: Reorder boards Rob Herring <robh@kernel.org> - 2017-01-23 17:50 +0100
        Re: [PATCH 01/18] Documentation: devicetree: amlogic: Reorder boards Andreas Färber <afaerber@suse.de> - 2017-01-23 19:40 +0100
    [PATCH 16/18] ARM64: dts: meson-gxl-s905x-nexbox-a95x: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 16/18] ARM64: dts: meson-gxl-s905x-nexbox-a95x: Reorder  nodes Neil Armstrong <narmstrong@baylibre.com> - 2017-01-23 10:00 +0100
    [PATCH 05/18] ARM64: dts: meson-gx-p23x-q20x: Fix Wifi node name Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 05/18] ARM64: dts: meson-gx-p23x-q20x: Fix Wifi node name Neil Armstrong <narmstrong@baylibre.com> - 2017-01-23 10:00 +0100
    [PATCH 17/18] ARM64: dts: meson-gxm-nexbox-a1: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 17/18] ARM64: dts: meson-gxm-nexbox-a1: Reorder nodes Neil Armstrong <narmstrong@baylibre.com> - 2017-01-23 10:00 +0100
    [PATCH 13/18] ARM64: dts: meson-gxbb-nexbox-a95x: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 13/18] ARM64: dts: meson-gxbb-nexbox-a95x: Reorder nodes Neil Armstrong <narmstrong@baylibre.com> - 2017-01-23 10:00 +0100
    [PATCH 08/18] ARM64: dts: meson-gxm: Drop trailing white line Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 12/18] ARM64: dts: meson-gxbb-vega-s95: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes Rob Herring <robh@kernel.org> - 2017-01-23 18:00 +0100
        Re: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-23 18:00 +0100
        Re: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes Russell King - ARM Linux <linux@armlinux.org.uk> - 2017-01-30 16:10 +0100
    [PATCH 09/18] ARM64: dts: meson-gxbb-wetek-hub: Reference CVBS node by label Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 11/18] ARM64: dts: meson-gxbb-odroidc2: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 02/18] ARM64: dts: amlogic: Sort Makefile Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 18/18] ARM64: dts: meson-gx-p23x-q20x: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 18/18] ARM64: dts: meson-gx-p23x-q20x: Reorder nodes Neil Armstrong <narmstrong@baylibre.com> - 2017-01-23 10:00 +0100
    [PATCH 03/18] ARM64: dts: meson-gxbb-vega-s95: Fix Wifi node name Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 07/18] ARM64: dts: meson-gxl-s905x: Comment typo fix Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 07/18] ARM64: dts: meson-gxl-s905x: Comment typo fix Neil Armstrong <narmstrong@baylibre.com> - 2017-01-23 10:00 +0100
    [PATCH 14/18] ARM64: dts: meson-gxbb-p20x: Reorder nodes Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
    [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: Fix Wifi node name Andreas Färber <afaerber@suse.de> - 2017-01-20 23:30 +0100
      Re: [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: Fix Wifi node name Neil Armstrong <narmstrong@baylibre.com> - 2017-01-23 10:00 +0100
      Re: [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: Fix Wifi node name Rob Herring <robh@kernel.org> - 2017-01-23 18:00 +0100
        Re: [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: Fix Wifi node name Andreas Färber <afaerber@suse.de> - 2017-01-23 18:00 +0100
    Re: [PATCH 00/18] ARM64: meson: DT cleanups Kevin Hilman <khilman@baylibre.com> - 2017-01-23 19:50 +0100

Page 2 of 2 — ← Prev page 1 [2]

#1569804 — Re: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes

On Mon, Jan 23, 2017 at 10:52:08AM -0600, Rob Herring wrote:
> On Fri, Jan 20, 2017 at 11:21:10PM +0100, Andreas Färber wrote:
> > Sort nodes referenced by label alphabetically.
> 
> Seems to be pointless churn.

Depends - if, as the author of a dts file, I order the nodes
alphabetically, and then someone comes along and adds a new node
non-alphabetically, meanwhile someone else also adds a node
elsewhere in the file which conflicts, git will silently merge the
changes without complaint.

Having an alphabetical sorting order means that (a) conflicting
changes are more likely to be highlighted, and (b) non-conflicting
changes are less likely to cause merge issues.

I've noticed exactly this with clearfog when merging my tree with
arm-soc.  I have a version of the DSA patch, meanwhile the mvebu
people merged the DSA patch.  Somehow, the order of nodes in my
file are alphabetical, the order in their file has the pinctrl and
mdio nodes swapped, which results in totally unnecessary merge
conflicts when I try merging the two trees.

It's more, unnecessary work.

So, I'm going to be submitting a patch to fix the mis-ordered nodes
in the clearfog dts file today to avoid having to resolve this each
time I rebuild my nightly build tree.

-- 
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.

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

#1563961 — [PATCH 09/18] ARM64: dts: meson-gxbb-wetek-hub: Reference CVBS node by label

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi     | 2 +-
 arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index 5183c5ce90c6..0d134a85e3a0 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -126,7 +126,7 @@
 		clock-names = "ext_clock";
 	};
 
-	cvbs-connector {
+	cvbs_connector: cvbs-connector {
 		compatible = "composite-video-connector";
 
 		port {
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
index 56f855901262..6e35265dc2fc 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts
@@ -59,8 +59,8 @@
 			panic-indicator;
 		};
 	};
+};
 
-	cvbs-connector {
-		status = "disabled";
-	};
+&cvbs_connector {
+	status = "disabled";
 };
-- 
2.10.2

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

#1563962 — [PATCH 11/18] ARM64: dts: meson-gxbb-odroidc2: Reorder nodes

Sort nodes referenced by label alphabetically.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 52 +++++++++++-----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
index 238fbeacd330..a1ccfe702c27 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts
@@ -137,45 +137,22 @@
 	};
 };
 
-&uart_AO {
-	status = "okay";
-	pinctrl-0 = <&uart_ao_a_pins>;
-	pinctrl-names = "default";
-};
-
 &ethmac {
 	status = "okay";
 	pinctrl-0 = <&eth_rgmii_pins>;
 	pinctrl-names = "default";
 };
 
-&ir {
-	status = "okay";
-	pinctrl-0 = <&remote_input_ao_pins>;
-	pinctrl-names = "default";
-};
-
 &i2c_A {
 	status = "okay";
 	pinctrl-0 = <&i2c_a_pins>;
 	pinctrl-names = "default";
 };
 
-&usb0_phy {
-	status = "okay";
-	phy-supply = <&usb_otg_pwr>;
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
-&usb1 {
+&ir {
 	status = "okay";
+	pinctrl-0 = <&remote_input_ao_pins>;
+	pinctrl-names = "default";
 };
 
 /* SD */
@@ -215,3 +192,26 @@
 	vmmc-supply = <&vcc3v3>;
 	vqmmc-supply = <&vcc1v8>;
 };
+
+&uart_AO {
+	status = "okay";
+	pinctrl-0 = <&uart_ao_a_pins>;
+	pinctrl-names = "default";
+};
+
+&usb0_phy {
+	status = "okay";
+	phy-supply = <&usb_otg_pwr>;
+};
+
+&usb1_phy {
+	status = "okay";
+};
+
+&usb0 {
+	status = "okay";
+};
+
+&usb1 {
+	status = "okay";
+};
-- 
2.10.2

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

#1563964 — [PATCH 02/18] ARM64: dts: amlogic: Sort Makefile

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 arch/arm64/boot/dts/amlogic/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile
index 3f94bce33b7f..efcd1763a82d 100644
--- a/arch/arm64/boot/dts/amlogic/Makefile
+++ b/arch/arm64/boot/dts/amlogic/Makefile
@@ -7,13 +7,13 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-meta.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-vega-s95-telos.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-hub.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxbb-wetek-play2.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-p212.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p230.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905d-p231.dtb
-dtb-$(CONFIG_ARCH_MESON) += meson-gxl-s905x-nexbox-a95x.dtb
+dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q200.dtb
 dtb-$(CONFIG_ARCH_MESON) += meson-gxm-q201.dtb
-dtb-$(CONFIG_ARCH_MESON) += meson-gxm-nexbox-a1.dtb
 
 always		:= $(dtb-y)
 subdir-y	:= $(dts-dirs)
-- 
2.10.2

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

#1563965 — [PATCH 18/18] ARM64: dts: meson-gx-p23x-q20x: Reorder nodes

Sort nodes referenced by label alphabetically.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
index 419c46cc64e4..cfc26a2a3a90 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -100,11 +100,8 @@
 	};
 };
 
-/* This UART is brought out to the DB9 connector */
-&uart_AO {
+&ethmac {
 	status = "okay";
-	pinctrl-0 = <&uart_ao_a_pins>;
-	pinctrl-names = "default";
 };
 
 &ir {
@@ -113,6 +110,14 @@
 	pinctrl-names = "default";
 };
 
+&pwm_ef {
+	status = "okay";
+	pinctrl-0 = <&pwm_e_pins>;
+	pinctrl-names = "default";
+	clocks = <&clkc CLKID_FCLK_DIV4>;
+	clock-names = "clkin0";
+};
+
 /* Wireless SDIO Module */
 &sd_emmc_a {
 	status = "okay";
@@ -177,14 +182,9 @@
 	vqmmc-supply = <&vddio_boot>;
 };
 
-&pwm_ef {
+/* This UART is brought out to the DB9 connector */
+&uart_AO {
 	status = "okay";
-	pinctrl-0 = <&pwm_e_pins>;
+	pinctrl-0 = <&uart_ao_a_pins>;
 	pinctrl-names = "default";
-	clocks = <&clkc CLKID_FCLK_DIV4>;
-	clock-names = "clkin0";
-};
-
-&ethmac {
-	status = "okay";
 };
-- 
2.10.2

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

#1564774 — Re: [PATCH 18/18] ARM64: dts: meson-gx-p23x-q20x: Reorder nodes

On 01/20/2017 11:21 PM, Andreas Färber wrote:
> Sort nodes referenced by label alphabetically.
> 
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 24 +++++++++++-----------
>  1 file changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
> index 419c46cc64e4..cfc26a2a3a90 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
> @@ -100,11 +100,8 @@
>  	};
>  };
>  
> -/* This UART is brought out to the DB9 connector */
> -&uart_AO {
> +&ethmac {
>  	status = "okay";
> -	pinctrl-0 = <&uart_ao_a_pins>;
> -	pinctrl-names = "default";
>  };
>  
>  &ir {
> @@ -113,6 +110,14 @@
>  	pinctrl-names = "default";
>  };
>  
> +&pwm_ef {
> +	status = "okay";
> +	pinctrl-0 = <&pwm_e_pins>;
> +	pinctrl-names = "default";
> +	clocks = <&clkc CLKID_FCLK_DIV4>;
> +	clock-names = "clkin0";
> +};
> +
>  /* Wireless SDIO Module */
>  &sd_emmc_a {
>  	status = "okay";
> @@ -177,14 +182,9 @@
>  	vqmmc-supply = <&vddio_boot>;
>  };
>  
> -&pwm_ef {
> +/* This UART is brought out to the DB9 connector */
> +&uart_AO {
>  	status = "okay";
> -	pinctrl-0 = <&pwm_e_pins>;
> +	pinctrl-0 = <&uart_ao_a_pins>;
>  	pinctrl-names = "default";
> -	clocks = <&clkc CLKID_FCLK_DIV4>;
> -	clock-names = "clkin0";
> -};
> -
> -&ethmac {
> -	status = "okay";
>  };
> 

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

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

#1563966 — [PATCH 03/18] ARM64: dts: meson-gxbb-vega-s95: Fix Wifi node name

bcrmf -> brcmf

Fixes: ab5b24fdd2d5 ("ARM64: dts: meson-gxbb-vega-s95: Add SD/SDIO/MMC and PWM nodes")
Cc: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
index 86709929fd20..e688e8971a95 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -167,7 +167,7 @@
 	vmmc-supply = <&vcc_3v3>;
 	vqmmc-supply = <&vcc_1v8>;
 
-	brcmf: bcrmf@1 {
+	brcmf: brcmf@1 {
 		reg = <1>;
 		compatible = "brcm,bcm4329-fmac";
 	};
-- 
2.10.2

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

#1563968 — [PATCH 07/18] ARM64: dts: meson-gxl-s905x: Comment typo fix

Cc: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
index 08237ee1e362..d49ee3c04dd7 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
@@ -47,7 +47,7 @@
 	compatible = "amlogic,s905x", "amlogic,meson-gxl";
 };
 
-/* S905X Only has access to its internal PHY */
+/* S905X only has access to its internal PHY */
 &ethmac {
 	phy-mode = "rmii";
 	phy-handle = <&internal_phy>;
-- 
2.10.2

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

#1564773 — Re: [PATCH 07/18] ARM64: dts: meson-gxl-s905x: Comment typo fix

On 01/20/2017 11:21 PM, Andreas Färber wrote:
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
> index 08237ee1e362..d49ee3c04dd7 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi
> @@ -47,7 +47,7 @@
>  	compatible = "amlogic,s905x", "amlogic,meson-gxl";
>  };
>  
> -/* S905X Only has access to its internal PHY */
> +/* S905X only has access to its internal PHY */
>  &ethmac {
>  	phy-mode = "rmii";
>  	phy-handle = <&internal_phy>;
> 

Can't hurt

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

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

#1563969 — [PATCH 14/18] ARM64: dts: meson-gxbb-p20x: Reorder nodes

Sort nodes referenced by label alphabetically.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 54 ++++++++++++------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index 0d134a85e3a0..b6f9d051439c 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -137,11 +137,10 @@
 	};
 };
 
-/* This UART is brought out to the DB9 connector */
-&uart_AO {
-	status = "okay";
-	pinctrl-0 = <&uart_ao_a_pins>;
-	pinctrl-names = "default";
+&cvbs_vdac_port {
+	cvbs_vdac_out: endpoint {
+		remote-endpoint = <&cvbs_connector_in>;
+	};
 };
 
 &ethmac {
@@ -156,21 +155,12 @@
 	pinctrl-names = "default";
 };
 
-&usb0_phy {
-	status = "okay";
-	phy-supply = <&usb_pwr>;
-};
-
-&usb1_phy {
-	status = "okay";
-};
-
-&usb0 {
-	status = "okay";
-};
-
-&usb1 {
+&pwm_ef {
 	status = "okay";
+	pinctrl-0 = <&pwm_e_pins>;
+	pinctrl-names = "default";
+	clocks = <&clkc CLKID_FCLK_DIV4>;
+	clock-names = "clkin0";
 };
 
 /* Wireless SDIO Module */
@@ -237,16 +227,26 @@
 	vqmmc-supply = <&vddio_boot>;
 };
 
-&pwm_ef {
+/* This UART is brought out to the DB9 connector */
+&uart_AO {
 	status = "okay";
-	pinctrl-0 = <&pwm_e_pins>;
+	pinctrl-0 = <&uart_ao_a_pins>;
 	pinctrl-names = "default";
-	clocks = <&clkc CLKID_FCLK_DIV4>;
-	clock-names = "clkin0";
 };
 
-&cvbs_vdac_port {
-	cvbs_vdac_out: endpoint {
-		remote-endpoint = <&cvbs_connector_in>;
-	};
+&usb0_phy {
+	status = "okay";
+	phy-supply = <&usb_pwr>;
+};
+
+&usb1_phy {
+	status = "okay";
+};
+
+&usb0 {
+	status = "okay";
+};
+
+&usb1 {
+	status = "okay";
 };
-- 
2.10.2

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

#1563970 — [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: Fix Wifi node name

bcrmf -> brcmf

Fixes: ab3943fe57a2 ("ARM64: dts: meson-gxbb: Add P20x Wifi SDIO support")
Cc: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
index 4a96e0f6f926..5183c5ce90c6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
@@ -193,7 +193,7 @@
 	vmmc-supply = <&vddao_3v3>;
 	vqmmc-supply = <&vddio_boot>;
 
-	brcmf: bcrmf@1 {
+	brcmf: brcmf@1 {
 		reg = <1>;
 		compatible = "brcm,bcm4329-fmac";
 	};
-- 
2.10.2

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

#1564777 — Re: [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: Fix Wifi node name

On 01/20/2017 11:21 PM, Andreas Färber wrote:
> bcrmf -> brcmf
> 
> Fixes: ab3943fe57a2 ("ARM64: dts: meson-gxbb: Add P20x Wifi SDIO support")
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> index 4a96e0f6f926..5183c5ce90c6 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> @@ -193,7 +193,7 @@
>  	vmmc-supply = <&vddao_3v3>;
>  	vqmmc-supply = <&vddio_boot>;
>  
> -	brcmf: bcrmf@1 {
> +	brcmf: brcmf@1 {
>  		reg = <1>;
>  		compatible = "brcm,bcm4329-fmac";
>  	};
> 

Good catch !

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

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

#1565134 — Re: [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: Fix Wifi node name

On Fri, Jan 20, 2017 at 11:21:04PM +0100, Andreas Färber wrote:
> bcrmf -> brcmf
> 
> Fixes: ab3943fe57a2 ("ARM64: dts: meson-gxbb: Add P20x Wifi SDIO support")
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> index 4a96e0f6f926..5183c5ce90c6 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
> @@ -193,7 +193,7 @@
>  	vmmc-supply = <&vddao_3v3>;
>  	vqmmc-supply = <&vddio_boot>;
>  
> -	brcmf: bcrmf@1 {
> +	brcmf: brcmf@1 {

wifi@1

>  		reg = <1>;
>  		compatible = "brcm,bcm4329-fmac";
>  	};
> -- 
> 2.10.2
> 

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

#1565137 — Re: [PATCH 04/18] ARM64: dts: meson-gxbb-p20x: Fix Wifi node name

Am 23.01.2017 um 17:50 schrieb Rob Herring:
> On Fri, Jan 20, 2017 at 11:21:04PM +0100, Andreas Färber wrote:
>> bcrmf -> brcmf
>>
>> Fixes: ab3943fe57a2 ("ARM64: dts: meson-gxbb: Add P20x Wifi SDIO support")
>> Cc: Neil Armstrong <narmstrong@baylibre.com>
>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>> ---
>>  arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
>> index 4a96e0f6f926..5183c5ce90c6 100644
>> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
>> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi
>> @@ -193,7 +193,7 @@
>>  	vmmc-supply = <&vddao_3v3>;
>>  	vqmmc-supply = <&vddio_boot>;
>>  
>> -	brcmf: bcrmf@1 {
>> +	brcmf: brcmf@1 {
> 
> wifi@1

Good point.

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]

#1565239

Andreas Färber <afaerber@suse.de> writes:

> Hello,
>
> This series fixes several cosmetic issues, on top of v4.11/dt64 branch.
>
> Patches 3-5 rename a node, the rest should all be non-functional changes.

Can you respin patches 1-9 with minor comments addressed and
acks/reviews collected and I'll apply those.

> Patches 10-18 could be squashed if desired.

I'm less sure about these as I tend to agree with Rob that this is just
needless churn.  If you want to resend those separately, making your
arguments, I'll merge it if you convice the DT maintainers. :)

Kevin

[toc] | [prev] | [standalone]

Page 2 of 2 — ← Prev page 1 [2]

Back to top | Article view | linux.kernel

csiph-web