Commit 144d1ba7 authored by Alexandre Torgue's avatar Alexandre Torgue
Browse files

ARM: dts: stm32: Adapt STM32MP157 DK boards to stm32 DT diversity 



To handle STM32MP15 SOCs diversity, some updates have to been done.
This commit mainly adapt dk1 board to include the correct package and the
correct SOC version. A new file has been created to factorize common parts.

Signed-off-by: default avatarAlexandre Torgue <alexandre.torgue@st.com>
parent 0eda69b6

arch/arm/boot/dts/stm32mp157a-dk1.dts

+1 −589
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ 
#include "stm32mp157.dtsi"

#include "stm32mp15-pinctrl.dtsi"

#include "stm32mp15xxac-pinctrl.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/mfd/st,stpmic1.h>

#include "stm32mp15xx-dkx.dtsi"



/ {

	model = "STMicroelectronics STM32MP157A-DK1 Discovery Board";
@@ -24,591 +23,4 @@ 
	chosen {

		stdout-path = "serial0:115200n8";

	};



	memory@c0000000 {

		device_type = "memory";

		reg = <0xc0000000 0x20000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		mcuram2: mcuram2@10000000 {

			compatible = "shared-dma-pool";

			reg = <0x10000000 0x40000>;

			no-map;

		};



		vdev0vring0: vdev0vring0@10040000 {

			compatible = "shared-dma-pool";

			reg = <0x10040000 0x1000>;

			no-map;

		};



		vdev0vring1: vdev0vring1@10041000 {

			compatible = "shared-dma-pool";

			reg = <0x10041000 0x1000>;

			no-map;

		};



		vdev0buffer: vdev0buffer@10042000 {

			compatible = "shared-dma-pool";

			reg = <0x10042000 0x4000>;

			no-map;

		};



		mcuram: mcuram@30000000 {

			compatible = "shared-dma-pool";

			reg = <0x30000000 0x40000>;

			no-map;

		};



		retram: retram@38000000 {

			compatible = "shared-dma-pool";

			reg = <0x38000000 0x10000>;

			no-map;

		};



		gpu_reserved: gpu@d4000000 {

			reg = <0xd4000000 0x4000000>;

			no-map;

		};

	};



	led {

		compatible = "gpio-leds";

		blue {

			label = "heartbeat";

			gpios = <&gpiod 11 GPIO_ACTIVE_HIGH>;

			linux,default-trigger = "heartbeat";

			default-state = "off";

		};

	};



	sound {

		compatible = "audio-graph-card";

		label = "STM32MP1-DK";

		routing =

			"Playback" , "MCLK",

			"Capture" , "MCLK",

			"MICL" , "Mic Bias";

		dais = <&sai2a_port &sai2b_port &i2s2_port>;

		status = "okay";

	};

};



&adc {

	pinctrl-names = "default";

	pinctrl-0 = <&adc12_ain_pins_a>, <&adc12_usb_cc_pins_a>;

	vdd-supply = <&vdd>;

	vdda-supply = <&vdd>;

	vref-supply = <&vrefbuf>;

	status = "disabled";

	adc1: adc@0 {

		/*

		 * Type-C USB_PWR_CC1 & USB_PWR_CC2 on in18 & in19.

		 * Use at least 5 * RC time, e.g. 5 * (Rp + Rd) * C:

		 * 5 * (56 + 47kOhms) * 5pF => 2.5us.

		 * Use arbitrary margin here (e.g. 5us).

		 */

		st,min-sample-time-nsecs = <5000>;

		/* AIN connector, USB Type-C CC1 & CC2 */

		st,adc-channels = <0 1 6 13 18 19>;

		status = "okay";

	};

	adc2: adc@100 {

		/* AIN connector, USB Type-C CC1 & CC2 */

		st,adc-channels = <0 1 2 6 18 19>;

		st,min-sample-time-nsecs = <5000>;

		status = "okay";

	};

};



&cec {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&cec_pins_b>;

	pinctrl-1 = <&cec_pins_sleep_b>;

	status = "okay";

};



&ethernet0 {

	status = "okay";

	pinctrl-0 = <&ethernet0_rgmii_pins_a>;

	pinctrl-1 = <&ethernet0_rgmii_pins_sleep_a>;

	pinctrl-names = "default", "sleep";

	phy-mode = "rgmii-id";

	max-speed = <1000>;

	phy-handle = <&phy0>;



	mdio0 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "snps,dwmac-mdio";

		phy0: ethernet-phy@0 {

			reg = <0>;

		};

	};

};



