2019-12-09 18:47:54

by Michael Walle

Subject: [PATCH v2] arm64: dts: ls1028a: fix reboot node

The reboot register isn't located inside the DCFG controller, but in its
own RST controller. Fix it.

Fixes: 8897f3255c9c ("arm64: dts: Add support for NXP LS1028A SoC")
Signed-off-by: Michael Walle <[email protected]>
---

changes since v1:
- add fixes tag
- remove "ls1028a-rst" compatible string, because there is no actual
driver for it. It just use the syscon driver.

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 8b28fda2ca20..7825550b7cef 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -88,7 +88,7 @@

reboot {
compatible ="syscon-reboot";
- regmap = <&dcfg>;
+ regmap = <&rst>;
offset = <0xb0>;
mask = <0x02>;
};
@@ -178,6 +178,12 @@
little-endian;
};

+ rst: syscon@1e60000 {
+ compatible = "syscon";
+ reg = <0x0 0x1e60000 0x0 0x10000>;
+ little-endian;
+ };
+
scfg: syscon@1fc0000 {
compatible = "fsl,ls1028a-scfg", "syscon";
reg = <0x0 0x1fc0000 0x0 0x10000>;
--
2.20.1

2019-12-09 19:52:48

by Leo Li

Subject: RE: [PATCH v2] arm64: dts: ls1028a: fix reboot node

> -----Original Message-----
> From: Michael Walle <[email protected]>
> Sent: Monday, December 9, 2019 12:47 PM
> To: [email protected]; [email protected]; linux-
> [email protected]
> Cc: Shawn Guo <[email protected]>; Leo Li <[email protected]>; Rob
> Herring <[email protected]>; Mark Rutland <[email protected]>;
> Michael Walle <[email protected]>
> Subject: [PATCH v2] arm64: dts: ls1028a: fix reboot node
>
> The reboot register isn't located inside the DCFG controller, but in its own RST
> controller. Fix it.
>
> Fixes: 8897f3255c9c ("arm64: dts: Add support for NXP LS1028A SoC")
> Signed-off-by: Michael Walle <[email protected]>

Acked-by: Li Yang <[email protected]>

> ---
>
> changes since v1:
> - add fixes tag
> - remove "ls1028a-rst" compatible string, because there is no actual
> driver for it. It just use the syscon driver.
>
> arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> index 8b28fda2ca20..7825550b7cef 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> @@ -88,7 +88,7 @@
>
> reboot {
> compatible ="syscon-reboot";
> - regmap = <&dcfg>;
> + regmap = <&rst>;
> offset = <0xb0>;
> mask = <0x02>;
> };
> @@ -178,6 +178,12 @@
> little-endian;
> };
>
> + rst: syscon@1e60000 {
> + compatible = "syscon";
> + reg = <0x0 0x1e60000 0x0 0x10000>;
> + little-endian;
> + };
> +
> scfg: syscon@1fc0000 {
> compatible = "fsl,ls1028a-scfg", "syscon";
> reg = <0x0 0x1fc0000 0x0 0x10000>;
> --
> 2.20.1

2019-12-11 07:54:43

by Shawn Guo

Subject: Re: [PATCH v2] arm64: dts: ls1028a: fix reboot node

On Mon, Dec 09, 2019 at 07:46:44PM +0100, Michael Walle wrote:
> The reboot register isn't located inside the DCFG controller, but in its
> own RST controller. Fix it.
>
> Fixes: 8897f3255c9c ("arm64: dts: Add support for NXP LS1028A SoC")
> Signed-off-by: Michael Walle <[email protected]>
> ---
>
> changes since v1:
> - add fixes tag
> - remove "ls1028a-rst" compatible string, because there is no actual
> driver for it. It just use the syscon driver.
>
> arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> index 8b28fda2ca20..7825550b7cef 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> @@ -88,7 +88,7 @@
>
> reboot {
> compatible ="syscon-reboot";
> - regmap = <&dcfg>;
> + regmap = <&rst>;
> offset = <0xb0>;
> mask = <0x02>;
> };
> @@ -178,6 +178,12 @@
> little-endian;
> };
>
> + rst: syscon@1e60000 {
> + compatible = "syscon";
> + reg = <0x0 0x1e60000 0x0 0x10000>;
> + little-endian;
> + };
> +
> scfg: syscon@1fc0000 {

Hmm, what is your base? It doesn't apply to my branch.

Shawn

> compatible = "fsl,ls1028a-scfg", "syscon";
> reg = <0x0 0x1fc0000 0x0 0x10000>;
> --
> 2.20.1
>