Skip to content

Commit eb3991e

Browse files
torvaldstorvalds
committed
Merge tag 'soc-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Too many fixes have accumulated in the soc tree, so this is a fairly large set. As usual, most of the fixes are for devicetree files, but there are also notable code changes for imx and omap regressions as well as some maintainer file updates. imx: - Fix an Ethernet issue on imx6ul-14x14-evk board that is caused by independent PHY reset. - Add missing `dma-coherent` property for LayerScape device trees to fix a kernel BUG report. - Use IRQCHIP_DECLARE for AVIC driver to fix a boot issue on i.MX25 with fw_devlink=on. - Add missing I2C pinctrl entry for imx8mp-phyboard-pollux-rdk board to fix the broken I2C GPIO recovery support. - Add `fsl,use-minimum-ecc` property for imx6ull-myir-mys-6ulx-eval device tree to fix UBI filesystem mount failure. at91: - wrong phy address that blocks Ethernet use on boards with sama5d27 SoM1 - restrictive pin possibilities for sam9x60 omap: - Fix ocp interconnect bus access error reporting for omap_l3_noc by setting IRQF_NO_THREAD - Fix changed mmc slot order regression by adding mmc aliases for am335x - Fix dra7 reboot regression caused by invalid pcie reset map - Fix smartreflex init regression caused by dropped legacy data - Fix ti-sysc driver warning on unbind if reset is not deasserted - Fix flakey reset deassert for dra7 iva stm32: - MAINTAINER file updates broadcom: - brcmstb SoC ID build fix - MAINTAINER file updates" * tag 'soc-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: MAINTAINERS: Add Alain Volmat as STM32 I2C/SMBUS maintainer MAINTAINERS: Remove Vincent Abriou for STM/STI DRM drivers. MAINTAINERS: Update some st.com email addresses to foss.st.com ARM: dts: imx6ull: fix ubi filesystem mount failed ARM: imx6ul-14x14-evk: Do not reset the Ethernet PHYs independently arm64: dts: imx8mp-phyboard-pollux-rdk: Add missing pinctrl entry arm64: dts: ls1012a: mark crypto engine dma coherent arm64: dts: ls1043a: mark crypto engine dma coherent arm64: dts: ls1046a: mark crypto engine dma coherent ARM: imx: avic: Convert to using IRQCHIP_DECLARE ARM: dts: at91: sam9x60: fix mux-mask to match product's datasheet ARM: dts: at91: sam9x60: fix mux-mask for PA7 so it can be set to A, B and C ARM: dts: at91-sama5d27_som1: fix phy address to 7 soc: ti: omap-prm: Fix occasional abort on reset deassert for dra7 iva bus: ti-sysc: Fix warning on unbind if reset is not deasserted ARM: OMAP2+: Fix smartreflex init regression after dropping legacy data soc: ti: omap-prm: Fix reboot issue with invalid pcie reset map for dra7 MAINTAINERS: rectify BROADCOM PMB (POWER MANAGEMENT BUS) DRIVER ARM: dts: am33xx: add aliases for mmc interfaces bus: omap_l3_noc: mark l3 irqs as IRQF_NO_THREAD
2 parents 6c20f6d + 67335b8 commit eb3991e

24 files changed

+136
-120
lines changed

‎MAINTAINERS‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2489,7 +2489,7 @@ N: sc27xx
24892489
N: sc2731
24902490

24912491
ARM/STI ARCHITECTURE
2492-
M: Patrice Chotard <patrice.chotard@st.com>
2492+
M: Patrice Chotard <patrice.chotard@foss.st.com>
24932493
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
24942494
S: Maintained
24952495
W: http://www.stlinux.com
@@ -2522,7 +2522,7 @@ F: include/linux/remoteproc/st_slim_rproc.h
25222522

25232523
ARM/STM32 ARCHITECTURE
25242524
M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
2525-
M: Alexandre Torgue <alexandre.torgue@st.com>
2525+
M: Alexandre Torgue <alexandre.torgue@foss.st.com>
25262526
L: linux-stm32@st-md-mailman.stormreply.com (moderated for non-subscribers)
25272527
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
25282528
S: Maintained
@@ -3115,7 +3115,7 @@ C: irc://irc.oftc.net/bcache
31153115
F: drivers/md/bcache/
31163116

