summaryrefslogtreecommitdiff
path: root/include/configs/vl_ma2sc.h
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-07-25 17:57:46 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-07-25 17:57:46 +0200
commit8b485ba12b0defa0c4ed3559789250238f8331a8 (patch)
treea1174810bef0d504370272918dca8d485ae2ae3b /include/configs/vl_ma2sc.h
parent12607adcd5181a8f6eab885a5fe4ba2fa12ef92a (diff)
parentaaf5e825606a70ddc8fca8e366d8c16a6fd3cc7c (diff)
downloadu-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.zip
u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.gz
u-boot-imx-8b485ba12b0defa0c4ed3559789250238f8331a8.tar.bz2
Merge branch 'u-boot/master' into u-boot-arm/master
Diffstat (limited to 'include/configs/vl_ma2sc.h')
-rw-r--r--include/configs/vl_ma2sc.h24
1 files changed, 5 insertions, 19 deletions
diff --git a/include/configs/vl_ma2sc.h b/include/configs/vl_ma2sc.h
index e2cf4f0..e171ae4 100644
--- a/include/configs/vl_ma2sc.h
+++ b/include/configs/vl_ma2sc.h
@@ -5,23 +5,7 @@
*
* Configuation settings for the VL_MA2SC board.
*
- * 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 __CONFIG_H
@@ -147,10 +131,12 @@
#define CONFIG_SYS_I2C_SLAVE 0 /* not used */
#ifndef CONFIG_HARD_I2C
-#define CONFIG_SOFT_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */
+#define CONFIG_SYS_I2C_SOFT_SPEED CONFIG_SYS_I2C_SPEED
+#define CONFIG_SYS_I2C_SOFT_SLAVE CONFIG_SYS_I2C_SLAVE
/* Software I2C driver configuration */
-
#define I2C_DELAY udelay(2500000/CONFIG_SYS_I2C_SPEED)
#define AT91_PIN_SDA (1<<4) /* AT91C_PIO_PB4 */