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

Merge tag 'stm32-dt-for-v5.14-fixes-1' of... 

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

STM32 DT fixes for v5.14, round 1

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

 -Fixes are for DHCOM/DHCOR boards:
  - Set HW RTC ad default RTC
  - Disable EDPD LAN8710 feature as it is not a stable feature.
  - Fix touchscreen IRQ line assignment

* tag 'stm32-dt-for-v5.14-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: Fix touchscreen IRQ line assignment on DHCOM
  ARM: dts: stm32: Disable LAN8710 EDPD on DHCOM
  ARM: dts: stm32: Prefer HW RTC on DHCOM SoM

Link: https://lore.kernel.org/r/c0b6031b-2de7-2ef8-71b2-a0af8f475932@foss.st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 64429b9e 15f68f02

arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi

+14 −10
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ gpio-keys-polled { 
		poll-interval = <20>;



		/*

		 * The EXTi IRQ line 3 is shared with touchscreen and ethernet,

		 * The EXTi IRQ line 3 is shared with ethernet,

		 * so mark this as polled GPIO key.

		 */

		button-0 {
@@ -46,6 +46,16 @@ button-0 { 
			gpios = <&gpiof 3 GPIO_ACTIVE_LOW>;

		};



		/*

		 * The EXTi IRQ line 6 is shared with touchscreen,

		 * so mark this as polled GPIO key.

		 */

		button-1 {

			label = "TA2-GPIO-B";

			linux,code = <KEY_B>;

			gpios = <&gpiod 6 GPIO_ACTIVE_LOW>;

		};



		/*

		 * The EXTi IRQ line 0 is shared with PMIC,

		 * so mark this as polled GPIO key.
@@ -60,13 +70,6 @@ button-2 { 
	gpio-keys {

		compatible = "gpio-keys";



		button-1 {

			label = "TA2-GPIO-B";

			linux,code = <KEY_B>;

			gpios = <&gpiod 6 GPIO_ACTIVE_LOW>;

			wakeup-source;

		};



		button-3 {

			label = "TA4-GPIO-D";

			linux,code = <KEY_D>;
@@ -82,6 +85,7 @@ led-0 { 
			label = "green:led5";

			gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			status = "disabled";

		};



		led-1 {
@@ -185,8 +189,8 @@ sgtl5000_rx_endpoint: endpoint@1 { 
	touchscreen@38 {

		compatible = "edt,edt-ft5406";

		reg = <0x38>;

		interrupt-parent = <&gpiog>;

		interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */

		interrupt-parent = <&gpioc>;

		interrupts = <6 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */

	};

};

arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi

+4 −1
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ / { 
	aliases {

		ethernet0 = &ethernet0;

		ethernet1 = &ksz8851;

		rtc0 = &hwrtc;

		rtc1 = &rtc;

	};



	memory@c0000000 {
@@ -138,6 +140,7 @@ phy0: ethernet-phy@1 { 
			reset-gpios = <&gpioh 3 GPIO_ACTIVE_LOW>;

			reset-assert-us = <500>;

			reset-deassert-us = <500>;

			smsc,disable-energy-detect;

			interrupt-parent = <&gpioi>;

			interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

		};
@@ -248,7 +251,7 @@ &i2c4 { 
	/delete-property/dmas;

	/delete-property/dma-names;



	rtc@32 {

	hwrtc: rtc@32 {

		compatible = "microcrystal,rv8803";

		reg = <0x32>;

	};