Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d35a5af321f33e6bd5b643e1b0356fc2bfa0ba0b

Authored by Patrick Delaunay
1 parent 7915b9914e
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

ARM: dts: stm32mp1: DT alignment with kernel v5.5-rc7 

Device tree and binding alignment with kernel v5.5-rc7

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Reviewed-by: Patrice Chotard <patrice.chotard@st.com>

Showing 7 changed files with 112 additions and 32 deletions Side-by-side Diff

arch/arm/dts/stm32mp157-pinctrl.dtsi
Diff comments   View file @ d35a5af
... ... @@ -138,8 +138,17 @@
138 138 status = "disabled";
139 139 };
140 140  
141   - adc12_usb_pwr_pins_a: adc12-usb-pwr-pins-0 {
  141 + adc12_ain_pins_a: adc12-ain-0 {
142 142 pins {
  143 + pinmux = <STM32_PINMUX('C', 3, ANALOG)>, /* ADC1 in13 */
  144 + <STM32_PINMUX('F', 12, ANALOG)>, /* ADC1 in6 */
  145 + <STM32_PINMUX('F', 13, ANALOG)>, /* ADC2 in2 */
  146 + <STM32_PINMUX('F', 14, ANALOG)>; /* ADC2 in6 */
  147 + };
  148 + };
  149 +
  150 + adc12_usb_cc_pins_a: adc12-usb-cc-pins-0 {
  151 + pins {
143 152 pinmux = <STM32_PINMUX('A', 4, ANALOG)>, /* ADC12 in18 */
144 153 <STM32_PINMUX('A', 5, ANALOG)>; /* ADC12 in19 */
145 154 };
... ... @@ -172,6 +181,18 @@
172 181 cec_pins_sleep_b: cec-sleep-1 {
173 182 pins {
174 183 pinmux = <STM32_PINMUX('B', 6, ANALOG)>; /* HDMI_CEC */
  184 + };
  185 + };
  186 +
  187 + dac_ch1_pins_a: dac-ch1 {
  188 + pins {
  189 + pinmux = <STM32_PINMUX('A', 4, ANALOG)>;
  190 + };
  191 + };
  192 +
  193 + dac_ch2_pins_a: dac-ch2 {
  194 + pins {
  195 + pinmux = <STM32_PINMUX('A', 5, ANALOG)>;
175 196 };
176 197 };
177 198  
arch/arm/dts/stm32mp157a-avenger96.dts
Diff comments   View file @ d35a5af
... ... @@ -252,14 +252,13 @@
252 252 regulator-name = "vbus_otg";
253 253 interrupts = <IT_OCP_OTG 0>;
254 254 interrupt-parent = <&pmic>;
255   - regulator-active-discharge;
256 255 };
257 256  
258 257 vbus_sw: pwr_sw2 {
259 258 regulator-name = "vbus_sw";
260 259 interrupts = <IT_OCP_SWOUT 0>;
261 260 interrupt-parent = <&pmic>;
262   - regulator-active-discharge;
  261 + regulator-active-discharge = <1>;
263 262 };
264 263 };
265 264  
arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
Diff comments   View file @ d35a5af
... ... @@ -35,24 +35,7 @@
35 35 };
36 36  
37 37 &adc {
38   - pinctrl-names = "default";
39   - pinctrl-0 = <&adc12_usb_pwr_pins_a>;
40   - vdd-supply = <&vdd>;
41   - vdda-supply = <&vdd>;
42   - vref-supply = <&vrefbuf>;
43 38 status = "okay";
44   - adc1: adc@0 {
45   - /*
46   - * Type-C USB_PWR_CC1 & USB_PWR_CC2 on in18 & in19.
47   - * Use at least 5 * RC time, e.g. 5 * (Rp + Rd) * C:
48   - * 5 * (56 + 47kOhms) * 5pF => 2.5us.
49   - * Use arbitrary margin here (e.g. 5ยตs).
50   - */
51   - st,min-sample-time-nsecs = <5000>;
52   - /* ANA0, ANA1, USB Type-C CC1 & CC2 */
53   - st,adc-channels = <0 1 18 19>;
54   - status = "okay";
55   - };
56 39 };
57 40  
58 41 &clk_hse {
arch/arm/dts/stm32mp157a-dk1.dts
Diff comments   View file @ d35a5af
... ... @@ -25,6 +25,7 @@
25 25 };
26 26  
27 27 memory@c0000000 {
  28 + device_type = "memory";
28 29 reg = <0xc0000000 0x20000000>;
29 30 };
30 31  
31 32  
... ... @@ -92,11 +93,38 @@
92 93 "Playback" , "MCLK",
93 94 "Capture" , "MCLK",
94 95 "MICL" , "Mic Bias";
95   - dais = <&sai2a_port &sai2b_port>;
  96 + dais = <&sai2a_port &sai2b_port &i2s2_port>;