&gpu {

	contiguous-area = <&gpu_reserved>;

	status = "okay";

};



&i2c1 {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&i2c1_pins_a>;

	pinctrl-1 = <&i2c1_pins_sleep_a>;

	i2c-scl-rising-time-ns = <100>;

	i2c-scl-falling-time-ns = <7>;

	status = "okay";

	/delete-property/dmas;

	/delete-property/dma-names;



	hdmi-transmitter@39 {

		compatible = "sil,sii9022";

		reg = <0x39>;

		iovcc-supply = <&v3v3_hdmi>;

		cvcc12-supply = <&v1v2_hdmi>;

		reset-gpios = <&gpioa 10 GPIO_ACTIVE_LOW>;

		interrupts = <1 IRQ_TYPE_EDGE_FALLING>;

		interrupt-parent = <&gpiog>;

		#sound-dai-cells = <0>;

		status = "okay";



		ports {

			#address-cells = <1>;

			#size-cells = <0>;



			port@0 {

				reg = <0>;

				sii9022_in: endpoint {

					remote-endpoint = <&ltdc_ep0_out>;

				};

			};



			port@3 {

				reg = <3>;

				sii9022_tx_endpoint: endpoint {

					remote-endpoint = <&i2s2_endpoint>;

				};

			};

		};

	};



	cs42l51: cs42l51@4a {

		compatible = "cirrus,cs42l51";

		reg = <0x4a>;

		#sound-dai-cells = <0>;

		VL-supply = <&v3v3>;

		VD-supply = <&v1v8_audio>;

		VA-supply = <&v1v8_audio>;

		VAHP-supply = <&v1v8_audio>;

		reset-gpios = <&gpiog 9 GPIO_ACTIVE_LOW>;

		clocks = <&sai2a>;

		clock-names = "MCLK";

		status = "okay";



		cs42l51_port: port {

			#address-cells = <1>;

			#size-cells = <0>;



			cs42l51_tx_endpoint: endpoint@0 {

				reg = <0>;

				remote-endpoint = <&sai2a_endpoint>;

				frame-master;

				bitclock-master;

			};



			cs42l51_rx_endpoint: endpoint@1 {

				reg = <1>;

				remote-endpoint = <&sai2b_endpoint>;

				frame-master;

				bitclock-master;

			};

		};

	};

};



&i2c4 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c4_pins_a>;

	i2c-scl-rising-time-ns = <185>;

	i2c-scl-falling-time-ns = <20>;

	status = "okay";

	/* spare dmas for other usage */

	/delete-property/dmas;

	/delete-property/dma-names;



	pmic: stpmic@33 {

		compatible = "st,stpmic1";

		reg = <0x33>;

		interrupts-extended = <&gpioa 0 IRQ_TYPE_EDGE_FALLING>;

		interrupt-controller;

		#interrupt-cells = <2>;

		status = "okay";



		regulators {

			compatible = "st,stpmic1-regulators";

			ldo1-supply = <&v3v3>;

			ldo3-supply = <&vdd_ddr>;

			ldo6-supply = <&v3v3>;

			pwr_sw1-supply = <&bst_out>;

			pwr_sw2-supply = <&bst_out>;



			vddcore: buck1 {

				regulator-name = "vddcore";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

				regulator-initial-mode = <0>;

				regulator-over-current-protection;

			};



			vdd_ddr: buck2 {

				regulator-name = "vdd_ddr";

				regulator-min-microvolt = <1350000>;

				regulator-max-microvolt = <1350000>;

				regulator-always-on;

				regulator-initial-mode = <0>;

				regulator-over-current-protection;

			};



			vdd: buck3 {

				regulator-name = "vdd";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

				st,mask-reset;

				regulator-initial-mode = <0>;

				regulator-over-current-protection;

			};



			v3v3: buck4 {

				regulator-name = "v3v3";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

				regulator-over-current-protection;

				regulator-initial-mode = <0>;

			};



			v1v8_audio: ldo1 {

				regulator-name = "v1v8_audio";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-always-on;

				interrupts = <IT_CURLIM_LDO1 0>;

			};



			v3v3_hdmi: ldo2 {

				regulator-name = "v3v3_hdmi";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

				interrupts = <IT_CURLIM_LDO2 0>;

			};



			vtt_ddr: ldo3 {

				regulator-name = "vtt_ddr";

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <750000>;

				regulator-always-on;

				regulator-over-current-protection;

			};



			vdd_usb: ldo4 {

				regulator-name = "vdd_usb";

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				interrupts = <IT_CURLIM_LDO4 0>;

			};



			vdda: ldo5 {

				regulator-name = "vdda";

				regulator-min-microvolt = <2900000>;

				regulator-max-microvolt = <2900000>;

				interrupts = <IT_CURLIM_LDO5 0>;

				regulator-boot-on;

			};



			v1v2_hdmi: ldo6 {

				regulator-name = "v1v2_hdmi";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1200000>;

				regulator-always-on;

				interrupts = <IT_CURLIM_LDO6 0>;

			};



			vref_ddr: vref_ddr {

				regulator-name = "vref_ddr";

				regulator-always-on;

				regulator-over-current-protection;

			};



			 bst_out: boost {

				regulator-name = "bst_out";

				interrupts = <IT_OCP_BOOST 0>;

			 };



			vbus_otg: pwr_sw1 {

				regulator-name = "vbus_otg";

				interrupts = <IT_OCP_OTG 0>;

			 };



			 vbus_sw: pwr_sw2 {

				regulator-name = "vbus_sw";

				interrupts = <IT_OCP_SWOUT 0>;

				regulator-active-discharge = <1>;

			 };

		};



		onkey {

			compatible = "st,stpmic1-onkey";

			interrupts = <IT_PONKEY_F 0>, <IT_PONKEY_R 0>;

			interrupt-names = "onkey-falling", "onkey-rising";

			power-off-time-sec = <10>;

			status = "okay";

		};



		watchdog {

			compatible = "st,stpmic1-wdt";

			status = "disabled";

		};

	};

};



