Merge branches 'next/cleanup' and 'next/fixes-non-critical' into next/cleanups-fixes

This is a merge of the cleanup and fixes-non-critical branches for the 4.7
merge window. It seems more appropriate to send a single pull request
for these than two separate ones, as both branches really contain both
fixes and cleanups.

* next/cleanup:
  ARM: debug: remove extraneous DEBUG_HI3716_UART option
  ARM: davinci: use IRQCHIP_DECLARE for cp_intc
  ARM: davinci: remove unused DA8XX_NUM_UARTS
  ARM: davinci: simplify call to of populate
  ARM: DaVinci USB: removed deprecated properties from MUSB config
  ARM: rockchip: Fix use of plain integer as NULL pointer
  ARM: realview: hide unused 'pmu_device' object
  soc: versatile: dynamically detect RealView HBI numbers

* next/fixes-non-critical:
  ARM: dts: exynos: Add interrupt line to MAX8997 PMIC on exynos4210-trats
  ARM: dts: exynos: Fix regulator name to avoid forbidden character on exynos4210-trats
  ARM: dts: exynos: Add MFC memory banks for Peach boards
  ARM: OMAP2+: n900 needs MMC slot names for legacy user space
  ARM: OMAP2+: Add more functions to pwm pdata for ir-rx51
  ARM: EXYNOS: Properly skip unitialized parent clock in power domain on
  ARM: OMAP2+: Simplify auxdata by using the generic match
  of/platform: Allow secondary compatible match in of_dev_lookup

2 files changed, 22 insertions, 0 deletions

diff --git a/include/linux/platform_data/media/ir-rx51.h b/include/linux/platform_data/media/ir-rx51.h
index 104aa892f31b..3038120ca46e 100644
--- a/include/linux/platform_data/media/ir-rx51.h
+++ b/include/linux/platform_data/media/ir-rx51.h
@@ -5,6 +5,7 @@ struct lirc_rx51_platform_data {
         int pwm_timer;
 
         int(*set_max_mpu_wakeup_lat)(struct device *dev, long t);
+        struct pwm_omap_dmtimer_pdata *dmtimer;
 };
 
 #endif
diff --git a/include/linux/platform_data/pwm_omap_dmtimer.h b/include/linux/platform_data/pwm_omap_dmtimer.h
index 59384217208f..e7d521e48855 100644
--- a/include/linux/platform_data/pwm_omap_dmtimer.h
+++ b/include/linux/platform_data/pwm_omap_dmtimer.h
@@ -35,6 +35,16 @@
 #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
@@ -45,15 +55,23 @@ 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);
@@ -63,7 +81,10 @@ struct pwm_omap_dmtimer_pdata {
                         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 */