diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2023-06-08 12:41:29 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-04-16 16:52:39 +0100 |
| commit | 5a58e3ece3b772d9087701407310de3e9347c89d (patch) | |
| tree | 0f664726b2e495c2ab820fe0014c23abe3b62ab7 | |
| parent | e9fa694abdef273815d0fa8a6aaa7306601cc83f (diff) | |
ARM: dts: Clearfog: use USB3 and SATA labels to reference nodes
Use the labels created by commit f3d1f7597ec1 ("ARM: dts: armada-38x:
label USB and SATA nodes")
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | arch/arm/boot/dts/marvell/armada-388-clearfog.dts | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi | 34 |
2 files changed, 20 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts index ddfe667014b3..9274ee4e9dda 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dts +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dts @@ -13,15 +13,6 @@ compatible = "solidrun,clearfog-a1", "marvell,armada388", "marvell,armada385", "marvell,armada380"; - soc { - internal-regs { - usb3@f0000 { - /* CON2, nearest CPU, USB2 only. */ - status = "okay"; - }; - }; - }; - gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&rear_button_pins>; @@ -171,6 +162,11 @@ */ pinctrl-0 = <&spi1_pins &clearfog_spi1_cs_pins &mikro_spi_pins>; }; + +&usb3_0 { + /* CON2, nearest CPU, USB2 only. */ + status = "okay"; +}; /* +#define A38x_CUSTOMER_BOARD_1_MPP16_23 0x00400011 MPP18: gpio ? (pca9655 int?) diff --git a/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi b/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi index 78126de6eb96..606f9b4b6888 100644 --- a/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi +++ b/arch/arm/boot/dts/marvell/armada-388-clearfog.dtsi @@ -28,25 +28,6 @@ regulator-always-on; }; - soc { - internal-regs { - sata@a8000 { - /* pinctrl? */ - status = "okay"; - }; - - sata@e0000 { - /* pinctrl? */ - status = "okay"; - }; - - usb3@f8000 { - /* CON7 */ - status = "okay"; - }; - }; - }; - sfp: sfp { compatible = "sff,sfp"; i2c-bus = <&i2c1>; @@ -58,6 +39,16 @@ }; }; +&ahci0 { + /* pinctrl? */ + status = "okay"; +}; + +&ahci1 { + /* pinctrl? */ + status = "okay"; +}; + ð1 { /* ethernet@30000 */ bm,pool-long = <2>; @@ -244,3 +235,8 @@ /* CON3, nearest power. */ status = "okay"; }; + +&usb3_1 { + /* CON7 */ + status = "okay"; +}; |