Skip to content

Commit 719fce7

Browse files
committed
Merge tag 'soc-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "The code changes address mostly minor problems: - Several NXP/FSL SoC driver fixes, addressing issues with error handling and compilation - Fix a clock disabling imbalance in gpcv2 driver. - Arm Juno DMA coherency issue - Trivial firmware driver fixes for op-tee and scmi firmware The remaining changes address issues in the devicetree files: - A timer regression for the OMAP devkit8000, which has to use the alternative timer. - A hang in the i.MX8MM power domain configuration - Multiple fixes for the Rockchip RK3399 addressing issues with sound and eMMC - Cosmetic fixes for i.MX8ULP, RK3xxx, and Tegra124" * tag 'soc-fixes-5.17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (32 commits) ARM: tegra: Move panels to AUX bus soc: imx: gpcv2: Fix clock disabling imbalance in error path soc: fsl: qe: Check of ioremap return value soc: fsl: qe: fix typo in a comment soc: fsl: guts: Add a missing memory allocation failure check soc: fsl: guts: Revert commit 3c0d64e soc: fsl: Correct MAINTAINERS database (SOC) soc: fsl: Correct MAINTAINERS database (QUICC ENGINE LIBRARY) soc: fsl: Replace kernel.h with the necessary inclusions dt-bindings: fsl,layerscape-dcfg: add missing compatible for lx2160a dt-bindings: qoriq-clock: add missing compatible for lx2160a ARM: dts: Use 32KiHz oscillator on devkit8000 ARM: dts: switch timer config to common devkit8000 devicetree tee: optee: fix error return code in probe function arm64: dts: imx8ulp: Set #thermal-sensor-cells to 1 as required arm64: dts: imx8mm: Fix VPU Hanging ARM: dts: rockchip: fix a typo on rk3288 crypto-controller ARM: dts: rockchip: reorder rk322x hmdi clocks firmware: arm_scmi: Remove space in MODULE_ALIAS name arm64: dts: agilex: use the compatible "intel,socfpga-agilex-hsotg" ...
2 parents 201b5c0 + c253bf7 commit 719fce7

39 files changed

Lines changed: 138 additions & 102 deletions

CREDITS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,12 @@ S: 3000 FORE Drive
895895
S: Warrendale, Pennsylvania 15086
896896
S: USA
897897

898+
N: Ludovic Desroches
899+
E: ludovic.desroches@microchip.com
900+
D: Maintainer for ARM/Microchip (AT91) SoC support
901+
D: Author of ADC, pinctrl, XDMA and SDHCI drivers for this platform
902+
S: France
903+
898904
N: Martin Devera
899905
E: devik@cdi.cz
900906
W: http://luxik.cdi.cz/~devik/qos/

Documentation/devicetree/bindings/arm/atmel-at91.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ title: Atmel AT91 device tree bindings.
88

99
maintainers:
1010
- Alexandre Belloni <alexandre.belloni@bootlin.com>
11-
- Ludovic Desroches <ludovic.desroches@microchip.com>
11+
- Claudiu Beznea <claudiu.beznea@microchip.com>
12+
- Nicolas Ferre <nicolas.ferre@microchip.com>
1213

1314
description: |
1415
Boards with a SoC of the Atmel AT91 or SMART family shall have the following

Documentation/devicetree/bindings/arm/freescale/fsl,layerscape-dcfg.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Required properties:
88
- compatible: Should contain a chip-specific compatible string,
99
Chip-specific strings are of the form "fsl,<chip>-dcfg",
1010
The following <chip>s are known to be supported:
11-
ls1012a, ls1021a, ls1043a, ls1046a, ls2080a.
11+
ls1012a, ls1021a, ls1043a, ls1046a, ls2080a, lx2160a
1212

1313
- reg : should contain base address and length of DCFG memory-mapped registers
1414

Documentation/devicetree/bindings/clock/qoriq-clock.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ Required properties:
4444
* "fsl,ls1046a-clockgen"
4545
* "fsl,ls1088a-clockgen"
4646
* "fsl,ls2080a-clockgen"
47+
* "fsl,lx2160a-clockgen"
4748
Chassis-version clock strings include:
4849
* "fsl,qoriq-clockgen-1.0": for chassis 1.0 clocks
4950
* "fsl,qoriq-clockgen-2.0": for chassis 2.0 clocks

Documentation/devicetree/bindings/usb/dwc2.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ properties:
5353
- const: st,stm32mp15-hsotg
5454
- const: snps,dwc2
5555
- const: samsung,s3c6400-hsotg
56+
- const: intel,socfpga-agilex-hsotg
5657

5758
reg:
5859
maxItems: 1

