diff options
| author | Braden Kell <bradenkell@google.com> | 2017-07-14 16:53:18 -0700 |
|---|---|---|
| committer | Braden Kell <bradenkell@google.com> | 2017-07-14 16:53:18 -0700 |
| commit | 05b694ba75784c7262caf1b835d095a9d91d5098 (patch) | |
| tree | e4b677cb3686873362ed33860277b4f6afbf7392 | |
| parent | 2d57130f9bea7e2fe14fb0bd933ab8784e3a02ae (diff) | |
| download | pi-v4.4-05b694ba75784c7262caf1b835d095a9d91d5098.tar.gz | |
Don't unregister cprman when disabling PWM
We don't want cprman to be unregistered now that
I2S no longer conflicts with it. Additionally,
hw graphics depends on cprman being available.
Remove cprman as the auxiliary device for PWM to
stop this from happening.
Bug: 63644623
Test: RPi doesn't get stuck in a boot loop
Change-Id: I1226b78319ffae6cce930af94a63fc2ffccc7c06
| -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 cfa04258709e..37712fd5e16a 100644 --- a/drivers/pinctrl/android-things/platform_devices.c +++ b/drivers/pinctrl/android-things/platform_devices.c @@ -54,7 +54,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, |