diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-15 17:19:45 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-15 17:19:45 +0200 |
commit | 44cfc3a83f2a62963af2de8d983daf4c77e1db0c (patch) | |
tree | ccdd7943466b3f6fa0231c14de7686cca84caeb4 /arch/arm/include/asm/arch-tegra20/pinmux.h | |
parent | 9f5f51540d0d6af03ff22f55b7afc3fda6a4120d (diff) | |
parent | 2364e151e432b4ccf32dc9e6147121253d4ff86d (diff) | |
download | blackbird-obmc-uboot-44cfc3a83f2a62963af2de8d983daf4c77e1db0c.tar.gz blackbird-obmc-uboot-44cfc3a83f2a62963af2de8d983daf4c77e1db0c.zip |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-tegra20/pinmux.h')
-rw-r--r-- | arch/arm/include/asm/arch-tegra20/pinmux.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-tegra20/pinmux.h b/arch/arm/include/asm/arch-tegra20/pinmux.h index 11c0104ff3..f7bc97fe5f 100644 --- a/arch/arm/include/asm/arch-tegra20/pinmux.h +++ b/arch/arm/include/asm/arch-tegra20/pinmux.h @@ -166,6 +166,7 @@ enum pmux_pingrp { * purely a convenience. The translation is done through a table search. */ enum pmux_func { + PMUX_FUNC_DEFAULT, PMUX_FUNC_AHB_CLK, PMUX_FUNC_APB_CLK, PMUX_FUNC_AUDIO_SYNC, |