i2c/pinmux tweaks (dm6446)

Do DM6446 I2C pinmux as part of davinci_init_i2c(); it
never changes, boards shouldn't have to care.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

arch/arm/mach-davinci/board-dm644x-evm.c

@@ -573,7 +573,6 @@ static struct davinci_i2c_platform_data i2c_pdata = {
 
 static void __init evm_init_i2c(void)
 {
-	davinci_cfg_reg(DM644X_I2C);
 	davinci_init_i2c(&i2c_pdata);
 	i2c_add_driver(&dm6446evm_msp_driver);
 	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));

arch/arm/mach-davinci/board-sffsdr.c

@@ -133,7 +133,6 @@ static struct davinci_i2c_platform_data i2c_pdata = {
 
 static void __init sffsdr_init_i2c(void)
 {
-	davinci_cfg_reg(DM644X_I2C);
 	davinci_init_i2c(&i2c_pdata);
 	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));
 }

arch/arm/mach-davinci/devices.c

@@ -63,6 +63,9 @@ static struct platform_device davinci_i2c_device = {
 
 void __init davinci_init_i2c(struct davinci_i2c_platform_data *pdata)
 {
+	if (cpu_is_davinci_dm644x())
+		davinci_cfg_reg(DM644X_I2C);
+
 	davinci_i2c_device.dev.platform_data = pdata;
 	(void) platform_device_register(&davinci_i2c_device);
 }