Merge tag 'u-boot-rockchip-20200522' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / arm / dts / am437x-sk-evm.dts

diff --git a/arch/arm/dts/am437x-sk-evm.dts b/arch/arm/dts/am437x-sk-evm.dts
index 89feaf3eb7181857bb38208e8f681be81aed8c12..66a3bd1dfa1bb75c10fa78ad6a2c4c4cb1d4b3c0 100644 (file)
--- a/arch/arm/dts/am437x-sk-evm.dts
+++ b/arch/arm/dts/am437x-sk-evm.dts
@@ -26,6 +26,7 @@
 
        chosen {
                stdout-path = &uart0;
+               tick-timer = &timer2;
        };
 
        backlight {
@@ -535,7 +536,7 @@
 
        vmmc-supply = <&dcdc4>;
        bus-width = <4>;
-       cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
+       cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
 };
 
 &usb2_phy1 {
@@ -567,7 +568,7 @@
 
        spi-max-frequency = <48000000>;
        m25p80@0 {
-               compatible = "mx66l51235l","spi-flash";
+               compatible = "mx66l51235l","jedec,spi-nor";
                spi-max-frequency = <48000000>;
                reg = <0>;
                spi-cpol;
@@ -625,16 +626,24 @@
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
        status = "okay";
+
+       ethphy0: ethernet-phy@4 {
+               reg = <4>;
+       };
+
+       ethphy1: ethernet-phy@5 {
+               reg = <5>;
+       };
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <4>;
+       phy-handle = <&ethphy0>;
        phy-mode = "rgmii";
        dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <5>;
+       phy-handle = <&ethphy1>;
        phy-mode = "rgmii";
        dual_emac_res_vlan = <2>;
 };