summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2019-01-09 12:48:23 +0300
committerKrzysztof Kozlowski <krzk@kernel.org>2019-01-10 23:01:34 +0300
commit04aacc64ca38ab63863c2798c2fc3fc52718aae6 (patch)
tree22ecc30e44ec127ad79c44264609ca16781236ed /arch
parent4de3f59c51f990b99691923c9e5c11928aea196d (diff)
downloadlinux-04aacc64ca38ab63863c2798c2fc3fc52718aae6.tar.xz
ARM: dts: exynos: Fix conflicting fixed-regulator GPIO flags and properties
Bindings of the fixed-regulator, which precedes support for GPIO flags passed via phandle descriptor, introduced its own method annotating that the given GPIO line is active low or high - by using 'enable-active-high' property. The driver always ignored flags passed via GPIO descriptor. Fix the conflicting GPIO flags to match the status forced by the 'enable-active-high' property to avoid future confusion. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/exynos4412-odroidx.dts2
-rw-r--r--arch/arm/boot/dts/exynos5250-arndale.dts2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts
index 348556fcdd9d..a2251581f6b6 100644
--- a/arch/arm/boot/dts/exynos4412-odroidx.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx.dts
@@ -53,7 +53,7 @@
regulator-name = "p3v3_en";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- gpio = <&gpa1 1 GPIO_ACTIVE_LOW>;
+ gpio = <&gpa1 1 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
};
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index 2ca9319f48f2..b44f03ef3b27 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -100,7 +100,7 @@
regulator-name = "VDD_33ON_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
- gpio = <&gpx1 1 GPIO_ACTIVE_LOW>;
+ gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;
enable-active-high;
};