diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MPC8349EMDS.h | 1 | ||||
| -rw-r--r-- | include/configs/P1010RDB.h | 2 | ||||
| -rw-r--r-- | include/configs/T2080QDS.h | 2 | ||||
| -rw-r--r-- | include/configs/VCMA9.h | 8 | ||||
| -rw-r--r-- | include/configs/arndale.h | 9 | ||||
| -rw-r--r-- | include/configs/bf506f-ezkit.h | 1 | ||||
| -rw-r--r-- | include/configs/bf525-ucr2.h | 1 | ||||
| -rw-r--r-- | include/configs/bf533-stamp.h | 29 | ||||
| -rw-r--r-- | include/configs/bf537-minotaur.h | 1 | ||||
| -rw-r--r-- | include/configs/bf537-srv1.h | 1 | ||||
| -rw-r--r-- | include/configs/blackstamp.h | 1 | ||||
| -rw-r--r-- | include/configs/cm-bf548.h | 2 | ||||
| -rw-r--r-- | include/configs/dnp5370.h | 1 | ||||
| -rw-r--r-- | include/configs/exynos5250-dt.h | 8 | ||||
| -rw-r--r-- | include/configs/trats.h | 25 | ||||
| -rw-r--r-- | include/configs/trats2.h | 27 | ||||
| -rw-r--r-- | include/dwmmc.h | 1 | ||||
| -rw-r--r-- | include/faraday/ftsdc021.h | 13 | 
18 files changed, 58 insertions, 75 deletions
| diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index a80a6966b..037484104 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -67,6 +67,7 @@   */  #define CONFIG_SYS_FSL_DDR2  #ifdef CONFIG_SYS_FSL_DDR2 +#define CONFIG_SYS_FSL_DDRC_GEN2  #define CONFIG_SYS_SPD_BUS_NUM	0  #define SPD_EEPROM_ADDRESS1	0x52  #define SPD_EEPROM_ADDRESS2	0x51 diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index eab386add..1ed5e1df2 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -173,7 +173,7 @@  #define CONFIG_SYS_NUM_ADDR_MAP		16	/* number of TLB1 entries */  #endif -#define CONFIG_SYS_MEMTEST_START	0x00000000	/* memtest works on */ +#define CONFIG_SYS_MEMTEST_START	0x00200000	/* memtest works on */  #define CONFIG_SYS_MEMTEST_END		0x1fffffff  #define CONFIG_PANIC_HANG		/* do not reset board on panic */ diff --git a/include/configs/T2080QDS.h b/include/configs/T2080QDS.h index ad0981697..bff001f43 100644 --- a/include/configs/T2080QDS.h +++ b/include/configs/T2080QDS.h @@ -155,7 +155,7 @@ unsigned long get_board_ddr_clk(void);  #define CONFIG_CHIP_SELECTS_PER_CTRL	(4 * CONFIG_DIMM_SLOTS_PER_CTLR)  #define CONFIG_DDR_SPD  #define CONFIG_SYS_FSL_DDR3 -#define CONFIG_FSL_DDR_INTERACTIVE +#undef CONFIG_FSL_DDR_INTERACTIVE  #define CONFIG_SYS_SPD_BUS_NUM	0  #define CONFIG_SYS_SDRAM_SIZE	2048	/* for fixed parameter use */  #define SPD_EEPROM_ADDRESS1	0x51 diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 79a607937..57b620d48 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -73,12 +73,12 @@   * the MPL VCMA9 is equipped with an ATMEL 24C256 EEPROM at   * address 0x50 with 16bit addressing   */ -#define CONFIG_HARD_I2C				/* I2C with hardware support */ -#define CONFIG_SYS_I2C_SPEED		100000	/* I2C speed */ -#define CONFIG_SYS_I2C_SLAVE		0x7F	/* I2C slave addr */ +#define CONFIG_SYS_I2C  /* we use the built-in I2C controller */ -#define CONFIG_DRIVER_S3C24X0_I2C +#define CONFIG_SYS_I2C_S3C24X0 +#define CONFIG_SYS_I2C_S3C24X0_SPEED    100000	/* I2C speed */ +#define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x7F	/* I2C slave addr */  #define CONFIG_SYS_I2C_EEPROM_ADDR	0x50  #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2 diff --git a/include/configs/arndale.h b/include/configs/arndale.h index 45fa047b3..ea8753b54 100644 --- a/include/configs/arndale.h +++ b/include/configs/arndale.h @@ -214,13 +214,12 @@  /* I2C */  #define CONFIG_SYS_I2C_INIT_BOARD -#define CONFIG_HARD_I2C +#define CONFIG_SYS_I2C  #define CONFIG_CMD_I2C -#define CONFIG_SYS_I2C_SPEED	100000		/* 100 Kbps */ -#define CONFIG_DRIVER_S3C24X0_I2C -#define CONFIG_I2C_MULTI_BUS +#define CONFIG_SYS_I2C_S3C24X0_SPEED	100000		/* 100 Kbps */ +#define CONFIG_SYS_I2C_S3C24X0  #define CONFIG_MAX_I2C_NUM	8 -#define CONFIG_SYS_I2C_SLAVE    0x0 +#define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0  #define CONFIG_I2C_EDID  /* PMIC */ diff --git a/include/configs/bf506f-ezkit.h b/include/configs/bf506f-ezkit.h index 77b6735a7..5ad3ee70d 100644 --- a/include/configs/bf506f-ezkit.h +++ b/include/configs/bf506f-ezkit.h @@ -94,6 +94,7 @@  #define CONFIG_DCACHE_OFF  #define CONFIG_UART_CONSOLE	0  #define CONFIG_BAUDRATE 115200 +#define CONFIG_BFIN_SERIAL  #define CONFIG_CMD_MEMORY  #undef CONFIG_GZIP diff --git a/include/configs/bf525-ucr2.h b/include/configs/bf525-ucr2.h index 1f65130f6..008f4b5ec 100644 --- a/include/configs/bf525-ucr2.h +++ b/include/configs/bf525-ucr2.h @@ -85,6 +85,7 @@  #define CONFIG_UART_CONSOLE	0  #define CONFIG_BAUDRATE		115200 +#define CONFIG_BFIN_SERIAL  #define CONFIG_BOOTARGS		"root=/dev/mtdblock0 rw"  #define CONFIG_BOOTCOMMAND	"run sfboot"  #define CONFIG_BOOTDELAY	5 diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index a22c86842..f5b965829 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -80,33 +80,8 @@  /*   * Software (bit-bang) I2C driver configuration   */ -#define PF_SCL			PF3 -#define PF_SDA			PF2 -#define I2C_INIT		(*pFIO_DIR |=  PF_SCL); asm("ssync;") -#define I2C_ACTIVE		(*pFIO_DIR |=  PF_SDA); \ -				*pFIO_INEN &= ~PF_SDA; asm("ssync;") -#define I2C_TRISTATE		(*pFIO_DIR &= ~PF_SDA); \ -				*pFIO_INEN |= PF_SDA; asm("ssync;") -#define I2C_READ		((volatile)(*pFIO_FLAG_D & PF_SDA) != 0); \ -				asm("ssync;") -#define I2C_SDA(bit)	if (bit) { \ -				*pFIO_FLAG_S = PF_SDA; \ -				asm("ssync;"); \ -				} \ -			else	{ \ -				*pFIO_FLAG_C = PF_SDA; \ -				asm("ssync;"); \ -				} -#define I2C_SCL(bit)	if (bit) { \ -				*pFIO_FLAG_S = PF_SCL; \ -				asm("ssync;"); \ -				} \ -			else	{ \ -				*pFIO_FLAG_C = PF_SCL; \ -				asm("ssync;"); \ -				} -#define I2C_DELAY		udelay(5)	/* 1/4 I2C clock duration */ - +#define CONFIG_SOFT_I2C_GPIO_SCL	GPIO_PF3 +#define CONFIG_SOFT_I2C_GPIO_SDA	GPIO_PF2  /*   * Flash Settings diff --git a/include/configs/bf537-minotaur.h b/include/configs/bf537-minotaur.h index feb9d7344..156eeabb0 100644 --- a/include/configs/bf537-minotaur.h +++ b/include/configs/bf537-minotaur.h @@ -136,6 +136,7 @@  #define CONFIG_BAUDRATE		57600  #define CONFIG_UART_CONSOLE	0 +#define CONFIG_BFIN_SERIAL  #define CONFIG_PANIC_HANG	1  #define CONFIG_RTC_BFIN		1 diff --git a/include/configs/bf537-srv1.h b/include/configs/bf537-srv1.h index 1de8ffe2d..e12d761a2 100644 --- a/include/configs/bf537-srv1.h +++ b/include/configs/bf537-srv1.h @@ -136,6 +136,7 @@  #define CONFIG_BAUDRATE		115200  #define CONFIG_UART_CONSOLE	0 +#define CONFIG_BFIN_SERIAL  #define CONFIG_PANIC_HANG	1  #define CONFIG_RTC_BFIN		1 diff --git a/include/configs/blackstamp.h b/include/configs/blackstamp.h index 5b3aac795..7de425349 100644 --- a/include/configs/blackstamp.h +++ b/include/configs/blackstamp.h @@ -195,6 +195,7 @@  #define CONFIG_BAUDRATE		57600  #define CONFIG_LOADS_ECHO	1  #define CONFIG_UART_CONSOLE	0 +#define CONFIG_BFIN_SERIAL  /*   * I2C settings diff --git a/include/configs/cm-bf548.h b/include/configs/cm-bf548.h index 3c9eeb58a..7f27eda41 100644 --- a/include/configs/cm-bf548.h +++ b/include/configs/cm-bf548.h @@ -118,6 +118,8 @@  #define CONFIG_BOOTCOMMAND	"run flashboot"  #define FLASHBOOT_ENV_SETTINGS	"flashboot=bootm 0x20040000\0" +#define CONFIG_ADI_GPIO2 +  #ifndef __ADSPBF542__  /* Don't waste time transferring a logo over the UART */  # if (CONFIG_BFIN_BOOT_MODE != BFIN_BOOT_UART) diff --git a/include/configs/dnp5370.h b/include/configs/dnp5370.h index d0e72e3e1..4f2c742a5 100644 --- a/include/configs/dnp5370.h +++ b/include/configs/dnp5370.h @@ -103,6 +103,7 @@  #define CONFIG_DNP5370_EXT_WD_DISABLE 1  #define CONFIG_UART_CONSOLE 0 +#define CONFIG_BFIN_SERIAL  #define CONFIG_BAUDRATE     115200  #define CONFIG_BOOTCOMMAND  "bootm 0x20030000"  #define CONFIG_BOOTARGS     "console=ttyBF0,115200 root=/dev/mtdblock3 rootfstype=ext2" diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 74ba2b64c..1e9c1e311 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -249,13 +249,13 @@  /* I2C */  #define CONFIG_SYS_I2C_INIT_BOARD -#define CONFIG_HARD_I2C +#define CONFIG_SYS_I2C  #define CONFIG_CMD_I2C -#define CONFIG_SYS_I2C_SPEED	100000		/* 100 Kbps */ -#define CONFIG_DRIVER_S3C24X0_I2C +#define CONFIG_SYS_I2C_S3C24X0_SPEED	100000		/* 100 Kbps */ +#define CONFIG_SYS_I2C_S3C24X0  #define CONFIG_I2C_MULTI_BUS  #define CONFIG_MAX_I2C_NUM	8 -#define CONFIG_SYS_I2C_SLAVE    0x0 +#define CONFIG_SYS_I2C_S3C24X0_SLAVE    0x0  #define CONFIG_I2C_EDID  /* PMIC */ diff --git a/include/configs/trats.h b/include/configs/trats.h index 3d080c4d1..f16330314 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -16,6 +16,7 @@   */  #define CONFIG_SAMSUNG		/* in a SAMSUNG core */  #define CONFIG_S5P		/* which is in a S5P Family */ +#define CONFIG_EXYNOS4		/* which is in a EXYNOS4XXX */  #define CONFIG_EXYNOS4210	/* which is in a EXYNOS4210 */  #define CONFIG_TRATS		/* working with TRATS */  #define CONFIG_TIZEN		/* TIZEN lib */ @@ -268,31 +269,21 @@  #define CONFIG_SYS_CACHELINE_SIZE       32  #define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_S3C24X0 +#define CONFIG_SYS_I2C_S3C24X0_SPEED	100000 +#define CONFIG_SYS_I2C_S3C24X0_SLAVE	0xFE +#define CONFIG_MAX_I2C_NUM		8  #define CONFIG_SYS_I2C_SOFT		/* I2C bit-banged */  #define CONFIG_SYS_I2C_SOFT_SPEED	50000 -#define CONFIG_SYS_I2C_SOFT_SLAVE	0xFE -#define I2C_SOFT_DECLARATIONS2 -#define CONFIG_SYS_I2C_SOFT_SPEED_2     50000 -#define CONFIG_SYS_I2C_SOFT_SLAVE_2     0x7F +#define CONFIG_SYS_I2C_SOFT_SLAVE	0x7F  #define CONFIG_SOFT_I2C_READ_REPEATED_START  #define CONFIG_SYS_I2C_INIT_BOARD -#define CONFIG_I2C_MULTI_BUS -#define CONFIG_SOFT_I2C_MULTI_BUS -#define CONFIG_SYS_MAX_I2C_BUS	15  #include <asm/arch/gpio.h> -/* I2C PMIC */ -#define CONFIG_SOFT_I2C_I2C5_SCL exynos4_gpio_part1_get_nr(b, 7) -#define CONFIG_SOFT_I2C_I2C5_SDA exynos4_gpio_part1_get_nr(b, 6) -  /* I2C FG */ -#define CONFIG_SOFT_I2C_I2C9_SCL exynos4_gpio_part2_get_nr(y4, 1) -#define CONFIG_SOFT_I2C_I2C9_SDA exynos4_gpio_part2_get_nr(y4, 0) - -#define CONFIG_SOFT_I2C_GPIO_SCL get_multi_scl_pin() -#define CONFIG_SOFT_I2C_GPIO_SDA get_multi_sda_pin() -#define I2C_INIT multi_i2c_init() +#define CONFIG_SOFT_I2C_GPIO_SCL exynos4_gpio_part2_get_nr(y4, 1) +#define CONFIG_SOFT_I2C_GPIO_SDA exynos4_gpio_part2_get_nr(y4, 0)  #define CONFIG_POWER  #define CONFIG_POWER_I2C diff --git a/include/configs/trats2.h b/include/configs/trats2.h index 0e93836c0..3bcdfb140 100644 --- a/include/configs/trats2.h +++ b/include/configs/trats2.h @@ -260,30 +260,25 @@  #include <asm/arch/gpio.h>  #define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_SOFT		/* I2C bit-banged */ +#define CONFIG_SYS_I2C_S3C24X0 +#define CONFIG_SYS_I2C_S3C24X0_SPEED	100000 +#define CONFIG_SYS_I2C_S3C24X0_SLAVE	0 +#define CONFIG_MAX_I2C_NUM		8 +#define CONFIG_SYS_I2C_SOFT  #define CONFIG_SYS_I2C_SOFT_SPEED	50000  #define CONFIG_SYS_I2C_SOFT_SLAVE	0x00  #define I2C_SOFT_DECLARATIONS2  #define CONFIG_SYS_I2C_SOFT_SPEED_2     50000  #define CONFIG_SYS_I2C_SOFT_SLAVE_2     0x00 -#define I2C_SOFT_DECLARATIONS3 -#define CONFIG_SYS_I2C_SOFT_SPEED_3     50000 -#define CONFIG_SYS_I2C_SOFT_SLAVE_3     0x00  #define CONFIG_SOFT_I2C_READ_REPEATED_START  #define CONFIG_SYS_I2C_INIT_BOARD -#define CONFIG_I2C_MULTI_BUS -#define CONFIG_SOFT_I2C_MULTI_BUS -#define CONFIG_SYS_MAX_I2C_BUS		15 -#define CONFIG_SOFT_I2C_I2C5_SCL exynos4x12_gpio_part1_get_nr(d0, 3) -#define CONFIG_SOFT_I2C_I2C5_SDA exynos4x12_gpio_part1_get_nr(d0, 2) -#define CONFIG_SOFT_I2C_I2C9_SCL exynos4x12_gpio_part1_get_nr(f1, 4) -#define CONFIG_SOFT_I2C_I2C9_SDA exynos4x12_gpio_part1_get_nr(f1, 5) -#define CONFIG_SOFT_I2C_I2C10_SCL exynos4x12_gpio_part2_get_nr(m2, 1) -#define CONFIG_SOFT_I2C_I2C10_SDA exynos4x12_gpio_part2_get_nr(m2, 0) -#define CONFIG_SOFT_I2C_GPIO_SCL get_multi_scl_pin() -#define CONFIG_SOFT_I2C_GPIO_SDA get_multi_sda_pin() -#define I2C_INIT multi_i2c_init() +#ifndef __ASSEMBLY__ +int get_soft_i2c_scl_pin(void); +int get_soft_i2c_sda_pin(void); +#endif +#define CONFIG_SOFT_I2C_GPIO_SCL	get_soft_i2c_scl_pin() +#define CONFIG_SOFT_I2C_GPIO_SDA	get_soft_i2c_sda_pin()  /* POWER */  #define CONFIG_POWER diff --git a/include/dwmmc.h b/include/dwmmc.h index 6c91143e9..a02dd67c1 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -141,6 +141,7 @@ struct dwmci_host {  	struct mmc *mmc;  	void (*clksel)(struct dwmci_host *host); +	void (*board_init)(struct dwmci_host *host);  	unsigned int (*get_mmc_clk)(int dev_index);  }; diff --git a/include/faraday/ftsdc021.h b/include/faraday/ftsdc021.h new file mode 100644 index 000000000..de8e25083 --- /dev/null +++ b/include/faraday/ftsdc021.h @@ -0,0 +1,13 @@ +/* + * (C) Copyright 2013 Faraday Technology + * Dante Su <dantesu@faraday-tech.com> + * + * SPDX-License-Identifier:    GPL-2.0+ + */ + +#ifndef __FTSDC021_H +#define __FTSDC021_H + +int ftsdc021_sdhci_init(u32 regbase); + +#endif /* __FTSDC021_H */ |