Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / vf610-zii-dev.dtsi

diff --git a/arch/arm/boot/dts/vf610-zii-dev.dtsi b/arch/arm/boot/dts/vf610-zii-dev.dtsi
index 0507e6d..a1b4cce 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-dev.dtsi
+++ b/arch/arm/boot/dts/vf610-zii-dev.dtsi
@@ -177,6 +177,36 @@
        status = "okay";
 };
 
+&qspi0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_qspi0>;
+       status = "okay";
+
+       /*
+        * Attached MT25QL02 can go up to 90Mhz in DTR and 166 in STR
+        * modes, so, spi-max-frequency is limited to 90MHz
+        */
+       flash@0 {
+               compatible = "jedec,spi-nor";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               spi-max-frequency = <90000000>;
+               spi-rx-bus-width = <4>;
+               reg = <0>;
+               m25p,fast-read;
+       };
+
+       flash@2 {
+               compatible = "jedec,spi-nor";
+               #address-cells = <1>;
+               #size-cells = <1>;
+               spi-max-frequency = <90000000>;
+               spi-rx-bus-width = <4>;
+               reg = <2>;
+               m25p,fast-read;
+       };
+};
+
 &uart0 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart0>;
@@ -360,12 +390,18 @@
 
        pinctrl_qspi0: qspi0grp {
                fsl,pins = <
-                       VF610_PAD_PTD7__QSPI0_B_QSCK    0x31c3
-                       VF610_PAD_PTD8__QSPI0_B_CS0     0x31ff
-                       VF610_PAD_PTD9__QSPI0_B_DATA3   0x31c3
-                       VF610_PAD_PTD10__QSPI0_B_DATA2  0x31c3
-                       VF610_PAD_PTD11__QSPI0_B_DATA1  0x31c3
-                       VF610_PAD_PTD12__QSPI0_B_DATA0  0x31c3
+                       VF610_PAD_PTD0__QSPI0_A_QSCK    0x38c2
+                       VF610_PAD_PTD1__QSPI0_A_CS0     0x38c2
+                       VF610_PAD_PTD2__QSPI0_A_DATA3   0x38c3
+                       VF610_PAD_PTD3__QSPI0_A_DATA2   0x38c3
+                       VF610_PAD_PTD4__QSPI0_A_DATA1   0x38c3
+                       VF610_PAD_PTD5__QSPI0_A_DATA0   0x38c3
+                       VF610_PAD_PTD7__QSPI0_B_QSCK    0x38c2
+                       VF610_PAD_PTD8__QSPI0_B_CS0     0x38c2
+                       VF610_PAD_PTD9__QSPI0_B_DATA3   0x38c3
+                       VF610_PAD_PTD10__QSPI0_B_DATA2  0x38c3
+                       VF610_PAD_PTD11__QSPI0_B_DATA1  0x38c3
+                       VF610_PAD_PTD12__QSPI0_B_DATA0  0x38c3
                >;
        };
 
@@ -385,8 +421,8 @@
 
        pinctrl_uart2: uart2grp {
                fsl,pins = <
-                       VF610_PAD_PTD0__UART2_TX        0x21a2
-                       VF610_PAD_PTD1__UART2_RX        0x21a1
+                       VF610_PAD_PTD23__UART2_TX       0x21a2
+                       VF610_PAD_PTD22__UART2_RX       0x21a1
                >;
        };