Commit 7e47a750 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'stm32-dt-for-v5.10-fixes-2' of...

Merge tag 'stm32-dt-for-v5.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/fixes

STM32 DT fixes for v5.10, round 2

Highlights:
-----------

 -Fixes are for DHCOM/DHCOR boards:
  - Fix TA3-GPIO-C button
  - Fix LED5 mapping
  - Define VIO regulator supply on DHCOM
  - Enable thermal sensor support on stm32mp15xx-dhcor
  - Keep VDDA LDO1 always on to avoid leakage

* tag 'stm32-dt-for-v5.10-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: Keep VDDA LDO1 always on on DHCOM
  ARM: dts: stm32: Enable thermal sensor support on stm32mp15xx-dhcor
  ARM: dts: stm32: Define VIO regulator supply on DHCOM
  ARM: dts: stm32: Fix LED5 on STM32MP1 DHCOM PDK2
  ARM: dts: stm32: Fix TA3-GPIO-C key on STM32MP1 DHCOM PDK2

Link: https://lore.kernel.org/r/65bfc73d-aae1-5309-2e11-1e3da647ad46@st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0461a1ae f4c7fa39
Loading
Loading
Loading
Loading
+11 −8
Original line number Diff line number Diff line
@@ -46,6 +46,16 @@
			linux,code = <KEY_A>;
			gpios = <&gpiof 3 GPIO_ACTIVE_LOW>;
		};

		/*
		 * The EXTi IRQ line 0 is shared with PMIC,
		 * so mark this as polled GPIO key.
		 */
		button-2 {
			label = "TA3-GPIO-C";
			linux,code = <KEY_C>;
			gpios = <&gpiog 0 GPIO_ACTIVE_LOW>;
		};
	};

	gpio-keys {
@@ -59,13 +69,6 @@
			wakeup-source;
		};

		button-2 {
			label = "TA3-GPIO-C";
			linux,code = <KEY_C>;
			gpios = <&gpioi 11 GPIO_ACTIVE_LOW>;
			wakeup-source;
		};

		button-3 {
			label = "TA4-GPIO-D";
			linux,code = <KEY_D>;
@@ -79,7 +82,7 @@

		led-0 {
			label = "green:led5";
			gpios = <&gpiog 2 GPIO_ACTIVE_HIGH>;
			gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>;
			default-state = "off";
		};

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@
		gpio = <&gpiog 3 GPIO_ACTIVE_LOW>;
		regulator-always-on;
		regulator-boot-on;
		vin-supply = <&vdd>;
	};
};

@@ -202,6 +203,7 @@

			vdda: ldo1 {
				regulator-name = "vdda";
				regulator-always-on;
				regulator-min-microvolt = <2900000>;
				regulator-max-microvolt = <2900000>;
				interrupts = <IT_CURLIM_LDO1 0>;
+4 −0
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@
	};
};

&dts {
	status = "okay";
};

&i2c4 {
	pinctrl-names = "default";
	pinctrl-0 = <&i2c4_pins_a>;