ARM: tegra: pinmux naming consistency fixes

[karo-tx-uboot.git] / arch / arm / include / asm / arch-tegra114 / pinmux.h

diff --git a/arch/arm/include/asm/arch-tegra114/pinmux.h b/arch/arm/include/asm/arch-tegra114/pinmux.h
index 00ef5423547dffffa153fc9d8964e06073f3ffee..070745933503950622c9c78b797701f09c7f2be4 100644 (file)
--- a/arch/arm/include/asm/arch-tegra114/pinmux.h
+++ b/arch/arm/include/asm/arch-tegra114/pinmux.h
@@ -202,10 +202,10 @@ enum pmux_pingrp {
        PINGRP_SDMMC3_CLK_LB_IN,
        PINGRP_SDMMC3_CLK_LB_OUT,
        PINGRP_RESET_OUT_N = PINGRP_SDMMC3_CLK_LB_OUT + 2,
-       PINGRP_COUNT,
+       PMUX_PINGRP_COUNT,
 };
 
-enum pdrive_pingrp {
+enum pmux_drvgrp {
        PDRIVE_PINGROUP_AO1 = 0, /* offset 0x868 */
        PDRIVE_PINGROUP_AO2,
        PDRIVE_PINGROUP_AT1,
@@ -244,7 +244,7 @@ enum pdrive_pingrp {
        PDRIVE_PINGROUP_HVC,
        PDRIVE_PINGROUP_SDIO4,
        PDRIVE_PINGROUP_AO0,
-       PDRIVE_PINGROUP_COUNT,
+       PMUX_DRVGRP_COUNT,
 };
 
 /*
@@ -378,7 +378,7 @@ enum pmux_func {
 
 #define TEGRA_PMX_HAS_PIN_IO_BIT_ETC
 #define TEGRA_PMX_HAS_RCV_SEL
-#define TEGRA_PMX_HAS_PADGRPS
+#define TEGRA_PMX_HAS_DRVGRPS
 #include <asm/arch-tegra/pinmux.h>
 
 #endif /* _TEGRA114_PINMUX_H_ */