These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / vf610-twr.dts

diff --git a/kernel/arch/arm/boot/dts/vf610-twr.dts b/kernel/arch/arm/boot/dts/vf610-twr.dts
index f64fddc..5438ee4 100644 (file)
--- a/kernel/arch/arm/boot/dts/vf610-twr.dts
+++ b/kernel/arch/arm/boot/dts/vf610-twr.dts
@@ -221,7 +221,7 @@
                                VF610_PAD_PTC9__ENET_RMII1_MDC          0x30d2
                                VF610_PAD_PTC10__ENET_RMII1_MDIO        0x30d3
                                VF610_PAD_PTC11__ENET_RMII1_CRS         0x30d1
-                               VF610_PAD_PTC12__ENET_RMII_RXD1         0x30d1
+                               VF610_PAD_PTC12__ENET_RMII1_RXD1        0x30d1
                                VF610_PAD_PTC13__ENET_RMII1_RXD0        0x30d1
                                VF610_PAD_PTC14__ENET_RMII1_RXER        0x30d1
                                VF610_PAD_PTC15__ENET_RMII1_TXD1        0x30d2
@@ -237,6 +237,33 @@
                        >;
                };
 
+               pinctrl_nfc: nfcgrp {
+                       fsl,pins = <
+                               VF610_PAD_PTD31__NF_IO15        0x28df
+                               VF610_PAD_PTD30__NF_IO14        0x28df
+                               VF610_PAD_PTD29__NF_IO13        0x28df
+                               VF610_PAD_PTD28__NF_IO12        0x28df
+                               VF610_PAD_PTD27__NF_IO11        0x28df
+                               VF610_PAD_PTD26__NF_IO10        0x28df
+                               VF610_PAD_PTD25__NF_IO9         0x28df
+                               VF610_PAD_PTD24__NF_IO8         0x28df
+                               VF610_PAD_PTD23__NF_IO7         0x28df
+                               VF610_PAD_PTD22__NF_IO6         0x28df
+                               VF610_PAD_PTD21__NF_IO5         0x28df
+                               VF610_PAD_PTD20__NF_IO4         0x28df
+                               VF610_PAD_PTD19__NF_IO3         0x28df
+                               VF610_PAD_PTD18__NF_IO2         0x28df
+                               VF610_PAD_PTD17__NF_IO1         0x28df
+                               VF610_PAD_PTD16__NF_IO0         0x28df
+                               VF610_PAD_PTB24__NF_WE_B        0x28c2
+                               VF610_PAD_PTB25__NF_CE0_B       0x28c2
+                               VF610_PAD_PTB27__NF_RE_B        0x28c2
+                               VF610_PAD_PTC26__NF_RB_B        0x283d
+                               VF610_PAD_PTC27__NF_ALE         0x28c2
+                               VF610_PAD_PTC28__NF_CLE         0x28c2
+                       >;
+               };
+
                pinctrl_pwm0: pwm0grp {
                        fsl,pins = <
                                VF610_PAD_PTB0__FTM0_CH0                0x1582
@@ -274,6 +301,26 @@
        };
 };
 
+&nfc {
+       assigned-clocks = <&clks VF610_CLK_NFC>;
+       assigned-clock-rates = <33000000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_nfc>;
+       status = "okay";
+
+       nand@0 {
+               compatible = "fsl,vf610-nfc-nandcs";
+               reg = <0>;
+               #address-cells = <1>;
+               #size-cells = <1>;
+               nand-bus-width = <16>;
+               nand-ecc-mode = "hw";
+               nand-ecc-strength = <24>;
+               nand-ecc-step-size = <2048>;
+               nand-on-flash-bbt;
+       };
+};
+
 &pwm0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm0>;