4 files changed, 19 insertions, 5 deletions

diff --git a/Documentation/arm/OMAP/README b/Documentation/arm/OMAP/README
new file mode 100644
index 000000000000..75645c45d14a
--- /dev/null
+++ b/Documentation/arm/OMAP/README
@@ -0,0 +1,7 @@
+This file contains documentation for running mainline
+kernel on omaps.
+
+KERNEL          NEW DEPENDENCIES
+v4.3+           Update is needed for custom .config files to make sure
+                CONFIG_REGULATOR_PBIAS is enabled for MMC1 to work
+                properly.
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 568adf5efde0..d55e3ea89fda 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -402,11 +402,12 @@
                                 /* SMPS9 unused */
 
                                 ldo1_reg: ldo1 {
-                                        /* VDD_SD  */
+                                        /* VDD_SD / VDDSHV8  */
                                         regulator-name = "ldo1";
                                         regulator-min-microvolt = <1800000>;
                                         regulator-max-microvolt = <3300000>;
                                         regulator-boot-on;
+                                        regulator-always-on;
                                 };
 
                                 ldo2_reg: ldo2 {
diff --git a/drivers/memory/Kconfig b/drivers/memory/Kconfig
index c6a644b22af4..6f3154613dc7 100644
--- a/drivers/memory/Kconfig
+++ b/drivers/memory/Kconfig
@@ -58,12 +58,18 @@ config OMAP_GPMC
           memory drives like NOR, NAND, OneNAND, SRAM.
 
 config OMAP_GPMC_DEBUG
-        bool
+        bool "Enable GPMC debug output and skip reset of GPMC during init"
         depends on OMAP_GPMC
         help
           Enables verbose debugging mostly to decode the bootloader provided
-          timings. Enable this during development to configure devices
-          connected to the GPMC bus.
+          timings. To preserve the bootloader provided timings, the reset
+          of GPMC is skipped during init. Enable this during development to
+          configure devices connected to the GPMC bus.
+
+          NOTE: In addition to matching the register setup with the bootloader
+          you also need to match the GPMC FCLK frequency used by the
+          bootloader or else the GPMC timings won't be identical with the
+          bootloader timings.
 
 config MVEBU_DEVBUS
         bool "Marvell EBU Device Bus Controller"
diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 32ac049f2bc4..6515dfc2b805 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -696,7 +696,6 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t,
         int div;
         u32 l;
 
-        gpmc_cs_show_timings(cs, "before gpmc_cs_set_timings");
         div = gpmc_calc_divider(t->sync_clk);
         if (div < 0)
                 return div;
@@ -1988,6 +1987,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
         if (ret < 0)
                 goto err;
 
+        gpmc_cs_show_timings(cs, "before gpmc_cs_program_settings");
         ret = gpmc_cs_program_settings(cs, &gpmc_s);
         if (ret < 0)
                 goto err;