[v2] i2c: I2C_HISI should depend on ACPI

Message ID 22d124a7f12f2c8b280a9cc7f3b766351c9a8d64.1620119167.git.geert+renesas@glider.be
State New
Headers show
Series
  • [v2] i2c: I2C_HISI should depend on ACPI
Related show

Commit Message

Geert Uytterhoeven May 4, 2021, 9:06 a.m.
The HiSilicon Kunpeng I2C controller driver relies on ACPI to probe for
its presence.  Hence add a dependency on ACPI, to prevent asking the
user about this driver when configuring a kernel without ACPI firmware
support.

Fixes: d62fbdb99a85730a ("i2c: add support for HiSilicon I2C controller")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
  - Drop dependency on ARCH_HISI, as this is a public IP which doesn't
    specifically depend on ARCH_HISI.
---
 drivers/i2c/busses/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Yicong Yang May 10, 2021, 1 p.m. | #1
On 2021/5/4 17:06, Geert Uytterhoeven wrote:
> The HiSilicon Kunpeng I2C controller driver relies on ACPI to probe for

> its presence.  Hence add a dependency on ACPI, to prevent asking the

> user about this driver when configuring a kernel without ACPI firmware

> support.

> 

> Fixes: d62fbdb99a85730a ("i2c: add support for HiSilicon I2C controller")

> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>


Acked-by: Yicong Yang <yangyicong@hisilicon.com>


> ---

> v2:

>   - Drop dependency on ARCH_HISI, as this is a public IP which doesn't

>     specifically depend on ARCH_HISI.

> ---

>  drivers/i2c/busses/Kconfig | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig

> index b5b4e0d0ff4dd0bc..226c0b79eac030fa 100644

> --- a/drivers/i2c/busses/Kconfig

> +++ b/drivers/i2c/busses/Kconfig

> @@ -647,7 +647,7 @@ config I2C_HIGHLANDER

>  

>  config I2C_HISI

>  	tristate "HiSilicon I2C controller"

> -	depends on ARM64 || COMPILE_TEST

> +	depends on (ARM64 && ACPI) || COMPILE_TEST

>  	help

>  	  Say Y here if you want to have Hisilicon I2C controller support

>  	  available on the Kunpeng Server.

>
Wolfram Sang May 25, 2021, 7:27 p.m. | #2
On Tue, May 04, 2021 at 11:06:32AM +0200, Geert Uytterhoeven wrote:
> The HiSilicon Kunpeng I2C controller driver relies on ACPI to probe for

> its presence.  Hence add a dependency on ACPI, to prevent asking the

> user about this driver when configuring a kernel without ACPI firmware

> support.

> 

> Fixes: d62fbdb99a85730a ("i2c: add support for HiSilicon I2C controller")

> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>


Applied to for-current, thanks!

Patch

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index b5b4e0d0ff4dd0bc..226c0b79eac030fa 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -647,7 +647,7 @@  config I2C_HIGHLANDER
 
 config I2C_HISI
 	tristate "HiSilicon I2C controller"
-	depends on ARM64 || COMPILE_TEST
+	depends on (ARM64 && ACPI) || COMPILE_TEST
 	help
 	  Say Y here if you want to have Hisilicon I2C controller support
 	  available on the Kunpeng Server.