Skip to content

Commit 1f70935

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Olof Johansson: "I had queued up a batch of fixes that got a bit close to the release for sending in before the merge window opened, so I'm including them in the merge window batch instead. Mostly smaller DT tweaks and fixes, the usual mix that we tend to have through the releases" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: ARM: dts: iwg20d-q7-common: Fix touch controller probe failure ARM: OMAP2+: Restore MPU power domain if cpu_cluster_pm_enter() fails ARM: dts: am33xx: modify AM33XX_IOPAD for #pinctrl-cells = 2 soc: actions: include header to fix missing prototype arm64: dts: ti: k3-j721e: Rename mux header and update macro names soc: qcom: pdr: Fixup array type of get_domain_list_resp message arm64: dts: qcom: pm660: Fix missing pound sign in interrupt-cells arm64: dts: qcom: kitakami: Temporarily disable SDHCI1 arm64: dts: sdm630: Temporarily disable SMMUs by default arm64: dts: sdm845: Fixup OPP table for all qup devices arm64: dts: allwinner: h5: remove Mali GPU PMU module ARM: dts: sun8i: r40: bananapi-m2-ultra: Fix dcdc1 regulator soc: xilinx: Fix error code in zynqmp_pm_probe()
2 parents f11901e + 6869f77 commit 1f70935

16 files changed

Lines changed: 134 additions & 82 deletions

File tree

‎arch/arm/boot/dts/iwg20d-q7-common.dtsi‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
lvds-receiver {
5959
compatible = "ti,ds90cf384a", "lvds-decoder";
60-
powerdown-gpios = <&gpio7 25 GPIO_ACTIVE_LOW>;
60+
power-supply = <&vcc_3v3_tft1>;
6161

6262
ports {
6363
#address-cells = <1>;
@@ -81,6 +81,7 @@
8181
panel {
8282
compatible = "edt,etm0700g0dh6";
8383
backlight = <&lcd_backlight>;
84+
power-supply = <&vcc_3v3_tft1>;
8485

8586
port {
8687
panel_in: endpoint {
@@ -113,6 +114,17 @@
113114
};
114115
};
115116

117+
vcc_3v3_tft1: regulator-panel {
118+
compatible = "regulator-fixed";
119+
120+
regulator-name = "vcc-3v3-tft1";
121+
regulator-min-microvolt = <3300000>;
122+
regulator-max-microvolt = <3300000>;
123+
enable-active-high;
124+
startup-delay-us = <500>;
125+
gpio = <&gpio7 25 GPIO_ACTIVE_HIGH>;
126+
};
127+
116128
vcc_sdhi1: regulator-vcc-sdhi1 {
117129
compatible = "regulator-fixed";
118130

@@ -207,6 +219,7 @@
207219
reg = <0x38>;
208220
interrupt-parent = <&gpio2>;
209221
interrupts = <12 IRQ_TYPE_EDGE_FALLING>;
222+
vcc-supply = <&vcc_3v3_tft1>;
210223
};
211224
};
212225

‎arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,16 +223,16 @@
223223
};
224224

225225
&reg_dc1sw {
226-
regulator-min-microvolt = <3000000>;
227-
regulator-max-microvolt = <3000000>;
226+
regulator-min-microvolt = <3300000>;
227+
regulator-max-microvolt = <3300000>;
228228
regulator-name = "vcc-gmac-phy";
229229
};
230230

231231
&reg_dcdc1 {
232232
regulator-always-on;
233-
regulator-min-microvolt = <3000000>;
234-
regulator-max-microvolt = <3000000>;
235-
regulator-name = "vcc-3v0";
233+
regulator-min-microvolt = <3300000>;
234+
regulator-max-microvolt = <3300000>;
235+
regulator-name = "vcc-3v3";
236236
};
237237

238238
&reg_dcdc2 {

‎arch/arm/mach-omap2/cpuidle44xx.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,10 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,
174174
*/
175175
if (mpuss_can_lose_context) {
176176
error = cpu_cluster_pm_enter();
177-
if (error)
177+
if (error) {
178+
omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);
178179
goto cpu_cluster_pm_out;
180+
}
179181
}
180182
}
181183

