Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / vf-colibri.dtsi

diff --git a/arch/arm/boot/dts/vf-colibri.dtsi b/arch/arm/boot/dts/vf-colibri.dtsi
index fda7f28101e1ca547acf8c765b6e7341842fb2e1..226a86ffd3c9c87da92cc6428237183bd393c635 100644 (file)
--- a/arch/arm/boot/dts/vf-colibri.dtsi
+++ b/arch/arm/boot/dts/vf-colibri.dtsi
@@ -40,6 +40,11 @@
  */
 
 / {
+       aliases {
+               ethernet0 = &fec1;
+               ethernet1 = &fec0;
+       };
+
        bl: backlight {
                compatible = "pwm-backlight";
                pinctrl-names = "default";
@@ -125,8 +130,6 @@
 };
 
 &nfc {
-       assigned-clocks = <&clks VF610_CLK_NFC>;
-       assigned-clock-rates = <33000000>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_nfc>;
        status = "okay";