diff options
| author | Jon Mason <jon.mason@broadcom.com> | 2016-12-13 19:13:45 +0100 |
|---|---|---|
| committer | Florian Fainelli <f.fainelli@gmail.com> | 2017-01-19 02:18:17 +0100 |
| commit | 1fd2bb6ceb401d8adaaf6ddb02ae67811054f401 (patch) | |
| tree | 21b9b290b879d3e032ec30771e976a0f289b84be /arch/arm/boot/dts/bcm958525xmc.dts | |
| parent | ARM: dts: BCM53573: Specify USB ports of on-SoC controllers (diff) | |
| download | linux-1fd2bb6ceb401d8adaaf6ddb02ae67811054f401.tar.xz linux-1fd2bb6ceb401d8adaaf6ddb02ae67811054f401.zip | |
ARM: dts: NSP: DT Clean-ups
The QSPI entry was added out of the sequental order that the rest of the
DTSI file is in. Move it to make it fit in properly. Also, some other
entries have been added in a non-alphabetical order in the DTS files,
making them different from the other NSP DTS files. Move the relevant
peices to make it match. Finally, remove errant new lines.
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/arm/boot/dts/bcm958525xmc.dts')
| -rw-r--r-- | arch/arm/boot/dts/bcm958525xmc.dts | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts index 959cde911c3c..4492f55720d9 100644 --- a/arch/arm/boot/dts/bcm958525xmc.dts +++ b/arch/arm/boot/dts/bcm958525xmc.dts @@ -59,6 +59,8 @@ }; }; +/* XHCI, MMC, and Ethernet support needed to be complete */ + &i2c0 { temperature-sensor@4c { compatible = "adi,adt7461a"; @@ -115,12 +117,6 @@ }; }; -/* XHCI, MMC, and Ethernet support needed to be complete */ - -&uart0 { - status = "okay"; -}; - &pcie0 { status = "okay"; }; @@ -129,6 +125,15 @@ status = "okay"; }; +&pinctrl { + pinctrl-names = "default"; + pinctrl-0 = <&nand_sel>; + nand_sel: nand_sel { + function = "nand"; + groups = "nand_grp"; + }; +}; + &sata_phy0 { status = "okay"; }; @@ -141,11 +146,6 @@ status = "okay"; }; -&pinctrl { - pinctrl-names = "default"; - pinctrl-0 = <&nand_sel>; - nand_sel: nand_sel { - function = "nand"; - groups = "nand_grp"; - }; +&uart0 { + status = "okay"; }; |