diff options
| author | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-04-03 09:14:38 -0400 |
| commit | 692e5c4e7eb267f3d8f3a8c9d2348eff6f5f21e2 (patch) | |
| tree | e47f18f7dd1507e91a46fcd6f550914ad3774f5a /arch/arm/mach-tegra/tegra124/pinmux.c | |
| parent | 8a5c9ca4d0b8aa13a1bb321494d24f656a9a7d72 (diff) | |
| parent | 76a30fedd44428c7108084266389c9b4ba5678c8 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
Conflicts:
board/armltd/vexpress64/vexpress64.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra124/pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra124/pinmux.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/tegra124/pinmux.c b/arch/arm/mach-tegra/tegra124/pinmux.c index c6685eaae1..4629b4676c 100644 --- a/arch/arm/mach-tegra/tegra124/pinmux.c +++ b/arch/arm/mach-tegra/tegra124/pinmux.c @@ -304,3 +304,20 @@ static const struct pmux_pingrp_desc tegra124_pingroups[] = { PIN(DP_HPD_PFF0, DP, RSVD2, RSVD3, RSVD4), }; const struct pmux_pingrp_desc *tegra_soc_pingroups = tegra124_pingroups; + +#define MIPIPADCTRL_GRP(grp, f0, f1) \ + { \ + .funcs = { \ + PMUX_FUNC_##f0, \ + PMUX_FUNC_##f1, \ + }, \ + } + +#define MIPIPADCTRL_RESERVED {} + +static const struct pmux_mipipadctrlgrp_desc tegra124_mipipadctrl_groups[] = { + /* pin, f0, f1 */ + /* Offset 0x820 */ + MIPIPADCTRL_GRP(DSI_B, CSI, DSI_B), +}; +const struct pmux_mipipadctrlgrp_desc *tegra_soc_mipipadctrl_groups = tegra124_mipipadctrl_groups; |