ENGR00221214 MX6Q/DL SabreSD: avoid pop-noise on audio pads

config audio pads to avoid pop-noise

Signed-off-by: Gary Zhang <b13634@freescale.com>

diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx6dl.h b/arch/arm/plat-mxc/include/mach/iomux-mx6dl.h
index 4d0fa922c742aa333d7caef414e1e258087464bd..df528bc4f028d778aa9d7b1aaea84de9191f8702 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/iomux-mx6dl.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx6dl.h
@@ -73,6 +73,10 @@
 #define MX6DL_ECSPI_PAD_CTRL (PAD_CTL_SRE_FAST | PAD_CTL_SPEED_MED |   \
                PAD_CTL_DSE_40ohm   | PAD_CTL_HYS)
 
+#define MX6DL_ADU_PAD_CTRL     (PAD_CTL_PKE | PAD_CTL_PUE |            \
+               PAD_CTL_DSE_40ohm | PAD_CTL_PUS_100K_DOWN |             \
+               PAD_CTL_HYS | PAD_CTL_SPEED_MED)
+
 #define MX6DL_GPMI_PAD_CTRL0 (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_PUS_100K_UP)
 #define MX6DL_GPMI_PAD_CTRL1 (PAD_CTL_DSE_40ohm | PAD_CTL_SPEED_MED | PAD_CTL_SRE_FAST)
 #define MX6DL_GPMI_PAD_CTRL2 (MX6DL_GPMI_PAD_CTRL0 | MX6DL_GPMI_PAD_CTRL1)
@@ -294,7 +298,7 @@
 #define MX6DL_PAD_CSI0_DAT5__KPP_ROW_5                                         \
                IOMUX_PAD(0x038C, 0x0078, 3, 0x08CC, 0, NO_PAD_CTRL)
 #define MX6DL_PAD_CSI0_DAT5__AUDMUX_AUD3_TXD                                   \
-               IOMUX_PAD(0x038C, 0x0078, 4, 0x0000, 0, NO_PAD_CTRL)
+               IOMUX_PAD(0x038C, 0x0078, 4, 0x0000, 0, MX6DL_ADU_PAD_CTRL)
 #define MX6DL_PAD_CSI0_DAT5__GPIO_5_23                                         \
                IOMUX_PAD(0x038C, 0x0078, 5, 0x0000, 0, NO_PAD_CTRL)
 #define MX6DL_PAD_CSI0_DAT5__MMDC_MMDC_DEBUG_44                                \
@@ -328,7 +332,7 @@
 #define MX6DL_PAD_CSI0_DAT7__KPP_ROW_6                                         \
                IOMUX_PAD(0x0394, 0x0080, 3, 0x08D0, 0, NO_PAD_CTRL)
 #define MX6DL_PAD_CSI0_DAT7__AUDMUX_AUD3_RXD                                   \
-               IOMUX_PAD(0x0394, 0x0080, 4, 0x0000, 0, NO_PAD_CTRL)
+               IOMUX_PAD(0x0394, 0x0080, 4, 0x0000, 0, MX6DL_ADU_PAD_CTRL)
 #define MX6DL_PAD_CSI0_DAT7__GPIO_5_25                                         \
                IOMUX_PAD(0x0394, 0x0080, 5, 0x0000, 0, NO_PAD_CTRL)
 #define MX6DL_PAD_CSI0_DAT7__MMDC_MMDC_DEBUG_46                                \

diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx6q.h b/arch/arm/plat-mxc/include/mach/iomux-mx6q.h
index 7618975d38a356d8f94ec9244e627dcd1dbb635d..9226af18f7ee3c47b9cfa17712ee3f6045bee6ad 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/iomux-mx6q.h
+++ b/arch/arm/plat-mxc/include/mach/iomux-mx6q.h
@@ -85,6 +85,10 @@
                PAD_CTL_PUE | PAD_CTL_PKE | PAD_CTL_ODE | PAD_CTL_SPEED_MED | \
                PAD_CTL_DSE_40ohm | PAD_CTL_SRE_SLOW)
 
+#define MX6Q_ADU_PAD_CTRL      (PAD_CTL_PKE | PAD_CTL_PUE |            \
+               PAD_CTL_DSE_40ohm | PAD_CTL_PUS_100K_DOWN |             \
+               PAD_CTL_HYS | PAD_CTL_SPEED_MED)
+
 #define _MX6Q_PAD_SD2_DAT1__USDHC2_DAT1                                \
                IOMUX_PAD(0x0360, 0x004C, 0, 0x0000, 0, 0)
 #define _MX6Q_PAD_SD2_DAT1__ECSPI5_SS0                         \
@@ -6177,7 +6181,8 @@
 #define  MX6Q_PAD_CSI0_DAT5__KPP_ROW_5         \
                (_MX6Q_PAD_CSI0_DAT5__KPP_ROW_5 | MUX_PAD_CTRL(NO_PAD_CTRL))
 #define  MX6Q_PAD_CSI0_DAT5__AUDMUX_AUD3_TXD           \
-               (_MX6Q_PAD_CSI0_DAT5__AUDMUX_AUD3_TXD | MUX_PAD_CTRL(NO_PAD_CTRL))
+               (_MX6Q_PAD_CSI0_DAT5__AUDMUX_AUD3_TXD | \
+                                       MUX_PAD_CTRL(MX6Q_ADU_PAD_CTRL))
 #define  MX6Q_PAD_CSI0_DAT5__GPIO_5_23         \
                (_MX6Q_PAD_CSI0_DAT5__GPIO_5_23 | MUX_PAD_CTRL(MX6Q_HIGH_DRV))
 #define  MX6Q_PAD_CSI0_DAT5__MMDC_MMDC_DEBUG_44                \
@@ -6211,7 +6216,8 @@
 #define  MX6Q_PAD_CSI0_DAT7__KPP_ROW_6         \
                (_MX6Q_PAD_CSI0_DAT7__KPP_ROW_6 | MUX_PAD_CTRL(NO_PAD_CTRL))
 #define  MX6Q_PAD_CSI0_DAT7__AUDMUX_AUD3_RXD           \
-               (_MX6Q_PAD_CSI0_DAT7__AUDMUX_AUD3_RXD | MUX_PAD_CTRL(NO_PAD_CTRL))
+               (_MX6Q_PAD_CSI0_DAT7__AUDMUX_AUD3_RXD | \
+                                       MUX_PAD_CTRL(MX6Q_ADU_PAD_CTRL))
 #define  MX6Q_PAD_CSI0_DAT7__GPIO_5_25         \
                (_MX6Q_PAD_CSI0_DAT7__GPIO_5_25 | MUX_PAD_CTRL(MX6Q_HIGH_DRV))
 #define  MX6Q_PAD_CSI0_DAT7__MMDC_MMDC_DEBUG_46                \