Unverified Commit 40a5af12 authored Oct 04, 2022 by Arnd Bergmann

Merge tag 'samsung-dt-dt64-6.1-2' of...

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

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>

parents 302c9454 17fffac4

arch/arm/boot/dts/exynos4412-origen.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ &exynos_usbphy {
		};

		&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";

arch/arm/boot/dts/s5pv210-aries.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -738,7 +738,7 @@ wifi_wake: wifi-wake-pins {
		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 @@ accel_i2c_pins: accel-i2c-pins {
		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>;

arch/arm/boot/dts/s5pv210-galaxys.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ &pinctrl0 {
		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>;

arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -795,7 +795,7 @@ s3fwrn5: nfc@27 {
		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>;
		};
		};