diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-01-02 15:27:16 +0000 |
|---|---|---|
| committer | Gregory CLEMENT <gregory.clement@free-electrons.com> | 2017-01-05 13:59:14 +0100 |
| commit | fce54ee273ef3676541a254001021972797ee35d (patch) | |
| tree | 8dca666ba3b4dfb167881c1683c7f2bfd5574473 /arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi | |
| parent | 712032aa65ae19a613488f8ce956e575cc5e1486 (diff) | |
| download | linux-stable-fce54ee273ef3676541a254001021972797ee35d.tar.gz linux-stable-fce54ee273ef3676541a254001021972797ee35d.tar.bz2 linux-stable-fce54ee273ef3676541a254001021972797ee35d.zip | |
ARM: dts: armada388-clearfog: move device specific pinctrl nodes
Move the device specific pinctrl nodes over to use the label form to
reference the pin mux controller, rather than replicating the device
node path.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi index 44e40a160939..116f461d8f6a 100644 --- a/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi +++ b/arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi @@ -94,20 +94,6 @@ }; }; - pinctrl@18000 { - microsom_phy_clk_pins: microsom-phy-clk-pins { - marvell,pins = "mpp45"; - marvell,function = "ref"; - }; - /* Optional eMMC */ - microsom_sdhci_pins: microsom-sdhci-pins { - marvell,pins = "mpp21", "mpp28", - "mpp37", "mpp38", - "mpp39", "mpp40"; - marvell,function = "sd0"; - }; - }; - rtc@a3800 { /* * If the rtc doesn't work, run "date reset" @@ -134,6 +120,19 @@ }; }; +&pinctrl { + microsom_phy_clk_pins: microsom-phy-clk-pins { + marvell,pins = "mpp45"; + marvell,function = "ref"; + }; + /* Optional eMMC */ + microsom_sdhci_pins: microsom-sdhci-pins { + marvell,pins = "mpp21", "mpp28", "mpp37", + "mpp38", "mpp39", "mpp40"; + marvell,function = "sd0"; + }; +}; + &spi1 { /* The microsom has an optional W25Q32 on board, connected to CS0 */ pinctrl-0 = <&spi1_pins>; |