Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos4412-odroidx.dts

diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 3ea2a01..0e9d626 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -15,6 +15,10 @@
        model = "Hardkernel ODROID-X board based on Exynos4412";
        compatible = "hardkernel,odroid-x", "samsung,exynos4412", "samsung,exynos4";
 
+       aliases {
+               ethernet = &ethernet;
+       };
+
        memory@40000000 {
                device_type = "memory";
                reg = <0x40000000 0x3FF00000>;
@@ -36,19 +40,7 @@
                };
        };
 
-       gpio_keys {
-               pinctrl-0 = <&gpio_power_key &gpio_home_key>;
-
-               home_key {
-                       gpios = <&gpx2 2 GPIO_ACTIVE_HIGH>;
-                       linux,code = <KEY_HOME>;
-                       label = "home key";
-                       debounce-interval = <10>;
-                       wakeup-source;
-               };
-       };
-
-       regulator_p3v3 {
+       regulator-1 {
                compatible = "regulator-fixed";
                regulator-name = "p3v3_en";
                regulator-min-microvolt = <3300000>;
@@ -72,8 +64,46 @@
 };
 
 &ehci {
+       #address-cells = <1>;
+       #size-cells = <0>;
        phys = <&exynos_usbphy 2>;
        phy-names = "hsic0";
+
+       hub@2 {
+               compatible = "usb0424,3503";
+               reg = <2>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               hub@1 {
+                       compatible = "usb0424,9514";
+                       reg = <1>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       ethernet: usbether@1 {
+                               compatible = "usb0424,ec00";
+                               reg = <1>;
+                               local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
+                       };
+               };
+       };
+};
+
+&gpio_keys {
+       pinctrl-0 = <&gpio_power_key &gpio_home_key>;
+
+       home-key {
+               gpios = <&gpx2 2 GPIO_ACTIVE_HIGH>;
+               linux,code = <KEY_HOME>;
+               label = "home key";
+               debounce-interval = <10>;
+               wakeup-source;
+       };
+};
+
+&hsotg {
+       dr_mode = "peripheral";
 };
 
 &mshc_0 {
@@ -81,7 +111,7 @@
 };
 
 &pinctrl_1 {
-       gpio_home_key: home_key {
+       gpio_home_key: home-key {
                samsung,pins = "gpx2-2";
                samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
        };