Merge tag 'samsung-dt-dt64-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel...

Samsung DTS ARM and ARM64 changes for v6.1

Late cleanup and fixes for Samsung DTS:
1. Fix polarity of pins:
   - enable GPIO of NFC chip in Exynos5433 TM2 boards,
   - vbus GPIO of EHCI in Exynos4412 Origen board.
2. Correct name of pin configuration nodes - redundant "pins" in the
   name (no functional impact).

* tag 'samsung-dt-dt64-6.1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5pv210: correct double "pins" in pinmux node
  ARM: dts: exynos: fix polarity of VBUS GPIO of Origen
  arm64: dts: exynos: fix polarity of "enable" line of NFC chip in TM2

Link: https://lore.kernel.org/r/20221003073916.12588-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 6db09db..a3905e2 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -95,7 +95,7 @@
 };
 
 &ehci {
-       samsung,vbus-gpio = <&gpx3 5 1>;
+       samsung,vbus-gpio = <&gpx3 5 GPIO_ACTIVE_HIGH>;
        status = "okay";
        phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>;
        phy-names = "hsic0", "hsic1";

diff --git a/arch/arm/boot/dts/s5pv210-aries.dtsi b/arch/arm/boot/dts/s5pv210-aries.dtsi
index 5541df4..964c5fe 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-aries.dtsi
+++ b/arch/arm/boot/dts/s5pv210-aries.dtsi
@@ -738,7 +738,7 @@
                samsung,pin-pud = <S5PV210_PIN_PULL_NONE>;
        };
 
-       magnetometer_i2c_pins: yas529-i2c-pins-pins {
+       magnetometer_i2c_pins: yas529-i2c-pins {
                samsung,pins = "gpj0-0", "gpj0-1";
                samsung,pin-pud = <S5PV210_PIN_PULL_NONE>;
                samsung,pin-drv = <S5PV210_PIN_DRV_LV1>;
@@ -788,7 +788,7 @@
                samsung,pin-drv = <S5PV210_PIN_DRV_LV1>;
        };
 
-       pmic_i2c_pins: pmic-i2c-pins-pins {
+       pmic_i2c_pins: pmic-i2c-pins {
                samsung,pins = "gpj4-0", "gpj4-3";
                samsung,pin-pud = <S5PV210_PIN_PULL_NONE>;
                samsung,pin-drv = <S5PV210_PIN_DRV_LV1>;

diff --git a/arch/arm/boot/dts/s5pv210-galaxys.dts b/arch/arm/boot/dts/s5pv210-galaxys.dts
index cdd3653..532d3f5 100644 (file)
--- a/arch/arm/boot/dts/s5pv210-galaxys.dts
+++ b/arch/arm/boot/dts/s5pv210-galaxys.dts
@@ -150,7 +150,7 @@
        pinctrl-names = "default";
        pinctrl-0 = <&sleep_cfg>;
 
-       fm_i2c_pins: fm-i2c-pins-pins {
+       fm_i2c_pins: fm-i2c-pins {
                samsung,pins = "gpd1-2", "gpd1-3";
                samsung,pin-pud = <S5PV210_PIN_PULL_NONE>;
                samsung,pin-drv = <S5PV210_PIN_DRV_LV1>;

diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
index 91c9bd1..bde6a6b 100644 (file)
--- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
@@ -795,7 +795,7 @@
                reg = <0x27>;
                interrupt-parent = <&gpa1>;
                interrupts = <3 IRQ_TYPE_EDGE_RISING>;
-               en-gpios = <&gpf1 4 GPIO_ACTIVE_HIGH>;
+               en-gpios = <&gpf1 4 GPIO_ACTIVE_LOW>;
                wake-gpios = <&gpj0 2 GPIO_ACTIVE_HIGH>;
        };
 };