&i2s2 {

	clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>;

	clock-names = "pclk", "i2sclk", "x8k", "x11k";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&i2s2_pins_a>;

	pinctrl-1 = <&i2s2_pins_sleep_a>;

	status = "okay";



	i2s2_port: port {

		i2s2_endpoint: endpoint {

			remote-endpoint = <&sii9022_tx_endpoint>;

			format = "i2s";

			mclk-fs = <256>;

		};

	};

};



&ipcc {

	status = "okay";

};



&iwdg2 {

	timeout-sec = <32>;

	status = "okay";

};



&ltdc {

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&ltdc_pins_a>;

	pinctrl-1 = <&ltdc_pins_sleep_a>;

	status = "okay";



	port {

		#address-cells = <1>;

		#size-cells = <0>;



		ltdc_ep0_out: endpoint@0 {

			reg = <0>;

			remote-endpoint = <&sii9022_in>;

		};

	};

};



&m4_rproc {

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

			<&vdev0vring1>, <&vdev0buffer>;

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

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

	interrupt-parent = <&exti>;

	interrupts = <68 1>;

	status = "okay";

};



&pwr_regulators {

	vdd-supply = <&vdd>;

	vdd_3v3_usbfs-supply = <&vdd_usb>;

};



&rng1 {

	status = "okay";

};



&rtc {

	status = "okay";

};



&sai2 {

	clocks = <&rcc SAI2>, <&rcc PLL3_Q>, <&rcc PLL3_R>;

	clock-names = "pclk", "x8k", "x11k";

	pinctrl-names = "default", "sleep";

	pinctrl-0 = <&sai2a_pins_a>, <&sai2b_pins_b>;

	pinctrl-1 = <&sai2a_sleep_pins_a>, <&sai2b_sleep_pins_b>;

	status = "okay";



	sai2a: audio-controller@4400b004 {

		#clock-cells = <0>;

		dma-names = "tx";

		clocks = <&rcc SAI2_K>;

		clock-names = "sai_ck";

		status = "okay";



		sai2a_port: port {

			sai2a_endpoint: endpoint {

				remote-endpoint = <&cs42l51_tx_endpoint>;

				format = "i2s";

				mclk-fs = <256>;

				dai-tdm-slot-num = <2>;

				dai-tdm-slot-width = <32>;

			};

		};

	};



	sai2b: audio-controller@4400b024 {

		dma-names = "rx";

		st,sync = <&sai2a 2>;

		clocks = <&rcc SAI2_K>, <&sai2a>;

		clock-names = "sai_ck", "MCLK";

		status = "okay";



		sai2b_port: port {

			sai2b_endpoint: endpoint {

				remote-endpoint = <&cs42l51_rx_endpoint>;

				format = "i2s";

				mclk-fs = <256>;

				dai-tdm-slot-num = <2>;

				dai-tdm-slot-width = <32>;

			};

		};

	};

};



