Skip to content

Commit f6597d1

Browse files
torvaldstorvalds
committed
Merge tag 'soc-drivers-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC driver updates from Arnd Bergmann: "A new drivers/cache/ subsystem is added to contain drivers for abstracting cache flush methods on riscv and potentially others, as this is needed for handling non-coherent DMA but several SoCs require nonstandard hardware methods for it. op-tee gains support for asynchronous notification with FF-A, as well as support for a system thread for executing in secure world. The tee, reset, bus, memory and scmi subsystems have a couple of minor updates. Platform specific soc driver changes include: - Samsung Exynos gains driver support for Google GS101 (Tensor G1) across multiple subsystems - Qualcomm Snapdragon gains support for SM8650 and X1E along with added features for some other SoCs - Mediatek adds support for "Smart Voltage Scaling" on MT8186 and MT8195, and driver support for MT8188 along with some code refactoring. - Microchip Polarfire FPGA support for "Auto Update" of the FPGA bitstream - Apple M1 mailbox driver is rewritten into a SoC driver - minor updates on amlogic, mvebu, ti, zynq, imx, renesas and hisilicon" * tag 'soc-drivers-6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (189 commits) memory: ti-emif-pm: Convert to platform remove callback returning void memory: ti-aemif: Convert to platform remove callback returning void memory: tegra210-emc: Convert to platform remove callback returning void memory: tegra186-emc: Convert to platform remove callback returning void memory: stm32-fmc2-ebi: Convert to platform remove callback returning void memory: exynos5422-dmc: Convert to platform remove callback returning void memory: renesas-rpc-if: Convert to platform remove callback returning void memory: omap-gpmc: Convert to platform remove callback returning void memory: mtk-smi: Convert to platform remove callback returning void memory: jz4780-nemc: Convert to platform remove callback returning void memory: fsl_ifc: Convert to platform remove callback returning void memory: fsl-corenet-cf: Convert to platform remove callback returning void memory: emif: Convert to platform remove callback returning void memory: brcmstb_memc: Convert to platform remove callback returning void memory: brcmstb_dpfe: Convert to platform remove callback returning void soc: qcom: llcc: Fix LLCC_TRP_ATTR2_CFGn offset firmware: qcom: qseecom: fix memory leaks in error paths dt-bindings: clock: google,gs101: rename CMU_TOP gate defines soc: qcom: llcc: Fix typo in kernel-doc dt-bindings: soc: qcom,aoss-qmp: document the X1E80100 Always-On Subsystem side channel ...
2 parents c4101e5 + db0a7c0 commit f6597d1

150 files changed

Lines changed: 7225 additions & 2110 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CREDITS‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,6 +1424,10 @@ S: University of Stellenbosch
14241424
S: Stellenbosch, Western Cape
14251425
S: South Africa
14261426

1427+
N: Andy Gross
1428+
E: agross@kernel.org
1429+
D: Qualcomm SoC subsystem and drivers
1430+
14271431
N: Grant Grundler
14281432
E: grantgrundler@gmail.com
14291433
W: http://obmouse.sourceforge.net/

‎Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ What: /sys/devices/platform/HISI04Bx:00/chipX/linked_full_lane
33
What: /sys/devices/platform/HISI04Bx:00/chipX/crc_err_cnt
44
Date: November 2023
55
KernelVersion: 6.6
6-
Contact: Huisong Li <lihuisong@huawei.org>
6+
Contact: Huisong Li <lihuisong@huawei.com>
77
Description:
88
The /sys/devices/platform/HISI04Bx:00/chipX/ directory
99
contains read-only attributes exposing some summarization
@@ -26,7 +26,7 @@ What: /sys/devices/platform/HISI04Bx:00/chipX/dieY/linked_full_lane
2626
What: /sys/devices/platform/HISI04Bx:00/chipX/dieY/crc_err_cnt
2727
Date: November 2023
2828
KernelVersion: 6.6
29-
Contact: Huisong Li <lihuisong@huawei.org>
29+
Contact: Huisong Li <lihuisong@huawei.com>
3030
Description:
3131
The /sys/devices/platform/HISI04Bx:00/chipX/dieY/ directory
3232
contains read-only attributes exposing some summarization
@@ -54,7 +54,7 @@ What: /sys/devices/platform/HISI04Bx:00/chipX/dieY/hccsN/lane_mask
5454
What: /sys/devices/platform/HISI04Bx:00/chipX/dieY/hccsN/crc_err_cnt
5555
Date: November 2023
5656
KernelVersion: 6.6
57-
Contact: Huisong Li <lihuisong@huawei.org>
57+
Contact: Huisong Li <lihuisong@huawei.com>
5858
Description:
5959
The /sys/devices/platform/HISI04Bx/chipX/dieX/hccsN/ directory
6060
contains read-only attributes exposing information about

