Merge branch 'master' of http://git.denx.de/u-boot-sparc

[oweals/u-boot.git] / arch / arm / include / asm / arch-tegra124 / pinmux.h

diff --git a/arch/arm/include/asm/arch-tegra124/pinmux.h b/arch/arm/include/asm/arch-tegra124/pinmux.h
index 70254b5c731e13209d1250ffc1076d8c5d667257..9fcbb0f80b4bb8d78b3e2660762b9752751aa291 100644 (file)
--- a/arch/arm/include/asm/arch-tegra124/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra124/pinmux.h
@@ -246,7 +246,13 @@ enum pmux_drvgrp {
        PMUX_DRVGRP_COUNT,
 };
 
+enum pmux_mipipadctrlgrp {
+       PMUX_MIPIPADCTRLGRP_DSI_B,
+       PMUX_MIPIPADCTRLGRP_COUNT,
+};
+
 enum pmux_func {
+       PMUX_FUNC_DEFAULT,
        PMUX_FUNC_BLINK,
        PMUX_FUNC_CCLA,
        PMUX_FUNC_CEC,
@@ -254,6 +260,7 @@ enum pmux_func {
        PMUX_FUNC_CLK,
        PMUX_FUNC_CLK12,
        PMUX_FUNC_CPU,
+       PMUX_FUNC_CSI,
        PMUX_FUNC_DAP,
        PMUX_FUNC_DAP1,
        PMUX_FUNC_DAP2,
@@ -262,6 +269,7 @@ enum pmux_func {
        PMUX_FUNC_DISPLAYA_ALT,
        PMUX_FUNC_DISPLAYB,
        PMUX_FUNC_DP,
+       PMUX_FUNC_DSI_B,
        PMUX_FUNC_DTV,
        PMUX_FUNC_EXTPERIPH1,
        PMUX_FUNC_EXTPERIPH2,
@@ -327,16 +335,26 @@ enum pmux_func {
        PMUX_FUNC_VI_ALT3,
        PMUX_FUNC_VIMCLK2,
        PMUX_FUNC_VIMCLK2_ALT,
+       PMUX_FUNC_RSVD1,
+       PMUX_FUNC_RSVD2,
+       PMUX_FUNC_RSVD3,
+       PMUX_FUNC_RSVD4,
        PMUX_FUNC_COUNT,
-       PMUX_FUNC_RSVD1 = 0x8000,
-       PMUX_FUNC_RSVD2 = 0x8001,
-       PMUX_FUNC_RSVD3 = 0x8002,
-       PMUX_FUNC_RSVD4 = 0x8003,
 };
 
-#define TEGRA_PMX_HAS_PIN_IO_BIT_ETC
-#define TEGRA_PMX_HAS_RCV_SEL
-#define TEGRA_PMX_HAS_DRVGRPS
+#define TEGRA_PMX_SOC_DRV_GROUP_BASE_REG 0x868
+#define TEGRA_PMX_SOC_MIPIPADCTRL_BASE_REG 0x820
+#define TEGRA_PMX_SOC_HAS_IO_CLAMPING
+#define TEGRA_PMX_SOC_HAS_DRVGRPS
+#define TEGRA_PMX_SOC_HAS_MIPI_PAD_CTRL_GRPS
+#define TEGRA_PMX_GRPS_HAVE_LPMD
+#define TEGRA_PMX_GRPS_HAVE_SCHMT
+#define TEGRA_PMX_GRPS_HAVE_HSM
+#define TEGRA_PMX_PINS_HAVE_E_INPUT
+#define TEGRA_PMX_PINS_HAVE_LOCK
+#define TEGRA_PMX_PINS_HAVE_OD
+#define TEGRA_PMX_PINS_HAVE_IO_RESET
+#define TEGRA_PMX_PINS_HAVE_RCV_SEL
 #include <asm/arch-tegra/pinmux.h>
 
 #endif /* _TEGRA124_PINMUX_H_ */