On Sun, 14 Feb 2016 00:58:13 +0300
Antony Pavlov <antonynpavlov@xxxxxxxxx> wrote:
> Here are some Sascha Hauer's arguments for using aliases in the dts
> files:
>
> - using aliases reduces the number of indentations in dts files;
>
> - dts files become independent of the layout of the dtsi files
> (it becomes possible to introduce another bus {} hierarchy between
> a toplevel bus and the devices when you have to);
>
> - less chances for typos. if &i2c2 does not exist you get an error.
> If instead you duplicate the whole path in the dts file a typo
> in the path will just create another node.
>
> Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx>
> Cc: Alban Bedel <albeu@xxxxxxx>
> Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
> Cc: Rob Herring <robh+dt@xxxxxxxxxx>
> Cc: Frank Rowand <frowand.list@xxxxxxxxx>
> Cc: Grant Likely <grant.likely@xxxxxxxxxx>
> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
> Cc: linux-mips@xxxxxxxxxxxxxx
> Cc: devicetree@xxxxxxxxxxxxxxx
> ---
> arch/mips/boot/dts/qca/ar9132.dtsi | 6 +-
> arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 82 ++++++++++++------------
> 2 files changed, 44 insertions(+), 44 deletions(-)
>
> diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
> index 3c2ed9e..511cb4d 100644
> --- a/arch/mips/boot/dts/qca/ar9132.dtsi
> +++ b/arch/mips/boot/dts/qca/ar9132.dtsi
> @@ -52,7 +52,7 @@
> #qca,ddr-wb-channel-cells = <1>;
> };
>
> - uart@18020000 {
> + uart: uart@18020000 {
> compatible = "ns8250";
> reg = <0x18020000 0x20>;
> interrupts = <3>;
Please also add a label for the watchdog, then all devices would be
covered.
> @@ -125,7 +125,7 @@
> };
> };
>
> - usb@1b000100 {
> + usb: usb@1b000100 {
> compatible = "qca,ar7100-ehci", "generic-ehci";
> reg = <0x1b000100 0x100>;
>
> @@ -140,7 +140,7 @@
> status = "disabled";
> };
>
> - spi@1f000000 {
> + spi: spi@1f000000 {
> compatible = "qca,ar9132-spi", "qca,ar7100-spi";
> reg = <0x1f000000 0x10>;
>
> diff --git a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> index c3069c3..9528ebd 100644
> --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> @@ -22,51 +22,10 @@
>
> ahb {
> apb {
> - uart@18020000 {
> - status = "okay";
> - };
> -
> pll-controller@18050000 {
> clocks = <&extosc>;
> };
> };
Better use a reference for the PLL clock too.
> -
> - usb@1b000100 {
> - status = "okay";
> - };
> -
> - spi@1f000000 {
> - status = "okay";
> - num-cs = <1>;
> -
> - flash@0 {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - compatible = "s25sl064a";
> - reg = <0>;
> - spi-max-frequency = <25000000>;
> -
> - partition@0 {
> - label = "u-boot";
> - reg = <0x000000 0x020000>;
> - };
> -
> - partition@1 {
> - label = "firmware";
> - reg = <0x020000 0x7D0000>;
> - };
> -
> - partition@2 {
> - label = "art";
> - reg = <0x7F0000 0x010000>;
> - read-only;
> - };
> - };
> - };
> - };
> -
> - usb-phy {
> - status = "okay";
> };
>
> gpio-keys {
> @@ -114,3 +73,44 @@
> };
> };
> };
> +
> +&uart {
> + status = "okay";
> +};
> +
> +&usb {
> + status = "okay";
> +};
> +
> +&usb_phy {
> + status = "okay";
> +};
> +
> +&spi {
> + status = "okay";
> + num-cs = <1>;
> +
> + flash@0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "s25sl064a";
> + reg = <0>;
> + spi-max-frequency = <25000000>;
> +
> + partition@0 {
> + label = "u-boot";
> + reg = <0x000000 0x020000>;
> + };
> +
> + partition@1 {
> + label = "firmware";
> + reg = <0x020000 0x7D0000>;
> + };
> +
> + partition@2 {
> + label = "art";
> + reg = <0x7F0000 0x010000>;
> + read-only;
> + };
Looses partitions like this are now deprecated, we could take the
opportunity to move to the new scheme. We just have to put all the
"partition" nodes under a "partitions" node with a proper compatible and
#address-cells and #size-cells.
Alban