‎arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,7 @@
139139
<GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
140140
<GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
141141
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
142-
<GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>,
143-
<GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
142+
<GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
144143
interrupt-names = "gp",
145144
"gpmmu",
146145
"pp",
@@ -151,8 +150,7 @@
151150
"pp2",
152151
"ppmmu2",
153152
"pp3",
154-
"ppmmu3",
155-
"pmu";
153+
"ppmmu3";
156154
clocks = <&ccu CLK_BUS_GPU>, <&ccu CLK_GPU>;
157155
clock-names = "bus", "core";
158156
resets = <&ccu RST_BUS_GPU>;

‎arch/arm64/boot/dts/qcom/msm8994-sony-xperia-kitakami.dtsi‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,12 @@
221221
};
222222

223223
&sdhc1 {
224-
status = "okay";
224+
/* There is an issue with the eMMC causing permanent
225+
* damage to the card if a quirk isn't addressed.
226+
* Until it's fixed, disable the MMC so as not to brick
227+
* devices.
228+
*/
229+
status = "disabled";
225230

226231
/* Downstream pushes 2.95V to the sdhci device,
227232
* but upstream driver REALLY wants to make vmmc 1.8v

‎arch/arm64/boot/dts/qcom/pm660.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
gpio-ranges = <&pm660_gpios 0 0 13>;
4545
#gpio-cells = <2>;
4646
interrupt-controller;
47-
interrupt-cells =<2>;
47+
#interrupt-cells = <2>;
4848
};
4949
};
5050
};

‎arch/arm64/boot/dts/qcom/sdm630.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,8 @@
518518
<GIC_SPI 472 IRQ_TYPE_LEVEL_HIGH>,
519519
<GIC_SPI 473 IRQ_TYPE_LEVEL_HIGH>,
520520
<GIC_SPI 474 IRQ_TYPE_LEVEL_HIGH>;
521+
522+
status = "disabled";
521523
};
522524

523525
tcsr_mutex_regs: syscon@1f40000 {
@@ -749,6 +751,8 @@
749751
<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
750752
<GIC_SPI 349 IRQ_TYPE_LEVEL_HIGH>,
751753
<GIC_SPI 350 IRQ_TYPE_LEVEL_HIGH>;
754+
755+
status = "disabled";
752756
};
753757

754758
lpass_smmu: iommu@5100000 {
@@ -778,6 +782,8 @@
778782
<GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>,
779783
<GIC_SPI 310 IRQ_TYPE_LEVEL_HIGH>,
780784
<GIC_SPI 404 IRQ_TYPE_LEVEL_HIGH>;
785+
786+
status = "disabled";
781787
};
782788

783789
spmi_bus: spmi@800f000 {
@@ -1074,6 +1080,8 @@
10741080
<GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH>,
10751081
<GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>,
10761082
<GIC_SPI 276 IRQ_TYPE_LEVEL_HIGH>;
1083+
1084+
status = "disabled";
10771085
};
10781086

10791087
apcs_glb: mailbox@17911000 {

‎arch/arm64/boot/dts/qcom/sdm845.dtsi‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,8 +1093,8 @@
10931093
qup_opp_table: qup-opp-table {
10941094
compatible = "operating-points-v2";
10951095

1096-
opp-19200000 {
1097-
opp-hz = /bits/ 64 <19200000>;
1096+
opp-50000000 {
1097+
opp-hz = /bits/ 64 <50000000>;
10981098
required-opps = <&rpmhpd_opp_min_svs>;
10991099
};
11001100

@@ -1107,6 +1107,11 @@
11071107
opp-hz = /bits/ 64 <100000000>;
11081108
required-opps = <&rpmhpd_opp_svs>;
11091109
};
1110+
1111+
opp-128000000 {
1112+
opp-hz = /bits/ 64 <128000000>;
1113+
required-opps = <&rpmhpd_opp_nom>;
1114+
};
11101115
};
11111116

11121117
qupv3_id_0: geniqup@8c0000 {

‎arch/arm64/boot/dts/ti/k3-j721e-common-proc-board.dts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -404,11 +404,12 @@
404404
};
405405

406406
&serdes_ln_ctrl {
407-
idle-states = <SERDES0_LANE0_PCIE0_LANE0>, <SERDES0_LANE1_PCIE0_LANE1>,
408-
<SERDES1_LANE0_PCIE1_LANE0>, <SERDES1_LANE1_PCIE1_LANE1>,
409-
<SERDES2_LANE0_PCIE2_LANE0>, <SERDES2_LANE1_PCIE2_LANE1>,
410-
<SERDES3_LANE0_USB3_0_SWAP>, <SERDES3_LANE1_USB3_0>,
411-
<SERDES4_LANE0_EDP_LANE0>, <SERDES4_LANE1_EDP_LANE1>, <SERDES4_LANE2_EDP_LANE2>, <SERDES4_LANE3_EDP_LANE3>;
407+
idle-states = <J721E_SERDES0_LANE0_PCIE0_LANE0>, <J721E_SERDES0_LANE1_PCIE0_LANE1>,
408+
<J721E_SERDES1_LANE0_PCIE1_LANE0>, <J721E_SERDES1_LANE1_PCIE1_LANE1>,
409+
<J721E_SERDES2_LANE0_PCIE2_LANE0>, <J721E_SERDES2_LANE1_PCIE2_LANE1>,
410+
<J721E_SERDES3_LANE0_USB3_0_SWAP>, <J721E_SERDES3_LANE1_USB3_0>,
411+
<J721E_SERDES4_LANE0_EDP_LANE0>, <J721E_SERDES4_LANE1_EDP_LANE1>,
412+
<J721E_SERDES4_LANE2_EDP_LANE2>, <J721E_SERDES4_LANE3_EDP_LANE3>;
412413
};
413414

414415
&serdes_wiz3 {

‎arch/arm64/boot/dts/ti/k3-j721e-main.dtsi‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77
#include <dt-bindings/phy/phy.h>
88
#include <dt-bindings/mux/mux.h>
9-
#include <dt-bindings/mux/mux-j721e-wiz.h>
9+
#include <dt-bindings/mux/ti-serdes.h>
1010

1111
&cbass_main {
1212
msmc_ram: sram@70000000 {
@@ -38,11 +38,12 @@
3838
<0x40b0 0x3>, <0x40b4 0x3>, /* SERDES3 lane0/1 select */
3939
<0x40c0 0x3>, <0x40c4 0x3>, <0x40c8 0x3>, <0x40cc 0x3>;
4040
/* SERDES4 lane0/1/2/3 select */
41-
idle-states = <SERDES0_LANE0_PCIE0_LANE0>, <SERDES0_LANE1_PCIE0_LANE1>,
42-
<SERDES1_LANE0_PCIE1_LANE0>, <SERDES1_LANE1_PCIE1_LANE1>,
43-
<SERDES2_LANE0_PCIE2_LANE0>, <SERDES2_LANE1_PCIE2_LANE1>,
44-
<MUX_IDLE_AS_IS>, <SERDES3_LANE1_USB3_0>,
45-
<SERDES4_LANE0_EDP_LANE0>, <SERDES4_LANE1_EDP_LANE1>, <SERDES4_LANE2_EDP_LANE2>, <SERDES4_LANE3_EDP_LANE3>;
41+
idle-states = <J721E_SERDES0_LANE0_PCIE0_LANE0>, <J721E_SERDES0_LANE1_PCIE0_LANE1>,
42+
<J721E_SERDES1_LANE0_PCIE1_LANE0>, <J721E_SERDES1_LANE1_PCIE1_LANE1>,
43+
<J721E_SERDES2_LANE0_PCIE2_LANE0>, <J721E_SERDES2_LANE1_PCIE2_LANE1>,
44+
<MUX_IDLE_AS_IS>, <J721E_SERDES3_LANE1_USB3_0>,
45+
<J721E_SERDES4_LANE0_EDP_LANE0>, <J721E_SERDES4_LANE1_EDP_LANE1>,
46+
<J721E_SERDES4_LANE2_EDP_LANE2>, <J721E_SERDES4_LANE3_EDP_LANE3>;
4647
};
4748

4849
usb_serdes_mux: mux-controller@4000 {

0 commit comments

Comments
 (0)