Merge tag 'omap-for-v4.5/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Two omap fixes for omaps against v4.5-rc5:

- Yet another fix for n900 onenand to avoid corruption. This time to
  fix the issue of mounting onenand back and forth between the original
  maemo kernel and mainline Linux kernel. And it also seems there will
  be two more fixes coming via the MTD tree as issues were discovered
  also in the onenand driver during testing.

- Revert tps65217 regulator clean up as it breaks MMC for am335x
  variants. The proper way to clean this up is just to rename the
  tps65217.dtsi file into tps65217-am335x.dtsi as a similar setup
  is used on many am335x boards.

* tag 'omap-for-v4.5/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix onenand initialization to avoid filesystem corruption
  Revert "regulator: tps65217: remove tps65217.dtsi file"

Signed-off-by: Olof Johansson <olof@lixom.net>

7 files changed, 70 insertions, 61 deletions

diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index f3db13d2d90e..0cc150b87b86 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -285,8 +285,10 @@
         };
 };
 
+
+/include/ "tps65217.dtsi"
+
 &tps {
-        compatible = "ti,tps65217";
         /*
          * Configure pmic to enter OFF-state instead of SLEEP-state ("RTC-only
          * mode") at poweroff.  Most BeagleBone versions do not support RTC-only
@@ -307,17 +309,12 @@
         ti,pmic-shutdown-controller;
 
         regulators {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
                 dcdc1_reg: regulator@0 {
-                        reg = <0>;
                         regulator-name = "vdds_dpr";
                         regulator-always-on;
                 };
 
                 dcdc2_reg: regulator@1 {
-                        reg = <1>;
                         /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
                         regulator-name = "vdd_mpu";
                         regulator-min-microvolt = <925000>;
@@ -327,7 +324,6 @@
                 };
 
                 dcdc3_reg: regulator@2 {
-                        reg = <2>;
                         /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
                         regulator-name = "vdd_core";
                         regulator-min-microvolt = <925000>;
@@ -337,25 +333,21 @@
                 };
 
                 ldo1_reg: regulator@3 {
-                        reg = <3>;
                         regulator-name = "vio,vrtc,vdds";
                         regulator-always-on;
                 };
 
                 ldo2_reg: regulator@4 {
-                        reg = <4>;
                         regulator-name = "vdd_3v3aux";
                         regulator-always-on;
                 };
 
                 ldo3_reg: regulator@5 {
-                        reg = <5>;
                         regulator-name = "vdd_1v8";
                         regulator-always-on;
                 };
 
                 ldo4_reg: regulator@6 {
-                        reg = <6>;
                         regulator-name = "vdd_3v3a";
                         regulator-always-on;
                 };
diff --git a/arch/arm/boot/dts/am335x-chilisom.dtsi b/arch/arm/boot/dts/am335x-chilisom.dtsi
index fda457b07e15..857d9894103a 100644
--- a/arch/arm/boot/dts/am335x-chilisom.dtsi
+++ b/arch/arm/boot/dts/am335x-chilisom.dtsi
@@ -128,21 +128,16 @@
 
 };
 
-&tps {
-        compatible = "ti,tps65217";
+/include/ "tps65217.dtsi"
 
+&tps {
         regulators {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
                 dcdc1_reg: regulator@0 {
-                        reg = <0>;
                         regulator-name = "vdds_dpr";
                         regulator-always-on;
                 };
 
                 dcdc2_reg: regulator@1 {
-                        reg = <1>;
                         /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
                         regulator-name = "vdd_mpu";
                         regulator-min-microvolt = <925000>;
@@ -152,7 +147,6 @@
                 };
 
                 dcdc3_reg: regulator@2 {
-                        reg = <2>;
                         /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
                         regulator-name = "vdd_core";
                         regulator-min-microvolt = <925000>;
@@ -162,28 +156,24 @@
                 };
 
                 ldo1_reg: regulator@3 {
-                        reg = <3>;
                         regulator-name = "vio,vrtc,vdds";
                         regulator-boot-on;
                         regulator-always-on;
                 };
 
                 ldo2_reg: regulator@4 {
-                        reg = <4>;
                         regulator-name = "vdd_3v3aux";
                         regulator-boot-on;
                         regulator-always-on;
                 };
 
                 ldo3_reg: regulator@5 {
-                        reg = <5>;
                         regulator-name = "vdd_1v8";
                         regulator-boot-on;
                         regulator-always-on;
                 };
 
                 ldo4_reg: regulator@6 {
-                        reg = <6>;
                         regulator-name = "vdd_3v3d";
                         regulator-boot-on;
                         regulator-always-on;
diff --git a/arch/arm/boot/dts/am335x-nano.dts b/arch/arm/boot/dts/am335x-nano.dts
index 77559a1ded60..f313999c503e 100644
--- a/arch/arm/boot/dts/am335x-nano.dts
+++ b/arch/arm/boot/dts/am335x-nano.dts
@@ -375,15 +375,11 @@
         wp-gpios = <&gpio3 18 0>;
 };
 
-&tps {
-        compatible = "ti,tps65217";
+#include "tps65217.dtsi"
 
+&tps {
         regulators {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
                 dcdc1_reg: regulator@0 {
-                        reg = <0>;
                         /* +1.5V voltage with ±4% tolerance */
                         regulator-min-microvolt = <1450000>;
                         regulator-max-microvolt = <1550000>;
@@ -392,7 +388,6 @@
                 };
 
                 dcdc2_reg: regulator@1 {
-                        reg = <1>;
                         /* VDD_MPU voltage limits 0.95V - 1.1V with ±4% tolerance */
                         regulator-name = "vdd_mpu";
                         regulator-min-microvolt = <915000>;
@@ -402,7 +397,6 @@
                 };
 
                 dcdc3_reg: regulator@2 {
-                        reg = <2>;
                         /* VDD_CORE voltage limits 0.95V - 1.1V with ±4% tolerance */
                         regulator-name = "vdd_core";
                         regulator-min-microvolt = <915000>;
@@ -412,7 +406,6 @@
                 };
 
                 ldo1_reg: regulator@3 {
-                        reg = <3>;
                         /* +1.8V voltage with ±4% tolerance */
                         regulator-min-microvolt = <1750000>;
                         regulator-max-microvolt = <1870000>;
@@ -421,7 +414,6 @@
                 };
 
                 ldo2_reg: regulator@4 {
-                        reg = <4>;
                         /* +3.3V voltage with ±4% tolerance */
                         regulator-min-microvolt = <3175000>;
                         regulator-max-microvolt = <3430000>;
@@ -430,7 +422,6 @@
                 };
 
                 ldo3_reg: regulator@5 {
-                        reg = <5>;
                         /* +1.8V voltage with ±4% tolerance */
                         regulator-min-microvolt = <1750000>;
                         regulator-max-microvolt = <1870000>;
@@ -439,7 +430,6 @@
                 };
 
                 ldo4_reg: regulator@6 {
-                        reg = <6>;
                         /* +3.3V voltage with ±4% tolerance */
                         regulator-min-microvolt = <3175000>;
                         regulator-max-microvolt = <3430000>;
diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
index 471a3a70ea1f..8867aaaec54d 100644
--- a/arch/arm/boot/dts/am335x-pepper.dts
+++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -420,9 +420,9 @@
         vin-supply = <&vbat>;
 };
 
