i2c: tegra: i2c-slave: Fixing initialization seq

Following are changes:
- Using the sysinit_call to initialize the driver.
- Using device from master adapter for slave adpter.

Original-Change-Id: I4dd0725694008a6aaee9a1d3a92d370a5c46de31
Reviewed-on: http://git-master/r/19249
Reviewed-by: Krishna Thota <kthota@nvidia.com>
Tested-by: Krishna Thota <kthota@nvidia.com>
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Original-Change-Id: I62ba2e474d15764eccb2174444b194502e771307

Rebase-Id: Re845b3bac0f08ac25d0aa330acf0ee267ea8fcd4

2 files changed, 15 insertions, 10 deletions

diff --git a/drivers/i2c/busses/i2c-slave-tegra.c b/drivers/i2c/busses/i2c-slave-tegra.c
index d5d4578bdbfb..bd2b3781257c 100755
--- a/drivers/i2c/busses/i2c-slave-tegra.c
+++ b/drivers/i2c/busses/i2c-slave-tegra.c
@@ -15,6 +15,9 @@
  *
  */
 
+/*#define DEBUG           1*/
+/*#define VERBOSE_DEBUG   1*/
+
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
@@ -324,7 +327,7 @@ static void configure_i2c_slave_address(struct tegra_i2c_slave_dev *i2c_dev)
 					I2C_SLV_ADDR2_ADDR0_TEN_BIT_ADDR_MODE;
 		writel(slave_add_reg, i2c_dev->base + I2C_SLV_ADDR2);
 	} else {
-		slave_add = (i2c_dev->slave_add & 0x3FF) >> 1;
+		slave_add = (i2c_dev->slave_add & 0x3FF);
 		slave_add_reg = readl(i2c_dev->base + I2C_SLV_ADDR1);
 		slave_add_reg |= slave_add << I2C_SLV_ADDR1_ADDR_SHIFT;
 		writel(slave_add_reg, i2c_dev->base + I2C_SLV_ADDR1);
@@ -1011,19 +1014,20 @@ static int tegra_i2c_slave_probe(struct platform_device *pdev)
 	i2c_bus->bus_clk_rate = pdata->bus_clk_rate ?: 100000;
 
 	i2c_bus->slv_adap.slv_algo = &tegra_i2c_slave_algo;
-
-	i2c_set_slave_adapdata(&i2c_bus->slv_adap, i2c_bus);
 	i2c_bus->slv_adap.owner = THIS_MODULE;
 	i2c_bus->slv_adap.class = I2C_CLASS_HWMON;
 	strlcpy(i2c_bus->slv_adap.name, "Tegra I2C SLAVE adapter",
 				sizeof(i2c_bus->slv_adap.name));
-	i2c_bus->slv_adap.dev.parent = &pdev->dev;
+	i2c_bus->slv_adap.parent_dev = &pdev->dev;
+	i2c_bus->slv_adap.dev = NULL;
 	i2c_bus->slv_adap.nr = pdata->adapter_nr;
 	ret = i2c_add_slave_adapter(&i2c_bus->slv_adap, true);
-	if (ret) {
+	if (ret < 0) {
 		dev_err(&pdev->dev, "Failed to add I2C adapter\n");
 		goto err_free_irq;
 	}
+	i2c_set_slave_adapdata(&i2c_bus->slv_adap, i2c_bus);
+	dev_dbg(&pdev->dev, "%s() suucess\n", __func__);
 	return 0;
 
 err_free_irq:
@@ -1038,6 +1042,7 @@ err_release_region:
 	release_mem_region(iomem->start, resource_size(iomem));
 err_iounmap:
 	iounmap(base);
+	dev_dbg(&pdev->dev, "%s() failed %d\n", __func__, ret);
 	return ret;
 }
 
@@ -1091,5 +1096,5 @@ static void __exit tegra_i2c_slave_exit_driver(void)
 {
 	platform_driver_unregister(&tegra_i2c_slave_driver);
 }
-module_init(tegra_i2c_slave_init_driver);
+subsys_initcall(tegra_i2c_slave_init_driver);
 module_exit(tegra_i2c_slave_exit_driver);
diff --git a/drivers/i2c/i2c-slave.c b/drivers/i2c/i2c-slave.c
index 755a51944869..a1cd4b220c23 100755
--- a/drivers/i2c/i2c-slave.c
+++ b/drivers/i2c/i2c-slave.c
@@ -246,7 +246,7 @@ int i2c_add_slave_adapter(struct i2c_slave_adapter *slv_adap, bool force_nr)
 	priv->master_adap.id = slv_adap->id;
 	priv->master_adap.algo = &priv->master_algo;
 	priv->master_adap.algo_data = priv;
-	priv->master_adap.dev.parent = &slv_adap->dev;
+	priv->master_adap.dev.parent = slv_adap->parent_dev;
 
 	if (force_nr) {
 		priv->master_adap.nr = slv_adap->nr;
@@ -255,13 +255,13 @@ int i2c_add_slave_adapter(struct i2c_slave_adapter *slv_adap, bool force_nr)
 		ret = i2c_add_adapter(&priv->master_adap);
 	}
 	if (ret < 0) {
-		dev_err(&slv_adap->dev,
+		dev_err(slv_adap->parent_dev,
 			"failed to add slave-adapter (error=%d)\n", ret);
 		kfree(priv);
 		return ret;
 	}
-
-	dev_info(&slv_adap->dev, "Added slave i2c bus %d\n",
+	slv_adap->dev = &priv->master_adap.dev;
+	dev_info(slv_adap->parent_dev, "Added slave i2c bus %d\n",
 		 i2c_adapter_id(&priv->master_adap));
 
 	return 0;