pwm: omap-dmtimer: Drop unused header file

pwm_omap_dmtimer.h is used only:
- to typedef struct omap_dm_timer to pwm_omap_dmtimer
- for macro PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE
Rest of the file is pretty mush unsed. So reuse omap_dm_timer
and OMAP_TIMER_TRIGGER_OVERFLOW_AND_COMPARE in pwm-omap-dmtimer.c
and delete the header file.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
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/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c
index 9e4378dc6897528d075c30e821525e00a613c9b4..e4f5f710bfaaffe32c7bbdc3f997eab8616faeaf 100644 (file)
--- a/drivers/pwm/pwm-omap-dmtimer.c
+++ b/drivers/pwm/pwm-omap-dmtimer.c
@@ -20,8 +20,8 @@
 #include <linux/mutex.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <clocksource/timer-ti-dm.h>
 #include <linux/platform_data/dmtimer-omap.h>
-#include <linux/platform_data/pwm_omap_dmtimer.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/pwm.h>
@@ -34,7 +34,7 @@
 struct pwm_omap_dmtimer_chip {
        struct pwm_chip chip;
        struct mutex mutex;
-       pwm_omap_dmtimer *dm_timer;
+       struct omap_dm_timer *dm_timer;
        const struct omap_dm_timer_ops *pdata;
        struct platform_device *dm_timer_pdev;
 };
@@ -190,10 +190,9 @@ static int pwm_omap_dmtimer_config(struct pwm_chip *chip,
                load_value, load_value, match_value, match_value);
 
        omap->pdata->set_pwm(omap->dm_timer,
-                             pwm_get_polarity(pwm) == PWM_POLARITY_INVERSED,
-                             true,
-                             PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE,
-                             true);
+                            pwm_get_polarity(pwm) == PWM_POLARITY_INVERSED,
+                            true, OMAP_TIMER_TRIGGER_OVERFLOW_AND_COMPARE,
+                            true);
 
        /* If config was called while timer was running it must be reenabled. */
        if (timer_active)
@@ -221,10 +220,9 @@ static int pwm_omap_dmtimer_set_polarity(struct pwm_chip *chip,
         */
        mutex_lock(&omap->mutex);
        omap->pdata->set_pwm(omap->dm_timer,
-                             polarity == PWM_POLARITY_INVERSED,
-                             true,
-                             PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE,
-                             true);
+                            polarity == PWM_POLARITY_INVERSED,
+                            true, OMAP_TIMER_TRIGGER_OVERFLOW_AND_COMPARE,
+                            true);
        mutex_unlock(&omap->mutex);
 
        return 0;
@@ -246,7 +244,7 @@ static int pwm_omap_dmtimer_probe(struct platform_device *pdev)
        struct pwm_omap_dmtimer_chip *omap;
        struct dmtimer_platform_data *timer_pdata;
        const struct omap_dm_timer_ops *pdata;
-       pwm_omap_dmtimer *dm_timer;
+       struct omap_dm_timer *dm_timer;
        u32 v;
        int ret = 0;
 

