Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1563950 > unrolled thread
| Started by | Andreas Färber <afaerber@suse.de> |
|---|---|
| First post | 2017-01-20 23:30 +0100 |
| Last post | 2017-01-23 19:50 +0100 |
| Articles | 20 on this page of 35 — 5 participants |
Back to article view | Back to linux.kernel
[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 1 of 2 [1] 2 Next page →
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 00/18] ARM64: meson: DT cleanups |
| Message-ID | <t1PR0-4BR-3@gated-at.bofh.it> |
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. Patches 10-18 could be squashed if desired. Regards, Andreas Cc: devicetree@vger.kernel.org Andreas Färber (18): Documentation: devicetree: amlogic: Reorder boards ARM64: dts: amlogic: Sort Makefile ARM64: dts: meson-gxbb-vega-s95: Fix Wifi node name ARM64: dts: meson-gxbb-p20x: Fix Wifi node name ARM64: dts: meson-gx-p23x-q20x: Fix Wifi node name ARM64: dts: meson-gxm-nexbox-a1: Drop UART comment ARM64: dts: meson-gxl-s905x: Comment typo fix ARM64: dts: meson-gxm: Drop trailing white line ARM64: dts: meson-gxbb-wetek-hub: Reference CVBS node by label ARM64: dts: meson-gxbb: Reorder nodes ARM64: dts: meson-gxbb-odroidc2: Reorder nodes ARM64: dts: meson-gxbb-vega-s95: Reorder nodes ARM64: dts: meson-gxbb-nexbox-a95x: Reorder nodes ARM64: dts: meson-gxbb-p20x: Reorder nodes ARM64: dts: meson-gxl: Reorder nodes ARM64: dts: meson-gxl-s905x-nexbox-a95x: Reorder nodes ARM64: dts: meson-gxm-nexbox-a1: Reorder nodes ARM64: dts: meson-gx-p23x-q20x: Reorder nodes Documentation/devicetree/bindings/arm/amlogic.txt | 19 ++++-- arch/arm64/boot/dts/amlogic/Makefile | 4 +- .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 26 ++++---- .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 28 ++++---- .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 52 +++++++-------- arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 58 ++++++++--------- .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 53 ++++++++------- .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 6 +- arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 76 +++++++++++----------- .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 28 ++++---- arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 40 ++++++------ .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 59 +++++++++-------- arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 1 - 14 files changed, 228 insertions(+), 224 deletions(-) -- 2.10.2
[toc] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 06/18] ARM64: dts: meson-gxm-nexbox-a1: Drop UART comment |
| Message-ID | <t1PR0-4BR-9@gated-at.bofh.it> |
| In reply to | #1563950 |
Product pictures show no DB9 connector, so this seems copy&paste.
Cc: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
index 5a337d339df1..439060652689 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
@@ -102,7 +102,6 @@
};
};
-/* This UART is brought out to the DB9 connector */
&uart_AO {
status = "okay";
pinctrl-0 = <&uart_ao_a_pins>;
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Neil Armstrong <narmstrong@baylibre.com> |
|---|---|
| Date | 2017-01-23 10:00 +0100 |
| Subject | Re: [PATCH 06/18] ARM64: dts: meson-gxm-nexbox-a1: Drop UART comment |
| Message-ID | <t2IDN-4em-39@gated-at.bofh.it> |
| In reply to | #1563951 |
On 01/20/2017 11:21 PM, Andreas Färber wrote:
> Product pictures show no DB9 connector, so this seems copy&paste.
>
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
> arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> index 5a337d339df1..439060652689 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> @@ -102,7 +102,6 @@
> };
> };
>
> -/* This UART is brought out to the DB9 connector */
> &uart_AO {
> status = "okay";
> pinctrl-0 = <&uart_ao_a_pins>;
>
Exact
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 15/18] ARM64: dts: meson-gxl: Reorder nodes |
| Message-ID | <t1PR0-4BR-7@gated-at.bofh.it> |
| In reply to | #1563950 |
Sort nodes referenced by label alphabetically.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 40 +++++++++++++++---------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
index bdf2305a2e25..afa74455e1de 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
@@ -120,6 +120,26 @@
};
};
+&hiubus {
+ clkc: clock-controller@0 {
+ compatible = "amlogic,gxl-clkc", "amlogic,gxbb-clkc";
+ #clock-cells = <1>;
+ reg = <0x0 0x0 0x0 0x3db>;
+ };
+};
+
+&i2c_A {
+ clocks = <&clkc CLKID_I2C>;
+};
+
+&i2c_B {
+ clocks = <&clkc CLKID_I2C>;
+};
+
+&i2c_C {
+ clocks = <&clkc CLKID_I2C>;
+};
+
&periphs {
pinctrl_periphs: pinctrl@4b0 {
compatible = "amlogic,meson-gxl-periphs-pinctrl";
@@ -320,26 +340,6 @@
};
};
-&hiubus {
- clkc: clock-controller@0 {
- compatible = "amlogic,gxl-clkc", "amlogic,gxbb-clkc";
- #clock-cells = <1>;
- reg = <0x0 0x0 0x0 0x3db>;
- };
-};
-
-&i2c_A {
- clocks = <&clkc CLKID_I2C>;
-};
-
-&i2c_B {
- clocks = <&clkc CLKID_I2C>;
-};
-
-&i2c_C {
- clocks = <&clkc CLKID_I2C>;
-};
-
&sd_emmc_a {
clocks = <&clkc CLKID_SD_EMMC_A>,
<&xtal>,
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 01/18] Documentation: devicetree: amlogic: Reorder boards |
| Message-ID | <t1PR0-4BR-11@gated-at.bofh.it> |
| In reply to | #1563950 |
Enforce groupment by SoCs and order alphabetically within the group
(with some exceptions). This should facilitate adding new boards.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
Documentation/devicetree/bindings/arm/amlogic.txt | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt
index c246cd2730d9..b03d23c9ea78 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.txt
+++ b/Documentation/devicetree/bindings/arm/amlogic.txt
@@ -29,23 +29,30 @@ Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:
Required root node property:
compatible: "amlogic,s912", "amlogic,meson-gxm";
-Board compatible values:
+Board compatible values (grouped by SoC):
+
- "geniatech,atv1200" (Meson6)
+
- "minix,neo-x8" (Meson8)
- - "tronfy,mxq" (Meson8b)
+
- "hardkernel,odroid-c1" (Meson8b)
+ - "tronfy,mxq" (Meson8b)
+
+ - "amlogic,p200" (Meson gxbb)
+ - "amlogic,p201" (Meson gxbb)
+ - "hardkernel,odroid-c2" (Meson gxbb)
+ - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)
- "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb)
- "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb)
- "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb)
- - "hardkernel,odroid-c2" (Meson gxbb)
- - "amlogic,p200" (Meson gxbb)
- - "amlogic,p201" (Meson gxbb)
- "wetek,hub" (Meson gxbb)
- "wetek,play2" (Meson gxbb)
+
- "amlogic,p212" (Meson gxl s905x)
+
- "amlogic,p230" (Meson gxl s905d)
- "amlogic,p231" (Meson gxl s905d)
+
- "amlogic,q200" (Meson gxm s912)
- "amlogic,q201" (Meson gxm s912)
- - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)
- "nexbox,a1" (Meson gxm s912)
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2017-01-23 17:50 +0100 |
| Subject | Re: [PATCH 01/18] Documentation: devicetree: amlogic: Reorder boards |
| Message-ID | <t2PYB-mQ-9@gated-at.bofh.it> |
| In reply to | #1563953 |
On Fri, Jan 20, 2017 at 11:21:01PM +0100, Andreas Färber wrote: > Enforce groupment by SoCs and order alphabetically within the group > (with some exceptions). This should facilitate adding new boards. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > Documentation/devicetree/bindings/arm/amlogic.txt | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt > index c246cd2730d9..b03d23c9ea78 100644 > --- a/Documentation/devicetree/bindings/arm/amlogic.txt > +++ b/Documentation/devicetree/bindings/arm/amlogic.txt > @@ -29,23 +29,30 @@ Boards with the Amlogic Meson GXM S912 SoC shall have the following properties: > Required root node property: > compatible: "amlogic,s912", "amlogic,meson-gxm"; > > -Board compatible values: > +Board compatible values (grouped by SoC): ...and alphabetical order within each SoC. > + > - "geniatech,atv1200" (Meson6) > + > - "minix,neo-x8" (Meson8) > - - "tronfy,mxq" (Meson8b) > + > - "hardkernel,odroid-c1" (Meson8b) > + - "tronfy,mxq" (Meson8b) > + > + - "amlogic,p200" (Meson gxbb) > + - "amlogic,p201" (Meson gxbb) > + - "hardkernel,odroid-c2" (Meson gxbb) > + - "nexbox,a95x" (Meson gxbb or Meson gxl s905x) > - "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb) > - "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb) > - "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb) > - - "hardkernel,odroid-c2" (Meson gxbb) > - - "amlogic,p200" (Meson gxbb) > - - "amlogic,p201" (Meson gxbb) > - "wetek,hub" (Meson gxbb) > - "wetek,play2" (Meson gxbb) > + > - "amlogic,p212" (Meson gxl s905x) > + > - "amlogic,p230" (Meson gxl s905d) > - "amlogic,p231" (Meson gxl s905d) > + > - "amlogic,q200" (Meson gxm s912) > - "amlogic,q201" (Meson gxm s912) > - - "nexbox,a95x" (Meson gxbb or Meson gxl s905x) > - "nexbox,a1" (Meson gxm s912) > -- > 2.10.2 >
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-23 19:40 +0100 |
| Subject | Re: [PATCH 01/18] Documentation: devicetree: amlogic: Reorder boards |
| Message-ID | <t2RH5-1v8-31@gated-at.bofh.it> |
| In reply to | #1565123 |
Am 23.01.2017 um 17:48 schrieb Rob Herring: > On Fri, Jan 20, 2017 at 11:21:01PM +0100, Andreas Färber wrote: >> Enforce groupment by SoCs and order alphabetically within the group >> (with some exceptions). This should facilitate adding new boards. >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> --- >> Documentation/devicetree/bindings/arm/amlogic.txt | 19 +++++++++++++------ >> 1 file changed, 13 insertions(+), 6 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt >> index c246cd2730d9..b03d23c9ea78 100644 >> --- a/Documentation/devicetree/bindings/arm/amlogic.txt >> +++ b/Documentation/devicetree/bindings/arm/amlogic.txt >> @@ -29,23 +29,30 @@ Boards with the Amlogic Meson GXM S912 SoC shall have the following properties: >> Required root node property: >> compatible: "amlogic,s912", "amlogic,meson-gxm"; >> >> -Board compatible values: >> +Board compatible values (grouped by SoC): > > ...and alphabetical order within each SoC. ...except for pro, meta, telos, which are in increasing feature set order - should we reorder them, or ignore but still write alphabetical? Regards, Andreas > >> + >> - "geniatech,atv1200" (Meson6) >> + >> - "minix,neo-x8" (Meson8) >> - - "tronfy,mxq" (Meson8b) >> + >> - "hardkernel,odroid-c1" (Meson8b) >> + - "tronfy,mxq" (Meson8b) >> + >> + - "amlogic,p200" (Meson gxbb) >> + - "amlogic,p201" (Meson gxbb) >> + - "hardkernel,odroid-c2" (Meson gxbb) >> + - "nexbox,a95x" (Meson gxbb or Meson gxl s905x) >> - "tronsmart,vega-s95-pro", "tronsmart,vega-s95" (Meson gxbb) >> - "tronsmart,vega-s95-meta", "tronsmart,vega-s95" (Meson gxbb) >> - "tronsmart,vega-s95-telos", "tronsmart,vega-s95" (Meson gxbb) >> - - "hardkernel,odroid-c2" (Meson gxbb) >> - - "amlogic,p200" (Meson gxbb) >> - - "amlogic,p201" (Meson gxbb) >> - "wetek,hub" (Meson gxbb) >> - "wetek,play2" (Meson gxbb) >> + >> - "amlogic,p212" (Meson gxl s905x) >> + >> - "amlogic,p230" (Meson gxl s905d) >> - "amlogic,p231" (Meson gxl s905d) >> + >> - "amlogic,q200" (Meson gxm s912) >> - "amlogic,q201" (Meson gxm s912) >> - - "nexbox,a95x" (Meson gxbb or Meson gxl s905x) >> - "nexbox,a1" (Meson gxm s912) >> -- >> 2.10.2 >> -- 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]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 16/18] ARM64: dts: meson-gxl-s905x-nexbox-a95x: Reorder nodes |
| Message-ID | <t1PR0-4BR-15@gated-at.bofh.it> |
| In reply to | #1563950 |
Sort nodes referenced by label alphabetically.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
.../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
index cea4a3eded9b..9e91f0809dcd 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
@@ -129,10 +129,10 @@
};
};
-&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>;
+ };
};
ðmac {
@@ -147,6 +147,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";
@@ -206,16 +214,8 @@
vqmmc-supply = <&vddio_boot>;
};
-&pwm_ef {
+&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>;
- };
};
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Neil Armstrong <narmstrong@baylibre.com> |
|---|---|
| Date | 2017-01-23 10:00 +0100 |
| Subject | Re: [PATCH 16/18] ARM64: dts: meson-gxl-s905x-nexbox-a95x: Reorder nodes |
| Message-ID | <t2IDM-4em-23@gated-at.bofh.it> |
| In reply to | #1563954 |
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>
> ---
> .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 28 +++++++++++-----------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
> index cea4a3eded9b..9e91f0809dcd 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts
> @@ -129,10 +129,10 @@
> };
> };
>
> -&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>;
> + };
> };
>
> ðmac {
> @@ -147,6 +147,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";
> @@ -206,16 +214,8 @@
> vqmmc-supply = <&vddio_boot>;
> };
>
> -&pwm_ef {
> +&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>;
> - };
> };
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 05/18] ARM64: dts: meson-gx-p23x-q20x: Fix Wifi node name |
| Message-ID | <t1PR0-4BR-25@gated-at.bofh.it> |
| In reply to | #1563950 |
bcrmf -> brcmf
Fixes: bb51b5350d2f ("ARM64: dts: Add support for Meson GXM")
Cc: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 7a078bef04cd..419c46cc64e4 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
@@ -133,7 +133,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]
| From | Neil Armstrong <narmstrong@baylibre.com> |
|---|---|
| Date | 2017-01-23 10:00 +0100 |
| Subject | Re: [PATCH 05/18] ARM64: dts: meson-gx-p23x-q20x: Fix Wifi node name |
| Message-ID | <t2IDL-4em-3@gated-at.bofh.it> |
| In reply to | #1563955 |
On 01/20/2017 11:21 PM, Andreas Färber wrote:
> bcrmf -> brcmf
>
> Fixes: bb51b5350d2f ("ARM64: dts: Add support for Meson GXM")
> Cc: Neil Armstrong <narmstrong@baylibre.com>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
> arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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 7a078bef04cd..419c46cc64e4 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi
> @@ -133,7 +133,7 @@
> vmmc-supply = <&vddao_3v3>;
> vqmmc-supply = <&vddio_boot>;
>
> - brcmf: bcrmf@1 {
> + brcmf: brcmf@1 {
> reg = <1>;
> compatible = "brcm,bcm4329-fmac";
> };
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 17/18] ARM64: dts: meson-gxm-nexbox-a1: Reorder nodes |
| Message-ID | <t1PR0-4BR-13@gated-at.bofh.it> |
| In reply to | #1563950 |
Sort nodes referenced by label alphabetically.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
.../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 58 +++++++++++-----------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
index 439060652689..804e8de80f37 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
@@ -102,10 +102,35 @@
};
};
-&uart_AO {
+&cvbs_vdac_port {
+ cvbs_vdac_out: endpoint {
+ remote-endpoint = <&cvbs_connector_in>;
+ };
+};
+
+ðmac {
status = "okay";
- pinctrl-0 = <&uart_ao_a_pins>;
+
+ pinctrl-0 = <ð_pins>;
pinctrl-names = "default";
+
+ /* Select external PHY by default */
+ phy-handle = <&external_phy>;
+
+ snps,reset-gpio = <&gpio GPIOZ_14 0>;
+ snps,reset-delays-us = <0 10000 1000000>;
+ snps,reset-active-low;
+
+ /* External PHY is in RGMII */
+ phy-mode = "rgmii";
+};
+
+&external_mdio {
+ external_phy: ethernet-phy@0 {
+ compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";
+ reg = <0>;
+ max-speed = <1000>;
+ };
};
&ir {
@@ -152,33 +177,8 @@
vqmmc-supply = <&vddio_boot>;
};
-ðmac {
+&uart_AO {
status = "okay";
-
- pinctrl-0 = <ð_pins>;
+ pinctrl-0 = <&uart_ao_a_pins>;
pinctrl-names = "default";
-
- /* Select external PHY by default */
- phy-handle = <&external_phy>;
-
- snps,reset-gpio = <&gpio GPIOZ_14 0>;
- snps,reset-delays-us = <0 10000 1000000>;
- snps,reset-active-low;
-
- /* External PHY is in RGMII */
- phy-mode = "rgmii";
-};
-
-&external_mdio {
- external_phy: ethernet-phy@0 {
- compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";
- reg = <0>;
- max-speed = <1000>;
- };
-};
-
-&cvbs_vdac_port {
- cvbs_vdac_out: endpoint {
- remote-endpoint = <&cvbs_connector_in>;
- };
};
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Neil Armstrong <narmstrong@baylibre.com> |
|---|---|
| Date | 2017-01-23 10:00 +0100 |
| Subject | Re: [PATCH 17/18] ARM64: dts: meson-gxm-nexbox-a1: Reorder nodes |
| Message-ID | <t2IDL-4em-9@gated-at.bofh.it> |
| In reply to | #1563956 |
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-gxm-nexbox-a1.dts | 58 +++++++++++-----------
> 1 file changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> index 439060652689..804e8de80f37 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts
> @@ -102,10 +102,35 @@
> };
> };
>
> -&uart_AO {
> +&cvbs_vdac_port {
> + cvbs_vdac_out: endpoint {
> + remote-endpoint = <&cvbs_connector_in>;
> + };
> +};
> +
> +ðmac {
> status = "okay";
> - pinctrl-0 = <&uart_ao_a_pins>;
> +
> + pinctrl-0 = <ð_pins>;
> pinctrl-names = "default";
> +
> + /* Select external PHY by default */
> + phy-handle = <&external_phy>;
> +
> + snps,reset-gpio = <&gpio GPIOZ_14 0>;
> + snps,reset-delays-us = <0 10000 1000000>;
> + snps,reset-active-low;
> +
> + /* External PHY is in RGMII */
> + phy-mode = "rgmii";
> +};
> +
> +&external_mdio {
> + external_phy: ethernet-phy@0 {
> + compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";
> + reg = <0>;
> + max-speed = <1000>;
> + };
> };
>
> &ir {
> @@ -152,33 +177,8 @@
> vqmmc-supply = <&vddio_boot>;
> };
>
> -ðmac {
> +&uart_AO {
> status = "okay";
> -
> - pinctrl-0 = <ð_pins>;
> + pinctrl-0 = <&uart_ao_a_pins>;
> pinctrl-names = "default";
> -
> - /* Select external PHY by default */
> - phy-handle = <&external_phy>;
> -
> - snps,reset-gpio = <&gpio GPIOZ_14 0>;
> - snps,reset-delays-us = <0 10000 1000000>;
> - snps,reset-active-low;
> -
> - /* External PHY is in RGMII */
> - phy-mode = "rgmii";
> -};
> -
> -&external_mdio {
> - external_phy: ethernet-phy@0 {
> - compatible = "ethernet-phy-id001c.c916", "ethernet-phy-ieee802.3-c22";
> - reg = <0>;
> - max-speed = <1000>;
> - };
> -};
> -
> -&cvbs_vdac_port {
> - cvbs_vdac_out: endpoint {
> - remote-endpoint = <&cvbs_connector_in>;
> - };
> };
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 13/18] ARM64: dts: meson-gxbb-nexbox-a95x: Reorder nodes |
| Message-ID | <t1PR0-4BR-17@gated-at.bofh.it> |
| In reply to | #1563950 |
Sort nodes referenced by label alphabetically.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
.../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 28 +++++++++++-----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
index 4cbd626a9e88..e642bfd5eec5 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
@@ -154,10 +154,10 @@
};
};
-&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>;
+ };
};
ðmac {
@@ -173,6 +173,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";
@@ -232,16 +240,8 @@
vqmmc-supply = <&vddio_boot>;
};
-&pwm_ef {
+&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>;
- };
};
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Neil Armstrong <narmstrong@baylibre.com> |
|---|---|
| Date | 2017-01-23 10:00 +0100 |
| Subject | Re: [PATCH 13/18] ARM64: dts: meson-gxbb-nexbox-a95x: Reorder nodes |
| Message-ID | <t2IDM-4em-19@gated-at.bofh.it> |
| In reply to | #1563957 |
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>
> ---
> .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 28 +++++++++++-----------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
> index 4cbd626a9e88..e642bfd5eec5 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
> +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts
> @@ -154,10 +154,10 @@
> };
> };
>
> -&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>;
> + };
> };
>
> ðmac {
> @@ -173,6 +173,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";
> @@ -232,16 +240,8 @@
> vqmmc-supply = <&vddio_boot>;
> };
>
> -&pwm_ef {
> +&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>;
> - };
> };
>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 08/18] ARM64: dts: meson-gxm: Drop trailing white line |
| Message-ID | <t1PR0-4BR-21@gated-at.bofh.it> |
| In reply to | #1563950 |
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
index 4c55665a253f..78a004d13236 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxm.dtsi
@@ -125,4 +125,3 @@
&vpu {
compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu";
};
-
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 12/18] ARM64: dts: meson-gxbb-vega-s95: Reorder nodes |
| Message-ID | <t1PR0-4BR-19@gated-at.bofh.it> |
| In reply to | #1563950 |
Sort nodes referenced by label alphabetically.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
.../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 51 +++++++++++-----------
1 file changed, 25 insertions(+), 26 deletions(-)
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 e688e8971a95..81024886d232 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi
@@ -111,11 +111,10 @@
};
};
-&uart_AO {
+ðmac {
status = "okay";
- pinctrl-0 = <&uart_ao_a_pins>;
+ pinctrl-0 = <ð_rgmii_pins>;
pinctrl-names = "default";
-
};
&ir {
@@ -124,27 +123,12 @@
pinctrl-names = "default";
};
-ðmac {
+&pwm_ef {
status = "okay";
- pinctrl-0 = <ð_rgmii_pins>;
+ pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default";
-};
-
-&usb0_phy {
- status = "okay";
- phy-supply = <&usb_vbus>;
-};
-
-&usb1_phy {
- status = "okay";
-};
-
-&usb0 {
- status = "okay";
-};
-
-&usb1 {
- status = "okay";
+ clocks = <&clkc CLKID_FCLK_DIV4>;
+ clock-names = "clkin0";
};
/* Wireless SDIO Module */
@@ -210,10 +194,25 @@
vmmcq-sumpply = <&vcc_1v8>;
};
-&pwm_ef {
+&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";
+};
+
+&usb0_phy {
+ status = "okay";
+ phy-supply = <&usb_vbus>;
+};
+
+&usb1_phy {
+ status = "okay";
+};
+
+&usb0 {
+ status = "okay";
+};
+
+&usb1 {
+ status = "okay";
};
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-20 23:30 +0100 |
| Subject | [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes |
| Message-ID | <t1PR0-4BR-27@gated-at.bofh.it> |
| In reply to | #1563950 |
Sort nodes referenced by label alphabetically.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 76 ++++++++++++++---------------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
index 39a774ad83ce..5c22c794ed95 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi
@@ -97,24 +97,6 @@
};
};
-&cbus {
- spifc: spi@8c80 {
- compatible = "amlogic,meson-gxbb-spifc";
- reg = <0x0 0x08c80 0x0 0x80>;
- #address-cells = <1>;
- #size-cells = <0>;
- clocks = <&clkc CLKID_SPI>;
- status = "disabled";
- };
-};
-
-ðmac {
- clocks = <&clkc CLKID_ETH>,
- <&clkc CLKID_FCLK_DIV2>,
- <&clkc CLKID_MPLL2>;
- clock-names = "stmmaceth", "clkin0", "clkin1";
-};
-
&aobus {
pinctrl_aobus: pinctrl@14 {
compatible = "amlogic,meson-gxbb-aobus-pinctrl";
@@ -230,6 +212,44 @@
};
};
+&cbus {
+ spifc: spi@8c80 {
+ compatible = "amlogic,meson-gxbb-spifc";
+ reg = <0x0 0x08c80 0x0 0x80>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ clocks = <&clkc CLKID_SPI>;
+ status = "disabled";
+ };
+};
+
+ðmac {
+ clocks = <&clkc CLKID_ETH>,
+ <&clkc CLKID_FCLK_DIV2>,
+ <&clkc CLKID_MPLL2>;
+ clock-names = "stmmaceth", "clkin0", "clkin1";
+};
+
+&hiubus {
+ clkc: clock-controller@0 {
+ compatible = "amlogic,gxbb-clkc";
+ #clock-cells = <1>;
+ reg = <0x0 0x0 0x0 0x3db>;
+ };
+};
+
+&i2c_A {
+ clocks = <&clkc CLKID_I2C>;
+};
+
+&i2c_B {
+ clocks = <&clkc CLKID_I2C>;
+};
+
+&i2c_C {
+ clocks = <&clkc CLKID_I2C>;
+};
+
&periphs {
pinctrl_periphs: pinctrl@4b0 {
compatible = "amlogic,meson-gxbb-periphs-pinctrl";
@@ -470,26 +490,6 @@
};
};
-&hiubus {
- clkc: clock-controller@0 {
- compatible = "amlogic,gxbb-clkc";
- #clock-cells = <1>;
- reg = <0x0 0x0 0x0 0x3db>;
- };
-};
-
-&i2c_A {
- clocks = <&clkc CLKID_I2C>;
-};
-
-&i2c_B {
- clocks = <&clkc CLKID_I2C>;
-};
-
-&i2c_C {
- clocks = <&clkc CLKID_I2C>;
-};
-
&sd_emmc_a {
clocks = <&clkc CLKID_SD_EMMC_A>,
<&xtal>,
--
2.10.2
[toc] | [prev] | [next] | [standalone]
| From | Rob Herring <robh@kernel.org> |
|---|---|
| Date | 2017-01-23 18:00 +0100 |
| Subject | Re: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes |
| Message-ID | <t2Q8h-qo-5@gated-at.bofh.it> |
| In reply to | #1563960 |
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. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > --- > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 76 ++++++++++++++--------------- > 1 file changed, 38 insertions(+), 38 deletions(-)
[toc] | [prev] | [next] | [standalone]
| From | Andreas Färber <afaerber@suse.de> |
|---|---|
| Date | 2017-01-23 18:00 +0100 |
| Subject | Re: [PATCH 10/18] ARM64: dts: meson-gxbb: Reorder nodes |
| Message-ID | <t2Q8h-qo-7@gated-at.bofh.it> |
| In reply to | #1565133 |
Am 23.01.2017 um 17:52 schrieb Rob Herring: > 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. We are constantly adding new nodes, so this avoids duplicates, mismerges and uncertainties of where things should be added. Thought that would be obvious, as I've been asked to do it elsewhere. It also helps with diff -u'ing .dts files to see actual differences. 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]
Page 1 of 2 [1] 2 Next page →
Back to top | Article view | linux.kernel
csiph-web