diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 20:13:48 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-04-21 20:13:48 +0200 |
| commit | 94b972d366c29b92319865e3ded16da062aa8507 (patch) | |
| tree | 2948fd62cdd789f182775f5d7d576ac9b7b025e5 /drivers/video | |
| parent | dda0dbfc69f3d560c87f5be85f127ed862ea6721 (diff) | |
| parent | d381294aef4a5b6ddeda3685519330a5b73d884f (diff) | |
| download | u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.zip u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.tar.gz u-boot-imx-94b972d366c29b92319865e3ded16da062aa8507.tar.bz2 | |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/tegra.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index c047e6e..57cb007 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -229,8 +229,8 @@ static int handle_stage(const void *blob) break; case STAGE_PWM: /* Enable PWM at 15/16 high, 32768 Hz with divider 1 */ - pinmux_set_func(PINGRP_GPU, PMUX_FUNC_PWM); - pinmux_tristate_disable(PINGRP_GPU); + pinmux_set_func(PMUX_PINGRP_GPU, PMUX_FUNC_PWM); + pinmux_tristate_disable(PMUX_PINGRP_GPU); pwm_enable(config.pwm_channel, 32768, 0xdf, 1); break; |