pwm: jz4740: Force dependency on Device Tree

Ingenic SoCs all require CONFIG_OF, so there is no case where we want to
use this driver without CONFIG_OF.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>

diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig
index 60d13a9..1fe420a 100644 (file)
--- a/drivers/pwm/Kconfig
+++ b/drivers/pwm/Kconfig
@@ -283,7 +283,7 @@ config PWM_IQS620A
 config PWM_JZ4740
        tristate "Ingenic JZ47xx PWM support"
        depends on MIPS || COMPILE_TEST
-       depends on COMMON_CLK
+       depends on COMMON_CLK && OF
        select MFD_SYSCON
        help
          Generic PWM framework driver for Ingenic JZ47xx based

diff --git a/drivers/pwm/pwm-jz4740.c b/drivers/pwm/pwm-jz4740.c
index a5fdf97..1a1a651 100644 (file)
--- a/drivers/pwm/pwm-jz4740.c
+++ b/drivers/pwm/pwm-jz4740.c
@@ -248,19 +248,18 @@ static int jz4740_pwm_probe(struct platform_device *pdev)
        return devm_pwmchip_add(dev, &jz4740->chip);
 }
 
-static const struct soc_info __maybe_unused jz4740_soc_info = {
+static const struct soc_info jz4740_soc_info = {
        .num_pwms = 8,
 };
 
-static const struct soc_info __maybe_unused jz4725b_soc_info = {
+static const struct soc_info jz4725b_soc_info = {
        .num_pwms = 6,
 };
 
-static const struct soc_info __maybe_unused x1000_soc_info = {
+static const struct soc_info x1000_soc_info = {
        .num_pwms = 5,
 };
 
-#ifdef CONFIG_OF
 static const struct of_device_id jz4740_pwm_dt_ids[] = {
        { .compatible = "ingenic,jz4740-pwm", .data = &jz4740_soc_info },
        { .compatible = "ingenic,jz4725b-pwm", .data = &jz4725b_soc_info },
@@ -268,12 +267,11 @@ static const struct of_device_id jz4740_pwm_dt_ids[] = {
        {},
 };
 MODULE_DEVICE_TABLE(of, jz4740_pwm_dt_ids);
-#endif
 
 static struct platform_driver jz4740_pwm_driver = {
        .driver = {
                .name = "jz4740-pwm",
-               .of_match_table = of_match_ptr(jz4740_pwm_dt_ids),
+               .of_match_table = jz4740_pwm_dt_ids,
        },
        .probe = jz4740_pwm_probe,
 };