Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-block.git] / arch / arm / boot / dts / am335x-pcm-953.dtsi

diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi
index d774bf76720c5596aa6b909990af721b86ef36aa..9bfa032bcada76248c618499024f0656f21f5430 100644 (file)
--- a/arch/arm/boot/dts/am335x-pcm-953.dtsi
+++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi
@@ -36,15 +36,13 @@
                pinctrl-names = "default";
                pinctrl-0 = <&user_leds_pins>;
 
-               green {
-                       label = "green:user";
+               user-led0 {
                        gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
                        linux,default-trigger = "gpio";
                        default-state = "on";
                };
 
-               yellow {
-                       label = "yellow:user";
+               user-led1 {
                        gpios = <&gpio1 31 GPIO_ACTIVE_LOW>;
                        linux,default-trigger = "gpio";
                        default-state = "on";
@@ -135,22 +133,6 @@
 &davinci_mdio {
        phy1: ethernet-phy@2 {
                reg = <2>;
-
-               /* Register 260 (104h) – RGMII Clock and Control Pad Skew */
-               rxc-skew-ps = <1400>;
-               rxdv-skew-ps = <0>;
-               txc-skew-ps = <1400>;
-               txen-skew-ps = <0>;
-               /* Register 261 (105h) – RGMII RX Data Pad Skew */
-               rxd3-skew-ps = <0>;
-               rxd2-skew-ps = <0>;
-               rxd1-skew-ps = <0>;
-               rxd0-skew-ps = <0>;
-               /* Register 262 (106h) – RGMII TX Data Pad Skew */
-               txd3-skew-ps = <0>;
-               txd2-skew-ps = <0>;
-               txd1-skew-ps = <0>;
-               txd0-skew-ps = <0>;
        };
 };