Fix the indentation in the OCMEM example and use generic node name -
sram - to reflect the type of the device.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Documentation/devicetree/bindings/sram/qcom,ocmem.yaml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/sram/qcom,ocmem.yaml b/Documentation/devicetree/bindings/sram/qcom,ocmem.yaml
index 930188bc5e6a..071f2d676196 100644
--- a/Documentation/devicetree/bindings/sram/qcom,ocmem.yaml
+++ b/Documentation/devicetree/bindings/sram/qcom,ocmem.yaml
@@ -72,10 +72,10 @@ patternProperties:
examples:
- |
- #include <dt-bindings/clock/qcom,rpmcc.h>
- #include <dt-bindings/clock/qcom,mmcc-msm8974.h>
+ #include <dt-bindings/clock/qcom,rpmcc.h>
+ #include <dt-bindings/clock/qcom,mmcc-msm8974.h>
- ocmem: ocmem@fdd00000 {
+ sram@fdd00000 {
compatible = "qcom,msm8974-ocmem";
reg = <0xfdd00000 0x2000>,
@@ -93,6 +93,6 @@ examples:
ranges = <0 0xfec00000 0x100000>;
gmu-sram@0 {
- reg = <0x0 0x100000>;
+ reg = <0x0 0x100000>;
};
- };
+ };
--
2.34.1
syscon compatible must be preceded with a specific compatible, to
accurately describe the device.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
index de01e34409f2..13ad1e84a25b 100644
--- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@ -342,7 +342,7 @@ mmc@12400000 {
};
sram@2a03f000 {
- compatible = "syscon", "simple-mfd";
+ compatible = "qcom,apq8064-imem", "syscon", "simple-mfd";
reg = <0x2a03f000 0x1000>;
reboot-mode {
--
2.34.1
According to Devicetree specification, the device nodes should be
generic, reflecting the function of the device. The typical name for
memory regions is "sram".
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 2 +-
arch/arm/boot/dts/qcom-msm8974.dtsi | 4 ++--
arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
index ca9f73528196..de01e34409f2 100644
--- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
+++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
@@ -341,7 +341,7 @@ mmc@12400000 {
};
};
- imem@2a03f000 {
+ sram@2a03f000 {
compatible = "syscon", "simple-mfd";
reg = <0x2a03f000 0x1000>;
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 814ad0b46232..09b181bb5365 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1603,7 +1603,7 @@ opp-27000000 {
};
};
- ocmem@fdd00000 {
+ sram@fdd00000 {
compatible = "qcom,msm8974-ocmem";
reg = <0xfdd00000 0x2000>,
<0xfec00000 0x180000>;
@@ -1650,7 +1650,7 @@ smd-edge {
};
};
- imem: imem@fe805000 {
+ imem: sram@fe805000 {
compatible = "syscon", "simple-mfd";
reg = <0xfe805000 0x1000>;
diff --git a/arch/arm/boot/dts/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom-sdx55.dtsi
index 1c2b208a5670..710c7f772d42 100644
--- a/arch/arm/boot/dts/qcom-sdx55.dtsi
+++ b/arch/arm/boot/dts/qcom-sdx55.dtsi
@@ -561,7 +561,7 @@ tlmm: pinctrl@f100000 {
#interrupt-cells = <2>;
};
- imem@1468f000 {
+ sram@1468f000 {
compatible = "simple-mfd";
reg = <0x1468f000 0x1000>;
--
2.34.1
Add proper compatibles to the IMEM device node:
1. syscon to allow accessing memory from other devices,
2. dedicated compatible as required for syscon and simple-mfd nodes.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index 1cca749ac9fb..7b5d3e1ddfc4 100644
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -1103,7 +1103,7 @@ blsp2_spi0: spi@7af5000 {
};
sram@8600000 {
- compatible = "simple-mfd";
+ compatible = "qcom,qcs404-imem", "syscon", "simple-mfd";
reg = <0x08600000 0x1000>;
#address-cells = <1>;
--
2.34.1
The OCMEM bindings require ranges property.
Fixes: a2cc991ed634 ("ARM: dts: qcom: msm8974: add ocmem node")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Not tested on HW. Testing might be useful.
---
arch/arm/boot/dts/qcom-msm8974.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 5e6b2ae72e62..add03309b3b4 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -1608,6 +1608,7 @@ sram@fdd00000 {
reg = <0xfdd00000 0x2000>,
<0xfec00000 0x180000>;
reg-names = "ctrl", "mem";
+ ranges = <0 0xfec00000 0x180000>;
clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>,
<&mmcc OCMEMCX_OCMEMNOC_CLK>;
clock-names = "core", "iface";
--
2.34.1
The OCMEM bindings require ranges property.
Fixes: 9d511d0a7926 ("arm64: dts: qcom: msm8994: Add OCMEM node")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Not tested on HW. Testing might be useful.
---
arch/arm64/boot/dts/qcom/msm8994.dtsi | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 0327c9941ae5..da9c8e05c7b4 100644
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -1074,6 +1074,7 @@ ocmem: sram@fdd00000 {
reg = <0xfdd00000 0x2000>,
<0xfec00000 0x200000>;
reg-names = "ctrl", "mem";
+ ranges = <0 0xfec00000 0x200000>;
clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>,
<&mmcc OCMEMCX_OCMEMNOC_CLK>;
clock-names = "core", "iface";
--
2.34.1
Add proper compatibles to the IMEM device node:
1. syscon to allow accessing memory from other devices,
2. dedicated compatible as required for syscon and simple-mfd nodes.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom-sdx55.dtsi
index 710c7f772d42..5a106708a240 100644
--- a/arch/arm/boot/dts/qcom-sdx55.dtsi
+++ b/arch/arm/boot/dts/qcom-sdx55.dtsi
@@ -562,7 +562,7 @@ tlmm: pinctrl@f100000 {
};
sram@1468f000 {
- compatible = "simple-mfd";
+ compatible = "qcom,sdx55-imem", "syscon", "simple-mfd";
reg = <0x1468f000 0x1000>;
#address-cells = <1>;
--
2.34.1
The IMEM node has children (PIL) which should be instantiated with
simple-mfd.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
Not tested on HW. Testing might be useful.
---
arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 11fe2ed464d0..ef45cd3811ea 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -4640,7 +4640,7 @@ sdc2_data_sleep: sdc2-data-sleep {
};
sram@146a5000 {
- compatible = "qcom,sc7280-imem", "syscon";
+ compatible = "qcom,sc7280-imem", "syscon", "simple-mfd";
reg = <0 0x146a5000 0 0x6000>;
#address-cells = <1>;
--
2.34.1
Add proper compatibles to the IMEM device node:
1. syscon to allow accessing memory from other devices,
2. dedicated compatible as required for syscon and simple-mfd nodes.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
index 6e13aab15931..1fa1436dd68c 100644
--- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
@@ -4722,7 +4722,7 @@ spmi_bus: spmi@c440000 {
};
sram@146bf000 {
- compatible = "simple-mfd";
+ compatible = "qcom,sdm845-imem", "syscon", "simple-mfd";
reg = <0 0x146bf000 0 0x1000>;
#address-cells = <1>;
--
2.34.1
Add bindings for IMEM memory region (like SRAM) used on several
Qualcomm SoCs. In the downstream (vendor) tree, it comes with several
children used for debugging purposes. The upstreamed parts are much
smaller - just image loader and syscon reboot.
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
.../devicetree/bindings/sram/qcom,imem.yaml | 75 +++++++++++++++++++
1 file changed, 75 insertions(+)
create mode 100644 Documentation/devicetree/bindings/sram/qcom,imem.yaml
diff --git a/Documentation/devicetree/bindings/sram/qcom,imem.yaml b/Documentation/devicetree/bindings/sram/qcom,imem.yaml
new file mode 100644
index 000000000000..e9199190198d
--- /dev/null
+++ b/Documentation/devicetree/bindings/sram/qcom,imem.yaml
@@ -0,0 +1,75 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/sram/qcom,imem.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm IMEM memory region
+
+maintainers:
+ - Bjorn Andersson <[email protected]>
+
+description:
+ Qualcomm IMEM is dedicated memory region for various debug features and DMA
+ transactions.
+
+properties:
+ compatible:
+ items:
+ - enum:
+ - qcom,apq8064-imem
+ - qcom,msm8974-imem
+ - qcom,qcs404-imem
+ - qcom,sc7180-imem
+ - qcom,sc7280-imem
+ - qcom,sdm630-imem
+ - qcom,sdm845-imem
+ - qcom,sdx55-imem
+ - const: syscon
+ - const: simple-mfd
+
+ reg:
+ maxItems: 1
+
+ ranges: true
+
+ '#address-cells':
+ const: 1
+
+ '#size-cells':
+ const: 1
+
+ reboot-mode:
+ $ref: /schemas/power/reset/syscon-reboot-mode.yaml#
+
+patternProperties:
+ "^pil-reloc@[0-9a-f]+$":
+ $ref: /schemas/remoteproc/qcom,pil-info.yaml#
+ description: Peripheral image loader relocation region
+
+required:
+ - compatible
+ - reg
+
+additionalProperties: false
+
+examples:
+ - |
+ soc {
+ #address-cells = <2>;
+ #size-cells = <2>;
+
+ sram@146bf000 {
+ compatible = "qcom,sdm845-imem", "syscon", "simple-mfd";
+ reg = <0 0x146bf000 0 0x1000>;
+ ranges = <0 0 0x146bf000 0x1000>;
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ pil-reloc@94c {
+ compatible = "qcom,pil-reloc-info";
+ reg = <0x94c 0xc8>;
+ };
+ };
+ };
--
2.34.1
On Tue, Jun 07, 2022 at 07:18:35PM +0200, Krzysztof Kozlowski wrote:
> Fix the indentation in the OCMEM example and use generic node name -
> sram - to reflect the type of the device.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> Documentation/devicetree/bindings/sram/qcom,ocmem.yaml | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
Applied, thanks.
On Tue, 07 Jun 2022 19:18:36 +0200, Krzysztof Kozlowski wrote:
> Add bindings for IMEM memory region (like SRAM) used on several
> Qualcomm SoCs. In the downstream (vendor) tree, it comes with several
> children used for debugging purposes. The upstreamed parts are much
> smaller - just image loader and syscon reboot.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> .../devicetree/bindings/sram/qcom,imem.yaml | 75 +++++++++++++++++++
> 1 file changed, 75 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/sram/qcom,imem.yaml
>
Applied, thanks!
Hi Krzysztof,
On Dienstag, 7. Juni 2022 19:18:41 CEST Krzysztof Kozlowski wrote:
> The OCMEM bindings require ranges property.
>
> Fixes: a2cc991ed634 ("ARM: dts: qcom: msm8974: add ocmem node")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
>
No functional regression on fairphone-fp2. Thanks!
Reviewed-by: Luca Weiss <[email protected]>
Tested-by: Luca Weiss <[email protected]>
> ---
>
> Not tested on HW. Testing might be useful.
> ---
> arch/arm/boot/dts/qcom-msm8974.dtsi | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
> b/arch/arm/boot/dts/qcom-msm8974.dtsi index 5e6b2ae72e62..add03309b3b4
> 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -1608,6 +1608,7 @@ sram@fdd00000 {
> reg = <0xfdd00000 0x2000>,
> <0xfec00000 0x180000>;
> reg-names = "ctrl", "mem";
> + ranges = <0 0xfec00000 0x180000>;
> clocks = <&rpmcc RPM_SMD_OCMEMGX_CLK>,
> <&mmcc OCMEMCX_OCMEMNOC_CLK>;
> clock-names = "core", "iface";
Hi Krzysztof,
On Dienstag, 7. Juni 2022 19:18:37 CEST Krzysztof Kozlowski wrote:
> According to Devicetree specification, the device nodes should be
> generic, reflecting the function of the device. The typical name for
> memory regions is "sram".
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
Reviewed-by: Luca Weiss <[email protected]>
Regards
Luca
> ---
> arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 2 +-
> arch/arm/boot/dts/qcom-msm8974.dtsi | 4 ++--
> arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
> b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts index
> ca9f73528196..de01e34409f2 100644
> --- a/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
> +++ b/arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts
> @@ -341,7 +341,7 @@ mmc@12400000 {
> };
> };
>
> - imem@2a03f000 {
> + sram@2a03f000 {
> compatible = "syscon", "simple-mfd";
> reg = <0x2a03f000 0x1000>;
>
> diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi
> b/arch/arm/boot/dts/qcom-msm8974.dtsi index 814ad0b46232..09b181bb5365
> 100644
> --- a/arch/arm/boot/dts/qcom-msm8974.dtsi
> +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
> @@ -1603,7 +1603,7 @@ opp-27000000 {
> };
> };
>
> - ocmem@fdd00000 {
> + sram@fdd00000 {
> compatible = "qcom,msm8974-ocmem";
> reg = <0xfdd00000 0x2000>,
> <0xfec00000 0x180000>;
> @@ -1650,7 +1650,7 @@ smd-edge {
> };
> };
>
> - imem: imem@fe805000 {
> + imem: sram@fe805000 {
> compatible = "syscon", "simple-mfd";
> reg = <0xfe805000 0x1000>;
>
> diff --git a/arch/arm/boot/dts/qcom-sdx55.dtsi
> b/arch/arm/boot/dts/qcom-sdx55.dtsi index 1c2b208a5670..710c7f772d42 100644
> --- a/arch/arm/boot/dts/qcom-sdx55.dtsi
> +++ b/arch/arm/boot/dts/qcom-sdx55.dtsi
> @@ -561,7 +561,7 @@ tlmm: pinctrl@f100000 {
> #interrupt-cells = <2>;
> };
>
> - imem@1468f000 {
> + sram@1468f000 {
> compatible = "simple-mfd";
> reg = <0x1468f000 0x1000>;
On 07/06/2022 19:18, Krzysztof Kozlowski wrote:
> According to Devicetree specification, the device nodes should be
> generic, reflecting the function of the device. The typical name for
> memory regions is "sram".
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 2 +-
> arch/arm/boot/dts/qcom-msm8974.dtsi | 4 ++--
> arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +-
> 3 files changed, 4 insertions(+), 4 deletions(-)
>
Bjorn,
Any comments from your side on these cleanups?
Best regards,
Krzysztof
On Tue, 7 Jun 2022 19:18:35 +0200, Krzysztof Kozlowski wrote:
> Fix the indentation in the OCMEM example and use generic node name -
> sram - to reflect the type of the device.
>
>
Applied, thanks!
[08/14] arm64: dts: qcom: use generic sram as name for imem and ocmem nodes
commit: bed0855657afebbcdd9d8a29546c550848452cf1
[09/14] arm64: dts: qcom: qcs404: add dedicated IMEM and syscon compatibles
commit: b2b86a2d89c26de048e44d3be439d9b2b1cb7ce5
[10/14] arm64: dts: qcom: sc7180: add dedicated IMEM and syscon compatibles
commit: c220f33e03a0cc4136ef205513b2266faf025e2e
[11/14] arm64: dts: qcom: sc7280: add simple-mfd to IMEM
commit: 2ffe4f99cbdd0639fc9a1254d39abd7b9dbe075e
[12/14] arm64: dts: qcom: sdm630: add dedicated IMEM and syscon compatibles
commit: 616ab047bec7c47d881751bc537d3d6f6ae0c6d0
[13/14] arm64: dts: qcom: sdm845: add dedicated IMEM and syscon compatibles
commit: 7cc60f6c09f49f0d8f8fa3083e7ff4fddec39ec0
[14/14] arm64: dts: qcom: msm8994: add required ranges to OCMEM
commit: 07f3c7a11dadbead580b6d6e7d86bcc87119fe74
Best regards,
--
Bjorn Andersson <[email protected]>