I2C mux and clocks for omap7xx
PATCH 1/1 I2C mux and clocks for omap7xx
This change adds MUX pin configuration and clocks for I2C support to OMAP 730 and 850-based devices.
Signed-off-by Cory Maccarrone <[email protected]>
--- arch/arm/mach-omap1/clock.c | 4 ++-- arch/arm/mach-omap1/i2c.c | 10 ++++++++-- arch/arm/mach-omap1/mux.c | 4 ++++ arch/arm/plat-omap/include/plat/mux.h | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-)
arch/arm/mach-omap1/clock.c +2 -2
@@ -132,9 +132,9 @@ static struct omap_clk omap_clks[] = {CLK ("mmci-omap.1" ,"ick" , &armper_ck.clk,CK_16XX ),/* Virtual clocks */ CLK (NULL ,"mpu" , &virtual_ck_mpu,CK_16XX |CK_1510 |CK_310 ), -CLK ("i2c_omap.1" ,"fck" , &i2c_fck,CK_16XX |CK_1510 |CK_310 ), +CLK ("i2c_omap.1" ,"fck" , &i2c_fck,CK_16XX |CK_1510 |CK_310 |CK_7XX ),CLK ("i2c_omap.1" ,"ick" , &i2c_ick,CK_16XX ), -CLK ("i2c_omap.1" ,"ick" , &dummy_ck,CK_1510 |CK_310 ), +CLK ("i2c_omap.1" ,"ick" , &dummy_ck,CK_1510 |CK_310 |CK_7XX ),CLK ("omap_uwire" ,"fck" , &armxor_ck.clk,CK_16XX |CK_1510 |CK_310 ),CLK ("omap-mcbsp.1" ,"ick" , &dspper_ck,CK_16XX ), CLK("omap-mcbsp.1", "ick", &dummy_ck, CK_1510 | CK_310),
arch/arm/mach-omap1/i2c.c +8 -2
@@ -21,13 +21,19 @@#include <plat/i2c.h> #include <plat/mux.h> +#include <plat/cpu.h> int __init omap_register_i2c_bus (int bus_id,u32 clkrate,struct i2c_board_info const *info,unsigned len) { -omap_cfg_reg (I2C_SDA ); -omap_cfg_reg (I2C_SCL ); +if (cpu_is_omap7xx ()) { +omap_cfg_reg (I2C_7XX_SDA ); +omap_cfg_reg (I2C_7XX_SCL ); + }else { +omap_cfg_reg (I2C_SDA ); +omap_cfg_reg (I2C_SCL ); + }return omap_plat_register_i2c_bus (bus_id, clkrate, info, len); }
arch/arm/mach-omap1/mux.c +4 -0
@@ -58,6 +58,10 @@ MUX_CFG_7XX("W19_7XX_USB_DCRST", 3, 7, 1, 6, 0, 0) MUX_CFG_7XX("MMC_7XX_CMD", 2, 9, 0, 8, 1, 0) MUX_CFG_7XX("MMC_7XX_CLK", 2, 13, 0, 12, 1, 0)MUX_CFG_7XX ("MMC_7XX_DAT0" ,2 ,17 ,0 ,16 ,1 ,0 ) + +/* I2C interface */ +MUX_CFG_7XX("I2C_7XX_SCL", 5, 1, 0, 0, 1, 0) +MUX_CFG_7XX ("I2C_7XX_SDA" ,5 ,5 ,0 ,0 ,1 ,0 ) };#define OMAP7XX_PINS_SZ ARRAY_SIZE(omap7xx_pins)#else
arch/arm/plat-omap/include/plat/mux.h +4 -0
@@ -179,6 +179,10 @@ enum omap7xx_index {MMC_7XX_CMD ,MMC_7XX_CLK ,MMC_7XX_DAT0 , + +/* I2C */ +I2C_7XX_SCL , + I2C_7XX_SDA, }; enum omap1xxx_index {
Signature · 1 line
1.6.3.3
Tony Lindgren
reviewerPATCH 1/1 I2C mux and clocks for omap7xx
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next-vol2
Initial commit ID (Likely to change): dca06476d0535c299fa87fa5737cf4c07f605555
PatchWorks
http://patchwork.kernel.org/patch/65105/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=dca06476d0535c299fa87fa5737cf4c07f605555