| Message ID | 413b332868bac086c32b7486a7cb9c6fc81c15c0.1694865711.git.tanyuan@tinylab.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Kconfig: Add dependencies of POWER_RESET for MIPS Malta | expand |
On 16/9/23 14:07, Yuan Tan wrote: > MIPS Malta's power off depends on PCI, PCI_QUIRKS, and > POWER_RESET_PIIX4_POWEROFF to work. Enable them when POWER_RESET is set > for convenience. > Then regenerate malta_defconfig with 'make savedefconfig'. > > Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> I haven't suggested that, just reviewed your patches, so: Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu> (I don't remember Christophe suggesting this either) > Suggested-by: Zhangjin Wu <falcon@tinylab.org> > Signed-off-by: Yuan Tan <tanyuan@tinylab.org> > --- > arch/mips/Kconfig | 3 +++ > arch/mips/configs/malta_defconfig | 2 -- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig > index fc6fba925aea..b63a93e39f23 100644 > --- a/arch/mips/Kconfig > +++ b/arch/mips/Kconfig > @@ -547,6 +547,9 @@ config MIPS_MALTA > select MIPS_L1_CACHE_SHIFT_6 > select MIPS_MSC > select PCI_GT64XXX_PCI0 > + select PCI if POWER_RESET > + select PCI_QUIRKS if POWER_RESET > + select POWER_RESET_PIIX4_POWEROFF if POWER_RESET > select SMP_UP if SMP > select SWAP_IO_SPACE > select SYS_HAS_CPU_MIPS32_R1 > diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig > index 7ae07d57b79a..99049e993192 100644 > --- a/arch/mips/configs/malta_defconfig > +++ b/arch/mips/configs/malta_defconfig > @@ -192,7 +192,6 @@ CONFIG_CFG80211=m > CONFIG_MAC80211=m > CONFIG_MAC80211_MESH=y > CONFIG_RFKILL=m > -CONFIG_PCI=y > CONFIG_DEVTMPFS=y > CONFIG_CONNECTOR=m > CONFIG_MTD=y > @@ -284,7 +283,6 @@ CONFIG_MOUSE_PS2_ELANTECH=y > CONFIG_SERIAL_8250=y > CONFIG_SERIAL_8250_CONSOLE=y > CONFIG_POWER_RESET=y > -CONFIG_POWER_RESET_PIIX4_POWEROFF=y > CONFIG_POWER_RESET_SYSCON=y > # CONFIG_HWMON is not set > CONFIG_FB=y
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index fc6fba925aea..b63a93e39f23 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -547,6 +547,9 @@ config MIPS_MALTA select MIPS_L1_CACHE_SHIFT_6 select MIPS_MSC select PCI_GT64XXX_PCI0 + select PCI if POWER_RESET + select PCI_QUIRKS if POWER_RESET + select POWER_RESET_PIIX4_POWEROFF if POWER_RESET select SMP_UP if SMP select SWAP_IO_SPACE select SYS_HAS_CPU_MIPS32_R1 diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 7ae07d57b79a..99049e993192 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig @@ -192,7 +192,6 @@ CONFIG_CFG80211=m CONFIG_MAC80211=m CONFIG_MAC80211_MESH=y CONFIG_RFKILL=m -CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_CONNECTOR=m CONFIG_MTD=y @@ -284,7 +283,6 @@ CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_PIIX4_POWEROFF=y CONFIG_POWER_RESET_SYSCON=y # CONFIG_HWMON is not set CONFIG_FB=y
MIPS Malta's power off depends on PCI, PCI_QUIRKS, and POWER_RESET_PIIX4_POWEROFF to work. Enable them when POWER_RESET is set for convenience. Then regenerate malta_defconfig with 'make savedefconfig'. Suggested-by: Philippe Mathieu-Daudé <philmd@linaro.org> Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu> Suggested-by: Zhangjin Wu <falcon@tinylab.org> Signed-off-by: Yuan Tan <tanyuan@tinylab.org> --- arch/mips/Kconfig | 3 +++ arch/mips/configs/malta_defconfig | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-)