drm: fix bochs kconfig dependencies

[~andy/linux] / drivers / pwm / pwm-renesas-tpu.c

diff --git a/drivers/pwm/pwm-renesas-tpu.c b/drivers/pwm/pwm-renesas-tpu.c
index 2600892782c13eded21d810077485150521da55e..aff6ba9b49e7b4b3bac9d566af39f01c6136b6bb 100644 (file)
--- a/drivers/pwm/pwm-renesas-tpu.c
+++ b/drivers/pwm/pwm-renesas-tpu.c
@@ -20,6 +20,7 @@
 #include <linux/ioport.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/of.h>
 #include <linux/platform_data/pwm-renesas-tpu.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
@@ -86,7 +87,7 @@ struct tpu_pwm_device {
 
 struct tpu_device {
        struct platform_device *pdev;
-       struct tpu_pwm_platform_data *pdata;
+       enum pwm_polarity polarities[TPU_CHANNEL_MAX];
        struct pwm_chip chip;
        spinlock_t lock;
 
@@ -228,8 +229,7 @@ static int tpu_pwm_request(struct pwm_chip *chip, struct pwm_device *_pwm)
 
        pwm->tpu = tpu;
        pwm->channel = _pwm->hwpwm;
-       pwm->polarity = tpu->pdata ? tpu->pdata->channels[pwm->channel].polarity
-                     : PWM_POLARITY_NORMAL;
+       pwm->polarity = tpu->polarities[pwm->channel];
        pwm->prescaler = 0;
        pwm->period = 0;
        pwm->duty = 0;
@@ -388,6 +388,16 @@ static const struct pwm_ops tpu_pwm_ops = {
  * Probe and remove
  */
 
+static void tpu_parse_pdata(struct tpu_device *tpu)
+{
+       struct tpu_pwm_platform_data *pdata = tpu->pdev->dev.platform_data;
+       unsigned int i;
+
+       for (i = 0; i < ARRAY_SIZE(tpu->polarities); ++i)
+               tpu->polarities[i] = pdata ? pdata->channels[i].polarity
+                                  : PWM_POLARITY_NORMAL;
+}
+
 static int tpu_probe(struct platform_device *pdev)
 {
        struct tpu_device *tpu;
@@ -400,15 +410,14 @@ static int tpu_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       tpu->pdata = pdev->dev.platform_data;
+       spin_lock_init(&tpu->lock);
+       tpu->pdev = pdev;
+
+       /* Initialize device configuration from platform data. */
+       tpu_parse_pdata(tpu);
 
        /* Map memory, get clock and pin control. */
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (!res) {
-               dev_err(&pdev->dev, "failed to get I/O memory\n");
-               return -ENXIO;
-       }
-
        tpu->base = devm_ioremap_resource(&pdev->dev, res);
        if (IS_ERR(tpu->base))
                return PTR_ERR(tpu->base);
@@ -422,11 +431,10 @@ static int tpu_probe(struct platform_device *pdev)
        /* Initialize and register the device. */
        platform_set_drvdata(pdev, tpu);
 
-       spin_lock_init(&tpu->lock);
-       tpu->pdev = pdev;
-
        tpu->chip.dev = &pdev->dev;
        tpu->chip.ops = &tpu_pwm_ops;
+       tpu->chip.of_xlate = of_pwm_xlate_with_flags;
+       tpu->chip.of_pwm_n_cells = 3;
        tpu->chip.base = -1;
        tpu->chip.npwm = TPU_CHANNEL_MAX;
 
@@ -457,12 +465,26 @@ static int tpu_remove(struct platform_device *pdev)
        return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id tpu_of_table[] = {
+       { .compatible = "renesas,tpu-r8a73a4", },
+       { .compatible = "renesas,tpu-r8a7740", },
+       { .compatible = "renesas,tpu-r8a7790", },
+       { .compatible = "renesas,tpu-sh7372", },
+       { .compatible = "renesas,tpu", },
+       { },
+};
+
+MODULE_DEVICE_TABLE(of, tpu_of_table);
+#endif
+
 static struct platform_driver tpu_driver = {
        .probe          = tpu_probe,
        .remove         = tpu_remove,
        .driver         = {
                .name   = "renesas-tpu-pwm",
                .owner  = THIS_MODULE,
+               .of_match_table = of_match_ptr(tpu_of_table),
        }
 };