&sdmmc1 {

	pinctrl-names = "default", "opendrain", "sleep";

	pinctrl-0 = <&sdmmc1_b4_pins_a>;

	pinctrl-1 = <&sdmmc1_b4_od_pins_a>;

	pinctrl-2 = <&sdmmc1_b4_sleep_pins_a>;

	broken-cd;

	st,neg-edge;

	bus-width = <4>;

	vmmc-supply = <&v3v3>;

	status = "okay";

};



&sdmmc3 {

	pinctrl-names = "default", "opendrain", "sleep";

	pinctrl-0 = <&sdmmc3_b4_pins_a>;

	pinctrl-1 = <&sdmmc3_b4_od_pins_a>;

	pinctrl-2 = <&sdmmc3_b4_sleep_pins_a>;

	broken-cd;

	st,neg-edge;

	bus-width = <4>;

	vmmc-supply = <&v3v3>;

	status = "disabled";

};



&timers1 {

	/* spare dmas for other usage */

	/delete-property/dmas;

	/delete-property/dma-names;

	status = "disabled";

	pwm {

		pinctrl-0 = <&pwm1_pins_a>;

		pinctrl-1 = <&pwm1_sleep_pins_a>;

		pinctrl-names = "default", "sleep";

		status = "okay";

	};

	timer@0 {

		status = "okay";

	};

};



&timers3 {

	/delete-property/dmas;

	/delete-property/dma-names;

	status = "disabled";

	pwm {

		pinctrl-0 = <&pwm3_pins_a>;

		pinctrl-1 = <&pwm3_sleep_pins_a>;

		pinctrl-names = "default", "sleep";

		status = "okay";

	};

	timer@2 {

		status = "okay";

	};

};



&timers4 {

	/delete-property/dmas;

	/delete-property/dma-names;

	status = "disabled";

	pwm {

		pinctrl-0 = <&pwm4_pins_a &pwm4_pins_b>;

		pinctrl-1 = <&pwm4_sleep_pins_a &pwm4_sleep_pins_b>;

		pinctrl-names = "default", "sleep";

		status = "okay";

	};

	timer@3 {

		status = "okay";

	};

};



&timers5 {

	/delete-property/dmas;

	/delete-property/dma-names;

	status = "disabled";

	pwm {

		pinctrl-0 = <&pwm5_pins_a>;

		pinctrl-1 = <&pwm5_sleep_pins_a>;

		pinctrl-names = "default", "sleep";

		status = "okay";

	};

	timer@4 {

		status = "okay";

	};

};



&timers6 {

	/delete-property/dmas;

	/delete-property/dma-names;

	status = "disabled";

	timer@5 {

		status = "okay";

	};

};



&timers12 {

	/delete-property/dmas;

	/delete-property/dma-names;

	status = "disabled";

	pwm {

		pinctrl-0 = <&pwm12_pins_a>;

		pinctrl-1 = <&pwm12_sleep_pins_a>;

		pinctrl-names = "default", "sleep";

		status = "okay";

	};

	timer@11 {

		status = "okay";

	};

};



&uart4 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart4_pins_a>;

	status = "okay";

};



&vrefbuf {

	regulator-min-microvolt = <2500000>;

	regulator-max-microvolt = <2500000>;

	vdda-supply = <&vdd>;

	status = "okay";

};

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

+14 −1
Original line number Diff line number Diff line
@@ -6,11 +6,24 @@ 


/dts-v1/;



#include "stm32mp157a-dk1.dts"

#include "stm32mp157.dtsi"

#include "stm32mp15xc.dtsi"

#include "stm32mp15-pinctrl.dtsi"

#include "stm32mp15xxac-pinctrl.dtsi"

#include "stm32mp15xx-dkx.dtsi"



/ {

	model = "STMicroelectronics STM32MP157C-DK2 Discovery Board";

	compatible = "st,stm32mp157c-dk2", "st,stm32mp157";



	aliases {

		ethernet0 = &ethernet0;

		serial0 = &uart4;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};

};



&dsi {

arch/arm/boot/dts/stm32mp15xx-dkx.dtsi

0 → 100644
+597 −0

File added.

Preview size limit exceeded, changes collapsed.