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

[cascardo/linux.git] / arch / arm / boot / dts / dra7-evm.dts

diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index d272cf1..bafcfac 100644 (file)
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -226,21 +226,6 @@
                >;
        };
 
-       qspi1_pins: pinmux_qspi1_pins {
-               pinctrl-single,pins = <
-                       DRA7XX_CORE_IOPAD(0x344c, PIN_INPUT | MUX_MODE1)  /* gpmc_a3.qspi1_cs2 */
-                       DRA7XX_CORE_IOPAD(0x3450, PIN_INPUT | MUX_MODE1)  /* gpmc_a4.qspi1_cs3 */
-                       DRA7XX_CORE_IOPAD(0x3474, PIN_INPUT | MUX_MODE1)  /* gpmc_a13.qspi1_rtclk */
-                       DRA7XX_CORE_IOPAD(0x3478, PIN_INPUT | MUX_MODE1)  /* gpmc_a14.qspi1_d3 */
-                       DRA7XX_CORE_IOPAD(0x347c, PIN_INPUT | MUX_MODE1)  /* gpmc_a15.qspi1_d2 */
-                       DRA7XX_CORE_IOPAD(0x3480, PIN_INPUT | MUX_MODE1) /* gpmc_a16.qspi1_d1 */
-                       DRA7XX_CORE_IOPAD(0x3484, PIN_INPUT | MUX_MODE1)  /* gpmc_a17.qspi1_d0 */
-                       DRA7XX_CORE_IOPAD(0x3488, PIN_INPUT | MUX_MODE1)  /* qpmc_a18.qspi1_sclk */
-                       DRA7XX_CORE_IOPAD(0x34b8, PIN_INPUT_PULLUP | MUX_MODE1)  /* gpmc_cs2.qspi1_cs0 */
-                       DRA7XX_CORE_IOPAD(0x34bc, PIN_INPUT_PULLUP | MUX_MODE1)  /* gpmc_cs3.qspi1_cs1 */
-               >;
-       };
-
        usb1_pins: pinmux_usb1_pins {
                 pinctrl-single,pins = <
                        DRA7XX_CORE_IOPAD(0x3680, PIN_INPUT_SLEW | MUX_MODE0) /* usb1_drvvbus */
@@ -431,7 +416,7 @@
                                        /* VDD_DSPEVE */
                                        regulator-name = "smps45";
                                        regulator-min-microvolt = < 850000>;
-                                       regulator-max-microvolt = <1150000>;
+                                       regulator-max-microvolt = <1250000>;
                                        regulator-always-on;
                                        regulator-boot-on;
                                };
@@ -449,7 +434,7 @@
                                        /* CORE_VDD */
                                        regulator-name = "smps7";
                                        regulator-min-microvolt = <850000>;
-                                       regulator-max-microvolt = <1060000>;
+                                       regulator-max-microvolt = <1150000>;
                                        regulator-always-on;
                                        regulator-boot-on;
                                };
@@ -556,7 +541,7 @@
        };
 
        pcf_lcd: gpio@20 {
-               compatible = "nxp,pcf8575";
+               compatible = "ti,pcf8575", "nxp,pcf8575";
                reg = <0x20>;
                gpio-controller;
                #gpio-cells = <2>;
@@ -567,7 +552,7 @@
        };
 
        pcf_gpio_21: gpio@21 {
-               compatible = "nxp,pcf8575";
+               compatible = "ti,pcf8575", "nxp,pcf8575";
                reg = <0x21>;
                lines-initial-states = <0x1408>;
                gpio-controller;
@@ -601,7 +586,7 @@
        clock-frequency = <400000>;
 
        pcf_hdmi: gpio@26 {
-               compatible = "nxp,pcf8575";
+               compatible = "ti,pcf8575", "nxp,pcf8575";
                reg = <0x26>;
                gpio-controller;
                #gpio-cells = <2>;
@@ -678,18 +663,14 @@
 
 &qspi {
        status = "okay";
-       pinctrl-names = "default";
-       pinctrl-0 = <&qspi1_pins>;
 
-       spi-max-frequency = <48000000>;
+       spi-max-frequency = <64000000>;
        m25p80@0 {
                compatible = "s25fl256s1";
-               spi-max-frequency = <48000000>;
+               spi-max-frequency = <64000000>;
                reg = <0>;
                spi-tx-bus-width = <1>;
                spi-rx-bus-width = <4>;
-               spi-cpol;
-               spi-cpha;
                #address-cells = <1>;
                #size-cells = <1>;