Merge tag 'drm-next-2020-12-24' of git://anongit.freedesktop.org/drm/drm

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos5410-odroidxu.dts

diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts
index 75b4150..949c072 100644 (file)
--- a/arch/arm/boot/dts/exynos5410-odroidxu.dts
+++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -19,6 +19,10 @@
        model = "Hardkernel Odroid XU";
        compatible = "hardkernel,odroid-xu", "samsung,exynos5410", "samsung,exynos5";
 
+       aliases {
+               ethernet = &ethernet;
+       };
+
        memory@40000000 {
                device_type = "memory";
                reg = <0x40000000 0x7ea00000>;
@@ -327,6 +331,8 @@
                                regulator-name = "vddq_lcd";
                                regulator-min-microvolt = <1800000>;
                                regulator-max-microvolt = <1800000>;
+                               /* Supplies also GPK and GPJ */
+                               regulator-always-on;
                        };
 
                        ldo8_reg: LDO8 {
@@ -498,7 +504,7 @@
 
 &i2c_1 {
        status = "okay";
-       max98090: max98090@10 {
+       max98090: audio-codec@10 {
                compatible = "maxim,max98090";
                reg = <0x10>;
                interrupt-parent = <&gpj3>;
@@ -636,12 +642,22 @@
        vtmu-supply = <&ldo10_reg>;
 };
 
+&usb3_0_oc {
+       /* External pull up */
+       samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+};
+
+&usb3_1_oc {
+       /* External pull up */
+       samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
+};
+
 &usbdrd_dwc3_0 {
-       dr_mode = "host";
+       dr_mode = "peripheral";
 };
 
 &usbdrd_dwc3_1 {
-       dr_mode = "peripheral";
+       dr_mode = "host";
 };
 
 &usbdrd3_0 {
@@ -653,3 +669,14 @@
        vdd33-supply = <&ldo12_reg>;
        vdd10-supply = <&ldo15_reg>;
 };
+
+&usbhost2 {
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       ethernet: usbether@2 {
+               compatible = "usb0424,9730";
+               reg = <2>;
+               local-mac-address = [00 00 00 00 00 00]; /* Filled in by a bootloader */
+       };
+};