Update pin mux configuration for AP dev board.
diff --git a/board/ti/panda/panda_mux_data.h b/board/ti/panda/panda_mux_data.h
index 5939257..2539a89 100644
--- a/board/ti/panda/panda_mux_data.h
+++ b/board/ti/panda/panda_mux_data.h
@@ -31,16 +31,16 @@
 
 const struct pad_conf_entry core_padconf_array_essential[] = {
 
-{GPMC_AD0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat0 */
-{GPMC_AD1, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat1 */
-{GPMC_AD2, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat2 */
-{GPMC_AD3, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat3 */
-{GPMC_AD4, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat4 */
-{GPMC_AD5, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat5 */
-{GPMC_AD6, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat6 */
-{GPMC_AD7, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_dat7 */
-{GPMC_NOE, (PTU | IEN | OFF_EN | OFF_OUT_PTD | M1)},	 /* sdmmc2_clk */
-{GPMC_NWE, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)}, /* sdmmc2_cmd */
+{GPMC_AD0, (M7)},					 /* sdmmc2_dat0 */
+{GPMC_AD1, (M7)},					 /* sdmmc2_dat1 */
+{GPMC_AD2, (M7)},					 /* sdmmc2_dat2 */
+{GPMC_AD3, (M7)},					 /* sdmmc2_dat3 */
+{GPMC_AD4, (M7)},					 /* sdmmc2_dat4 */
+{GPMC_AD5, (M7)},					 /* sdmmc2_dat5 */
+{GPMC_AD6, (M7)},					 /* sdmmc2_dat6 */
+{GPMC_AD7, (M7)},					 /* sdmmc2_dat7 */
+{GPMC_NOE, (M7)},					 /* sdmmc2_clk */
+{GPMC_NWE, (M7)},					 /* sdmmc2_cmd */
 {SDMMC1_CLK, (PTU | OFF_EN | OFF_OUT_PTD | M0)},	 /* sdmmc1_clk */
 {SDMMC1_CMD, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_cmd */
 {SDMMC1_DAT0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)}, /* sdmmc1_dat0 */
@@ -77,10 +77,10 @@
 {USBB1_ULPITLL_DAT7, (IEN | OFF_EN | OFF_PD | OFF_IN | M4)},	/* usbb1_ulpiphy_dat7 */
 {USBB1_HSIC_DATA, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* usbb1_hsic_data */
 {USBB1_HSIC_STROBE, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* usbb1_hsic_strobe */
-{USBC1_ICUSB_DP, (IEN | M0)},					/* usbc1_icusb_dp */
-{USBC1_ICUSB_DM, (IEN | M0)},					/* usbc1_icusb_dm */
-{UNIPRO_TY2, (PTU | IEN | M3)},					/* gpio_1 */
-{GPMC_WAIT1,  (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M3)},	/* gpio_62 */
+{USBC1_ICUSB_DP, (M7)},						/* usbc1_icusb_dp */
+{USBC1_ICUSB_DM, (M7)},						/* usbc1_icusb_dm */
+{UNIPRO_TY2, (PTU | IEN | M3)},					/* hub_power */
+{GPMC_WAIT1,  (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M3)},	/* hub_nreset */
 {FREF_CLK2_OUT, (PTU | IEN | M3)},				/* gpio_182 */
 
 };
@@ -101,60 +101,60 @@
 };
 
 const struct pad_conf_entry core_padconf_array_non_essential[] = {
-	{GPMC_AD8, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M3)},	/* gpio_32 */
-	{GPMC_AD9, (PTU | IEN | M3)},					/* gpio_33 */
-	{GPMC_AD10, (PTU | IEN | M3)},					/* gpio_34 */
-	{GPMC_AD11, (PTU | IEN | M3)},					/* gpio_35 */
-	{GPMC_AD12, (PTU | IEN | M3)},					/* gpio_36 */
-	{GPMC_AD13, (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M3)},	/* gpio_37 */
-	{GPMC_AD14, (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M3)},	/* gpio_38 */
-	{GPMC_AD15, (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M3)},	/* gpio_39 */
-	{GPMC_A16, (M3)},						/* gpio_40 */
-	{GPMC_A17, (PTD | M3)},						/* gpio_41 */
-	{GPMC_A18, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)},	/* kpd_row6 */
-	{GPMC_A19, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)},	/* kpd_row7 */
-	{GPMC_A20, (IEN | M3)},						/* gpio_44 */
-	{GPMC_A21, (M3)},						/* gpio_45 */
-	{GPMC_A22, (M3)},						/* gpio_46 */
-	{GPMC_A23, (OFF_EN | OFF_PD | OFF_IN | M1)},			/* kpd_col7 */
-	{GPMC_A24, (PTD | M3)},						/* gpio_48 */
-	{GPMC_A25, (PTD | M3)},						/* gpio_49 */
-	{GPMC_NCS0, (M3)},						/* gpio_50 */
-	{GPMC_NCS1, (IEN | M3)},					/* gpio_51 */
-	{GPMC_NCS2, (IEN | M3)},					/* gpio_52 */
-	{GPMC_NCS3, (IEN | M3)},					/* gpio_53 */
-	{GPMC_NWP, (M3)},						/* gpio_54 */
-	{GPMC_CLK, (PTD | M3)},						/* gpio_55 */
-	{GPMC_NADV_ALE, (M3)},						/* gpio_56 */
-	{GPMC_NBE0_CLE, (M3)},						/* gpio_59 */
-	{GPMC_NBE1, (PTD | M3)},					/* gpio_60 */
-	{GPMC_WAIT0, (PTU | IEN | M3)},					/* gpio_61 */
-	{C2C_DATA11, (PTD | M3)},					/* gpio_100 */
-	{C2C_DATA12, (PTU | IEN | M3)},					/* gpio_101 */
-	{C2C_DATA13, (PTD | M3)},					/* gpio_102 */
-	{C2C_DATA14, (M1)},						/* dsi2_te0 */
-	{C2C_DATA15, (PTD | M3)},					/* gpio_104 */
+	{GPMC_AD8, (M7)},						/* gpio_32 */
+	{GPMC_AD9, (M7)},						/* gpio_33 */
+	{GPMC_AD10, (M7)},						/* gpio_34 */
+	{GPMC_AD11, (M7)},						/* gpio_35 */
+	{GPMC_AD12, (M7)},						/* gpio_36 */
+	{GPMC_AD13, (M7)},						/* gpio_37 */
+	{GPMC_AD14, (M7)},						/* gpio_38 */
+	{GPMC_AD15, (M7)},						/* gpio_39 */
+	{GPMC_A16, (M7)},						/* gpio_40 */
+	{GPMC_A17, (PTD | M3)},						/* hdmi_ls_oe */
+	{GPMC_A18, (M7)},						/* kpd_row6 */
+	{GPMC_A19, (M7)},						/* gpio_43/sdio_exp_act_n */
+	{GPMC_A20, (M7)},						/* gpio_44 */
+	{GPMC_A21, (M7)},						/* gpio_45 */
+	{GPMC_A22, (M7)},						/* gpio_46 */
+	{GPMC_A23, (M7)},						/* kpd_col7 */
+	{GPMC_A24, (M7)},						/* gpio_48 */
+	{GPMC_A25, (M7)},						/* gpio_49 */
+	{GPMC_NCS0, (M7)},						/* gpio_50 */
+	{GPMC_NCS1, (M7)},						/* gpio_51 */
+	{GPMC_NCS2, (IEN | M3)},					/* ts_int */
+	{GPMC_NCS3, (M7)},						/* gpio_53 */
+	{GPMC_NWP, (M7)},						/* gpio_54 */
+	{GPMC_CLK, (M7)},						/* gpio_55 */
+	{GPMC_NADV_ALE, (M7)},						/* gpio_56 */
+	{GPMC_NBE0_CLE, (M7)},						/* gpio_59 */
+	{GPMC_NBE1, (PTD | M3)},					/* hdmi_ct_cp_hpd */
+	{GPMC_WAIT0, (M7)},						/* gpio_61 */
+	{C2C_DATA11, (M7)},						/* gpio_100 */
+	{C2C_DATA12, (PTU | IEN | M3)},					/* tearing_effect */
+	{C2C_DATA13, (PTD | M3)},					/* lcd_reset */
+	{C2C_DATA14, (M7)},						/* dsi2_te0 */
+	{C2C_DATA15, (M7)},						/* gpio_104 */
 	{HDMI_HPD, (M0)},						/* hdmi_hpd */
 	{HDMI_CEC, (M0)},						/* hdmi_cec */
 	{HDMI_DDC_SCL, (PTU | M0)},					/* hdmi_ddc_scl */
 	{HDMI_DDC_SDA, (PTU | IEN | M0)},				/* hdmi_ddc_sda */
-	{CSI21_DX0, (IEN | M0)},					/* csi21_dx0 */
-	{CSI21_DY0, (IEN | M0)},					/* csi21_dy0 */
-	{CSI21_DX1, (IEN | M0)},					/* csi21_dx1 */
-	{CSI21_DY1, (IEN | M0)},					/* csi21_dy1 */
-	{CSI21_DX2, (IEN | M0)},					/* csi21_dx2 */
-	{CSI21_DY2, (IEN | M0)},					/* csi21_dy2 */
-	{CSI21_DX3, (PTD | M7)},					/* csi21_dx3 */
-	{CSI21_DY3, (PTD | M7)},					/* csi21_dy3 */
-	{CSI21_DX4, (PTD | OFF_EN | OFF_PD | OFF_IN | M7)},		/* csi21_dx4 */
-	{CSI21_DY4, (PTD | OFF_EN | OFF_PD | OFF_IN | M7)},		/* csi21_dy4 */
-	{CSI22_DX0, (IEN | M0)},					/* csi22_dx0 */
-	{CSI22_DY0, (IEN | M0)},					/* csi22_dy0 */
-	{CSI22_DX1, (IEN | M0)},					/* csi22_dx1 */
-	{CSI22_DY1, (IEN | M0)},					/* csi22_dy1 */
-	{CAM_SHUTTER, (OFF_EN | OFF_PD | OFF_OUT_PTD | M0)},		/* cam_shutter */
-	{CAM_STROBE, (OFF_EN | OFF_PD | OFF_OUT_PTD | M0)},		/* cam_strobe */
-	{CAM_GLOBALRESET, (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M3)},	/* gpio_83 */
+	{CSI21_DX0, (M7)},						/* csi21_dx0 */
+	{CSI21_DY0, (M7)},						/* csi21_dy0 */
+	{CSI21_DX1, (M7)},						/* csi21_dx1 */
+	{CSI21_DY1, (M7)},						/* csi21_dy1 */
+	{CSI21_DX2, (M7)},						/* csi21_dx2 */
+	{CSI21_DY2, (M7)},						/* csi21_dy2 */
+	{CSI21_DX3, (M7)},						/* csi21_dx3 */
+	{CSI21_DY3, (M7)},						/* csi21_dy3 */
+	{CSI21_DX4, (M7)},						/* csi21_dx4 */
+	{CSI21_DY4, (M7)},						/* csi21_dy4 */
+	{CSI22_DX0, (M7)},						/* csi22_dx0 */
+	{CSI22_DY0, (M7)},						/* csi22_dy0 */
+	{CSI22_DX1, (M7)},						/* csi22_dx1 */
+	{CSI22_DY1, (M7)},						/* csi22_dy1 */
+	{CAM_SHUTTER, (M7)},						/* cam_shutter */
+	{CAM_STROBE, (M7)},						/* cam_strobe */
+	{CAM_GLOBALRESET, (M7)},					/* gpio_83 */
 	{ABE_MCBSP2_DR, (IEN | OFF_EN | OFF_OUT_PTD | M0)},		/* abe_mcbsp2_dr */
 	{ABE_MCBSP2_DX, (OFF_EN | OFF_OUT_PTD | M0)},			/* abe_mcbsp2_dx */
 	{ABE_MCBSP2_FSX, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* abe_mcbsp2_fsx */
@@ -167,59 +167,59 @@
 	{ABE_PDM_FRAME, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* abe_pdm_frame */
 	{ABE_PDM_LB_CLK, (PTD | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* abe_pdm_lb_clk */
 	{ABE_CLKS, (PTD | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* abe_clks */
-	{ABE_DMIC_CLK1, (M0)},						/* abe_dmic_clk1 */
-	{ABE_DMIC_DIN1, (IEN | M0)},					/* abe_dmic_din1 */
-	{ABE_DMIC_DIN2, (PTU | IEN | M3)},				/* gpio_121 */
-	{ABE_DMIC_DIN3, (IEN | M0)},					/* abe_dmic_din3 */
-	{UART2_CTS, (PTU | IEN | M7)},					/* uart2_cts */
+	{ABE_DMIC_CLK1, (M3)},						/* gpio_119 */
+	{ABE_DMIC_DIN1, (M7)},						/* abe_dmic_din1 */
+	{ABE_DMIC_DIN2, (PTD | M3)},					/* ts_reset */
+	{ABE_DMIC_DIN3, (M7)},						/* abe_dmic_din3 */
+	{UART2_CTS, (M7)},						/* uart2_cts */
 	{UART2_RTS, (M7)},						/* uart2_rts */
-	{UART2_RX, (PTU | IEN | M7)},					/* uart2_rx */
+	{UART2_RX, (M7)},						/* uart2_rx */
 	{UART2_TX, (M7)},						/* uart2_tx */
 	{HDQ_SIO, (M3)},						/* gpio_127 */
-	{MCSPI1_CLK, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},		/* mcspi1_clk */
-	{MCSPI1_SOMI, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},		/* mcspi1_somi */
-	{MCSPI1_SIMO, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},		/* mcspi1_simo */
-	{MCSPI1_CS0, (PTD | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* mcspi1_cs0 */
-	{MCSPI1_CS1, (PTD | IEN | OFF_EN | OFF_PD | OFF_IN | M3)},	/* mcspi1_cs1 */
-	{MCSPI1_CS2, (PTU | OFF_EN | OFF_OUT_PTU | M3)},		/* gpio_139 */
-	{MCSPI1_CS3, (PTU | IEN | M3)},					/* gpio_140 */
-	{SDMMC5_CLK, (PTU | IEN | OFF_EN | OFF_OUT_PTD | M0)},		/* sdmmc5_clk */
-	{SDMMC5_CMD, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* sdmmc5_cmd */
-	{SDMMC5_DAT0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* sdmmc5_dat0 */
-	{SDMMC5_DAT1, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* sdmmc5_dat1 */
-	{SDMMC5_DAT2, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* sdmmc5_dat2 */
-	{SDMMC5_DAT3, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* sdmmc5_dat3 */
-	{MCSPI4_CLK, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},		/* mcspi4_clk */
-	{MCSPI4_SIMO, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},		/* mcspi4_simo */
-	{MCSPI4_SOMI, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},		/* mcspi4_somi */
-	{MCSPI4_CS0, (PTD | IEN | OFF_EN | OFF_PD | OFF_IN | M0)},	/* mcspi4_cs0 */
-	{UART4_RX, (IEN | M0)},						/* uart4_rx */
-	{UART4_TX, (M0)},						/* uart4_tx */
-	{USBB2_ULPITLL_CLK, (IEN | M3)},				/* gpio_157 */
-	{USBB2_ULPITLL_STP, (IEN | M5)},				/* dispc2_data23 */
-	{USBB2_ULPITLL_DIR, (IEN | M5)},				/* dispc2_data22 */
-	{USBB2_ULPITLL_NXT, (IEN | M5)},				/* dispc2_data21 */
-	{USBB2_ULPITLL_DAT0, (IEN | M5)},				/* dispc2_data20 */
-	{USBB2_ULPITLL_DAT1, (IEN | M5)},				/* dispc2_data19 */
-	{USBB2_ULPITLL_DAT2, (IEN | M5)},				/* dispc2_data18 */
-	{USBB2_ULPITLL_DAT3, (IEN | M5)},				/* dispc2_data15 */
-	{USBB2_ULPITLL_DAT4, (IEN | M5)},				/* dispc2_data14 */
-	{USBB2_ULPITLL_DAT5, (IEN | M5)},				/* dispc2_data13 */
-	{USBB2_ULPITLL_DAT6, (IEN | M5)},				/* dispc2_data12 */
-	{USBB2_ULPITLL_DAT7, (IEN | M5)},				/* dispc2_data11 */
-	{USBB2_HSIC_DATA, (PTD | OFF_EN | OFF_OUT_PTU | M3)},		/* gpio_169 */
-	{USBB2_HSIC_STROBE, (PTD | OFF_EN | OFF_OUT_PTU | M3)},		/* gpio_170 */
-	{UNIPRO_TX0, (PTD | IEN | M3)},					/* gpio_171 */
-	{UNIPRO_TY0, (OFF_EN | OFF_PD | OFF_IN | M1)},			/* kpd_col1 */
-	{UNIPRO_TX1, (OFF_EN | OFF_PD | OFF_IN | M1)},			/* kpd_col2 */
-	{UNIPRO_TY1, (OFF_EN | OFF_PD | OFF_IN | M1)},			/* kpd_col3 */
-	{UNIPRO_TX2, (PTU | IEN | M3)},					/* gpio_0 */
-	{UNIPRO_RX0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)},	/* kpd_row0 */
-	{UNIPRO_RY0, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)},	/* kpd_row1 */
-	{UNIPRO_RX1, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)},	/* kpd_row2 */
-	{UNIPRO_RY1, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)},	/* kpd_row3 */
-	{UNIPRO_RX2, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)},	/* kpd_row4 */
-	{UNIPRO_RY2, (PTU | IEN | OFF_EN | OFF_PD | OFF_IN | M1)},	/* kpd_row5 */
+	{MCSPI1_CLK, (M7)},						/* mcspi1_clk */
+	{MCSPI1_SOMI, (M7)},						/* mcspi1_somi */
+	{MCSPI1_SIMO, (M7)},						/* mcspi1_simo */
+	{MCSPI1_CS0, (M7)},						/* mcspi1_cs0 */
+	{MCSPI1_CS1, (M7)},						/* mcspi1_cs1 */
+	{MCSPI1_CS2, (M7)},						/* gpio_139 */
+	{MCSPI1_CS3, (M7)},						/* gpio_140 */
+	{SDMMC5_CLK, (M7)},						/* sdmmc5_clk */
+	{SDMMC5_CMD, (M7)},						/* sdmmc5_cmd */
+	{SDMMC5_DAT0, (M7)},						/* sdmmc5_dat0 */
+	{SDMMC5_DAT1, (M7)},						/* sdmmc5_dat1 */
+	{SDMMC5_DAT2, (M7)},						/* sdmmc5_dat2 */
+	{SDMMC5_DAT3, (M7)},						/* sdmmc5_dat3 */
+	{MCSPI4_CLK, (M7)},						/* sdmmc4_clk */
+	{MCSPI4_SIMO, (M7)},						/* sdmmc4_cmd */
+	{MCSPI4_SOMI, (M7)},						/* sdmmc4_dat0 */
+	{MCSPI4_CS0, (M7)},						/* sdmmc4_dat3 */
+	{UART4_RX, (M7)},						/* sdmmc4_dat2 */
+	{UART4_TX, (M7)},						/* sdmmc4_dat1 */
+	{USBB2_ULPITLL_CLK, (M7)},					/* gpio_157 */
+	{USBB2_ULPITLL_STP, (M7)},					/* dispc2_data23 */
+	{USBB2_ULPITLL_DIR, (M7)},					/* dispc2_data22 */
+	{USBB2_ULPITLL_NXT, (M7)},					/* dispc2_data21 */
+	{USBB2_ULPITLL_DAT0, (M7)},					/* dispc2_data20 */
+	{USBB2_ULPITLL_DAT1, (M7)},					/* dispc2_data19 */
+	{USBB2_ULPITLL_DAT2, (M7)},					/* dispc2_data18 */
+	{USBB2_ULPITLL_DAT3, (M7)},					/* dispc2_data15 */
+	{USBB2_ULPITLL_DAT4, (M7)},					/* dispc2_data14 */
+	{USBB2_ULPITLL_DAT5, (M7)},					/* dispc2_data13 */
+	{USBB2_ULPITLL_DAT6, (M7)},					/* dispc2_data12 */
+	{USBB2_ULPITLL_DAT7, (M7)},					/* dispc2_data11 */
+	{USBB2_HSIC_DATA, (M7)},					/* gpio_169 */
+	{USBB2_HSIC_STROBE, (M7)},					/* gpio_170 */
+	{UNIPRO_TX0, (M7)},						/* gpio_171 */
+	{UNIPRO_TY0, (M7)},						/* kpd_col1 */
+	{UNIPRO_TX1, (M7)},						/* kpd_col2 */
+	{UNIPRO_TY1, (M7)},						/* kpd_col3 */
+	{UNIPRO_TX2, (M7)},						/* gpio_0 */
+	{UNIPRO_RX0, (M7)},						/* kpd_row0 */
+	{UNIPRO_RY0, (M7)},						/* kpd_row1 */
+	{UNIPRO_RX1, (M7)},						/* kpd_row2 */
+	{UNIPRO_RY1, (M7)},						/* kpd_row3 */
+	{UNIPRO_RX2, (M7)},						/* kpd_row4 */
+	{UNIPRO_RY2, (M7)},						/* kpd_row5 */
 	{USBA0_OTG_CE, (PTD | OFF_EN | OFF_PD | OFF_OUT_PTD | M0)},	/* usba0_otg_ce */
 	{USBA0_OTG_DP, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},		/* usba0_otg_dp */
 	{USBA0_OTG_DM, (IEN | OFF_EN | OFF_PD | OFF_IN | M0)},		/* usba0_otg_dm */
@@ -235,23 +235,23 @@
 	{DPM_EMU0, (IEN | M0)},						/* dpm_emu0 */
 	{DPM_EMU1, (IEN | M0)},						/* dpm_emu1 */
 	{DPM_EMU2, (IEN | M0)},						/* dpm_emu2 */
-	{DPM_EMU3, (IEN | M5)},						/* dispc2_data10 */
-	{DPM_EMU4, (IEN | M5)},						/* dispc2_data9 */
-	{DPM_EMU5, (IEN | M5)},						/* dispc2_data16 */
-	{DPM_EMU6, (IEN | M5)},						/* dispc2_data17 */
-	{DPM_EMU7, (IEN | M5)},						/* dispc2_hsync */
-	{DPM_EMU8, (IEN | M5)},						/* dispc2_pclk */
-	{DPM_EMU9, (IEN | M5)},						/* dispc2_vsync */
-	{DPM_EMU10, (IEN | M5)},					/* dispc2_de */
-	{DPM_EMU11, (IEN | M5)},					/* dispc2_data8 */
-	{DPM_EMU12, (IEN | M5)},					/* dispc2_data7 */
-	{DPM_EMU13, (IEN | M5)},					/* dispc2_data6 */
-	{DPM_EMU14, (IEN | M5)},					/* dispc2_data5 */
-	{DPM_EMU15, (IEN | M5)},					/* dispc2_data4 */
-	{DPM_EMU16, (M3)},						/* gpio_27 */
-	{DPM_EMU17, (IEN | M5)},					/* dispc2_data2 */
-	{DPM_EMU18, (IEN | M5)},					/* dispc2_data1 */
-	{DPM_EMU19, (IEN | M5)},					/* dispc2_data0 */
+	{DPM_EMU3, (M7)},						/* dispc2_data10 */
+	{DPM_EMU4, (M7)},						/* dispc2_data9 */
+	{DPM_EMU5, (M7)},						/* dispc2_data16 */
+	{DPM_EMU6, (M7)},						/* dispc2_data17 */
+	{DPM_EMU7, (M7)},						/* dispc2_hsync */
+	{DPM_EMU8, (M7)},						/* dispc2_pclk */
+	{DPM_EMU9, (M7)},						/* dispc2_vsync */
+	{DPM_EMU10, (M7)},						/* dispc2_de */
+	{DPM_EMU11, (M7)},						/* dispc2_data8 */
+	{DPM_EMU12, (M7)},						/* dispc2_data7 */
+	{DPM_EMU13, (M7)},						/* dispc2_data6 */
+	{DPM_EMU14, (M7)},						/* dispc2_data5 */
+	{DPM_EMU15, (M7)},						/* dispc2_data4 */
+	{DPM_EMU16, (IEN | M3)},					/* btn0 */
+	{DPM_EMU17, (IEN | M3)},					/* btn1 */
+	{DPM_EMU18, (M3)},						/* led0 */
+	{DPM_EMU19, (M3)},						/* led1 */
 };
 
 const struct pad_conf_entry core_padconf_array_non_essential_4430[] = {