-&tps {
-        compatible = "ti,tps65217";
+/include/ "tps65217.dtsi"
 
+&tps {
         backlight {
                 isel = <1>; /* ISET1 */
                 fdim = <200>; /* TPS65217_BL_FDIM_200HZ */
@@ -430,17 +430,12 @@
         };
 
         regulators {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
                 dcdc1_reg: regulator@0 {
-                        reg = <0>;
                         /* VDD_1V8 system supply */
                         regulator-always-on;
                 };
 
                 dcdc2_reg: regulator@1 {
-                        reg = <1>;
                         /* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */
                         regulator-name = "vdd_core";
                         regulator-min-microvolt = <925000>;
@@ -450,7 +445,6 @@
                 };
 
                 dcdc3_reg: regulator@2 {
-                        reg = <2>;
                         /* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */
                         regulator-name = "vdd_mpu";
                         regulator-min-microvolt = <925000>;
@@ -460,21 +454,18 @@
                 };
 
                 ldo1_reg: regulator@3 {
-                        reg = <3>;
                         /* VRTC 1.8V always-on supply */
                         regulator-name = "vrtc,vdds";
                         regulator-always-on;
                 };
 
                 ldo2_reg: regulator@4 {
-                        reg = <4>;
                         /* 3.3V rail */
                         regulator-name = "vdd_3v3aux";
                         regulator-always-on;
                 };
 
                 ldo3_reg: regulator@5 {
-                        reg = <5>;
                         /* VDD_3V3A 3.3V rail */
                         regulator-name = "vdd_3v3a";
                         regulator-min-microvolt = <3300000>;
@@ -482,7 +473,6 @@
                 };
 
                 ldo4_reg: regulator@6 {
-                        reg = <6>;
                         /* VDD_3V3B 3.3V rail */
                         regulator-name = "vdd_3v3b";
                         regulator-always-on;
diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index d38edfa53bb9..3303c281697b 100644
--- a/arch/arm/boot/dts/am335x-sl50.dts
+++ b/arch/arm/boot/dts/am335x-sl50.dts
@@ -375,19 +375,16 @@
         pinctrl-0 = <&uart4_pins>;
 };
 
+#include "tps65217.dtsi"
+
 &tps {
-        compatible = "ti,tps65217";
         ti,pmic-shutdown-controller;
 
         interrupt-parent = <&intc>;
         interrupts = <7>;       /* NNMI */
 
         regulators {
-                #address-cells = <1>;
-                #size-cells = <0>;
-
                 dcdc1_reg: regulator@0 {
-                        reg = <0>;
                         /* VDDS_DDR */
                         regulator-min-microvolt = <1500000>;
                         regulator-max-microvolt = <1500000>;
@@ -395,7 +392,6 @@
                 };
 
                 dcdc2_reg: regulator@1 {
-                        reg = <1>;
                         /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
                         regulator-name = "vdd_mpu";
                         regulator-min-microvolt = <925000>;
@@ -405,7 +401,6 @@
                 };
 
                 dcdc3_reg: regulator@2 {
-                        reg = <2>;
                         /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
                         regulator-name = "vdd_core";
                         regulator-min-microvolt = <925000>;
@@ -415,7 +410,6 @@
                 };
 
                 ldo1_reg: regulator@3 {
-                        reg = <3>;
                         /* VRTC / VIO / VDDS*/
                         regulator-always-on;
                         regulator-min-microvolt = <1800000>;
@@ -423,7 +417,6 @@
                 };
 
                 ldo2_reg: regulator@4 {
-                        reg = <4>;
                         /* VDD_3V3AUX */
                         regulator-always-on;
                         regulator-min-microvolt = <3300000>;
@@ -431,7 +424,6 @@
                 };
 
                 ldo3_reg: regulator@5 {
-                        reg = <5>;
                         /* VDD_1V8 */
                         regulator-min-microvolt = <1800000>;
                         regulator-max-microvolt = <1800000>;
@@ -439,7 +431,6 @@
                 };
 
                 ldo4_reg: regulator@6 {
-                        reg = <6>;
                         /* VDD_3V3A */
                         regulator-min-microvolt = <3300000>;
                         regulator-max-microvolt = <3300000>;
diff --git a/arch/arm/boot/dts/tps65217.dtsi b/arch/arm/boot/dts/tps65217.dtsi
new file mode 100644
index 000000000000..a63272422d76
--- /dev/null
+++ b/arch/arm/boot/dts/tps65217.dtsi
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/*
+ * Integrated Power Management Chip
+ * http://www.ti.com/lit/ds/symlink/tps65217.pdf
+ */
+
+&tps {
+        compatible = "ti,tps65217";
+
+        regulators {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                dcdc1_reg: regulator@0 {
+                        reg = <0>;
+                        regulator-compatible = "dcdc1";
+                };
+
+                dcdc2_reg: regulator@1 {
+                        reg = <1>;
+                        regulator-compatible = "dcdc2";
+                };
+
+                dcdc3_reg: regulator@2 {
+                        reg = <2>;
+                        regulator-compatible = "dcdc3";
+                };
+
+                ldo1_reg: regulator@3 {
+                        reg = <3>;
+                        regulator-compatible = "ldo1";
+                };
+
+                ldo2_reg: regulator@4 {
+                        reg = <4>;
+                        regulator-compatible = "ldo2";
+                };
+
+                ldo3_reg: regulator@5 {
+                        reg = <5>;
+                        regulator-compatible = "ldo3";
+                };
+
+                ldo4_reg: regulator@6 {
+                        reg = <6>;
+                        regulator-compatible = "ldo4";
+                };
+        };
+};
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c
index 7b76ce01c21d..8633c703546a 100644
--- a/arch/arm/mach-omap2/gpmc-onenand.c
+++ b/arch/arm/mach-omap2/gpmc-onenand.c
@@ -101,10 +101,8 @@ static void omap2_onenand_set_async_mode(void __iomem *onenand_base)
 
 static void set_onenand_cfg(void __iomem *onenand_base)
 {
-        u32 reg;
+        u32 reg = ONENAND_SYS_CFG1_RDY | ONENAND_SYS_CFG1_INT;
 
-        reg = readw(onenand_base + ONENAND_REG_SYS_CFG1);
-        reg &= ~((0x7 << ONENAND_SYS_CFG1_BRL_SHIFT) | (0x7 << 9));
         reg |=  (latency << ONENAND_SYS_CFG1_BRL_SHIFT) |
                 ONENAND_SYS_CFG1_BL_16;
         if (onenand_flags & ONENAND_FLAG_SYNCREAD)
@@ -123,6 +121,7 @@ static void set_onenand_cfg(void __iomem *onenand_base)
                 reg |= ONENAND_SYS_CFG1_VHF;
         else
                 reg &= ~ONENAND_SYS_CFG1_VHF;
+
         writew(reg, onenand_base + ONENAND_REG_SYS_CFG1);
 }
 
@@ -289,6 +288,7 @@ static int omap2_onenand_setup_async(void __iomem *onenand_base)
                 }
         }
 
+        onenand_async.sync_write = true;
         omap2_onenand_calc_async_timings(&t);
 
         ret = gpmc_cs_program_settings(gpmc_onenand_data->cs, &onenand_async);