Skip to content

Commit c1084b6

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Another set of minor patches for Arm DTS files and soc specific drivers: - More reference counting bug fixes for DT nodes, and other trivial code fixes - Multiple code fixes for the Arm SCMI firmware driver to improve compatibility with firmware implementations. - A patch series for at91 to address power management issues from using the wrong DT compatible properties. - A series of patches to fix pad settings for NXP imx8mp to leave the configuration untouched from the boot loader - Additional DT fixes for qualcomm and NXP platforms - A boot time fix for stm32mp15 DT - Konrad Dybcio becomes an additional reviewer for the Qualcomm platforms" * tag 'soc-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (42 commits) soc: qcom: smem: use correct format characters ARM: dts: stm32: add missing usbh clock and fix clk order on stm32mp15 ARM: dts: stm32: delete fixed clock node on STM32MP15-SCMI ARM: dts: stm32: DSI should use LSE SCMI clock on DK1/ED1 STM32 board ARM: dts: stm32: use the correct clock source for CEC on stm32mp151 ARM: dts: stm32: fix pwr regulators references to use scmi soc: ixp4xx/npe: Fix unused match warning ARM: at91: pm: Mark at91_pm_secure_init as __init ARM: at91: fix soc detection for SAM9X60 SiPs ARM: dts: at91: sama5d2_icp: fix eeprom compatibles ARM: dts: at91: sam9x60ek: fix eeprom compatible and size ARM: at91: pm: use proper compatibles for sama7g5's rtc and rtt ARM: at91: pm: use proper compatibles for sam9x60's rtc and rtt ARM: at91: pm: use proper compatible for sama5d2's rtc arm64: dts: qcom: msm8992-*: Fix vdd_lvs1_2-supply typo firmware: arm_scmi: Remove usage of the deprecated ida_simple_xxx API firmware: arm_scmi: Fix response size warning for OPTEE transport arm64: dts: imx8mp-icore-mx8mp-edim2.2: correct pad settings arm64: dts: imx8mp-phyboard-pollux-rdk: correct i2c2 & mmc settings arm64: dts: imx8mp-phyboard-pollux-rdk: correct eqos pad settings ...
2 parents 88084a3 + c0d1a7b commit c1084b6

33 files changed

+300
-188
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2540,6 +2540,7 @@ W: http://www.armlinux.org.uk/
25402540
ARM/QUALCOMM SUPPORT
25412541
M: Andy Gross <[email protected]>
25422542
M: Bjorn Andersson <[email protected]>
2543+
R: Konrad Dybcio <[email protected]>
25432544
L: [email protected]
25442545
S: Maintained
25452546
T: git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git

‎arch/arm/boot/dts/at91-sam9x60ek.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,9 @@
233233
status = "okay";
234234

235235
eeprom@53 {
236-
compatible = "atmel,24c32";
236+
compatible = "atmel,24c02";
237237
reg = <0x53>;
238238
pagesize = <16>;
239-
size = <128>;
240239
status = "okay";
241240
};
242241
};

‎arch/arm/boot/dts/at91-sama5d2_icp.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,21 +329,21 @@
329329
status = "okay";
330330

331331
eeprom@50 {
332-
compatible = "atmel,24c32";
332+
compatible = "atmel,24c02";
333333
reg = <0x50>;
334334
pagesize = <16>;
335335
status = "okay";
336336
};
337337

338338
eeprom@52 {
339-
compatible = "atmel,24c32";
339+
compatible = "atmel,24c02";
340340
reg = <0x52>;
341341
pagesize = <16>;
342342
status = "disabled";
343343
};
344344