31173117
BDISP ST MEDIA DRIVER
3118-
M: Fabien Dessenne <fabien.dessenne@st.com>
3118+
M: Fabien Dessenne <fabien.dessenne@foss.st.com>
31193119
L: linux-media@vger.kernel.org
31203120
S: Supported
31213121
W: https://linuxtv.org
@@ -3675,7 +3675,7 @@ M: bcm-kernel-feedback-list@broadcom.com
36753675
L: linux-pm@vger.kernel.org
36763676
S: Maintained
36773677
T: git git://github.com/broadcom/stblinux.git
3678-
F: drivers/soc/bcm/bcm-pmb.c
3678+
F: drivers/soc/bcm/bcm63xx/bcm-pmb.c
36793679
F: include/dt-bindings/soc/bcm-pmb.h
36803680

36813681
BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@ -5080,7 +5080,7 @@ S: Maintained
50805080
F: drivers/platform/x86/dell/dell-wmi.c
50815081

50825082
DELTA ST MEDIA DRIVER
5083-
M: Hugues Fruchet <hugues.fruchet@st.com>
5083+
M: Hugues Fruchet <hugues.fruchet@foss.st.com>
50845084
L: linux-media@vger.kernel.org
50855085
S: Supported
50865086
W: https://linuxtv.org
@@ -6006,18 +6006,16 @@ F: drivers/gpu/drm/rockchip/
60066006

60076007
DRM DRIVERS FOR STI
60086008
M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
6009-
M: Vincent Abriou <vincent.abriou@st.com>
60106009
L: dri-devel@lists.freedesktop.org
60116010
S: Maintained
60126011
T: git git://anongit.freedesktop.org/drm/drm-misc
60136012
F: Documentation/devicetree/bindings/display/st,stih4xx.txt
60146013
F: drivers/gpu/drm/sti
60156014

60166015
DRM DRIVERS FOR STM
6017-
M: Yannick Fertre <yannick.fertre@st.com>
6018-
M: Philippe Cornu <philippe.cornu@st.com>
6016+
M: Yannick Fertre <yannick.fertre@foss.st.com>
6017+
M: Philippe Cornu <philippe.cornu@foss.st.com>
60196018
M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
6020-
M: Vincent Abriou <vincent.abriou@st.com>
60216019
L: dri-devel@lists.freedesktop.org
60226020
S: Maintained
60236021
T: git git://anongit.freedesktop.org/drm/drm-misc
@@ -8230,7 +8228,7 @@ F: include/linux/hugetlb.h
82308228
F: mm/hugetlb.c
82318229

82328230
HVA ST MEDIA DRIVER
8233-
M: Jean-Christophe Trotin <jean-christophe.trotin@st.com>
8231+
M: Jean-Christophe Trotin <jean-christophe.trotin@foss.st.com>
82348232
L: linux-media@vger.kernel.org
82358233
S: Supported
82368234
W: https://linuxtv.org
@@ -11165,7 +11163,7 @@ T: git git://linuxtv.org/media_tree.git
1116511163
F: drivers/media/dvb-frontends/stv6111*
1116611164

1116711165
MEDIA DRIVERS FOR STM32 - DCMI
11168-
M: Hugues Fruchet <hugues.fruchet@st.com>
11166+
M: Hugues Fruchet <hugues.fruchet@foss.st.com>
1116911167
L: linux-media@vger.kernel.org
1117011168
S: Supported
1117111169
T: git git://linuxtv.org/media_tree.git
@@ -16938,7 +16936,8 @@ F: Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt
1693816936
F: drivers/media/i2c/st-mipid02.c
1693916937

1694016938
ST STM32 I2C/SMBUS DRIVER
16941-
M: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
16939+
M: Pierre-Yves MORDRET <pierre-yves.mordret@foss.st.com>
16940+
M: Alain Volmat <alain.volmat@foss.st.com>
1694216941
L: linux-i2c@vger.kernel.org
1694316942
S: Maintained
1694416943
F: drivers/i2c/busses/i2c-stm32*
@@ -17063,7 +17062,7 @@ F: kernel/jump_label.c
1706317062
F: kernel/static_call.c
1706417063

