ARM: dts: aspeed: p10: Enable USB host ports

Ensure both controllers are enabled on, and add GPIO hog for USB power
control to set the USB power to always on.

Signed-off-by: Eddie James <eajames@linux.ibm.com>
Link: https://lore.kernel.org/r/20211208170641.13322-1-eajames@linux.ibm.com
Signed-off-by: Joel Stanley <joel@jms.id.au>

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
index f42e2d776ba8555d420005c556d3d609d1ef257f..3e9edc893f558de265f6137d50f5de16fda94adc 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
@@ -280,7 +280,7 @@
        /*L0-L7*/       "","","","","","","","",
        /*M0-M7*/       "","","","","","","","",
        /*N0-N7*/       "","","","","","","","",
-       /*O0-O7*/       "","","","","","","","",
+       /*O0-O7*/       "","","","usb-power","","","","",
        /*P0-P7*/       "","","","","led-pcieslot-power","","","",
        /*Q0-Q7*/       "","","regulator-standby-faulted","","","","","",
        /*R0-R7*/       "bmc-tpm-reset","power-chassis-control","power-chassis-good","","","I2C_FLASH_MICRO_N","","",
@@ -292,6 +292,12 @@
        /*X0-X7*/       "","","","","","","","",
        /*Y0-Y7*/       "","","","","","","","",
        /*Z0-Z7*/   "","","","","","","","";
+
+       usb_power {
+               gpio-hog;
+               gpios = <ASPEED_GPIO(O, 3) GPIO_ACTIVE_LOW>;
+               output-high;
+       };
 };
 
 &i2c0 {
@@ -2375,6 +2381,10 @@
        };
 };
 
+&ehci0 {
+       status = "okay";
+};
+
 &ehci1 {
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
index 866f32cdccea8b6e84178bcc94c29de099bc6e43..cb7d86a2862cfb6929a732b16d8e926a9ca4b036 100644 (file)
--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
@@ -275,6 +275,12 @@
                output-high;
                line-name = "I2C3_MUX_OE_N";
        };
+
+       usb_power {
+               gpio-hog;
+               gpios = <ASPEED_GPIO(O, 3) GPIO_ACTIVE_LOW>;
+               output-high;
+       };
 };
 
 &emmc_controller {