345345
eeprom@53 {
346-
compatible = "atmel,24c32";
346+
compatible = "atmel,24c02";
347347
reg = <0x53>;
348348
pagesize = <16>;
349349
status = "disabled";

‎arch/arm/boot/dts/imx7d-smegw01.dts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,8 @@
216216
pinctrl-names = "default";
217217
pinctrl-0 = <&pinctrl_usdhc2>;
218218
bus-width = <4>;
219+
no-1-8-v;
219220
non-removable;
220-
cap-sd-highspeed;
221-
sd-uhs-ddr50;
222-
mmc-ddr-1_8v;
223221
vmmc-supply = <&reg_wifi>;
224222
enable-sdio-wakeup;
225223
status = "okay";

‎arch/arm/boot/dts/stm32mp15-scmi.dtsi

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,37 @@
2727
reg = <0x16>;
2828
#reset-cells = <1>;
2929
};
30+
31+
scmi_voltd: protocol@17 {
32+
reg = <0x17>;
33+
34+
scmi_reguls: regulators {
35+
#address-cells = <1>;
36+
#size-cells = <0>;
37+
38+
scmi_reg11: reg11@0 {
39+
reg = <0>;
40+
regulator-name = "reg11";
41+
regulator-min-microvolt = <1100000>;
42+
regulator-max-microvolt = <1100000>;
43+
};
44+
45+
scmi_reg18: reg18@1 {
46+
voltd-name = "reg18";
47+
reg = <1>;
48+
regulator-name = "reg18";
49+
regulator-min-microvolt = <1800000>;
50+
regulator-max-microvolt = <1800000>;
51+
};
52+
53+
scmi_usb33: usb33@2 {
54+
reg = <2>;
55+
regulator-name = "usb33";
56+
regulator-min-microvolt = <3300000>;
57+
regulator-max-microvolt = <3300000>;
58+
};
59+
};
60+
};
3061
};
3162
};
3263

@@ -45,3 +76,30 @@
4576
};
4677
};
4778
};
79+
80+
&reg11 {
81+
status = "disabled";
82+
};
83+
84+
&reg18 {
85+
status = "disabled";
86+
};
87+
88+
&usb33 {
89+
status = "disabled";
90+
};
91+
92+
&usbotg_hs {
93+
usb33d-supply = <&scmi_usb33>;
94+
};
95+
96+
&usbphyc {
97+
vdda1v1-supply = <&scmi_reg11>;
98+
vdda1v8-supply = <&scmi_reg18>;
99+
};
100+
101+
/delete-node/ &clk_hse;
102+
/delete-node/ &clk_hsi;
103+
/delete-node/ &clk_lse;
104+
/delete-node/ &clk_lsi;
105+
/delete-node/ &clk_csi;

‎arch/arm/boot/dts/stm32mp151.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@
565565
compatible = "st,stm32-cec";
566566
reg = <0x40016000 0x400>;
567567
interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
568-
clocks = <&rcc CEC_K>, <&clk_lse>;
568+
clocks = <&rcc CEC_K>, <&rcc CEC>;
569569
clock-names = "cec", "hdmi-cec";
570570
status = "disabled";
571571
};
@@ -1474,7 +1474,7 @@
14741474
usbh_ohci: usb@5800c000 {
14751475
compatible = "generic-ohci";
14761476
reg = <0x5800c000 0x1000>;
1477-
clocks = <&rcc USBH>, <&usbphyc>;
1477+
clocks = <&usbphyc>, <&rcc USBH>;
14781478
resets = <&rcc USBH_R>;
14791479
interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
14801480
status = "disabled";
@@ -1483,7 +1483,7 @@
14831483
usbh_ehci: usb@5800d000 {
14841484
compatible = "generic-ehci";
14851485
reg = <0x5800d000 0x1000>;
1486-
clocks = <&rcc USBH>;
1486+
clocks = <&usbphyc>, <&rcc USBH>;
14871487
resets = <&rcc USBH_R>;
14881488
interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
14891489
companion = <&usbh_ohci>;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
clocks = <&scmi_clk CK_SCMI_MPU>;
3030
};
3131

32+
&dsi {
33+
clocks = <&rcc DSI_K>, <&scmi_clk CK_SCMI_HSE>, <&rcc DSI_PX>;
34+
};
35+
3236
&gpioz {
3337
clocks = <&scmi_clk CK_SCMI_GPIOZ>;
3438
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
};
3636

3737
&dsi {
38+
phy-dsi-supply = <&scmi_reg18>;
3839
clocks = <&rcc DSI_K>, <&scmi_clk CK_SCMI_HSE>, <&rcc DSI_PX>;
3940
};
4041

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
resets = <&scmi_reset RST_SCMI_CRYP1>;
3535
};
3636

37+
&dsi {
38+
clocks = <&rcc DSI_K>, <&scmi_clk CK_SCMI_HSE>, <&rcc DSI_PX>;
39+
};
40+
3741
&gpioz {
3842
clocks = <&scmi_clk CK_SCMI_GPIOZ>;
3943
};

‎arch/arm/boot/dts/stm32mp157c-ev1-scmi.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
};
3737