96 97 status = "okay";
97 98 };
98 99 };
99 100  
  101 +&adc {
  102 + pinctrl-names = "default";
  103 + pinctrl-0 = <&adc12_ain_pins_a>, <&adc12_usb_cc_pins_a>;
  104 + vdd-supply = <&vdd>;
  105 + vdda-supply = <&vdd>;
  106 + vref-supply = <&vrefbuf>;
  107 + status = "disabled";
  108 + adc1: adc@0 {
  109 + /*
  110 + * Type-C USB_PWR_CC1 & USB_PWR_CC2 on in18 & in19.
  111 + * Use at least 5 * RC time, e.g. 5 * (Rp + Rd) * C:
  112 + * 5 * (56 + 47kOhms) * 5pF => 2.5us.
  113 + * Use arbitrary margin here (e.g. 5us).
  114 + */
  115 + st,min-sample-time-nsecs = <5000>;
  116 + /* AIN connector, USB Type-C CC1 & CC2 */
  117 + st,adc-channels = <0 1 6 13 18 19>;
  118 + status = "okay";
  119 + };
  120 + adc2: adc@100 {
  121 + /* AIN connector, USB Type-C CC1 & CC2 */
  122 + st,adc-channels = <0 1 2 6 18 19>;
  123 + st,min-sample-time-nsecs = <5000>;
  124 + status = "okay";
  125 + };
  126 +};
  127 +
100 128 &cec {
101 129 pinctrl-names = "default", "sleep";
102 130 pinctrl-0 = <&cec_pins_b>;
... ... @@ -146,9 +174,7 @@
146 174 reset-gpios = <&gpioa 10 GPIO_ACTIVE_LOW>;
147 175 interrupts = <1 IRQ_TYPE_EDGE_FALLING>;
148 176 interrupt-parent = <&gpiog>;
149   - pinctrl-names = "default", "sleep";
150   - pinctrl-0 = <&ltdc_pins_a>;
151   - pinctrl-1 = <&ltdc_pins_sleep_a>;
  177 + #sound-dai-cells = <0>;
152 178 status = "okay";
153 179  
154 180 ports {
... ... @@ -161,6 +187,13 @@
161 187 remote-endpoint = <&ltdc_ep0_out>;
162 188 };
163 189 };
  190 +
  191 + port@3 {
  192 + reg = <3>;
  193 + sii9022_tx_endpoint: endpoint {
  194 + remote-endpoint = <&i2s2_endpoint>;
  195 + };
  196 + };
164 197 };
165 198 };
166 199  
... ... @@ -244,7 +277,7 @@
244 277  
245 278 vddcore: buck1 {
246 279 regulator-name = "vddcore";
247   - regulator-min-microvolt = <800000>;
  280 + regulator-min-microvolt = <1200000>;
248 281 regulator-max-microvolt = <1350000>;
249 282 regulator-always-on;
250 283 regulator-initial-mode = <0>;
... ... @@ -345,7 +378,7 @@
345 378 vbus_sw: pwr_sw2 {
346 379 regulator-name = "vbus_sw";
347 380 interrupts = <IT_OCP_SWOUT 0>;
348   - regulator-active-discharge;
  381 + regulator-active-discharge = <1>;
349 382 };
350 383 };
351 384  
... ... @@ -364,6 +397,23 @@
364 397 };
365 398 };
366 399  
  400 +&i2s2 {
  401 + clocks = <&rcc SPI2>, <&rcc SPI2_K>, <&rcc PLL3_Q>, <&rcc PLL3_R>;
  402 + clock-names = "pclk", "i2sclk", "x8k", "x11k";
  403 + pinctrl-names = "default", "sleep";
  404 + pinctrl-0 = <&i2s2_pins_a>;
  405 + pinctrl-1 = <&i2s2_pins_sleep_a>;
  406 + status = "okay";
  407 +
  408 + i2s2_port: port {
  409 + i2s2_endpoint: endpoint {
  410 + remote-endpoint = <&sii9022_tx_endpoint>;
  411 + format = "i2s";
  412 + mclk-fs = <256>;
  413 + };
  414 + };
  415 +};
  416 +
