| Message ID | 20190109094823.4818-1-m.szyprowski@samsung.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 04aacc64ca38ab63863c2798c2fc3fc52718aae6 |
| Headers | show |
| Series | ARM: dts: exynos: Fix conflicting fixed-regulator GPIO flags and properties | expand |
On Wed, 9 Jan 2019 at 10:48, Marek Szyprowski <m.szyprowski@samsung.com> wrote: > > 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> Thanks, applied. Best regards, Krzysztof
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; };
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> --- arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)