3838
&dsi {
39+
phy-dsi-supply = <&scmi_reg18>;
3940
clocks = <&rcc DSI_K>, <&scmi_clk CK_SCMI_HSE>, <&rcc DSI_PX>;
4041
};
4142

‎arch/arm/configs/mxs_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
9393
CONFIG_DRM=y
9494
CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
9595
CONFIG_DRM_MXSFB=y
96+
CONFIG_FB=y
9697
CONFIG_FB_MODE_HELPERS=y
9798
CONFIG_LCD_CLASS_DEVICE=y
9899
CONFIG_BACKLIGHT_CLASS_DEVICE=y

‎arch/arm/mach-at91/pm.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static const struct wakeup_source_info ws_info[] = {
202202

203203
static const struct of_device_id sama5d2_ws_ids[] = {
204204
{ .compatible = "atmel,sama5d2-gem", .data = &ws_info[0] },
205-
{ .compatible = "atmel,at91rm9200-rtc", .data = &ws_info[1] },
205+
{ .compatible = "atmel,sama5d2-rtc", .data = &ws_info[1] },
206206
{ .compatible = "atmel,sama5d3-udc", .data = &ws_info[2] },
207207
{ .compatible = "atmel,at91rm9200-ohci", .data = &ws_info[2] },
208208
{ .compatible = "usb-ohci", .data = &ws_info[2] },
@@ -213,24 +213,24 @@ static const struct of_device_id sama5d2_ws_ids[] = {
213213
};
214214

215215
static const struct of_device_id sam9x60_ws_ids[] = {
216-
{ .compatible = "atmel,at91sam9x5-rtc", .data = &ws_info[1] },
216+
{ .compatible = "microchip,sam9x60-rtc", .data = &ws_info[1] },
217217
{ .compatible = "atmel,at91rm9200-ohci", .data = &ws_info[2] },
218218
{ .compatible = "usb-ohci", .data = &ws_info[2] },
219219
{ .compatible = "atmel,at91sam9g45-ehci", .data = &ws_info[2] },
220220
{ .compatible = "usb-ehci", .data = &ws_info[2] },
221-
{ .compatible = "atmel,at91sam9260-rtt", .data = &ws_info[4] },
221+
{ .compatible = "microchip,sam9x60-rtt", .data = &ws_info[4] },
222222
{ .compatible = "cdns,sam9x60-macb", .data = &ws_info[5] },
223223
{ /* sentinel */ }
224224
};
225225

226226
static const struct of_device_id sama7g5_ws_ids[] = {
227-
{ .compatible = "atmel,at91sam9x5-rtc", .data = &ws_info[1] },
227+
{ .compatible = "microchip,sama7g5-rtc", .data = &ws_info[1] },
228228
{ .compatible = "microchip,sama7g5-ohci", .data = &ws_info[2] },
229229
{ .compatible = "usb-ohci", .data = &ws_info[2] },
230230
{ .compatible = "atmel,at91sam9g45-ehci", .data = &ws_info[2] },
231231
{ .compatible = "usb-ehci", .data = &ws_info[2] },
232232
{ .compatible = "microchip,sama7g5-sdhci", .data = &ws_info[3] },
233-
{ .compatible = "atmel,at91sam9260-rtt", .data = &ws_info[4] },
233+
{ .compatible = "microchip,sama7g5-rtt", .data = &ws_info[4] },
234234
{ /* sentinel */ }
235235
};
236236

@@ -1079,7 +1079,7 @@ static int __init at91_pm_backup_init(void)
10791079
return ret;
10801080
}
10811081

1082-
static void at91_pm_secure_init(void)
1082+
static void __init at91_pm_secure_init(void)
10831083
{
10841084
int suspend_mode;
10851085
struct arm_smccc_res res;

‎arch/arm/mach-meson/platsmp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible,
7171
}
7272

7373
sram_base = of_iomap(node, 0);
74+
of_node_put(node);
7475
if (!sram_base) {
7576
pr_err("Couldn't map SRAM registers\n");
7677
return;
@@ -91,6 +92,7 @@ static void __init meson_smp_prepare_cpus(const char *scu_compatible,
9192
}
9293

9394
scu_base = of_iomap(node, 0);
95+
of_node_put(node);
9496
if (!scu_base) {
9597
pr_err("Couldn't map SCU registers\n");
9698
return;

0 commit comments

Comments
 (0)