Skip to content

Commit 822ef14

Browse files
torvaldstorvalds
committed
Merge tag 'arm-drivers-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC driver updates from Arnd Bergmann: "A couple of subsystems have their own subsystem maintainers but choose to have the code merged through the soc tree as upstream, as the code tends to be used across multiple SoCs or has SoC specific drivers itself: - memory controllers: Krzysztof Kozlowski takes ownership of the drivers/memory subsystem and its drivers, starting out with a set of cleanup patches. A larger driver for the Tegra memory controller that was accidentally missed for v5.8 is now added. - reset controllers: Only minor updates to drivers/reset this time - firmware: The "turris mox" firmware driver gains support for signed firmware blobs The tegra firmware driver gets extended to export some debug information Various updates to i.MX firmware drivers, mostly cosmetic - ARM SCMI/SCPI: A new mechanism for platform notifications is added, among a number of minor changes. - optee: Probing of the TEE bus is rewritten to better support detection of devices that depend on the tee-supplicant user space. A new firmware based trusted platform module (fTPM) driver is added based on OP-TEE - SoC attributes: A new driver is added to provide a generic soc_device for identifying a machine through the SMCCC ARCH_SOC_ID firmware interface rather than by probing SoC family specific registers. The series also contains some cleanups to the common soc_device code. There are also a number of updates to SoC specific drivers, the main ones are: - Mediatek cmdq driver gains a few in-kernel interfaces - Minor updates to Qualcomm RPMh, socinfo, rpm drivers, mostly adding support for additional SoC variants - The Qualcomm GENI core code gains interconnect path voting and performance level support, and integrating this into a number of device drivers. - A new driver for Samsung Exynos5800 voltage coupler for - Renesas RZ/G2H (R8A774E1) SoC support gets added to a couple of SoC specific device drivers - Updates to the TI K3 Ring Accelerator driver" * tag 'arm-drivers-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (164 commits) soc: qcom: geni: Fix unused label warning soc: qcom: smd-rpm: Fix kerneldoc memory: jz4780_nemc: Only request IO memory the driver will use soc: qcom: pdr: Reorder the PD state indication ack MAINTAINERS: Add Git repository for memory controller drivers memory: brcmstb_dpfe: Fix language typo memory: samsung: exynos5422-dmc: Correct white space issues memory: samsung: exynos-srom: Correct alignment memory: pl172: Enclose macro argument usage in parenthesis memory: of: Correct kerneldoc memory: omap-gpmc: Fix language typo memory: omap-gpmc: Correct white space issues memory: omap-gpmc: Use 'unsigned int' for consistency memory: omap-gpmc: Enclose macro argument usage in parenthesis memory: omap-gpmc: Correct kerneldoc memory: mvebu-devbus: Align with open parenthesis memory: mvebu-devbus: Add missing braces to all arms of if statement memory: bt1-l2-ctl: Add blank lines after declarations soc: TI knav_qmss: make symbol 'knav_acc_range_ops' static firmware: ti_sci: Replace HTTP links with HTTPS ones ...
2 parents 6ce076f + d76cfc7 commit 822ef14

File tree

143 files changed

+10925
-1350
lines changed

Some content is hidden

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

143 files changed

+10925
-1350
lines changed

‎Documentation/ABI/testing/debugfs-turris-mox-rwtm

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/kernel/debug/turris-mox-rwtm/do_sign
2+
Date: Jun 2020
3+
KernelVersion: 5.8
4+
Contact: Marek Behún <[email protected]>
5+
Description: (W) Message to sign with the ECDSA private key stored in
6+
device's OTP. The message must be exactly 64 bytes (since
7+
this is intended for SHA-512 hashes).
8+
(R) The resulting signature, 136 bytes. This contains the R and
9+
S values of the ECDSA signature, both in big-endian format.

‎Documentation/ABI/testing/sysfs-bus-optee-devices

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /sys/bus/tee/devices/optee-ta-<uuid>/
2+
Date: May 2020
3+
KernelVersion 5.8
4+
Contact: [email protected]
5+
Description:
6+
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
7+
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
8+
are free to create needed API under optee-ta-<uuid> directory.

‎Documentation/ABI/testing/sysfs-devices-soc

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,30 @@ Description:
2626
Read-only attribute common to all SoCs. Contains SoC family name
2727
(e.g. DB8500).
2828

29+
On many of ARM based silicon with SMCCC v1.2+ compliant firmware
30+
this will contain the JEDEC JEP106 manufacturer’s identification
31+
code. The format is "jep106:XXYY" where XX is identity code and
32+
YY is continuation code.
33+
34+
This manufacturer’s identification code is defined by one
35+
or more eight (8) bit fields, each consisting of seven (7)
36+
data bits plus one (1) odd parity bit. It is a single field,
37+
limiting the possible number of vendors to 126. To expand
38+
the maximum number of identification codes, a continuation
39+
scheme has been defined.
40+
41+
The specified mechanism is that an identity code of 0x7F
42+
represents the "continuation code" and implies the presence
43+
of an additional identity code field, and this mechanism
44+
may be extended to multiple continuation codes followed
45+
by the manufacturer's identity code.
46+
47+
For example, ARM has identity code 0x7F 0x7F 0x7F 0x7F 0x3B,
48+
which is code 0x3B on the fifth 'page'. This is shortened
49+
as JEP106 identity code of 0x3B and a continuation code of
50+
0x4 to represent the four continuation codes preceding the
51+
identity code.
52+
2953
What: /sys/devices/socX/serial_number
3054
Date: January 2019
3155
contact: Bjorn Andersson <[email protected]>
@@ -40,6 +64,12 @@ Description:
4064
Read-only attribute supported by most SoCs. In the case of
4165
ST-Ericsson's chips this contains the SoC serial number.
4266

