hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MIPS: SEAD3: Reset via generic syscon-reboot driver & DT 

Remove the SEAD3 implementation of _machine_restart & instead make use
of the generic syscon-reboot driver probed via device tree.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14056/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Paul Burton 2016-08-26 15:17:43 +01:00 committed by Ralf Baechle
parent c764583f40
commit 70bfdcec9a
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/mips/boot/dts/mti/sead3.dts
View File

@ -93,6 +93,18 @@
}; };
}; };
fpga_regs: system-controller@1f000000 {
compatible = "mti,sead3-fpga", "syscon", "simple-mfd";
reg = <0x1f000000 0x200>;
reboot {
compatible = "syscon-reboot";
regmap = <&fpga_regs>;
offset = <0x50>;
mask = <0x4d>;
};
};
system-controller@1f000200 { system-controller@1f000200 {
compatible = "mti,sead3-cpld", "syscon", "simple-mfd"; compatible = "mti,sead3-cpld", "syscon", "simple-mfd";
reg = <0x1f000200 0x300>; reg = <0x1f000200 0x300>;

3
arch/mips/configs/sead3_defconfig
View File

@ -80,8 +80,9 @@ CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_HELPER_AUTO is not set # CONFIG_I2C_HELPER_AUTO is not set
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_SYSCON=y
CONFIG_SENSORS_ADT7475=y CONFIG_SENSORS_ADT7475=y
CONFIG_MFD_SYSCON=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y

9
arch/mips/mti-sead3/sead3-reset.c
View File

@ -13,14 +13,6 @@
#define SOFTRES_REG 0x1f000050 #define SOFTRES_REG 0x1f000050
#define GORESET 0x4d #define GORESET 0x4d
static void mips_machine_restart(char *command)
{
unsigned int __iomem *softres_reg =
ioremap(SOFTRES_REG, sizeof(unsigned int));
__raw_writel(GORESET, softres_reg);
}
static void mips_machine_halt(void) static void mips_machine_halt(void)
{ {
unsigned int __iomem *softres_reg = unsigned int __iomem *softres_reg =
@ -31,7 +23,6 @@ static void mips_machine_halt(void)
static int __init mips_reboot_setup(void) static int __init mips_reboot_setup(void)
{ {
_machine_restart = mips_machine_restart;
_machine_halt = mips_machine_halt; _machine_halt = mips_machine_halt;
pm_power_off = mips_machine_halt; pm_power_off = mips_machine_halt;