| Message ID | 20191211171145.14736-1-michael@walle.cc (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 3f0fb37b22b460e3dec62bee284932881574acb9 |
| Headers | show |
| Series | [v3] arm64: dts: ls1028a: fix reboot node | expand |
On Wed, Dec 11, 2019 at 06:11:45PM +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 <michael@walle.cc> You missed Leo's ACK on v2? I added it and applied the patch. Shawn
Am 2019-12-12 03:00, schrieb Shawn Guo: > On Wed, Dec 11, 2019 at 06:11:45PM +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 <michael@walle.cc> > > You missed Leo's ACK on v2? I added it and applied the patch. Yes, I forgot to add that, thanks. -michael
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 261663f4a2db..301a76e441fc 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 @@ big-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>;
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 <michael@walle.cc> --- changes since v2: - rebase to shawnguo/linux/for-next 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(-)