Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

[platform/kernel/u-boot.git] / arch / arm / dts / uniphier-ld11-global.dts

diff --git a/arch/arm/dts/uniphier-ld11-global.dts b/arch/arm/dts/uniphier-ld11-global.dts
index 11be2aa..644ffb9 100644 (file)
--- a/arch/arm/dts/uniphier-ld11-global.dts
+++ b/arch/arm/dts/uniphier-ld11-global.dts
@@ -30,6 +30,7 @@
                i2c3 = &i2c3;
                i2c4 = &i2c4;
                i2c5 = &i2c5;
+               ethernet0 = ð
        };
 
        memory@80000000 {
@@ -54,12 +55,13 @@
        sound {
                compatible = "audio-graph-card";
                label = "UniPhier LD11";
-               widgets = "Headphone", "Headphone Jack";
+               widgets = "Headphone", "Headphones";
                dais = <&i2s_port2
                        &i2s_port3
                        &i2s_port4
                        &spdif_port0
                        &comp_spdif_port0>;
+               hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
        };
 
        spdif-out {
@@ -131,7 +133,7 @@
        };
 
        eeprom@50 {
-               compatible = "st,24c64", "atmel,24c64", "i2c-eeprom";
+               compatible = "st,24c64", "atmel,24c64";
                reg = <0x50>;
                pagesize = <32>;
        };
@@ -155,7 +157,7 @@
 };
 
 &mdio {
-       ethphy: ethphy@1 {
+       ethphy: ethernet-phy@1 {
                reg = <1>;
        };
 };