summaryrefslogtreecommitdiff
path: root/board/ti/omap5_uevm/mux_data.h
diff options
context:
space:
mode:
authorStefano Babic <sbabic@denx.de>2013-07-31 11:30:38 +0200
committerStefano Babic <sbabic@denx.de>2013-07-31 11:30:38 +0200
commit326ea986ac150acdc7656d57fca647db80b50158 (patch)
tree15724288b8b6da3a98d934db8330bb964cdfdf36 /board/ti/omap5_uevm/mux_data.h
parent4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff)
parentfdce7b633a1de24456226b18527cc7900c34282a (diff)
Merge git://git.denx.de/u-boot-arm
Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/ti/omap5_uevm/mux_data.h')
-rw-r--r--board/ti/omap5_uevm/mux_data.h20
1 files changed, 3 insertions, 17 deletions
diff --git a/board/ti/omap5_uevm/mux_data.h b/board/ti/omap5_uevm/mux_data.h
index a82795dc13c..612c13e4792 100644
--- a/board/ti/omap5_uevm/mux_data.h
+++ b/board/ti/omap5_uevm/mux_data.h
@@ -4,23 +4,7 @@
*
* Sricharan R <r.sricharan@ti.com>
*
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _EVM5430_MUX_DATA_H
#define _EVM5430_MUX_DATA_H
@@ -56,6 +40,8 @@ const struct pad_conf_entry core_padconf_array_essential[] = {
{USBD0_HS_DP, (IEN | M0)}, /* USBD0_HS_DP */
{USBD0_HS_DM, (IEN | M0)}, /* USBD0_HS_DM */
{USBD0_SS_RX, (IEN | M0)}, /* USBD0_SS_RX */
+ {I2C5_SCL, (IEN | M0)}, /* I2C5_SCL */
+ {I2C5_SDA, (IEN | M0)}, /* I2C5_SDA */
};