‎Documentation/devicetree/bindings/cache/qcom,llcc.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ properties:
3333
- qcom,sm8350-llcc
3434
- qcom,sm8450-llcc
3535
- qcom,sm8550-llcc
36+
- qcom,sm8650-llcc
37+
- qcom,x1e80100-llcc
3638

3739
reg:
3840
minItems: 2
@@ -104,6 +106,7 @@ allOf:
104106
- qcom,qdu1000-llcc
105107
- qcom,sc8180x-llcc
106108
- qcom,sc8280xp-llcc
109+
- qcom,x1e80100-llcc
107110
then:
108111
properties:
109112
reg:

‎Documentation/devicetree/bindings/cache/sifive,ccache0.yaml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ properties:
3838
- sifive,fu740-c000-ccache
3939
- const: cache
4040
- items:
41-
- const: starfive,jh7110-ccache
41+
- enum:
42+
- starfive,jh7100-ccache
43+
- starfive,jh7110-ccache
4244
- const: sifive,ccache0
4345
- const: cache
4446
- items:
@@ -88,6 +90,7 @@ allOf:
8890
contains:
8991
enum:
9092
- sifive,fu740-c000-ccache
93+
- starfive,jh7100-ccache
9194
- starfive,jh7110-ccache
9295
- microchip,mpfs-ccache
9396

@@ -111,6 +114,7 @@ allOf:
111114
contains:
112115
enum:
113116
- sifive,fu740-c000-ccache
117+
- starfive,jh7100-ccache
114118
- starfive,jh7110-ccache
115119

116120
then:

‎Documentation/devicetree/bindings/firmware/qcom,scm.yaml‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ properties:
6363
- qcom,scm-sm8350
6464
- qcom,scm-sm8450
6565
- qcom,scm-sm8550
66+
- qcom,scm-sm8650
6667
- qcom,scm-qcs404
68+
- qcom,scm-x1e80100
6769
- const: qcom,scm
6870

6971
clocks:
@@ -178,21 +180,6 @@ allOf:
178180
minItems: 3
179181
maxItems: 3
180182

181-
# Interconnects
182-
- if:
183-
not:
184-
properties:
185-
compatible:
186-
contains:
187-
enum:
188-
- qcom,scm-qdu1000
189-
- qcom,scm-sc8280xp
190-
- qcom,scm-sm8450
191-
- qcom,scm-sm8550
192-
then:
193-
properties:
194-
interconnects: false
195-
196183
# Interrupts
197184
- if:
198185
not:
@@ -202,6 +189,7 @@ allOf:
202189
enum:
203190
- qcom,scm-sm8450
204191
- qcom,scm-sm8550
192+
- qcom,scm-sm8650
205193
then:
206194
properties:
207195
interrupts: false

‎Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
- amlogic,meson-axg-reset # Reset Controller on AXG and compatible SoCs
1919
- amlogic,meson-a1-reset # Reset Controller on A1 and compatible SoCs
2020
- amlogic,meson-s4-reset # Reset Controller on S4 and compatible SoCs
21+
- amlogic,c3-reset # Reset Controller on C3 and compatible SoCs
2122

2223
reg:
2324
maxItems: 1

