Skip to content

Commit 3dc064d

Browse files
committed
Merge tag 'soc-fixes-5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Lots of small fixes for Arm SoCs this time, nothing too worrying: - omap/beaglebone boot regression fix in gpt12 timer - revert for i.mx8 soc driver breaking as a platform_driver - kexec/kdump fixes for op-tee - various fixes for incorrect DT settings on imx, mvebu, omap, stm32, and tegra causing problems. - device tree fixes for static checks in nomadik, versatile, stm32 - code fixes for issues found in build testing and with static checking on tegra, ixp4xx, imx, omap" * tag 'soc-fixes-5.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (36 commits) soc: ixp4xx/qmgr: fix invalid __iomem access soc: ixp4xx: fix printing resources ARM: ixp4xx: goramo_mlr depends on old PCI driver ARM: ixp4xx: fix compile-testing soc drivers soc/tegra: Make regulator couplers depend on CONFIG_REGULATOR ARM: dts: nomadik: Fix up interrupt controller node names ARM: dts: stm32: Fix touchscreen IRQ line assignment on DHCOM ARM: dts: stm32: Disable LAN8710 EDPD on DHCOM ARM: dts: stm32: Prefer HW RTC on DHCOM SoM omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator ARM: dts: am437x-l4: fix typo in can@0 node ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218 bus: ti-sysc: AM3: RNG is GP only ARM: omap2+: hwmod: fix potential NULL pointer access arm64: dts: armada-3720-turris-mox: remove mrvl,i2c-fast-mode arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers ARM: dts: imx: Swap M53Menlo pinctrl_power_button/pinctrl_power_out pins ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init ARM: dts: colibri-imx6ull: limit SDIO clock to 25MHz arm64: dts: ls1028: sl28: fix networking for variant 2 ...
2 parents 73f2553 + 19c1eb3 commit 3dc064d

32 files changed

Lines changed: 292 additions & 151 deletions

arch/arm/boot/dts/am437x-l4.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@
15951595
compatible = "ti,am4372-d_can", "ti,am3352-d_can";
15961596
reg = <0x0 0x2000>;
15971597
clocks = <&dcan1_fck>;
1598-
clock-name = "fck";
1598+
clock-names = "fck";
15991599
syscon-raminit = <&scm_conf 0x644 1>;
16001600
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
16011601
status = "disabled";

arch/arm/boot/dts/am43x-epos-evm.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
status = "okay";
583583
pinctrl-names = "default";
584584
pinctrl-0 = <&i2c0_pins>;
585-
clock-frequency = <400000>;
585+
clock-frequency = <100000>;
586586

587587
tps65218: tps65218@24 {
588588
reg = <0x24>;

arch/arm/boot/dts/imx53-m53menlo.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,13 +388,13 @@
388388

389389
pinctrl_power_button: powerbutgrp {
390390
fsl,pins = <
391-
MX53_PAD_SD2_DATA2__GPIO1_13 0x1e4
391+
MX53_PAD_SD2_DATA0__GPIO1_15 0x1e4
392392
>;
393393
};
394394

395395
pinctrl_power_out: poweroutgrp {
396396
fsl,pins = <
397-
MX53_PAD_SD2_DATA0__GPIO1_15 0x1e4
397+
MX53_PAD_SD2_DATA2__GPIO1_13 0x1e4
398398
>;
399399
};
400400

arch/arm/boot/dts/imx6qdl-sr-som.dtsi

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@
5454
pinctrl-names = "default";
5555
pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
5656
phy-mode = "rgmii-id";
57-
phy-reset-duration = <2>;
57+
58+
/*
59+
* The PHY seems to require a long-enough reset duration to avoid
60+
* some rare issues where the PHY gets stuck in an inconsistent and
61+
* non-functional state at boot-up. 10ms proved to be fine .
62+
*/
63+
phy-reset-duration = <10>;
5864
phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
5965
status = "okay";
6066

arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
assigned-clock-rates = <0>, <198000000>;
4444
cap-power-off-card;
4545
keep-power-in-suspend;
46+
max-frequency = <25000000>;
4647
mmc-pwrseq = <&wifi_pwrseq>;
4748
no-1-8-v;
4849
non-removable;

arch/arm/boot/dts/omap5-board-common.dtsi

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,6 @@
3030
regulator-max-microvolt = <5000000>;
3131
};
3232

33-
vdds_1v8_main: fixedregulator-vdds_1v8_main {
34-
compatible = "regulator-fixed";
35-
regulator-name = "vdds_1v8_main";
36-
vin-supply = <&smps7_reg>;
37-
regulator-min-microvolt = <1800000>;
38-
regulator-max-microvolt = <1800000>;
39-
};
40-
4133
vmmcsd_fixed: fixedregulator-mmcsd {
4234
compatible = "regulator-fixed";
4335
regulator-name = "vmmcsd_fixed";
@@ -487,6 +479,7 @@
487479
regulator-boot-on;
488480
};
489481

