On Sat, 23 Jan 2016 23:17:23 +0300
Antony Pavlov <antonynpavlov@xxxxxxxxx> wrote:
I personally prefer the version without aliases :) Is there any
guidelines on this?
Alban
> Signed-off-by: Antony Pavlov <antonynpavlov@xxxxxxxxx>
> Cc: Alban Bedel <albeu@xxxxxxx>
> Cc: linux-mips@xxxxxxxxxxxxxx
> Cc: devicetree@xxxxxxxxxxxxxxx
> ---
> arch/mips/boot/dts/qca/ar9132.dtsi | 4 +-
> arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 70 +++++++++++-------------
> 2 files changed, 35 insertions(+), 39 deletions(-)
>
> diff --git a/arch/mips/boot/dts/qca/ar9132.dtsi b/arch/mips/boot/dts/qca/ar9132.dtsi
> index cd1602f..a14f6f2 100644
> --- a/arch/mips/boot/dts/qca/ar9132.dtsi
> +++ b/arch/mips/boot/dts/qca/ar9132.dtsi
> @@ -61,7 +61,7 @@
> #qca,ddr-wb-channel-cells = <1>;
> };
>
> - uart@18020000 {
> + uart: uart@18020000 {
> compatible = "ns8250";
> reg = <0x18020000 0x20>;
> interrupts = <3>;
> @@ -134,7 +134,7 @@
> };
> };
>
> - 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 9618105..f22c22c 100644
> --- a/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> +++ b/arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts
> @@ -14,43 +14,6 @@
> reg = <0x0 0x2000000>;
> };
>
> - ahb {
> - apb {
> - uart@18020000 {
> - 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;
> - };
> - };
> - };
> - };
> -
> gpio-keys {
> compatible = "gpio-keys-polled";
> #address-cells = <1>;
> @@ -100,3 +63,36 @@
> &extosc {
> clock-frequency = <40000000>;
> };
> +
> +&uart {
> + 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;
> + };
> + };
> +};
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
