From: Patrick Delaunay Date: Tue, 28 Jan 2020 10:11:00 +0100 Subject: [PATCH 3/9] ARM: dts: stm32mp1: DT alignment with kernel v5.5-rc7 In-Reply-To: <20200128091106.28552-1-patrick.delaunay@st.com> References: <20200128091106.28552-1-patrick.delaunay@st.com> Message-ID: <20200128091106.28552-3-patrick.delaunay@st.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: u-boot@lists.denx.de Device tree and binding alignment with kernel v5.5-rc7 Signed-off-by: Patrick Delaunay --- arch/arm/dts/stm32mp157-pinctrl.dtsi | 23 ++++++++- arch/arm/dts/stm32mp157a-avenger96.dts | 3 +- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 17 ------- arch/arm/dts/stm32mp157a-dk1.dts | 65 +++++++++++++++++++++--- arch/arm/dts/stm32mp157c-dk2.dts | 13 +++++ arch/arm/dts/stm32mp157c-ed1.dts | 20 ++++++-- arch/arm/dts/stm32mp157c-ev1.dts | 3 -- 7 files changed, 112 insertions(+), 32 deletions(-) diff --git a/arch/arm/dts/stm32mp157-pinctrl.dtsi b/arch/arm/dts/stm32mp157= -pinctrl.dtsi index 07cd0809ff..81a363d93d 100644 --- a/arch/arm/dts/stm32mp157-pinctrl.dtsi +++ b/arch/arm/dts/stm32mp157-pinctrl.dtsi @@ -138,7 +138,16 @@ status =3D "disabled"; }; =20 - adc12_usb_pwr_pins_a: adc12-usb-pwr-pins-0 { + adc12_ain_pins_a: adc12-ain-0 { + pins { + pinmux =3D , /* ADC1 in13 */ + , /* ADC1 in6 */ + , /* ADC2 in2 */ + ; /* ADC2 in6 */ + }; + }; + + adc12_usb_cc_pins_a: adc12-usb-cc-pins-0 { pins { pinmux =3D , /* ADC12 in18 */ ; /* ADC12 in19 */ @@ -175,6 +184,18 @@ }; }; =20 + dac_ch1_pins_a: dac-ch1 { + pins { + pinmux =3D ; + }; + }; + + dac_ch2_pins_a: dac-ch2 { + pins { + pinmux =3D ; + }; + }; + dcmi_pins_a: dcmi-0 { pins { pinmux =3D ,/* DCMI_HSYNC */ diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts b/arch/arm/dts/stm32mp1= 57a-avenger96.dts index 232fe70905..3065593bf2 100644 --- a/arch/arm/dts/stm32mp157a-avenger96.dts +++ b/arch/arm/dts/stm32mp157a-avenger96.dts @@ -252,14 +252,13 @@ regulator-name =3D "vbus_otg"; interrupts =3D ; interrupt-parent =3D <&pmic>; - regulator-active-discharge; }; =20 vbus_sw: pwr_sw2 { regulator-name =3D "vbus_sw"; interrupts =3D ; interrupt-parent =3D <&pmic>; - regulator-active-discharge; + regulator-active-discharge =3D <1>; }; }; =20 diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32m= p157a-dk1-u-boot.dtsi index dcaab3eef2..4045a6e731 100644 --- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi +++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi @@ -35,24 +35,7 @@ }; =20 &adc { - pinctrl-names =3D "default"; - pinctrl-0 =3D <&adc12_usb_pwr_pins_a>; - vdd-supply =3D <&vdd>; - vdda-supply =3D <&vdd>; - vref-supply =3D <&vrefbuf>; status =3D "okay"; - adc1: adc at 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 =3D> 2.5us. - * Use arbitrary margin here (e.g. 5=C2=B5s). - */ - st,min-sample-time-nsecs =3D <5000>; - /* ANA0, ANA1, USB Type-C CC1 & CC2 */ - st,adc-channels =3D <0 1 18 19>; - status =3D "okay"; - }; }; =20 &clk_hse { diff --git a/arch/arm/dts/stm32mp157a-dk1.dts b/arch/arm/dts/stm32mp157a-dk= 1.dts index dc61bfc3d5..624bf6954b 100644 --- a/arch/arm/dts/stm32mp157a-dk1.dts +++ b/arch/arm/dts/stm32mp157a-dk1.dts @@ -25,6 +25,7 @@ }; =20 memory at c0000000 { + device_type =3D "memory"; reg =3D <0xc0000000 0x20000000>; }; =20 @@ -92,7 +93,34 @@ "Playback" , "MCLK", "Capture" , "MCLK", "MICL" , "Mic Bias"; - dais =3D <&sai2a_port &sai2b_port>; + dais =3D <&sai2a_port &sai2b_port &i2s2_port>; + status =3D "okay"; + }; +}; + +&adc { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&adc12_ain_pins_a>, <&adc12_usb_cc_pins_a>; + vdd-supply =3D <&vdd>; + vdda-supply =3D <&vdd>; + vref-supply =3D <&vrefbuf>; + status =3D "disabled"; + adc1: adc at 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 =3D> 2.5us. + * Use arbitrary margin here (e.g. 5us). + */ + st,min-sample-time-nsecs =3D <5000>; + /* AIN connector, USB Type-C CC1 & CC2 */ + st,adc-channels =3D <0 1 6 13 18 19>; + status =3D "okay"; + }; + adc2: adc at 100 { + /* AIN connector, USB Type-C CC1 & CC2 */ + st,adc-channels =3D <0 1 2 6 18 19>; + st,min-sample-time-nsecs =3D <5000>; status =3D "okay"; }; }; @@ -146,9 +174,7 @@ reset-gpios =3D <&gpioa 10 GPIO_ACTIVE_LOW>; interrupts =3D <1 IRQ_TYPE_EDGE_FALLING>; interrupt-parent =3D <&gpiog>; - pinctrl-names =3D "default", "sleep"; - pinctrl-0 =3D <<dc_pins_a>; - pinctrl-1 =3D <<dc_pins_sleep_a>; + #sound-dai-cells =3D <0>; status =3D "okay"; =20 ports { @@ -161,6 +187,13 @@ remote-endpoint =3D <<dc_ep0_out>; }; }; + + port at 3 { + reg =3D <3>; + sii9022_tx_endpoint: endpoint { + remote-endpoint =3D <&i2s2_endpoint>; + }; + }; }; }; =20 @@ -244,7 +277,7 @@ =20 vddcore: buck1 { regulator-name =3D "vddcore"; - regulator-min-microvolt =3D <800000>; + regulator-min-microvolt =3D <1200000>; regulator-max-microvolt =3D <1350000>; regulator-always-on; regulator-initial-mode =3D <0>; @@ -345,7 +378,7 @@ vbus_sw: pwr_sw2 { regulator-name =3D "vbus_sw"; interrupts =3D ; - regulator-active-discharge; + regulator-active-discharge =3D <1>; }; }; =20 @@ -364,6 +397,23 @@ }; }; =20 +&i2s2 { + clocks =3D <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>; + clock-names =3D "pclk", "i2sclk", "x8k", "x11k"; + pinctrl-names =3D "default", "sleep"; + pinctrl-0 =3D <&i2s2_pins_a>; + pinctrl-1 =3D <&i2s2_pins_sleep_a>; + status =3D "okay"; + + i2s2_port: port { + i2s2_endpoint: endpoint { + remote-endpoint =3D <&sii9022_tx_endpoint>; + format =3D "i2s"; + mclk-fs =3D <256>; + }; + }; +}; + &ipcc { status =3D "okay"; }; @@ -374,6 +424,9 @@ }; =20 <dc { + pinctrl-names =3D "default", "sleep"; + pinctrl-0 =3D <<dc_pins_a>; + pinctrl-1 =3D <<dc_pins_sleep_a>; status =3D "okay"; =20 port { diff --git a/arch/arm/dts/stm32mp157c-dk2.dts b/arch/arm/dts/stm32mp157c-dk= 2.dts index 020ea0f0e2..d26adcbeba 100644 --- a/arch/arm/dts/stm32mp157c-dk2.dts +++ b/arch/arm/dts/stm32mp157c-dk2.dts @@ -53,6 +53,19 @@ }; }; =20 +&i2c1 { + touchscreen at 38 { + compatible =3D "focaltech,ft6236"; + reg =3D <0x38>; + interrupts =3D <2 2>; + interrupt-parent =3D <&gpiof>; + interrupt-controller; + touchscreen-size-x =3D <480>; + touchscreen-size-y =3D <800>; + status =3D "okay"; + }; +}; + <dc { status =3D "okay"; =20 diff --git a/arch/arm/dts/stm32mp157c-ed1.dts b/arch/arm/dts/stm32mp157c-ed= 1.dts index acb59f24cc..ae4da39ce8 100644 --- a/arch/arm/dts/stm32mp157c-ed1.dts +++ b/arch/arm/dts/stm32mp157c-ed1.dts @@ -84,7 +84,21 @@ =20 gpios =3D <&gpiof 14 GPIO_ACTIVE_HIGH>; gpios-states =3D <0>; - states =3D <1800000 0x1 2900000 0x0>; + states =3D <1800000 0x1>, + <2900000 0x0>; + }; +}; + +&dac { + pinctrl-names =3D "default"; + pinctrl-0 =3D <&dac_ch1_pins_a &dac_ch2_pins_a>; + vref-supply =3D <&vdda>; + status =3D "disabled"; + dac1: dac at 1 { + status =3D "okay"; + }; + dac2: dac at 2 { + status =3D "okay"; }; }; =20 @@ -127,7 +141,7 @@ =20 vddcore: buck1 { regulator-name =3D "vddcore"; - regulator-min-microvolt =3D <800000>; + regulator-min-microvolt =3D <1200000>; regulator-max-microvolt =3D <1350000>; regulator-always-on; regulator-initial-mode =3D <0>; @@ -225,7 +239,7 @@ vbus_sw: pwr_sw2 { regulator-name =3D "vbus_sw"; interrupts =3D ; - regulator-active-discharge; + regulator-active-discharge =3D <1>; }; }; =20 diff --git a/arch/arm/dts/stm32mp157c-ev1.dts b/arch/arm/dts/stm32mp157c-ev= 1.dts index aa5892b156..bd8ffc185f 100644 --- a/arch/arm/dts/stm32mp157c-ev1.dts +++ b/arch/arm/dts/stm32mp157c-ev1.dts @@ -32,7 +32,6 @@ =20 joystick { compatible =3D "gpio-keys"; - #size-cells =3D <0>; pinctrl-0 =3D <&joystick_pins>; pinctrl-names =3D "default"; button-0 { @@ -343,14 +342,12 @@ =20 &usbh_ehci { phys =3D <&usbphyc_port0>; - phy-names =3D "usb"; status =3D "okay"; }; =20 &usbotg_hs { dr_mode =3D "peripheral"; phys =3D <&usbphyc_port1 0>; - phy-names =3D "usb2-phy"; status =3D "okay"; }; =20 --=20 2.17.1