diff --git a/include/clocksource/timer-ti-dm.h b/include/clocksource/timer-ti-dm.h
index 25f05235866eec0f0a52fe8fb04babbafe7b9f0f..531ca87fcd08d8e3fadddcbfaf92e3dd97ce9005 100644 (file)
--- a/include/clocksource/timer-ti-dm.h
+++ b/include/clocksource/timer-ti-dm.h
@@ -248,8 +248,7 @@ int omap_dm_timers_active(void);
 
 /*
  * The below are inlined to optimize code size for system timers. Other code
- * should not need these at all, see
- * include/linux/platform_data/pwm_omap_dmtimer.h
+ * should not need these at all.
  */
 #if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2PLUS)
 static inline u32 __omap_dm_timer_read(struct omap_dm_timer *timer, u32 reg,

diff --git a/include/linux/platform_data/pwm_omap_dmtimer.h b/include/linux/platform_data/pwm_omap_dmtimer.h
deleted file mode 100644 (file)
index e7d521e..0000000
--- a/include/linux/platform_data/pwm_omap_dmtimer.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * include/linux/platform_data/pwm_omap_dmtimer.h
- *
- * OMAP Dual-Mode Timer PWM platform data
- *
- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
- * Tarun Kanti DebBarma <tarun.kanti@ti.com>
- * Thara Gopinath <thara@ti.com>
- *
- * Platform device conversion and hwmod support.
- *
- * Copyright (C) 2005 Nokia Corporation
- * Author: Lauri Leukkunen <lauri.leukkunen@nokia.com>
- * PWM and clock framework support by Timo Teras.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2 of the License, or (at your
- * option) any later version.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * You should have received a copy of the  GNU General Public License along
- * with this program; if not, write  to the Free Software Foundation, Inc.,
- * 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __PWM_OMAP_DMTIMER_PDATA_H
-#define __PWM_OMAP_DMTIMER_PDATA_H
-
-/* clock sources */
-#define PWM_OMAP_DMTIMER_SRC_SYS_CLK                   0x00
-#define PWM_OMAP_DMTIMER_SRC_32_KHZ                    0x01
-#define PWM_OMAP_DMTIMER_SRC_EXT_CLK                   0x02
-
-/* timer interrupt enable bits */
-#define PWM_OMAP_DMTIMER_INT_CAPTURE                   (1 << 2)
-#define PWM_OMAP_DMTIMER_INT_OVERFLOW                  (1 << 1)
-#define PWM_OMAP_DMTIMER_INT_MATCH                     (1 << 0)
-
-/* trigger types */
-#define PWM_OMAP_DMTIMER_TRIGGER_NONE                  0x00
-#define PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW              0x01
-#define PWM_OMAP_DMTIMER_TRIGGER_OVERFLOW_AND_COMPARE  0x02
-
-struct omap_dm_timer;
-typedef struct omap_dm_timer pwm_omap_dmtimer;
-
-struct pwm_omap_dmtimer_pdata {
-       pwm_omap_dmtimer *(*request_by_node)(struct device_node *np);
-       pwm_omap_dmtimer *(*request_specific)(int timer_id);
-       pwm_omap_dmtimer *(*request)(void);
-
-       int     (*free)(pwm_omap_dmtimer *timer);
-
-       void    (*enable)(pwm_omap_dmtimer *timer);
-       void    (*disable)(pwm_omap_dmtimer *timer);
-
-       int     (*get_irq)(pwm_omap_dmtimer *timer);
-       int     (*set_int_enable)(pwm_omap_dmtimer *timer, unsigned int value);
-       int     (*set_int_disable)(pwm_omap_dmtimer *timer, u32 mask);
-
-       struct clk *(*get_fclk)(pwm_omap_dmtimer *timer);
-
-       int     (*start)(pwm_omap_dmtimer *timer);
-       int     (*stop)(pwm_omap_dmtimer *timer);
-       int     (*set_source)(pwm_omap_dmtimer *timer, int source);
-
-       int     (*set_load)(pwm_omap_dmtimer *timer, int autoreload,
-                       unsigned int value);
-       int     (*set_match)(pwm_omap_dmtimer *timer, int enable,
-                       unsigned int match);
-       int     (*set_pwm)(pwm_omap_dmtimer *timer, int def_on,
-                       int toggle, int trigger);
-       int     (*set_prescaler)(pwm_omap_dmtimer *timer, int prescaler);
-
-       unsigned int (*read_counter)(pwm_omap_dmtimer *timer);
-       int     (*write_counter)(pwm_omap_dmtimer *timer, unsigned int value);
-       unsigned int (*read_status)(pwm_omap_dmtimer *timer);
-       int     (*write_status)(pwm_omap_dmtimer *timer, unsigned int value);
-};
-
-#endif /* __PWM_OMAP_DMTIMER_PDATA_H */