Skip to content

Commit a9fc230

Browse files
committed
Merge tag 'soc-drivers-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull SoC driver updates from Arnd Bergmann: "These are the updates for SoC specific drivers and related subsystems: - Firmware driver updates for SCMI, FF-A and SMCCC firmware interfaces, adding support for additional firmware features including SoC identification and FF-A SRI callbacks as well as various bugfixes - Memory controller updates for Nvidia and Mediatek - Reset controller support for microchip sam9x7 and imx8qxp/imx8qm - New hardware support for multiple Mediatek, Renesas and Samsung Exynos chips - Minor updates on Zynq, Qualcomm, Amlogic, TI, Samsung, Nvidia and Apple chips There will be a follow up with a few more driver updates that are still causing build regressions at the moment" * tag 'soc-drivers-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (97 commits) irqchip: Add support for Amlogic A4 and A5 SoCs dt-bindings: interrupt-controller: Add support for Amlogic A4 and A5 SoCs reset: imx: fix incorrect module device table dt-bindings: power: qcom,kpss-acc-v2: add qcom,msm8916-acc compatible bus: qcom-ssc-block-bus: Fix the error handling path of qcom_ssc_block_bus_probe() bus: qcom-ssc-block-bus: Remove some duplicated iounmap() calls soc: qcom: pd-mapper: Add support for SDM630/636 reset: imx: Add SCU reset driver for i.MX8QXP and i.MX8QM dt-bindings: firmware: imx: add property reset-controller dt-bindings: reset: atmel,at91sam9260-reset: add sam9x7 memory: mtk-smi: Add ostd setting for mt8192 dt-bindings: soc: samsung: exynos-usi: Drop unnecessary status from example firmware: tegra: bpmp: Fix typo in bpmp-abi.h soc/tegra: pmc: Use str_enable_disable-like helpers soc: samsung: include linux/array_size.h where needed firmware: arm_scmi: use ioread64() instead of ioread64_hi_lo() soc: mediatek: mtk-socinfo: Add extra entry for MT8395AV/ZA Genio 1200 soc: mediatek: mt8188-mmsys: Add support for DSC on VDO0 soc: mediatek: mmsys: Migrate all tables to MMSYS_ROUTE() macro soc: mediatek: mt8365-mmsys: Fix routing table masks and values ...
2 parents 2f24482 + 2124055 commit a9fc230

79 files changed

Lines changed: 3246 additions & 1076 deletions

Some content is hidden

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

Documentation/devicetree/bindings/firmware/fsl,scu.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,18 @@ properties:
4545
Keys provided by the SCU
4646
$ref: /schemas/input/fsl,scu-key.yaml
4747

48+
reset-controller:
49+
type: object
50+
properties:
51+
compatible:
52+
const: fsl,imx-scu-reset
53+
'#reset-cells':
54+
const: 1
55+
required:
56+
- compatible
57+
- '#reset-cells'
58+
additionalProperties: false
59+
4860
mboxes:
4961
description:
5062
A list of phandles of TX MU channels followed by a list of phandles of
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright 2024 Linaro Ltd.
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/firmware/google,gs101-acpm-ipc.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Samsung Exynos ACPM mailbox protocol
9+
10+
maintainers:
11+
- Tudor Ambarus <tudor.ambarus@linaro.org>
12+
13+
description: |
14+
ACPM (Alive Clock and Power Manager) is a firmware that operates on the
15+
APM (Active Power Management) module that handles overall power management
16+
activities. ACPM and masters regard each other as independent hardware
17+
component and communicate with each other using mailbox messages and
18+
shared memory.
19+
20+
This binding is intended to define the interface the firmware implementing
21+
ACPM provides for OSPM in the device tree.
22+
23+
properties:
24+
compatible:
25+
const: google,gs101-acpm-ipc
26+
27+
mboxes:
28+
maxItems: 1
29+
30+
shmem:
31+
description:
32+
List of phandle pointing to the shared memory (SHM) area. The memory
33+
contains channels configuration data and the TX/RX ring buffers that
34+
are used for passing messages to/from the ACPM firmware.
35+
maxItems: 1
36+
37+
required:
38+
- compatible
39+
- mboxes
40+
- shmem
41+
42+
additionalProperties: false
43+
44+
examples:
45+
- |
46+
power-management {
47+
compatible = "google,gs101-acpm-ipc";
48+
mboxes = <&ap2apm_mailbox>;
49+
shmem = <&apm_sram>;
50+
};

