* [PATCH 0/2] arm64: dts: meson: g12a board node order
@ 2019-05-10 15:53 Jerome Brunet
2019-05-10 15:53 ` [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes Jerome Brunet
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Jerome Brunet @ 2019-05-10 15:53 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-amlogic, devicetree, linux-kernel, Jerome Brunet
The order of the nodes in the u200 and sei510 is bit fancy.
Order nodes by address, then node name, then aliases.
This makes rebasing is little less painful
Jerome Brunet (2):
arm64: dts: meson: sei510: consistently order nodes
arm64: dts: meson: u200: consistently order nodes
.../boot/dts/amlogic/meson-g12a-sei510.dts | 92 +++++++++----------
.../boot/dts/amlogic/meson-g12a-u200.dts | 50 +++++-----
2 files changed, 72 insertions(+), 70 deletions(-)
--
2.20.1
_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes 2019-05-10 15:53 [PATCH 0/2] arm64: dts: meson: g12a board node order Jerome Brunet @ 2019-05-10 15:53 ` Jerome Brunet 2019-05-10 21:43 ` Kevin Hilman 2019-05-10 15:53 ` [PATCH 2/2] arm64: dts: meson: u200: " Jerome Brunet 2019-05-10 21:46 ` [PATCH 0/2] arm64: dts: meson: g12a board node order Kevin Hilman 2 siblings, 1 reply; 8+ messages in thread From: Jerome Brunet @ 2019-05-10 15:53 UTC (permalink / raw) To: Kevin Hilman; +Cc: linux-amlogic, devicetree, linux-kernel, Jerome Brunet Like order boards, order nodes by address then node names then aliases. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- .../boot/dts/amlogic/meson-g12a-sei510.dts | 92 +++++++++---------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts index 34b40587e5ef..61fb30047d7f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts @@ -14,10 +14,6 @@ compatible = "seirobotics,sei510", "amlogic,g12a"; model = "SEI Robotics SEI510"; - aliases { - serial0 = &uart_AO; - }; - adc_keys { compatible = "adc-keys"; io-channels = <&saradc 0>; @@ -31,13 +27,8 @@ }; }; - ao_5v: regulator-ao_5v { - compatible = "regulator-fixed"; - regulator-name = "AO_5V"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&dc_in>; - regulator-always-on; + aliases { + serial0 = &uart_AO; }; chosen { @@ -54,23 +45,6 @@ }; }; - dc_in: regulator-dc_in { - compatible = "regulator-fixed"; - regulator-name = "DC_IN"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - regulator-always-on; - }; - - emmc_1v8: regulator-emmc_1v8 { - compatible = "regulator-fixed"; - regulator-name = "EMMC_1V8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&vddao_3v3>; - regulator-always-on; - }; - hdmi-connector { compatible = "hdmi-connector"; type = "a"; @@ -87,12 +61,30 @@ reg = <0x0 0x0 0x0 0x40000000>; }; - reserved-memory { - /* TEE Reserved Memory */ - bl32_reserved: bl32@5000000 { - reg = <0x0 0x05300000 0x0 0x2000000>; - no-map; - }; + ao_5v: regulator-ao_5v { + compatible = "regulator-fixed"; + regulator-name = "AO_5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&dc_in>; + regulator-always-on; + }; + + dc_in: regulator-dc_in { + compatible = "regulator-fixed"; + regulator-name = "DC_IN"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + }; + + emmc_1v8: regulator-emmc_1v8 { + compatible = "regulator-fixed"; + regulator-name = "EMMC_1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; }; vddao_3v3: regulator-vddao_3v3 { @@ -122,6 +114,14 @@ vin-supply = <&vddao_3v3>; regulator-always-on; }; + + reserved-memory { + /* TEE Reserved Memory */ + bl32_reserved: bl32@5000000 { + reg = <0x0 0x05300000 0x0 0x2000000>; + no-map; + }; + }; }; &cec_AO { @@ -144,6 +144,18 @@ }; }; +&hdmi_tx { + status = "okay"; + pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; + pinctrl-names = "default"; +}; + +&hdmi_tx_tmds_port { + hdmi_tx_tmds_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; +}; + &saradc { status = "okay"; vref-supply = <&vddio_ao1v8>; @@ -161,18 +173,6 @@ }; }; -&hdmi_tx { - status = "okay"; - pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; - pinctrl-names = "default"; -}; - -&hdmi_tx_tmds_port { - hdmi_tx_tmds_out: endpoint { - remote-endpoint = <&hdmi_connector_in>; - }; -}; - &uart_AO { status = "okay"; pinctrl-0 = <&uart_ao_a_pins>; -- 2.20.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes 2019-05-10 15:53 ` [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes Jerome Brunet @ 2019-05-10 21:43 ` Kevin Hilman 2019-05-11 15:52 ` Jerome Brunet 0 siblings, 1 reply; 8+ messages in thread From: Kevin Hilman @ 2019-05-10 21:43 UTC (permalink / raw) To: Jerome Brunet; +Cc: linux-amlogic, devicetree, linux-kernel, Jerome Brunet Jerome Brunet <jbrunet@baylibre.com> writes: > Like order boards, order nodes by address then node names then aliases. > > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > --- > .../boot/dts/amlogic/meson-g12a-sei510.dts | 92 +++++++++---------- > 1 file changed, 46 insertions(+), 46 deletions(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts > index 34b40587e5ef..61fb30047d7f 100644 > --- a/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts > +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts > @@ -14,10 +14,6 @@ > compatible = "seirobotics,sei510", "amlogic,g12a"; > model = "SEI Robotics SEI510"; > > - aliases { > - serial0 = &uart_AO; > - }; > - > adc_keys { > compatible = "adc-keys"; > io-channels = <&saradc 0>; > @@ -31,13 +27,8 @@ > }; > }; > > - ao_5v: regulator-ao_5v { > - compatible = "regulator-fixed"; > - regulator-name = "AO_5V"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - vin-supply = <&dc_in>; > - regulator-always-on; > + aliases { > + serial0 = &uart_AO; > }; minor nit: I kind of like "aliases" and "chosen" at the top since they are kind of special nodes, but honestly, I can't think of a really good reason other than personal preference, so keeping things sorted as you've done here is probably better. Kevin _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes 2019-05-10 21:43 ` Kevin Hilman @ 2019-05-11 15:52 ` Jerome Brunet 2019-05-13 7:41 ` Neil Armstrong 0 siblings, 1 reply; 8+ messages in thread From: Jerome Brunet @ 2019-05-11 15:52 UTC (permalink / raw) To: Kevin Hilman; +Cc: linux-amlogic, linux-kernel, devicetree On Fri, 2019-05-10 at 14:43 -0700, Kevin Hilman wrote: > minor nit: I kind of like "aliases" and "chosen" at the top since they > are kind of special nodes, but honestly, I can't think of a really good > reason other than personal preference, so keeping things sorted as > you've done here is probably better. > You thought the same, then thought maybe memory was important too. But going down that path, you end up sorting by feeling. It is going to be difficult to all agree on which nodes are special. In the end, we just want/need something that is easy to respect and verify. > Kevin _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes 2019-05-11 15:52 ` Jerome Brunet @ 2019-05-13 7:41 ` Neil Armstrong 2019-05-13 23:40 ` Kevin Hilman 0 siblings, 1 reply; 8+ messages in thread From: Neil Armstrong @ 2019-05-13 7:41 UTC (permalink / raw) To: Jerome Brunet, Kevin Hilman; +Cc: linux-amlogic, linux-kernel, devicetree On 11/05/2019 17:52, Jerome Brunet wrote: > On Fri, 2019-05-10 at 14:43 -0700, Kevin Hilman wrote: >> minor nit: I kind of like "aliases" and "chosen" at the top since they >> are kind of special nodes, but honestly, I can't think of a really good >> reason other than personal preference, so keeping things sorted as >> you've done here is probably better. >> > > You thought the same, then thought maybe memory was important too. But going > down that path, you end up sorting by feeling. It is going to be difficult > to all agree on which nodes are special. > > In the end, we just want/need something that is easy to respect and verify. I think it would be better to have the same layout for aliases and memory over all the amlogic DTS, it's common over all socs to have these nodes on top. Neil > >> Kevin > > > > _______________________________________________ > linux-amlogic mailing list > linux-amlogic@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-amlogic > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes 2019-05-13 7:41 ` Neil Armstrong @ 2019-05-13 23:40 ` Kevin Hilman 0 siblings, 0 replies; 8+ messages in thread From: Kevin Hilman @ 2019-05-13 23:40 UTC (permalink / raw) To: Neil Armstrong, Jerome Brunet; +Cc: linux-amlogic, linux-kernel, devicetree Neil Armstrong <narmstrong@baylibre.com> writes: > On 11/05/2019 17:52, Jerome Brunet wrote: >> On Fri, 2019-05-10 at 14:43 -0700, Kevin Hilman wrote: >>> minor nit: I kind of like "aliases" and "chosen" at the top since they >>> are kind of special nodes, but honestly, I can't think of a really good >>> reason other than personal preference, so keeping things sorted as >>> you've done here is probably better. >>> >> >> You thought the same, then thought maybe memory was important too. But going >> down that path, you end up sorting by feeling. It is going to be difficult >> to all agree on which nodes are special. >> >> In the end, we just want/need something that is easy to respect and verify. > > I think it would be better to have the same layout for aliases and memory over > all the amlogic DTS, it's common over all socs to have these nodes on top. aliases, chosen, memory and reserved-memory are ones that are typically on the top for convience sake, but looking around we have not been terribly consistent there either. At this point, to continue the tradition, I'm not going to be too picky about enforcing "standards" that are loosely defined (or undefined) and will generally accept cleanups that are moving us towards consistency and ease of rebasing. Kevin _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/2] arm64: dts: meson: u200: consistently order nodes 2019-05-10 15:53 [PATCH 0/2] arm64: dts: meson: g12a board node order Jerome Brunet 2019-05-10 15:53 ` [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes Jerome Brunet @ 2019-05-10 15:53 ` Jerome Brunet 2019-05-10 21:46 ` [PATCH 0/2] arm64: dts: meson: g12a board node order Kevin Hilman 2 siblings, 0 replies; 8+ messages in thread From: Jerome Brunet @ 2019-05-10 15:53 UTC (permalink / raw) To: Kevin Hilman; +Cc: linux-amlogic, devicetree, linux-kernel, Jerome Brunet Like order boards, order nodes by address then node names then aliases. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- .../boot/dts/amlogic/meson-g12a-u200.dts | 50 ++++++++++--------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts index e91201809abf..7cc3e2d6a4f1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts @@ -16,13 +16,10 @@ aliases { serial0 = &uart_AO; }; + chosen { stdout-path = "serial0:115200n8"; }; - memory@0 { - device_type = "memory"; - reg = <0x0 0x0 0x0 0x40000000>; - }; cvbs-connector { compatible = "composite-video-connector"; @@ -34,15 +31,6 @@ }; }; - flash_1v8: regulator-flash_1v8 { - compatible = "regulator-fixed"; - regulator-name = "FLASH_1V8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&vcc_3v3>; - regulator-always-on; - }; - hdmi-connector { compatible = "hdmi-connector"; type = "a"; @@ -54,6 +42,20 @@ }; }; + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x40000000>; + }; + + flash_1v8: regulator-flash_1v8 { + compatible = "regulator-fixed"; + regulator-name = "FLASH_1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vcc_3v3>; + regulator-always-on; + }; + main_12v: regulator-main_12v { compatible = "regulator-fixed"; regulator-name = "12V"; @@ -62,6 +64,17 @@ regulator-always-on; }; + usb_pwr_en: regulator-usb_pwr_en { + compatible = "regulator-fixed"; + regulator-name = "USB_PWR_EN"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc_5v>; + + gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>; + enable-active-high; + }; + vcc_1v8: regulator-vcc_1v8 { compatible = "regulator-fixed"; regulator-name = "VCC_1V8"; @@ -92,17 +105,6 @@ enable-active-high; }; - usb_pwr_en: regulator-usb_pwr_en { - compatible = "regulator-fixed"; - regulator-name = "USB_PWR_EN"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc_5v>; - - gpio = <&gpio GPIOH_6 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - vddao_1v8: regulator-vddao_1v8 { compatible = "regulator-fixed"; regulator-name = "VDDAO_1V8"; -- 2.20.1 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/2] arm64: dts: meson: g12a board node order 2019-05-10 15:53 [PATCH 0/2] arm64: dts: meson: g12a board node order Jerome Brunet 2019-05-10 15:53 ` [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes Jerome Brunet 2019-05-10 15:53 ` [PATCH 2/2] arm64: dts: meson: u200: " Jerome Brunet @ 2019-05-10 21:46 ` Kevin Hilman 2 siblings, 0 replies; 8+ messages in thread From: Kevin Hilman @ 2019-05-10 21:46 UTC (permalink / raw) To: Jerome Brunet; +Cc: linux-amlogic, devicetree, linux-kernel, Jerome Brunet Jerome Brunet <jbrunet@baylibre.com> writes: > The order of the nodes in the u200 and sei510 is bit fancy. > Order nodes by address, then node name, then aliases. > > This makes rebasing is little less painful Fully agree. Thanks for the cleanup. Queued for v5.3 (branch: v5.3/dt64) Kevin _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-05-13 23:41 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-10 15:53 [PATCH 0/2] arm64: dts: meson: g12a board node order Jerome Brunet 2019-05-10 15:53 ` [PATCH 1/2] arm64: dts: meson: sei510: consistently order nodes Jerome Brunet 2019-05-10 21:43 ` Kevin Hilman 2019-05-11 15:52 ` Jerome Brunet 2019-05-13 7:41 ` Neil Armstrong 2019-05-13 23:40 ` Kevin Hilman 2019-05-10 15:53 ` [PATCH 2/2] arm64: dts: meson: u200: " Jerome Brunet 2019-05-10 21:46 ` [PATCH 0/2] arm64: dts: meson: g12a board node order Kevin Hilman
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).