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-388-clearfog.dtsi | |
parent | 712032aa65ae19a613488f8ce956e575cc5e1486 (diff) | |
download | op-kernel-dev-fce54ee273ef3676541a254001021972797ee35d.zip op-kernel-dev-fce54ee273ef3676541a254001021972797ee35d.tar.gz |
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-388-clearfog.dtsi')
-rw-r--r-- | arch/arm/boot/dts/armada-388-clearfog.dtsi | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/arch/arm/boot/dts/armada-388-clearfog.dtsi b/arch/arm/boot/dts/armada-388-clearfog.dtsi index 770d4bf..7946400 100644 --- a/arch/arm/boot/dts/armada-388-clearfog.dtsi +++ b/arch/arm/boot/dts/armada-388-clearfog.dtsi @@ -217,31 +217,6 @@ status = "okay"; }; - pinctrl@18000 { - clearfog_i2c1_pins: i2c1-pins { - /* SFP, PCIe, mSATA, mikrobus */ - marvell,pins = "mpp26", "mpp27"; - marvell,function = "i2c1"; - }; - clearfog_sdhci_cd_pins: clearfog-sdhci-cd-pins { - marvell,pins = "mpp20"; - marvell,function = "gpio"; - }; - mikro_pins: mikro-pins { - /* int: mpp22 rst: mpp29 */ - marvell,pins = "mpp22", "mpp29"; - marvell,function = "gpio"; - }; - mikro_spi_pins: mikro-spi-pins { - marvell,pins = "mpp43"; - marvell,function = "spi1"; - }; - mikro_uart_pins: mikro-uart-pins { - marvell,pins = "mpp24", "mpp25"; - marvell,function = "ua1"; - }; - }; - sata@a8000 { /* pinctrl? */ status = "okay"; @@ -297,6 +272,31 @@ }; }; +&pinctrl { + clearfog_i2c1_pins: i2c1-pins { + /* SFP, PCIe, mSATA, mikrobus */ + marvell,pins = "mpp26", "mpp27"; + marvell,function = "i2c1"; + }; + clearfog_sdhci_cd_pins: clearfog-sdhci-cd-pins { + marvell,pins = "mpp20"; + marvell,function = "gpio"; + }; + mikro_pins: mikro-pins { + /* int: mpp22 rst: mpp29 */ + marvell,pins = "mpp22", "mpp29"; + marvell,function = "gpio"; + }; + mikro_spi_pins: mikro-spi-pins { + marvell,pins = "mpp43"; + marvell,function = "spi1"; + }; + mikro_uart_pins: mikro-uart-pins { + marvell,pins = "mpp24", "mpp25"; + marvell,function = "ua1"; + }; +}; + &spi1 { /* * Add SPI CS pins for clearfog: |