1706517064
STI AUDIO (ASoC) DRIVERS
17066-
M: Arnaud Pouliquen <arnaud.pouliquen@st.com>
17065+
M: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
1706717066
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1706817067
S: Maintained
1706917068
F: Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
@@ -17083,15 +17082,15 @@ T: git git://linuxtv.org/media_tree.git
1708317082
F: drivers/media/usb/stk1160/
1708417083

1708517084
STM32 AUDIO (ASoC) DRIVERS
17086-
M: Olivier Moysan <olivier.moysan@st.com>
17087-
M: Arnaud Pouliquen <arnaud.pouliquen@st.com>
17085+
M: Olivier Moysan <olivier.moysan@foss.st.com>
17086+
M: Arnaud Pouliquen <arnaud.pouliquen@foss.st.com>
1708817087
L: alsa-devel@alsa-project.org (moderated for non-subscribers)
1708917088
S: Maintained
1709017089
F: Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml
1709117090
F: sound/soc/stm/
1709217091

1709317092
STM32 TIMER/LPTIMER DRIVERS
17094-
M: Fabrice Gasnier <fabrice.gasnier@st.com>
17093+
M: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
1709517094
S: Maintained
1709617095
F: Documentation/ABI/testing/*timer-stm32
1709717096
F: Documentation/devicetree/bindings/*/*stm32-*timer*
@@ -17101,7 +17100,7 @@ F: include/linux/*/stm32-*tim*
1710117100

1710217101
STMMAC ETHERNET DRIVER
1710317102
M: Giuseppe Cavallaro <peppe.cavallaro@st.com>
17104-
M: Alexandre Torgue <alexandre.torgue@st.com>
17103+
M: Alexandre Torgue <alexandre.torgue@foss.st.com>
1710517104
M: Jose Abreu <joabreu@synopsys.com>
1710617105
L: netdev@vger.kernel.org
1710717106
S: Supported

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
ethernet1 = &cpsw_emac1;
4141
spi0 = &spi0;
4242
spi1 = &spi1;
43+
mmc0 = &mmc1;
44+
mmc1 = &mmc2;
45+
mmc2 = &mmc3;
4346
};
4447

4548
cpus {

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -334,14 +334,6 @@
334334
};
335335

336336
&pinctrl {
337-
atmel,mux-mask = <
338-
/* A B C */
339-
0xFFFFFE7F 0xC0E0397F 0xEF00019D /* pioA */
340-
0x03FFFFFF 0x02FC7E68 0x00780000 /* pioB */
341-
0xffffffff 0xF83FFFFF 0xB800F3FC /* pioC */
342-
0x003FFFFF 0x003F8000 0x00000000 /* pioD */
343-
>;
344-
345337
adc {
346338
pinctrl_adc_default: adc_default {
347339
atmel,pins = <AT91_PIOB 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;

‎arch/arm/boot/dts/at91-sama5d27_som1.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
pinctrl-0 = <&pinctrl_macb0_default>;
8585
phy-mode = "rmii";
8686

87-
ethernet-phy@0 {
88-
reg = <0x0>;
87+
ethernet-phy@7 {
88+
reg = <0x7>;
8989
interrupt-parent = <&pioA>;
9090
interrupts = <PIN_PD31 IRQ_TYPE_LEVEL_LOW>;
9191
pinctrl-names = "default";

‎arch/arm/boot/dts/imx6ul-14x14-evk.dtsi‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -210,9 +210,6 @@
210210
micrel,led-mode = <1>;
211211
clocks = <&clks IMX6UL_CLK_ENET_REF>;
212212
clock-names = "rmii-ref";
213-
reset-gpios = <&gpio_spi 1 GPIO_ACTIVE_LOW>;
214-
reset-assert-us = <10000>;
215-
reset-deassert-us = <100>;
216213

217214
};
218215

@@ -222,9 +219,6 @@
222219
micrel,led-mode = <1>;
223220
clocks = <&clks IMX6UL_CLK_ENET2_REF>;
224221
clock-names = "rmii-ref";
225-
reset-gpios = <&gpio_spi 2 GPIO_ACTIVE_LOW>;
226-
reset-assert-us = <10000>;
227-
reset-deassert-us = <100>;
228222
};
229223
};
230224
};
@@ -243,6 +237,22 @@
243237
status = "okay";
244238
};
245239