482+
vdds_1v8_main:
490483
smps7_reg: smps7 {
491484
/* VDDS_1v8_OMAP over VDDS_1v8_MAIN */
492485
regulator-name = "smps7";

arch/arm/boot/dts/ste-nomadik-stn8815.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -755,14 +755,14 @@
755755
status = "disabled";
756756
};
757757

758-
vica: intc@10140000 {
758+
vica: interrupt-controller@10140000 {
759759
compatible = "arm,versatile-vic";
760760
interrupt-controller;
761761
#interrupt-cells = <1>;
762762
reg = <0x10140000 0x20>;
763763
};
764764

765-
vicb: intc@10140020 {
765+
vicb: interrupt-controller@10140020 {
766766
compatible = "arm,versatile-vic";
767767
interrupt-controller;
768768
#interrupt-cells = <1>;

arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
poll-interval = <20>;
3838

3939
/*
40-
* The EXTi IRQ line 3 is shared with touchscreen and ethernet,
40+
* The EXTi IRQ line 3 is shared with ethernet,
4141
* so mark this as polled GPIO key.
4242
*/
4343
button-0 {
@@ -46,6 +46,16 @@
4646
gpios = <&gpiof 3 GPIO_ACTIVE_LOW>;
4747
};
4848

49+
/*
50+
* The EXTi IRQ line 6 is shared with touchscreen,
51+
* so mark this as polled GPIO key.
52+
*/
53+
button-1 {
54+
label = "TA2-GPIO-B";
55+
linux,code = <KEY_B>;
56+
gpios = <&gpiod 6 GPIO_ACTIVE_LOW>;
57+
};
58+
4959
/*
5060
* The EXTi IRQ line 0 is shared with PMIC,
5161
* so mark this as polled GPIO key.
@@ -60,13 +70,6 @@
6070
gpio-keys {
6171
compatible = "gpio-keys";
6272

63-
button-1 {
64-
label = "TA2-GPIO-B";
65-
linux,code = <KEY_B>;
66-
gpios = <&gpiod 6 GPIO_ACTIVE_LOW>;
67-
wakeup-source;
68-
};
69-
7073
button-3 {
7174
label = "TA4-GPIO-D";
7275
linux,code = <KEY_D>;
@@ -82,6 +85,7 @@
8285
label = "green:led5";
8386
gpios = <&gpioc 6 GPIO_ACTIVE_HIGH>;
8487
default-state = "off";
88+
status = "disabled";
8589
};
8690

8791
led-1 {
@@ -185,8 +189,8 @@
185189
touchscreen@38 {
186190
compatible = "edt,edt-ft5406";
187191
reg = <0x38>;
188-
interrupt-parent = <&gpiog>;
189-
interrupts = <2 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */
192+
interrupt-parent = <&gpioc>;
193+
interrupts = <6 IRQ_TYPE_EDGE_FALLING>; /* GPIO E */
190194
};
191195
};
192196

arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
aliases {
1313
ethernet0 = &ethernet0;
1414
ethernet1 = &ksz8851;
15+
rtc0 = &hwrtc;
16+
rtc1 = &rtc;
1517
};
1618

1719
memory@c0000000 {
@@ -138,6 +140,7 @@
138140
reset-gpios = <&gpioh 3 GPIO_ACTIVE_LOW>;
139141
reset-assert-us = <500>;
140142
reset-deassert-us = <500>;
143+
smsc,disable-energy-detect;
141144
interrupt-parent = <&gpioi>;
142145
interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
143146
};
@@ -248,7 +251,7 @@
248251
/delete-property/dmas;
249252
/delete-property/dma-names;
250253

251-
rtc@32 {
254+
hwrtc: rtc@32 {
252255
compatible = "microcrystal,rv8803";
253256
reg = <0x32>;
254257
};

arch/arm/mach-imx/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ void imx_set_cpu_arg(int cpu, u32 arg);
6868
void v7_secondary_startup(void);
6969
void imx_scu_map_io(void);
7070
void imx_smp_prepare(void);
71-
void imx_gpcv2_set_core1_pdn_pup_by_software(bool pdn);
7271
#else
7372
static inline void imx_scu_map_io(void) {}
7473
static inline void imx_smp_prepare(void) {}
@@ -81,6 +80,7 @@ void imx_gpc_mask_all(void);
8180
void imx_gpc_restore_all(void);
8281
void imx_gpc_hwirq_mask(unsigned int hwirq);
8382
void imx_gpc_hwirq_unmask(unsigned int hwirq);
83+
void imx_gpcv2_set_core1_pdn_pup_by_software(bool pdn);
8484
void imx_anatop_init(void);
8585
void imx_anatop_pre_suspend(void);
8686
void imx_anatop_post_resume(void);

0 commit comments

Comments
 (0)