This fixes up the compatible string for the pmsleep register
region based on Arnd and Rob's feedback:
- Add "mstar,msc313-pmsleep" to mfd/syscon.yaml
- Remove the unneeded binding description for "mstar,pmsleep"
- Use the new string in the MStar v7 base dtsi
Daniel Palmer (3):
dt-bindings: mfd: syscon: add compatible string for
mstar,msc313-pmsleep
dt-bindings: arm: mstar: remove the binding description for
mstar,pmsleep
ARM: mstar: Correct the compatible string for pmsleep
.../bindings/arm/mstar/mstar,pmsleep.yaml | 43 -------------------
.../devicetree/bindings/mfd/syscon.yaml | 1 +
arch/arm/boot/dts/mstar-v7.dtsi | 2 +-
3 files changed, 2 insertions(+), 44 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/mstar/mstar,pmsleep.yaml
--
2.27.0
Add a compatible string for the pmsleep register region in the
MStar MSC313 SoC.
Signed-off-by: Daniel Palmer <[email protected]>
---
Documentation/devicetree/bindings/mfd/syscon.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/mfd/syscon.yaml b/Documentation/devicetree/bindings/mfd/syscon.yaml
index f3fba860d3cc..614e58bb5d7d 100644
--- a/Documentation/devicetree/bindings/mfd/syscon.yaml
+++ b/Documentation/devicetree/bindings/mfd/syscon.yaml
@@ -39,6 +39,7 @@ properties:
- allwinner,sun8i-v3s-system-controller
- allwinner,sun50i-a64-system-controller
- microchip,sparx5-cpu-syscon
+ - mstar,msc313-pmsleep
- const: syscon
--
2.27.0
Remove the unneeded binding description.
Compatible string is in mfd/syscon.yaml now.
Signed-off-by: Daniel Palmer <[email protected]>
---
.../bindings/arm/mstar/mstar,pmsleep.yaml | 43 -------------------
1 file changed, 43 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/mstar/mstar,pmsleep.yaml
diff --git a/Documentation/devicetree/bindings/arm/mstar/mstar,pmsleep.yaml b/Documentation/devicetree/bindings/arm/mstar/mstar,pmsleep.yaml
deleted file mode 100644
index 0b45e7012ceb..000000000000
--- a/Documentation/devicetree/bindings/arm/mstar/mstar,pmsleep.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
-# Copyright 2020 thingy.jp.
-%YAML 1.2
----
-$id: "http://devicetree.org/schemas/arm/mstar/mstar,pmsleep.yaml#"
-$schema: "http://devicetree.org/meta-schemas/core.yaml#"
-
-title: MStar/SigmaStar Armv7 SoC pmsleep register region
-
-maintainers:
- - Daniel Palmer <[email protected]>
-
-description: |
- MStar/Sigmastar's Armv7 SoCs contain a region of registers that are
- in the always on domain that the vendor code calls the "pmsleep" area.
-
- This area contains registers and bits for a broad range of functionality
- ranging from registers that control going into deep sleep to bits that
- turn things like the internal temperature sensor on and off.
-
-properties:
- compatible:
- oneOf:
- - items:
- - enum:
- - mstar,pmsleep
- - const: syscon
-
- reg:
- maxItems: 1
-
-required:
- - compatible
- - reg
-
-additionalProperties: false
-
-examples:
- - |
- pmsleep: pmsleep@1c00 {
- compatible = "mstar,pmsleep", "syscon";
- reg = <0x1c00 0x100>;
- };
--
2.27.0
The compatible string for the pmsleep region has changed.
Update the MStar/Sigmastar v7 base dtsi with the new string.
Signed-off-by: Daniel Palmer <[email protected]>
---
arch/arm/boot/dts/mstar-v7.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/mstar-v7.dtsi b/arch/arm/boot/dts/mstar-v7.dtsi
index c7458c67c4df..3b7b9b793736 100644
--- a/arch/arm/boot/dts/mstar-v7.dtsi
+++ b/arch/arm/boot/dts/mstar-v7.dtsi
@@ -74,7 +74,7 @@ riu: bus@1f000000 {
ranges = <0x0 0x1f000000 0x00400000>;
pmsleep: syscon@1c00 {
- compatible = "mstar,pmsleep", "syscon";
+ compatible = "mstar,msc313-pmsleep", "syscon";
reg = <0x1c00 0x100>;
};
--
2.27.0
On Wed, Jul 29, 2020 at 5:08 PM Daniel Palmer <[email protected]> wrote:
>
> Remove the unneeded binding description.
> Compatible string is in mfd/syscon.yaml now.
>
> Signed-off-by: Daniel Palmer <[email protected]>
This patch for some reason did not apply, so I ended up removing the
file manually and using your changelog.
Arnd
On Sat, 1 Aug 2020 at 04:22, Arnd Bergmann <[email protected]> wrote:
> This patch for some reason did not apply, so I ended up removing the
> file manually and using your changelog.
>
> Arnd
Thanks Arnd.