240+
&gpio_spi {
241+
eth0-phy-hog {
242+
gpio-hog;
243+
gpios = <1 GPIO_ACTIVE_HIGH>;
244+
output-high;
245+
line-name = "eth0-phy";
246+
};
247+
248+
eth1-phy-hog {
249+
gpio-hog;
250+
gpios = <2 GPIO_ACTIVE_HIGH>;
251+
output-high;
252+
line-name = "eth1-phy";
253+
};
254+
};
255+
246256
&i2c1 {
247257
clock-frequency = <100000>;
248258
pinctrl-names = "default";

‎arch/arm/boot/dts/imx6ull-myir-mys-6ulx-eval.dts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
};
1515

1616
&gpmi {
17+
fsl,use-minimum-ecc;
1718
status = "okay";
1819
};

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,15 @@
606606
compatible = "microchip,sam9x60-pinctrl", "atmel,at91sam9x5-pinctrl", "atmel,at91rm9200-pinctrl", "simple-bus";
607607
ranges = <0xfffff400 0xfffff400 0x800>;
608608

609+
/* mux-mask corresponding to sam9x60 SoC in TFBGA228L package */
610+
atmel,mux-mask = <
611+
/* A B C */
612+
0xffffffff 0xffe03fff 0xef00019d /* pioA */
613+
0x03ffffff 0x02fc7e7f 0x00780000 /* pioB */
614+
0xffffffff 0xffffffff 0xf83fffff /* pioC */
615+
0x003fffff 0x003f8000 0x00000000 /* pioD */
616+
>;
617+
609618
pioA: gpio@fffff400 {
610619
compatible = "microchip,sam9x60-gpio", "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
611620
reg = <0xfffff400 0x200>;

‎arch/arm/mach-imx/avic.c‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/module.h>
88
#include <linux/irq.h>
99
#include <linux/irqdomain.h>
10+
#include <linux/irqchip.h>
1011
#include <linux/io.h>
1112
#include <linux/of.h>
1213
#include <linux/of_address.h>
@@ -162,7 +163,7 @@ static void __exception_irq_entry avic_handle_irq(struct pt_regs *regs)
162163
* interrupts. It registers the interrupt enable and disable functions
163164
* to the kernel for each interrupt source.
164165
*/
165-
void __init mxc_init_irq(void __iomem *irqbase)
166+
static void __init mxc_init_irq(void __iomem *irqbase)
166167
{
167168
struct device_node *np;
168169
int irq_base;
@@ -220,3 +221,16 @@ void __init mxc_init_irq(void __iomem *irqbase)
220221

221222
printk(KERN_INFO "MXC IRQ initialized\n");
222223
}
224+
225+
static int __init imx_avic_init(struct device_node *node,
226+
struct device_node *parent)
227+
{
228+
void __iomem *avic_base;
229+
230+
avic_base = of_iomap(node, 0);
231+
BUG_ON(!avic_base);
232+
mxc_init_irq(avic_base);
233+
return 0;
234+
}
235+
236+
IRQCHIP_DECLARE(imx_avic, "fsl,avic", imx_avic_init);

‎arch/arm/mach-imx/common.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ void mx35_map_io(void);
2222
void imx21_init_early(void);
2323
void imx31_init_early(void);
2424
void imx35_init_early(void);
25-
void mxc_init_irq(void __iomem *);
2625
void mx31_init_irq(void);
2726
void mx35_init_irq(void);
2827
void mxc_set_cpu_type(unsigned int type);

‎arch/arm/mach-imx/mach-imx1.c‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,13 @@ static void __init imx1_init_early(void)
1717
mxc_set_cpu_type(MXC_CPU_MX1);
1818
}
1919

20-
static void __init imx1_init_irq(void)
21-
{
22-
void __iomem *avic_addr;
23-
24-
avic_addr = ioremap(MX1_AVIC_ADDR, SZ_4K);
25-
WARN_ON(!avic_addr);
26-
27-
mxc_init_irq(avic_addr);
28-
}
29-
3020
static const char * const imx1_dt_board_compat[] __initconst = {
3121
"fsl,imx1",
3222
NULL
3323
};
3424

3525
DT_MACHINE_START(IMX1_DT, "Freescale i.MX1 (Device Tree Support)")
3626
.init_early = imx1_init_early,
37-
.init_irq = imx1_init_irq,
3827
.dt_compat = imx1_dt_board_compat,
3928
.restart = mxc_restart,
4029
MACHINE_END

0 commit comments

Comments
 (0)