Documentation/devicetree/bindings/hwinfo/samsung,exynos-chipid.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@ properties:
1919
- enum:
2020
- samsung,exynos5433-chipid
2121
- samsung,exynos7-chipid
22+
- samsung,exynos7870-chipid
2223
- const: samsung,exynos4210-chipid
2324
- items:
2425
- enum:
26+
- samsung,exynos2200-chipid
2527
- samsung,exynos7885-chipid
2628
- samsung,exynos8895-chipid
2729
- samsung,exynos9810-chipid

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ properties:
3535
- amlogic,meson-sm1-gpio-intc
3636
- amlogic,meson-a1-gpio-intc
3737
- amlogic,meson-s4-gpio-intc
38+
- amlogic,a4-gpio-intc
39+
- amlogic,a4-gpio-ao-intc
40+
- amlogic,a5-gpio-intc
3841
- amlogic,c3-gpio-intc
3942
- amlogic,t7-gpio-intc
4043
- const: amlogic,meson-gpio-intc
@@ -49,7 +52,7 @@ properties:
4952

5053
amlogic,channel-interrupts:
5154
description: Array with the upstream hwirq numbers
52-
minItems: 8
55+
minItems: 2
5356
maxItems: 12
5457
$ref: /schemas/types.yaml#/definitions/uint32-array
5558

@@ -60,6 +63,20 @@ required:
6063
- "#interrupt-cells"
6164
- amlogic,channel-interrupts
6265

66+
if:
67+
properties:
68+
compatible:
69+
contains:
70+
const: amlogic,a4-gpio-ao-intc
71+
then:
72+
properties:
73+
amlogic,channel-interrupts:
74+
maxItems: 2
75+
else:
76+
properties:
77+
amlogic,channel-interrupts:
78+
minItems: 8
79+
6380
additionalProperties: false
6481

6582
examples:

Documentation/devicetree/bindings/power/qcom,kpss-acc-v2.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ description:
1818

1919
properties:
2020
compatible:
21-
const: qcom,kpss-acc-v2
21+
enum:
22+
- qcom,kpss-acc-v2
23+
- qcom,msm8916-acc
2224

2325
reg:
2426
items:

Documentation/devicetree/bindings/reset/atmel,at91sam9260-reset.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ properties:
2626
- items:
2727
- const: atmel,sama5d3-rstc
2828
- const: atmel,at91sam9g45-rstc
29+
- items:
30+
- enum:
31+
- microchip,sam9x7-rstc
32+
- const: microchip,sam9x60-rstc
2933

3034
reg:
3135
minItems: 1

Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ properties:
5454

5555
dma-coherent: true
5656

57+
firmware-name:
58+
maxItems: 1
59+
description: Specify the name of the QUP firmware to load.
60+
5761
required:
5862
- compatible
5963
- reg
@@ -135,6 +139,7 @@ examples:
135139
#address-cells = <2>;
136140
#size-cells = <2>;
137141
ranges;
142+
firmware-name = "qcom/sa8775p/qupv3fw.elf";
138143
139144
i2c0: i2c@a94000 {
140145
compatible = "qcom,geni-i2c";

Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ properties:
3838
- items:
3939
- enum:
4040
- qcom,sm8650-pmic-glink
41+
- qcom,sm8750-pmic-glink
4142
- qcom,x1e80100-pmic-glink
4243
- const: qcom,sm8550-pmic-glink
4344
- const: qcom,pmic-glink

Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ properties:
5252
- const: syscon
5353
- items:
5454
- enum:
55+
- samsung,exynos2200-pmu
56+
- samsung,exynos7870-pmu
5557
- samsung,exynos7885-pmu
5658
- samsung,exynos8895-pmu
5759
- samsung,exynos9810-pmu

Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ examples:
191191
interrupts = <GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH>;
192192
clocks = <&cmu_peri 32>, <&cmu_peri 31>;
193193
clock-names = "uart", "clk_uart_baud0";
194-
status = "disabled";
195194
};
196195
197196
hsi2c_0: i2c@13820000 {

0 commit comments

Comments
 (0)