mirror of
				https://source.denx.de/u-boot/u-boot.git
				synced 2025-10-31 16:31:25 +01:00 
			
		
		
		
	Merge branch 'master' of git://git.denx.de/u-boot-i2c
This commit is contained in:
		
						commit
						f15f14e528
					
				| @ -412,7 +412,6 @@ extern unsigned long calculate_board_ddr_clk(unsigned long dummy); | |||||||
| #define CONFIG_HARD_I2C		/* I2C with hardware support */ | #define CONFIG_HARD_I2C		/* I2C with hardware support */ | ||||||
| #undef	CONFIG_SOFT_I2C		/* I2C bit-banged */ | #undef	CONFIG_SOFT_I2C		/* I2C bit-banged */ | ||||||
| #define CONFIG_I2C_MULTI_BUS | #define CONFIG_I2C_MULTI_BUS | ||||||
| #define CONFIG_I2C_CMD_TREE |  | ||||||
| #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */ | #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed and slave address */ | ||||||
| #define CONFIG_SYS_I2C_EEPROM_ADDR	0x57 | #define CONFIG_SYS_I2C_EEPROM_ADDR	0x57 | ||||||
| #define CONFIG_SYS_I2C_SLAVE		0x7F | #define CONFIG_SYS_I2C_SLAVE		0x7F | ||||||
|  | |||||||
| @ -254,7 +254,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); | |||||||
| #define CONFIG_SYS_I2C_OFFSET		0x3000 | #define CONFIG_SYS_I2C_OFFSET		0x3000 | ||||||
| #define CONFIG_SYS_I2C2_OFFSET		0x3100 | #define CONFIG_SYS_I2C2_OFFSET		0x3100 | ||||||
| #define CONFIG_I2C_MULTI_BUS | #define CONFIG_I2C_MULTI_BUS | ||||||
| #define CONFIG_I2C_CMD_TREE |  | ||||||
| 
 | 
 | ||||||
| /* PEX8518 slave I2C interface */ | /* PEX8518 slave I2C interface */ | ||||||
| #define CONFIG_SYS_I2C_PEX8518_ADDR	0x70 | #define CONFIG_SYS_I2C_PEX8518_ADDR	0x70 | ||||||
|  | |||||||
| @ -376,7 +376,6 @@ | |||||||
| #define CONFIG_HARD_I2C			/* I2C with hardware support */ | #define CONFIG_HARD_I2C			/* I2C with hardware support */ | ||||||
| #undef CONFIG_SOFT_I2C			/* so disable bit-banged I2C */ | #undef CONFIG_SOFT_I2C			/* so disable bit-banged I2C */ | ||||||
| #define CONFIG_I2C_MULTI_BUS | #define CONFIG_I2C_MULTI_BUS | ||||||
| #define CONFIG_I2C_CMD_TREE |  | ||||||
| 
 | 
 | ||||||
| /* I2C speed and slave address */ | /* I2C speed and slave address */ | ||||||
| #define CONFIG_SYS_I2C_SPEED		100000 | #define CONFIG_SYS_I2C_SPEED		100000 | ||||||
|  | |||||||
| @ -249,7 +249,6 @@ | |||||||
| #define CONFIG_HARD_I2C			/* I2C with hardware support */ | #define CONFIG_HARD_I2C			/* I2C with hardware support */ | ||||||
| #undef CONFIG_SOFT_I2C			/* so disable bit-banged I2C */ | #undef CONFIG_SOFT_I2C			/* so disable bit-banged I2C */ | ||||||
| #define CONFIG_I2C_MULTI_BUS | #define CONFIG_I2C_MULTI_BUS | ||||||
| #define CONFIG_I2C_CMD_TREE |  | ||||||
| #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed */ | #define CONFIG_SYS_I2C_SPEED		400000	/* I2C speed */ | ||||||
| #define CONFIG_SYS_I2C_SLAVE		0x7F	/* slave address */ | #define CONFIG_SYS_I2C_SLAVE		0x7F	/* slave address */ | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user