Commit a787f40a authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'omap-for-v4.3/fixes-rc5' of...

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

Merge "Fixes for omap against v4.3-rc5" from Tony Lindgren:

- Regulator fix for beagle-x15 to fix HDMI without a SD card being
  inserted

- GPMC fix for showing proper timings and to allow enabling debug
  options that somehow was unselectable earlier

- Add minimal documentation for new MMC1 dependency on
  REGULATOR_PBIAS as it may not be obvious for people with
  targeted .config files

* tag 'omap-for-v4.3/fixes-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  Documentation: ARM: List new omap MMC requirements
  memory: omap-gpmc: dump "before" state before first modification
  memory: omap-gpmc: Fix unselectable debug option for GPMC
  ARM: dts: am57xx-beagle-x15: set VDD_SD to always-on
parents 2e4e5da5 d8e1f5ed
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.
...@@ -402,11 +402,12 @@ smps8_reg: smps8 { ...@@ -402,11 +402,12 @@ smps8_reg: smps8 {
/* SMPS9 unused */ /* SMPS9 unused */
ldo1_reg: ldo1 { ldo1_reg: ldo1 {
/* VDD_SD */ /* VDD_SD / VDDSHV8 */
regulator-name = "ldo1"; regulator-name = "ldo1";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-boot-on; regulator-boot-on;
regulator-always-on;
}; };
ldo2_reg: ldo2 { ldo2_reg: ldo2 {
......
...@@ -58,12 +58,18 @@ config OMAP_GPMC ...@@ -58,12 +58,18 @@ config OMAP_GPMC
memory drives like NOR, NAND, OneNAND, SRAM. memory drives like NOR, NAND, OneNAND, SRAM.
config OMAP_GPMC_DEBUG config OMAP_GPMC_DEBUG
bool bool "Enable GPMC debug output and skip reset of GPMC during init"
depends on OMAP_GPMC depends on OMAP_GPMC
help help
Enables verbose debugging mostly to decode the bootloader provided Enables verbose debugging mostly to decode the bootloader provided
timings. Enable this during development to configure devices timings. To preserve the bootloader provided timings, the reset
connected to the GPMC bus. 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 config MVEBU_DEVBUS
bool "Marvell EBU Device Bus Controller" bool "Marvell EBU Device Bus Controller"
......
...@@ -696,7 +696,6 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t, ...@@ -696,7 +696,6 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t,
int div; int div;
u32 l; u32 l;
gpmc_cs_show_timings(cs, "before gpmc_cs_set_timings");
div = gpmc_calc_divider(t->sync_clk); div = gpmc_calc_divider(t->sync_clk);
if (div < 0) if (div < 0)
return div; return div;
...@@ -1988,6 +1987,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, ...@@ -1988,6 +1987,7 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
if (ret < 0) if (ret < 0)
goto err; goto err;
gpmc_cs_show_timings(cs, "before gpmc_cs_program_settings");
ret = gpmc_cs_program_settings(cs, &gpmc_s); ret = gpmc_cs_program_settings(cs, &gpmc_s);
if (ret < 0) if (ret < 0)
goto err; goto err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment