Unverified Commit d07156eb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt 

Samsung DTS ARM changes for v5.17

1. Fix Bluetooth GPIO on GT-I9100.
2. Minor improvements and dtschema fixes.

* tag 'samsung-dt-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Rename hsi2c nodes to i2c for Exynos5260
  ARM: dts: exynos: Use interrupt for BCM4330 host wakeup in I9100
  ARM: dts: exynos: Fix BCM4330 Bluetooth reset polarity in I9100

Link: https://lore.kernel.org/r/20211220115530.30961-1-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents aa7bb116 29bf0ff5

arch/arm/boot/dts/exynos4210-i9100.dts

+5 −2
Original line number Diff line number Diff line
@@ -828,9 +828,12 @@ bluetooth { 
		compatible = "brcm,bcm4330-bt";



		shutdown-gpios = <&gpl0 4 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpl1 0 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpl1 0 GPIO_ACTIVE_LOW>;

		device-wakeup-gpios = <&gpx3 1 GPIO_ACTIVE_HIGH>;

		host-wakeup-gpios = <&gpx2 6 GPIO_ACTIVE_HIGH>;



		interrupt-parent = <&gpx2>;

		interrupts = <6 IRQ_TYPE_EDGE_FALLING>;

		interrupt-names = "host-wakeup";

	};

};

arch/arm/boot/dts/exynos5260.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ mmc_2: mmc@12160000 { 
			status = "disabled";

		};



		hsi2c_0: hsi2c@12da0000 {

		hsi2c_0: i2c@12da0000 {

			compatible = "samsung,exynos5260-hsi2c";

			reg = <0x12DA0000 0x1000>;

			interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -381,7 +381,7 @@ hsi2c_0: hsi2c@12da0000 { 
			status = "disabled";

		};



		hsi2c_1: hsi2c@12db0000 {

		hsi2c_1: i2c@12db0000 {

			compatible = "samsung,exynos5260-hsi2c";

			reg = <0x12DB0000 0x1000>;

			interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
@@ -394,7 +394,7 @@ hsi2c_1: hsi2c@12db0000 { 
			status = "disabled";

		};



		hsi2c_2: hsi2c@12dc0000 {

		hsi2c_2: i2c@12dc0000 {

			compatible = "samsung,exynos5260-hsi2c";

			reg = <0x12DC0000 0x1000>;

			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
@@ -407,7 +407,7 @@ hsi2c_2: hsi2c@12dc0000 { 
			status = "disabled";

		};



		hsi2c_3: hsi2c@12dd0000 {

		hsi2c_3: i2c@12dd0000 {

			compatible = "samsung,exynos5260-hsi2c";

			reg = <0x12DD0000 0x1000>;

			interrupts = <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;