MAINTAINERS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,7 +2254,7 @@ F: drivers/phy/mediatek/
22542254
ARM/Microchip (AT91) SoC support
22552255
M: Nicolas Ferre <nicolas.ferre@microchip.com>
22562256
M: Alexandre Belloni <alexandre.belloni@bootlin.com>
2257-
M: Ludovic Desroches <ludovic.desroches@microchip.com>
2257+
M: Claudiu Beznea <claudiu.beznea@microchip.com>
22582258
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
22592259
S: Supported
22602260
W: http://www.linux4sam.org
@@ -7744,8 +7744,7 @@ M: Qiang Zhao <qiang.zhao@nxp.com>
77447744
L: linuxppc-dev@lists.ozlabs.org
77457745
S: Maintained
77467746
F: drivers/soc/fsl/qe/
7747-
F: include/soc/fsl/*qe*.h
7748-
F: include/soc/fsl/*ucc*.h
7747+
F: include/soc/fsl/qe/
77497748

77507749
FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
77517750
M: Li Yang <leoyang.li@nxp.com>
@@ -7776,6 +7775,7 @@ F: Documentation/devicetree/bindings/misc/fsl,dpaa2-console.yaml
77767775
F: Documentation/devicetree/bindings/soc/fsl/
77777776
F: drivers/soc/fsl/
77787777
F: include/linux/fsl/
7778+
F: include/soc/fsl/
77797779

77807780
FREESCALE SOC FS_ENET DRIVER
77817781
M: Pantelis Antoniou <pantelis.antoniou@gmail.com>

arch/arm/boot/dts/omap3-devkit8000-common.dtsi

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,24 @@
158158
status = "disabled";
159159
};
160160

161+
/* Unusable as clockevent because if unreliable oscillator, allow to idle */
162+
&timer1_target {
163+
/delete-property/ti,no-reset-on-init;
164+
/delete-property/ti,no-idle;
165+
timer@0 {
166+
/delete-property/ti,timer-alwon;
167+
};
168+
};
169+
170+
/* Preferred timer for clockevent */
171+
&timer12_target {
172+
ti,no-reset-on-init;
173+
ti,no-idle;
174+
timer@0 {
175+
/* Always clocked by secure_32k_fck */
176+
};
177+
};
178+
161179
&twl_gpio {
162180
ti,use-leds;
163181
/*

arch/arm/boot/dts/omap3-devkit8000.dts

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,3 @@
1414
display2 = &tv0;
1515
};
1616
};
17-
18-
/* Unusable as clocksource because of unreliable oscillator */
19-
&counter32k {
20-
status = "disabled";
21-
};
22-
23-
/* Unusable as clockevent because if unreliable oscillator, allow to idle */
24-
&timer1_target {
25-
/delete-property/ti,no-reset-on-init;
26-
/delete-property/ti,no-idle;
27-
timer@0 {
28-
/delete-property/ti,timer-alwon;
29-
};
30-
};
31-
32-
/* Preferred always-on timer for clocksource */
33-
&timer12_target {
34-
ti,no-reset-on-init;
35-
ti,no-idle;
36-
timer@0 {
37-
/* Always clocked by secure_32k_fck */
38-
};
39-
};
40-
41-
/* Preferred timer for clockevent */
42-
&timer2_target {
43-
ti,no-reset-on-init;
44-
ti,no-idle;
45-
timer@0 {
46-
assigned-clocks = <&gpt2_fck>;
47-
assigned-clock-parents = <&sys_ck>;
48-
};
49-
};

arch/arm/boot/dts/rk322x.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,8 @@
718718
interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
719719
assigned-clocks = <&cru SCLK_HDMI_PHY>;
720720
assigned-clock-parents = <&hdmi_phy>;
721-
clocks = <&cru SCLK_HDMI_HDCP>, <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_CEC>;
722-
clock-names = "isfr", "iahb", "cec";
721+
clocks = <&cru PCLK_HDMI_CTRL>, <&cru SCLK_HDMI_HDCP>, <&cru SCLK_HDMI_CEC>;
722+
clock-names = "iahb", "isfr", "cec";
723723
pinctrl-names = "default";
724724
pinctrl-0 = <&hdmii2c_xfer &hdmi_hpd &hdmi_cec>;
725725
resets = <&cru SRST_HDMI_P>;

arch/arm/boot/dts/rk3288.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -971,7 +971,7 @@
971971
status = "disabled";
972972
};
973973

974-
crypto: cypto-controller@ff8a0000 {
974+
crypto: crypto@ff8a0000 {
975975
compatible = "rockchip,rk3288-crypto";
976976
reg = <0x0 0xff8a0000 0x0 0x4000>;
977977
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;

0 commit comments

Comments
 (0)