diff options
| author | Braden Kell <bradenkell@google.com> | 2017-07-17 15:44:05 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-17 15:44:05 +0000 |
| commit | a080e6077372bf74ec7121b9c9a03765c2812364 (patch) | |
| tree | d9a60042ec47dffbf1ed72e63ecb53499c2e0fb6 | |
| parent | 28bb284a19661b479f2f8a6ccfc7605b3773e94d (diff) | |
| parent | 05b694ba75784c7262caf1b835d095a9d91d5098 (diff) | |
| download | pi-v4.4-a080e6077372bf74ec7121b9c9a03765c2812364.tar.gz | |
Merge "Don't unregister cprman when disabling PWM" into oc-iot-dev
| -rw-r--r-- | drivers/pinctrl/android-things/platform_devices.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/android-things/platform_devices.c b/drivers/pinctrl/android-things/platform_devices.c index fbc9d8592e4c..999f3b58025c 100644 --- a/drivers/pinctrl/android-things/platform_devices.c +++ b/drivers/pinctrl/android-things/platform_devices.c @@ -61,7 +61,7 @@ struct bcm_device platform_devices[] = { }, { .name = "PWM", .node = { .path = "/soc/pwm@7e20c000" }, - .aux_dev = { .path = "/soc/cprman@7e101000" }, + .aux_dev = { .path = NULL }, .use_default = 0, .always_unreg_aux = 0, .init_unreg = 1, |