Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / include / linux / pwm.h

diff --git a/include/linux/pwm.h b/include/linux/pwm.h
index f0feafd..e16ee37 100644 (file)
--- a/include/linux/pwm.h
+++ b/include/linux/pwm.h
@@ -274,14 +274,18 @@ struct pwm_lookup {
        unsigned int index;
        const char *dev_id;
        const char *con_id;
+       unsigned int period;
+       enum pwm_polarity polarity;
 };
 
-#define PWM_LOOKUP(_provider, _index, _dev_id, _con_id)        \
+#define PWM_LOOKUP(_provider, _index, _dev_id, _con_id, _period, _polarity) \
        {                                               \
                .provider = _provider,                  \
                .index = _index,                        \
                .dev_id = _dev_id,                      \
                .con_id = _con_id,                      \
+               .period = _period,                      \
+               .polarity = _polarity                   \
        }
 
 #if IS_ENABLED(CONFIG_PWM)