67+
On many of ARM based silicon with SMCCC v1.2+ compliant firmware
68+
this will contain the SOC ID appended to the family attribute
69+
to ensure there is no conflict in this namespace across various
70+
vendors. The format is "jep106:XXYY:ZZZZ" where XX is identity
71+
code, YY is continuation code and ZZZZ is the SOC ID.
72+
4373
What: /sys/devices/socX/revision
4474
Date: January 2012
4575
contact: Lee Jones <[email protected]>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,12 @@ Required properties:
1111
* "qcom,scm-apq8084"
1212
* "qcom,scm-ipq4019"
1313
* "qcom,scm-ipq806x"
14+
* "qcom,scm-ipq8074"
1415
* "qcom,scm-msm8660"
1516
* "qcom,scm-msm8916"
1617
* "qcom,scm-msm8960"
1718
* "qcom,scm-msm8974"
19+
* "qcom,scm-msm8994"
1820
* "qcom,scm-msm8996"
1921
* "qcom,scm-msm8998"
2022
* "qcom,scm-sc7180"

‎Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Required Properties:
5555
corresponds to a range of host irqs.
5656

5757
For more details on TISCI IRQ resource management refer:
58-
http://downloads.ti.com/tisci/esd/latest/2_tisci_msgs/rm/rm_irq.html
58+
https://downloads.ti.com/tisci/esd/latest/2_tisci_msgs/rm/rm_irq.html
5959

6060
Example:
6161
--------

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

Lines changed: 0 additions & 49 deletions
This file was deleted.

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/reset/fsl,imx-src.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX System Reset Controller
8+
9+
maintainers:
10+
- Philipp Zabel <[email protected]>
11+
12+
description: |
13+
The system reset controller can be used to reset the GPU, VPU,
14+
IPU, and OpenVG IP modules on i.MX5 and i.MX6 ICs. Those device
15+
nodes should specify the reset line on the SRC in their resets
16+
property, containing a phandle to the SRC device node and a
17+
RESET_INDEX specifying which module to reset, as described in
18+
reset.txt
19+
20+
The following RESET_INDEX values are valid for i.MX5:
21+
GPU_RESET 0
22+
VPU_RESET 1
23+
IPU1_RESET 2
24+
OPEN_VG_RESET 3
25+
The following additional RESET_INDEX value is valid for i.MX6:
26+
IPU2_RESET 4
27+
28+
properties:
29+
compatible:
30+
oneOf:
31+
- const: "fsl,imx51-src"
32+
- 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"
53+
54+
reg:
55+
maxItems: 1
56+
57+
interrupts:
58+
items:
59+
- description: SRC interrupt
60+
- description: CPU WDOG interrupts out of SRC
61+
minItems: 1
62+
maxItems: 2
63+
64+
'#reset-cells':
65+
const: 1
66+
67+
required:
68+
- compatible
69+
- reg
70+
- interrupts
71+
- '#reset-cells'
72+
73+
additionalProperties: false
74+
75+
examples:
76+
- |
77+
reset-controller@73fd0000 {
78+
compatible = "fsl,imx51-src";
79+
reg = <0x73fd0000 0x4000>;
80+
interrupts = <75>;
81+
#reset-cells = <1>;
82+
};

‎Documentation/devicetree/bindings/reset/fsl,imx7-src.txt

Lines changed: 0 additions & 56 deletions
This file was deleted.

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

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/reset/fsl,imx7-src.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale i.MX7 System Reset Controller
8+
9+
maintainers:
10+
- Andrey Smirnov <[email protected]>
11+
12+
description: |
13+
The system reset controller can be used to reset various set of
14+
peripherals. Device nodes that need access to reset lines should
15+
specify them as a reset phandle in their corresponding node as
16+
specified in reset.txt.
17+
18+
For list of all valid reset indices see
19+
<dt-bindings/reset/imx7-reset.h> for i.MX7,
20+
<dt-bindings/reset/imx8mq-reset.h> for i.MX8MQ, i.MX8MM and i.MX8MN,
21+
<dt-bindings/reset/imx8mp-reset.h> for i.MX8MP.
22+
23+
properties:
24+
compatible:
25+
items:
26+
- enum:
27+
- fsl,imx7d-src
28+
- fsl,imx8mq-src
29+
- fsl,imx8mp-src
30+
- const: syscon
31+
32+
reg:
33+
maxItems: 1
34+
35+
interrupts:
36+
maxItems: 1
37+
38+
'#reset-cells':
39+
const: 1
40+
41+
required:
42+
- compatible
43+
- reg
44+
- interrupts
45+
- '#reset-cells'
46+
47+
additionalProperties: false
48+
49+
examples:
50+
- |
51+
#include <dt-bindings/interrupt-controller/arm-gic.h>
52+
53+
reset-controller@30390000 {
54+
compatible = "fsl,imx7d-src", "syscon";
55+
reg = <0x30390000 0x2000>;
56+
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
57+
#reset-cells = <1>;
58+
};

‎Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)