Unverified Commit 57798ff2 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'stm32-dt-for-v5.15-1' of... 

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

STM32 DT for v5.15, round 1

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

-MPU:
 - ST boards:
  - Add coporcessor detach mailbox on ED and DKx boards
  - Fix dtbs_check SAI warnings

 - DH boards:
  -Fix some dtbs_check warnings: usb, backlight, hdmi

* tag 'stm32-dt-for-v5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
  ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check
  ARM: dts: stm32: Set {bitclock,frame}-master phandles on ST DKx
  ARM: dts: stm32: Add coprocessor detach mbox on stm32mp15x-dkx boards
  ARM: dts: stm32: Add coprocessor detach mbox on stm32mp157c-ed1 board
  ARM: dts: stm32: Add usbphyc_port1 supply on DHCOM SoM
  ARM: dts: stm32: Add backlight and panel supply on DHCOM SoM
  ARM: dts: stm32: Set {bitclock,frame}-master phandles on DHCOM SoM
  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/e4f0bea3-4065-38d5-f1b2-007e4094c4a8@foss.st.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f3e22d32 1e6bc598

arch/arm/boot/dts/stm32mp157c-ed1.dts

+2 −2
Original line number Diff line number Diff line
@@ -313,8 +313,8 @@ 
&m4_rproc {

	memory-region = <&retram>, <&mcuram>, <&mcuram2>, <&vdev0vring0>,

			<&vdev0vring1>, <&vdev0buffer>;

	mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>;

	mbox-names = "vq0", "vq1", "shutdown";

	mboxes = <&ipcc 0>, <&ipcc 1>, <&ipcc 2>, <&ipcc 3>;

	mbox-names = "vq0", "vq1", "shutdown", "detach";

	interrupt-parent = <&exti>;

	interrupts = <68 1>;

	status = "okay";

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

+4 −0
Original line number Diff line number Diff line
@@ -159,3 +159,7 @@ 
&usbphyc_port0 {

	phy-supply = <&vdd_usb>;

};



&usbphyc_port1 {

	phy-supply = <&vdd_usb>;

};

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

+35 −14
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
		brightness-levels = <0 16 22 30 40 55 75 102 138 188 255>;

		default-brightness-level = <8>;

		enable-gpios = <&gpioi 0 GPIO_ACTIVE_HIGH>;

		power-supply = <&reg_panel_bl>;

		status = "okay";

	};
@@ -37,7 +38,7 @@ 
		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 +47,16 @@ 
			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 +71,6 @@ 
	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 +86,7 @@ 
			label = "green:led5";

			gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>;

			default-state = "off";

			status = "disabled";

		};



		led-1 {
@@ -106,6 +111,7 @@ 
	panel {

		compatible = "edt,etm0700g0edh6";

		backlight = <&display_bl>;

		power-supply = <&reg_panel_bl>;



		port {

			lcd_panel_in: endpoint {
@@ -114,6 +120,21 @@ 
		};

	};



	reg_panel_bl: regulator-panel-bl {

		compatible = "regulator-fixed";

		regulator-name = "panel_backlight";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&reg_panel_supply>;

	};



	reg_panel_supply: regulator-panel-supply {

		compatible = "regulator-fixed";

		regulator-name = "panel_supply";

		regulator-min-microvolt = <24000000>;

		regulator-max-microvolt = <24000000>;

	};



	sound {

		compatible = "audio-graph-card";

		routing =
@@ -168,15 +189,15 @@ 
			sgtl5000_tx_endpoint: endpoint@0 {

				reg = <0>;

				remote-endpoint = <&sai2a_endpoint>;

				frame-master;

				bitclock-master;

				frame-master = <&sgtl5000_tx_endpoint>;

				bitclock-master = <&sgtl5000_tx_endpoint>;

			};



			sgtl5000_rx_endpoint: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&sai2b_endpoint>;

				frame-master;

				bitclock-master;

				frame-master = <&sgtl5000_rx_endpoint>;

				bitclock-master = <&sgtl5000_rx_endpoint>;

			};

		};
@@ -185,8 +206,8 @@ 
	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 @@ 
			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 @@ 
	/delete-property/dmas;

	/delete-property/dma-names;



	rtc@32 {

	hwrtc: rtc@32 {

		compatible = "microcrystal,rv8803";

		reg = <0x32>;

	};

arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi

+2 −4
Original line number Diff line number Diff line
@@ -220,8 +220,8 @@ 
&i2c4 {

	hdmi-transmitter@3d {

		compatible = "adi,adv7513";

		reg = <0x3d>, <0x2d>, <0x4d>, <0x5d>;

		reg-names = "main", "cec", "edid", "packet";

		reg = <0x3d>, <0x4d>, <0x2d>, <0x5d>;

		reg-names = "main", "edid", "cec", "packet";

		clocks = <&cec_clock>;

		clock-names = "cec";
@@ -239,8 +239,6 @@ 
		adi,input-depth = <8>;

		adi,input-colorspace = "rgb";

		adi,input-clock = "1x";

		adi,input-style = <1>;

		adi,input-justification = "evenly";



		ports {

			#address-cells = <1>;