367 417 &ipcc {
368 418 status = "okay";
369 419 };
... ... @@ -374,6 +424,9 @@
374 424 };
375 425  
376 426 &ltdc {
  427 + pinctrl-names = "default", "sleep";
  428 + pinctrl-0 = <&ltdc_pins_a>;
  429 + pinctrl-1 = <&ltdc_pins_sleep_a>;
377 430 status = "okay";
378 431  
379 432 port {
arch/arm/dts/stm32mp157c-dk2.dts
Diff comments   View file @ d35a5af
... ... @@ -53,6 +53,19 @@
53 53 };
54 54 };
55 55  
  56 +&i2c1 {
  57 + touchscreen@38 {
  58 + compatible = "focaltech,ft6236";
  59 + reg = <0x38>;
  60 + interrupts = <2 2>;
  61 + interrupt-parent = <&gpiof>;
  62 + interrupt-controller;
  63 + touchscreen-size-x = <480>;
  64 + touchscreen-size-y = <800>;
  65 + status = "okay";
  66 + };
  67 +};
  68 +
56 69 &ltdc {
57 70 status = "okay";
58 71  
arch/arm/dts/stm32mp157c-ed1.dts
Diff comments   View file @ d35a5af
... ... @@ -84,10 +84,24 @@
84 84  
85 85 gpios = <&gpiof 14 GPIO_ACTIVE_HIGH>;
86 86 gpios-states = <0>;
87   - states = <1800000 0x1 2900000 0x0>;
  87 + states = <1800000 0x1>,
  88 + <2900000 0x0>;
88 89 };
89 90 };
90 91  
  92 +&dac {
  93 + pinctrl-names = "default";
  94 + pinctrl-0 = <&dac_ch1_pins_a &dac_ch2_pins_a>;
  95 + vref-supply = <&vdda>;
  96 + status = "disabled";
  97 + dac1: dac@1 {
  98 + status = "okay";
  99 + };
  100 + dac2: dac@2 {
  101 + status = "okay";
  102 + };
  103 +};
  104 +
91 105 &dts {
92 106 status = "okay";
93 107 };
... ... @@ -127,7 +141,7 @@
127 141  
128 142 vddcore: buck1 {
129 143 regulator-name = "vddcore";
130   - regulator-min-microvolt = <800000>;
  144 + regulator-min-microvolt = <1200000>;
131 145 regulator-max-microvolt = <1350000>;
132 146 regulator-always-on;
133 147 regulator-initial-mode = <0>;
... ... @@ -225,7 +239,7 @@
225 239 vbus_sw: pwr_sw2 {
226 240 regulator-name = "vbus_sw";
227 241 interrupts = <IT_OCP_SWOUT 0>;
228   - regulator-active-discharge;
  242 + regulator-active-discharge = <1>;
229 243 };
230 244 };
231 245  
arch/arm/dts/stm32mp157c-ev1.dts
Diff comments   View file @ d35a5af
... ... @@ -32,7 +32,6 @@
32 32  
33 33 joystick {
34 34 compatible = "gpio-keys";
35   - #size-cells = <0>;
36 35 pinctrl-0 = <&joystick_pins>;
37 36 pinctrl-names = "default";
38 37 button-0 {
39 38  
... ... @@ -343,14 +342,12 @@
343 342  
344 343 &usbh_ehci {
345 344 phys = <&usbphyc_port0>;
346   - phy-names = "usb";
347 345 status = "okay";
348 346 };
349 347  
350 348 &usbotg_hs {
351 349 dr_mode = "peripheral";
352 350 phys = <&usbphyc_port1 0>;
353   - phy-names = "usb2-phy";
354 351 status = "okay";
355 352 };
356 353