mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 02:15:45 +01:00 
			
		
		
		
	1. Introduce a new structure `struct mxc_i2c_bus`, this structure will
   used for non-DM and DM.
2. Remove `struct mxc_i2c_regs` structure, but use register offset to access
   registers based on `base` entry of `struct mxc_i2c_bus`.
3. Remove most `#ifdef I2C_QUIRK_REG`. Using driver_data to contain platform
   flags. A new flag is introduced, I2C_QUIRK_FLAG.
4. Most functions use `struct mxc_i2c_bus` as one of the parameters.
   Make most functions common to DM and non-DM, try to avoid duplicated code.
5. Support DM, but pinctrl is not included. Pinmux setting is still set
   by setup_i2c, but we do not need bus_i2c_init for DM.
6. struct i2c_parms and struct sram_data are removed.
7. Remove bus_i2c_read bus_i2c_write prototype in header file. The frist
   paramter of bus_i2c_init is modified to i2c index. Add new prototype
   i2c_idle_bus and force_bus_idle. Since bus_i2c_init is not good for
   DM I2C and pinctrl is missed, we use a weak function for i2c_idle_bus.
   Board file take the responsibility to implement this function, like this:
   "
   int i2c_idle_bus(struct mxc_i2c_bus *i2c_bus)
   {
	   if (i2c_bus->index == 0)
		   force_bus_idle(i2c_pads_info0);
	   else if (i2c_bus->index == 1)
		   force_bus_idle(i2c_pads_info1);
	   else
		   xxxxxx
   }
   "
8. Introduce a weak function, enable_i2c_clk
9. Tested on an i.MX7 platform. Log info:
 => dm tree
 Class       Probed   Name
 ----------------------------------------
 root        [ + ]    root_driver
 simple_bus  [   ]    |-- soc
 simple_bus  [   ]    |   |-- aips-bus@30000000
 simple_bus  [   ]    |   |   |-- anatop@30360000
 simple_bus  [   ]    |   |   `-- snvs@30370000
 simple_bus  [   ]    |   |-- aips-bus@30400000
 simple_bus  [   ]    |   `-- aips-bus@30800000
 i2c         [   ]    |       |-- i2c@30a20000
 i2c         [   ]    |       `-- i2c@30a40000
 simple_bus  [   ]    `-- regulators
 => i2c dev 0
 Setting bus to 0
 => i2c probe
 Valid chip addresses: 08 50
 => i2c md 8 31
 0031: 08 08 08 08 08 08 08 08 08 08 08 08 08 08 08 08
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>
		
	
		
			
				
	
	
		
			92 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			92 lines
		
	
	
		
			2.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved.
 | |
|  *
 | |
|  * SPDX-License-Identifier:	GPL-2.0+
 | |
|  */
 | |
| #ifndef __ASM_ARCH_MXC_MXC_I2C_H__
 | |
| #define __ASM_ARCH_MXC_MXC_I2C_H__
 | |
| #include <asm/imx-common/iomux-v3.h>
 | |
| 
 | |
| struct i2c_pin_ctrl {
 | |
| 	iomux_v3_cfg_t i2c_mode;
 | |
| 	iomux_v3_cfg_t gpio_mode;
 | |
| 	unsigned char gp;
 | |
| 	unsigned char spare;
 | |
| };
 | |
| 
 | |
| struct i2c_pads_info {
 | |
| 	struct i2c_pin_ctrl scl;
 | |
| 	struct i2c_pin_ctrl sda;
 | |
| };
 | |
| 
 | |
| /*
 | |
|  * Information about i2c controller
 | |
|  * struct mxc_i2c_bus - information about the i2c[x] bus
 | |
|  * @index: i2c bus index
 | |
|  * @base: Address of I2C bus controller
 | |
|  * @driver_data: Flags for different platforms, such as I2C_QUIRK_FLAG.
 | |
|  * @speed: Speed of I2C bus
 | |
|  * @pads_info: pinctrl info for this i2c bus, will be used when pinctrl is ok.
 | |
|  * The following two is only to be compatible with non-DM part.
 | |
|  * @idle_bus_fn: function to force bus idle
 | |
|  * @idle_bus_data: parameter for idle_bus_fun
 | |
|  */
 | |
| struct mxc_i2c_bus {
 | |
| 	/*
 | |
| 	 * board file can use this index to locate which i2c_pads_info is for
 | |
| 	 * i2c_idle_bus. When pinmux is implement, this entry can be
 | |
| 	 * discarded. Here we do not use dev->seq, because we do not want to
 | |
| 	 * export device to board file.
 | |
| 	 */
 | |
| 	int index;
 | |
| 	ulong base;
 | |
| 	ulong driver_data;
 | |
| 	int speed;
 | |
| 	struct i2c_pads_info *pads_info;
 | |
| #ifndef CONFIG_DM_I2C
 | |
| 	int (*idle_bus_fn)(void *p);
 | |
| 	void *idle_bus_data;
 | |
| #endif
 | |
| };
 | |
| 
 | |
| #if defined(CONFIG_MX6QDL)
 | |
| #define I2C_PADS(name, scl_i2c, scl_gpio, scl_gp, sda_i2c, sda_gpio, sda_gp) \
 | |
| 	struct i2c_pads_info mx6q_##name = {		\
 | |
| 		.scl = {				\
 | |
| 			.i2c_mode = MX6Q_##scl_i2c,	\
 | |
| 			.gpio_mode = MX6Q_##scl_gpio,	\
 | |
| 			.gp = scl_gp,			\
 | |
| 		},					\
 | |
| 		.sda = {				\
 | |
| 			.i2c_mode = MX6Q_##sda_i2c,	\
 | |
| 			.gpio_mode = MX6Q_##sda_gpio,	\
 | |
| 			.gp = sda_gp,			\
 | |
| 		}					\
 | |
| 	};						\
 | |
| 	struct i2c_pads_info mx6s_##name = {		\
 | |
| 		.scl = {				\
 | |
| 			.i2c_mode = MX6DL_##scl_i2c,	\
 | |
| 			.gpio_mode = MX6DL_##scl_gpio,	\
 | |
| 			.gp = scl_gp,			\
 | |
| 		},					\
 | |
| 		.sda = {				\
 | |
| 			.i2c_mode = MX6DL_##sda_i2c,	\
 | |
| 			.gpio_mode = MX6DL_##sda_gpio,	\
 | |
| 			.gp = sda_gp,			\
 | |
| 		}					\
 | |
| 	};
 | |
| 
 | |
| 
 | |
| #define I2C_PADS_INFO(name)	\
 | |
| 	(is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) ? \
 | |
| 					&mx6q_##name : &mx6s_##name
 | |
| #endif
 | |
| 
 | |
| int setup_i2c(unsigned i2c_index, int speed, int slave_addr,
 | |
| 	      struct i2c_pads_info *p);
 | |
| void bus_i2c_init(int index, int speed, int slave_addr,
 | |
| 		int (*idle_bus_fn)(void *p), void *p);
 | |
| int force_idle_bus(void *priv);
 | |
| int i2c_idle_bus(struct mxc_i2c_bus *i2c_bus);
 | |
| #endif
 |