diff options
author | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2014-05-19 16:42:37 -0400 |
---|---|---|
committer | Thierry Reding <thierry.reding@gmail.com> | 2014-05-21 05:19:36 -0400 |
commit | 4284402924cc55e182008ca7e9d4fb1e891ff5ae (patch) | |
tree | 33ea885d12a999eeb5412affcaccfe97919c0260 | |
parent | fcb355063ffb12a834b3ca1383c9beec9285d568 (diff) |
pwm: modify PWM_LOOKUP to initialize all struct pwm_lookup members
Now that PWM_LOOKUP is not used anymore, modify it to initialize all the
members of struct pwm_lookup.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
-rw-r--r-- | Documentation/pwm.txt | 3 | ||||
-rw-r--r-- | include/linux/pwm.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/pwm.txt b/Documentation/pwm.txt index 0527f615b115..ca895fd211e4 100644 --- a/Documentation/pwm.txt +++ b/Documentation/pwm.txt | |||
@@ -19,7 +19,8 @@ should instead register a static mapping that can be used to match PWM | |||
19 | consumers to providers, as given in the following example: | 19 | consumers to providers, as given in the following example: |
20 | 20 | ||
21 | static struct pwm_lookup board_pwm_lookup[] = { | 21 | static struct pwm_lookup board_pwm_lookup[] = { |
22 | PWM_LOOKUP("tegra-pwm", 0, "pwm-backlight", NULL), | 22 | PWM_LOOKUP("tegra-pwm", 0, "pwm-backlight", NULL, |
23 | 50000, PWM_POLARITY_NORMAL), | ||
23 | }; | 24 | }; |
24 | 25 | ||
25 | static void __init board_init(void) | 26 | static void __init board_init(void) |
diff --git a/include/linux/pwm.h b/include/linux/pwm.h index 2f45e2fe5b93..e90628cac8fa 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h | |||
@@ -278,12 +278,14 @@ struct pwm_lookup { | |||
278 | enum pwm_polarity polarity; | 278 | enum pwm_polarity polarity; |
279 | }; | 279 | }; |
280 | 280 | ||
281 | #define PWM_LOOKUP(_provider, _index, _dev_id, _con_id) \ | 281 | #define PWM_LOOKUP(_provider, _index, _dev_id, _con_id, _period, _polarity) \ |
282 | { \ | 282 | { \ |
283 | .provider = _provider, \ | 283 | .provider = _provider, \ |
284 | .index = _index, \ | 284 | .index = _index, \ |
285 | .dev_id = _dev_id, \ | 285 | .dev_id = _dev_id, \ |
286 | .con_id = _con_id, \ | 286 | .con_id = _con_id, \ |
287 | .period = _period, \ | ||
288 | .polarity = _polarity \ | ||
287 | } | 289 | } |
288 | 290 | ||
289 | #if IS_ENABLED(CONFIG_PWM) | 291 | #if IS_ENABLED(CONFIG_PWM) |