diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2016-04-29 21:04:02 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2016-04-29 21:04:02 +0200 |
| commit | ed19ca7fa8bd44936aa3d5284bf38f5d96a28b35 (patch) | |
| tree | a25315139b37ad3ecc9ef2d1cab5bb28aa78e21f | |
| parent | ARM: davinci: only use NVMEM when available (diff) | |
| parent | ARM: dts: sun8i-q8-common: Do not set constraints on dc1sw regulator (diff) | |
| download | linux-ed19ca7fa8bd44936aa3d5284bf38f5d96a28b35.tar.xz linux-ed19ca7fa8bd44936aa3d5284bf38f5d96a28b35.zip | |
Merge tag 'sunxi-fixes-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into fixes
Allwinner fixes for 4.6
A single regulator fix
* tag 'sunxi-fixes-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
ARM: dts: sun8i-q8-common: Do not set constraints on dc1sw regulator
| -rw-r--r-- | arch/arm/boot/dts/sun8i-q8-common.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi index 9d2b7e2f5975..346a49d805a7 100644 --- a/arch/arm/boot/dts/sun8i-q8-common.dtsi +++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi @@ -125,8 +125,6 @@ }; ®_dc1sw { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; regulator-name = "vcc-lcd"; }; |