diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2016-07-09 16:45:29 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-07-10 10:33:41 +0200 |
commit | a11836fa5a67ba56d8338138e37b42384af73e5e (patch) | |
tree | 60e017b812029d58e8f10c70f00f0ba7dc661f7e /arch/x86 | |
parent | 62d855d3e725f4e4b0d2786f7cad3f0660a03a59 (diff) | |
download | linux-a11836fa5a67ba56d8338138e37b42384af73e5e.tar.bz2 |
x86/platform/intel-mid: Mark regulators explicitly defined
Intel MID platforms are using explicitly defined regulators.
Let the regulator core know that we do not have any additional
regulators left. This lets it substitute unprovided regulators with
dummy ones.
Without this change when CONFIG_REGULATOR=y the USB driver fails on getting
"vbus" regulator and SDHCI can't get "vmmc" and "vqmmc" regulators either.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1468071929-77383-1-git-send-email-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/platform/intel-mid/intel-mid.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c index 90bb997ed0a2..abbf49c6e9d3 100644 --- a/arch/x86/platform/intel-mid/intel-mid.c +++ b/arch/x86/platform/intel-mid/intel-mid.c @@ -16,6 +16,7 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/interrupt.h> +#include <linux/regulator/machine.h> #include <linux/scatterlist.h> #include <linux/sfi.h> #include <linux/irq.h> @@ -144,6 +145,15 @@ static void intel_mid_arch_setup(void) out: if (intel_mid_ops->arch_setup) intel_mid_ops->arch_setup(); + + /* + * Intel MID platforms are using explicitly defined regulators. + * + * Let the regulator core know that we do not have any additional + * regulators left. This lets it substitute unprovided regulators with + * dummy ones: + */ + regulator_has_full_constraints(); } /* MID systems don't have i8042 controller */ |