| Message ID | 20200128091106.28552-3-patrick.delaunay@st.com |
|---|---|
| State | Accepted |
| Commit | d35a5af321f33e6bd5b643e1b0356fc2bfa0ba0b |
| Delegated to: | Patrick Delaunay |
| Headers | show |
| Series | stm32mp1 devicetre-tree and board update | expand |
On 1/28/20 10:11 AM, Patrick Delaunay wrote: > Device tree and binding alignment with kernel v5.5-rc7 > > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> > --- > > 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 = "disabled"; > }; > > - adc12_usb_pwr_pins_a: adc12-usb-pwr-pins-0 { > + adc12_ain_pins_a: adc12-ain-0 { > + pins { > + pinmux = <STM32_PINMUX('C', 3, ANALOG)>, /* ADC1 in13 */ > + <STM32_PINMUX('F', 12, ANALOG)>, /* ADC1 in6 */ > + <STM32_PINMUX('F', 13, ANALOG)>, /* ADC2 in2 */ > + <STM32_PINMUX('F', 14, ANALOG)>; /* ADC2 in6 */ > + }; > + }; > + > + adc12_usb_cc_pins_a: adc12-usb-cc-pins-0 { > pins { > pinmux = <STM32_PINMUX('A', 4, ANALOG)>, /* ADC12 in18 */ > <STM32_PINMUX('A', 5, ANALOG)>; /* ADC12 in19 */ > @@ -175,6 +184,18 @@ > }; > }; > > + dac_ch1_pins_a: dac-ch1 { > + pins { > + pinmux = <STM32_PINMUX('A', 4, ANALOG)>; > + }; > + }; > + > + dac_ch2_pins_a: dac-ch2 { > + pins { > + pinmux = <STM32_PINMUX('A', 5, ANALOG)>; > + }; > + }; > + > dcmi_pins_a: dcmi-0 { > pins { > pinmux = <STM32_PINMUX('H', 8, AF13)>,/* DCMI_HSYNC */ > diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts b/arch/arm/dts/stm32mp157a-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 = "vbus_otg"; > interrupts = <IT_OCP_OTG 0>; > interrupt-parent = <&pmic>; > - regulator-active-discharge; > }; > > vbus_sw: pwr_sw2 { > regulator-name = "vbus_sw"; > interrupts = <IT_OCP_SWOUT 0>; > interrupt-parent = <&pmic>; > - regulator-active-discharge; > + regulator-active-discharge = <1>; > }; > }; > > diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-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 @@ > }; > > &adc { > - pinctrl-names = "default"; > - pinctrl-0 = <&adc12_usb_pwr_pins_a>; > - vdd-supply = <&vdd>; > - vdda-supply = <&vdd>; > - vref-supply = <&vrefbuf>; > status = "okay"; > - 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. 5µs). > - */ > - st,min-sample-time-nsecs = <5000>; > - /* ANA0, ANA1, USB Type-C CC1 & CC2 */ > - st,adc-channels = <0 1 18 19>; > - status = "okay"; > - }; > }; > > &clk_hse { > diff --git a/arch/arm/dts/stm32mp157a-dk1.dts b/arch/arm/dts/stm32mp157a-dk1.dts > index dc61bfc3d5..624bf6954b 100644 > --- a/arch/arm/dts/stm32mp157a-dk1.dts > +++ b/arch/arm/dts/stm32mp157a-dk1.dts > @@ -25,6 +25,7 @@ > }; > > memory@c0000000 { > + device_type = "memory"; > reg = <0xc0000000 0x20000000>; > }; > > @@ -92,7 +93,34 @@ > "Playback" , "MCLK", > "Capture" , "MCLK", > "MICL" , "Mic Bias"; > - dais = <&sai2a_port &sai2b_port>; > + 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"; > }; > }; > @@ -146,9 +174,7 @@ > reset-gpios = <&gpioa 10 GPIO_ACTIVE_LOW>; > interrupts = <1 IRQ_TYPE_EDGE_FALLING>; > interrupt-parent = <&gpiog>; > - pinctrl-names = "default", "sleep"; > - pinctrl-0 = <<dc_pins_a>; > - pinctrl-1 = <<dc_pins_sleep_a>; > + #sound-dai-cells = <0>; > status = "okay"; > > ports { > @@ -161,6 +187,13 @@ > remote-endpoint = <<dc_ep0_out>; > }; > }; > + > + port@3 { > + reg = <3>; > + sii9022_tx_endpoint: endpoint { > + remote-endpoint = <&i2s2_endpoint>; > + }; > + }; > }; > }; > > @@ -244,7 +277,7 @@ > > vddcore: buck1 { > regulator-name = "vddcore"; > - regulator-min-microvolt = <800000>; > + regulator-min-microvolt = <1200000>; > regulator-max-microvolt = <1350000>; > regulator-always-on; > regulator-initial-mode = <0>; > @@ -345,7 +378,7 @@ > vbus_sw: pwr_sw2 { > regulator-name = "vbus_sw"; > interrupts = <IT_OCP_SWOUT 0>; > - regulator-active-discharge; > + regulator-active-discharge = <1>; > }; > }; > > @@ -364,6 +397,23 @@ > }; > }; > > +&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"; > }; > @@ -374,6 +424,9 @@ > }; > > <dc { > + pinctrl-names = "default", "sleep"; > + pinctrl-0 = <<dc_pins_a>; > + pinctrl-1 = <<dc_pins_sleep_a>; > status = "okay"; > > port { > diff --git a/arch/arm/dts/stm32mp157c-dk2.dts b/arch/arm/dts/stm32mp157c-dk2.dts > index 020ea0f0e2..d26adcbeba 100644 > --- a/arch/arm/dts/stm32mp157c-dk2.dts > +++ b/arch/arm/dts/stm32mp157c-dk2.dts > @@ -53,6 +53,19 @@ > }; > }; > > +&i2c1 { > + touchscreen@38 { > + compatible = "focaltech,ft6236"; > + reg = <0x38>; > + interrupts = <2 2>; > + interrupt-parent = <&gpiof>; > + interrupt-controller; > + touchscreen-size-x = <480>; > + touchscreen-size-y = <800>; > + status = "okay"; > + }; > +}; > + > <dc { > status = "okay"; > > diff --git a/arch/arm/dts/stm32mp157c-ed1.dts b/arch/arm/dts/stm32mp157c-ed1.dts > index acb59f24cc..ae4da39ce8 100644 > --- a/arch/arm/dts/stm32mp157c-ed1.dts > +++ b/arch/arm/dts/stm32mp157c-ed1.dts > @@ -84,7 +84,21 @@ > > gpios = <&gpiof 14 GPIO_ACTIVE_HIGH>; > gpios-states = <0>; > - states = <1800000 0x1 2900000 0x0>; > + states = <1800000 0x1>, > + <2900000 0x0>; > + }; > +}; > + > +&dac { > + pinctrl-names = "default"; > + pinctrl-0 = <&dac_ch1_pins_a &dac_ch2_pins_a>; > + vref-supply = <&vdda>; > + status = "disabled"; > + dac1: dac@1 { > + status = "okay"; > + }; > + dac2: dac@2 { > + status = "okay"; > }; > }; > > @@ -127,7 +141,7 @@ > > vddcore: buck1 { > regulator-name = "vddcore"; > - regulator-min-microvolt = <800000>; > + regulator-min-microvolt = <1200000>; > regulator-max-microvolt = <1350000>; > regulator-always-on; > regulator-initial-mode = <0>; > @@ -225,7 +239,7 @@ > vbus_sw: pwr_sw2 { > regulator-name = "vbus_sw"; > interrupts = <IT_OCP_SWOUT 0>; > - regulator-active-discharge; > + regulator-active-discharge = <1>; > }; > }; > > diff --git a/arch/arm/dts/stm32mp157c-ev1.dts b/arch/arm/dts/stm32mp157c-ev1.dts > index aa5892b156..bd8ffc185f 100644 > --- a/arch/arm/dts/stm32mp157c-ev1.dts > +++ b/arch/arm/dts/stm32mp157c-ev1.dts > @@ -32,7 +32,6 @@ > > joystick { > compatible = "gpio-keys"; > - #size-cells = <0>; > pinctrl-0 = <&joystick_pins>; > pinctrl-names = "default"; > button-0 { > @@ -343,14 +342,12 @@ > > &usbh_ehci { > phys = <&usbphyc_port0>; > - phy-names = "usb"; > status = "okay"; > }; > > &usbotg_hs { > dr_mode = "peripheral"; > phys = <&usbphyc_port1 0>; > - phy-names = "usb2-phy"; > status = "okay"; > }; > > Reviewed-by: Patrice Chotard <patrice.chotard@st.com> Thanks > _______________________________________________ > Uboot-stm32 mailing list > Uboot-stm32@st-md-mailman.stormreply.com > https://st-md-mailman.stormreply.com/mailman/listinfo/uboot-stm32
Hi, > From: Patrick DELAUNAY <patrick.delaunay@st.com> > Sent: mardi 28 janvier 2020 10:11 > > Device tree and binding alignment with kernel v5.5-rc7 > > Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> > --- Applied to u-boot-stm32/master, thanks! Regards Patrick
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 = "disabled"; }; - adc12_usb_pwr_pins_a: adc12-usb-pwr-pins-0 { + adc12_ain_pins_a: adc12-ain-0 { + pins { + pinmux = <STM32_PINMUX('C', 3, ANALOG)>, /* ADC1 in13 */ + <STM32_PINMUX('F', 12, ANALOG)>, /* ADC1 in6 */ + <STM32_PINMUX('F', 13, ANALOG)>, /* ADC2 in2 */ + <STM32_PINMUX('F', 14, ANALOG)>; /* ADC2 in6 */ + }; + }; + + adc12_usb_cc_pins_a: adc12-usb-cc-pins-0 { pins { pinmux = <STM32_PINMUX('A', 4, ANALOG)>, /* ADC12 in18 */ <STM32_PINMUX('A', 5, ANALOG)>; /* ADC12 in19 */ @@ -175,6 +184,18 @@ }; }; + dac_ch1_pins_a: dac-ch1 { + pins { + pinmux = <STM32_PINMUX('A', 4, ANALOG)>; + }; + }; + + dac_ch2_pins_a: dac-ch2 { + pins { + pinmux = <STM32_PINMUX('A', 5, ANALOG)>; + }; + }; + dcmi_pins_a: dcmi-0 { pins { pinmux = <STM32_PINMUX('H', 8, AF13)>,/* DCMI_HSYNC */ diff --git a/arch/arm/dts/stm32mp157a-avenger96.dts b/arch/arm/dts/stm32mp157a-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 = "vbus_otg"; interrupts = <IT_OCP_OTG 0>; interrupt-parent = <&pmic>; - regulator-active-discharge; }; vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; interrupt-parent = <&pmic>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; }; diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi b/arch/arm/dts/stm32mp157a-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 @@ }; &adc { - pinctrl-names = "default"; - pinctrl-0 = <&adc12_usb_pwr_pins_a>; - vdd-supply = <&vdd>; - vdda-supply = <&vdd>; - vref-supply = <&vrefbuf>; status = "okay"; - 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. 5µs). - */ - st,min-sample-time-nsecs = <5000>; - /* ANA0, ANA1, USB Type-C CC1 & CC2 */ - st,adc-channels = <0 1 18 19>; - status = "okay"; - }; }; &clk_hse { diff --git a/arch/arm/dts/stm32mp157a-dk1.dts b/arch/arm/dts/stm32mp157a-dk1.dts index dc61bfc3d5..624bf6954b 100644 --- a/arch/arm/dts/stm32mp157a-dk1.dts +++ b/arch/arm/dts/stm32mp157a-dk1.dts @@ -25,6 +25,7 @@ }; memory@c0000000 { + device_type = "memory"; reg = <0xc0000000 0x20000000>; }; @@ -92,7 +93,34 @@ "Playback" , "MCLK", "Capture" , "MCLK", "MICL" , "Mic Bias"; - dais = <&sai2a_port &sai2b_port>; + 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"; }; }; @@ -146,9 +174,7 @@ reset-gpios = <&gpioa 10 GPIO_ACTIVE_LOW>; interrupts = <1 IRQ_TYPE_EDGE_FALLING>; interrupt-parent = <&gpiog>; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <<dc_pins_a>; - pinctrl-1 = <<dc_pins_sleep_a>; + #sound-dai-cells = <0>; status = "okay"; ports { @@ -161,6 +187,13 @@ remote-endpoint = <<dc_ep0_out>; }; }; + + port@3 { + reg = <3>; + sii9022_tx_endpoint: endpoint { + remote-endpoint = <&i2s2_endpoint>; + }; + }; }; }; @@ -244,7 +277,7 @@ vddcore: buck1 { regulator-name = "vddcore"; - regulator-min-microvolt = <800000>; + regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1350000>; regulator-always-on; regulator-initial-mode = <0>; @@ -345,7 +378,7 @@ vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; }; @@ -364,6 +397,23 @@ }; }; +&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"; }; @@ -374,6 +424,9 @@ }; <dc { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <<dc_pins_a>; + pinctrl-1 = <<dc_pins_sleep_a>; status = "okay"; port { diff --git a/arch/arm/dts/stm32mp157c-dk2.dts b/arch/arm/dts/stm32mp157c-dk2.dts index 020ea0f0e2..d26adcbeba 100644 --- a/arch/arm/dts/stm32mp157c-dk2.dts +++ b/arch/arm/dts/stm32mp157c-dk2.dts @@ -53,6 +53,19 @@ }; }; +&i2c1 { + touchscreen@38 { + compatible = "focaltech,ft6236"; + reg = <0x38>; + interrupts = <2 2>; + interrupt-parent = <&gpiof>; + interrupt-controller; + touchscreen-size-x = <480>; + touchscreen-size-y = <800>; + status = "okay"; + }; +}; + <dc { status = "okay"; diff --git a/arch/arm/dts/stm32mp157c-ed1.dts b/arch/arm/dts/stm32mp157c-ed1.dts index acb59f24cc..ae4da39ce8 100644 --- a/arch/arm/dts/stm32mp157c-ed1.dts +++ b/arch/arm/dts/stm32mp157c-ed1.dts @@ -84,7 +84,21 @@ gpios = <&gpiof 14 GPIO_ACTIVE_HIGH>; gpios-states = <0>; - states = <1800000 0x1 2900000 0x0>; + states = <1800000 0x1>, + <2900000 0x0>; + }; +}; + +&dac { + pinctrl-names = "default"; + pinctrl-0 = <&dac_ch1_pins_a &dac_ch2_pins_a>; + vref-supply = <&vdda>; + status = "disabled"; + dac1: dac@1 { + status = "okay"; + }; + dac2: dac@2 { + status = "okay"; }; }; @@ -127,7 +141,7 @@ vddcore: buck1 { regulator-name = "vddcore"; - regulator-min-microvolt = <800000>; + regulator-min-microvolt = <1200000>; regulator-max-microvolt = <1350000>; regulator-always-on; regulator-initial-mode = <0>; @@ -225,7 +239,7 @@ vbus_sw: pwr_sw2 { regulator-name = "vbus_sw"; interrupts = <IT_OCP_SWOUT 0>; - regulator-active-discharge; + regulator-active-discharge = <1>; }; }; diff --git a/arch/arm/dts/stm32mp157c-ev1.dts b/arch/arm/dts/stm32mp157c-ev1.dts index aa5892b156..bd8ffc185f 100644 --- a/arch/arm/dts/stm32mp157c-ev1.dts +++ b/arch/arm/dts/stm32mp157c-ev1.dts @@ -32,7 +32,6 @@ joystick { compatible = "gpio-keys"; - #size-cells = <0>; pinctrl-0 = <&joystick_pins>; pinctrl-names = "default"; button-0 { @@ -343,14 +342,12 @@ &usbh_ehci { phys = <&usbphyc_port0>; - phy-names = "usb"; status = "okay"; }; &usbotg_hs { dr_mode = "peripheral"; phys = <&usbphyc_port1 0>; - phy-names = "usb2-phy"; status = "okay"; };
Device tree and binding alignment with kernel v5.5-rc7 Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com> --- 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(-)