‎Documentation/devicetree/bindings/reset/fsl,imx-src.yaml‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,28 +28,17 @@ description: |
2828
properties:
2929
compatible:
3030
oneOf:
31-
- const: "fsl,imx51-src"
31+
- const: fsl,imx51-src
3232
- items:
33-
- const: "fsl,imx50-src"
34-
- const: "fsl,imx51-src"
35-
- items:
36-
- const: "fsl,imx53-src"
37-
- const: "fsl,imx51-src"
38-
- items:
39-
- const: "fsl,imx6q-src"
40-
- const: "fsl,imx51-src"
41-
- items:
42-
- const: "fsl,imx6sx-src"
43-
- const: "fsl,imx51-src"
44-
- items:
45-
- const: "fsl,imx6sl-src"
46-
- const: "fsl,imx51-src"
47-
- items:
48-
- const: "fsl,imx6ul-src"
49-
- const: "fsl,imx51-src"
50-
- items:
51-
- const: "fsl,imx6sll-src"
52-
- const: "fsl,imx51-src"
33+
- enum:
34+
- fsl,imx50-src
35+
- fsl,imx53-src
36+
- fsl,imx6q-src
37+
- fsl,imx6sx-src
38+
- fsl,imx6sl-src
39+
- fsl,imx6ul-src
40+
- fsl,imx6sll-src
41+
- const: fsl,imx51-src
5342

5443
reg:
5544
maxItems: 1

‎Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.yaml‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -50,32 +50,9 @@ additionalProperties: false
5050

5151
examples:
5252
- |
53-
#include <dt-bindings/interrupt-controller/irq.h>
54-
#include <dt-bindings/interrupt-controller/arm-gic.h>
55-
#include <dt-bindings/clock/hi3660-clock.h>
56-
57-
iomcu: iomcu@ffd7e000 {
58-
compatible = "hisilicon,hi3660-iomcu", "syscon";
59-
reg = <0xffd7e000 0x1000>;
60-
};
61-
62-
iomcu_rst: iomcu_rst_controller {
53+
iomcu_rst_controller {
6354
compatible = "hisilicon,hi3660-reset";
6455
hisilicon,rst-syscon = <&iomcu>;
6556
#reset-cells = <2>;
6657
};
67-
68-
/* Specifying reset lines connected to IP modules */
69-
i2c@ffd71000 {
70-
compatible = "snps,designware-i2c";
71-
reg = <0xffd71000 0x1000>;
72-
interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>;
73-
#address-cells = <1>;
74-
#size-cells = <0>;
75-
clock-frequency = <400000>;
76-
clocks = <&crg_ctrl HI3660_CLK_GATE_I2C0>;
77-
resets = <&iomcu_rst 0x20 3>;
78-
pinctrl-names = "default";
79-
pinctrl-0 = <&i2c0_pmx_func &i2c0_cfg_func>;
80-
};
8158
...

‎Documentation/devicetree/bindings/reset/qcom,aoss-reset.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ properties:
1818
oneOf:
1919
- description: on SC7180 SoCs the following compatibles must be specified
2020
items:
21-
- const: "qcom,sc7180-aoss-cc"
22-
- const: "qcom,sdm845-aoss-cc"
21+
- const: qcom,sc7180-aoss-cc
22+
- const: qcom,sdm845-aoss-cc
2323

2424
- description: on SC7280 SoCs the following compatibles must be specified
2525
items:
26-
- const: "qcom,sc7280-aoss-cc"
27-
- const: "qcom,sdm845-aoss-cc"
26+
- const: qcom,sc7280-aoss-cc
27+
- const: qcom,sdm845-aoss-cc
2828

2929
- description: on SDM845 SoCs the following compatibles must be specified
3030
items:
31-
- const: "qcom,sdm845-aoss-cc"
31+
- const: qcom,sdm845-aoss-cc
3232

3333
reg:
3434
maxItems: 1

‎Documentation/devicetree/bindings/reset/qcom,pdc-global.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ properties:
1818
oneOf:
1919
- description: on SC7180 SoCs the following compatibles must be specified
2020
items:
21-
- const: "qcom,sc7180-pdc-global"
22-
- const: "qcom,sdm845-pdc-global"
21+
- const: qcom,sc7180-pdc-global
22+
- const: qcom,sdm845-pdc-global
2323

2424
- description: on SC7280 SoCs the following compatibles must be specified
2525
items:
26-
- const: "qcom,sc7280-pdc-global"
26+
- const: qcom,sc7280-pdc-global
2727

2828
- description: on SDM845 SoCs the following compatibles must be specified
2929
items:
30-
- const: "qcom,sdm845-pdc-global"
30+
- const: qcom,sdm845-pdc-global
3131

3232
reg:
3333
maxItems: 1

0 commit comments

Comments
 (0)