diff options
author | Paul Burton <paul.burton@imgtec.com> | 2016-10-14 05:17:32 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2016-11-03 19:27:27 -0400 |
commit | 93032e31a5f12df847639db3ad0b7f300bf44b7b (patch) | |
tree | 01522d8d158cb7dbea251cce9763f4742e7ca636 /arch/mips/boot | |
parent | 682c1e52215da4a3e89c14aad60bfc0d400b025f (diff) |
MIPS: Malta: Fixup reboot
Commit 10b6ea0959de ("MIPS: Malta: Use syscon-reboot driver to reboot")
converted the Malta board to use the generic syscon-reboot driver to
handle reboots, but incorrectly used the value 0x4d rather than 0x42 as
the magic to write to the reboot register.
I also incorrectly believed that syscon/regmap would default to native
endianness, but this isn't the case. Force this by specifying with a
native-endian property in the devicetree.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Fixes: 10b6ea0959de ("MIPS: Malta: Use syscon-reboot driver to reboot")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Cc: linux-mips@linux-mips.org
Tested-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Maciej W. Rozycki <macro@imgtec.com>
Patchwork: https://patchwork.linux-mips.org/patch/14396/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/boot')
-rw-r--r-- | arch/mips/boot/dts/mti/malta.dts | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/boot/dts/mti/malta.dts b/arch/mips/boot/dts/mti/malta.dts index f604a272d91d..ffe3a1508e72 100644 --- a/arch/mips/boot/dts/mti/malta.dts +++ b/arch/mips/boot/dts/mti/malta.dts | |||
@@ -84,12 +84,13 @@ | |||
84 | fpga_regs: system-controller@1f000000 { | 84 | fpga_regs: system-controller@1f000000 { |
85 | compatible = "mti,malta-fpga", "syscon", "simple-mfd"; | 85 | compatible = "mti,malta-fpga", "syscon", "simple-mfd"; |
86 | reg = <0x1f000000 0x1000>; | 86 | reg = <0x1f000000 0x1000>; |
87 | native-endian; | ||
87 | 88 | ||
88 | reboot { | 89 | reboot { |
89 | compatible = "syscon-reboot"; | 90 | compatible = "syscon-reboot"; |
90 | regmap = <&fpga_regs>; | 91 | regmap = <&fpga_regs>; |
91 | offset = <0x500>; | 92 | offset = <0x500>; |
92 | mask = <0x4d>; | 93 | mask = <0x42>; |
93 | }; | 94 | }; |
94 | }; | 95 | }; |
95 | 96 | ||