powerpc/fsl: add QIXIS-I2C support in qixis driver

BSC9132 on-board FPGA connected on I2C bus, so add regmap support
i2c access control the QIXIS.

Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>
Change-Id: Iecaf76384cafd9d85b13f8f95055f460a9e48f24
Reviewed-on: http://git.am.freescale.net:8181/34989
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Scott Wood <scottwood@freescale.com>
Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>

3 files changed, 77 insertions, 8 deletions

diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig
index df26cf1..f8ed76d 100644
--- a/drivers/soc/fsl/Kconfig
+++ b/drivers/soc/fsl/Kconfig
@@ -5,6 +5,8 @@ endif
 config FSL_QIXIS
 	tristate "QIXIS system controller driver"
 	depends on FSL_SOC_DRIVERS
+	select REGMAP_I2C
+	select REGMAP_MMIO
 	default n
 	help
 	  Say y here to enable QIXIS system controller api.  The qixis driver
diff --git a/drivers/soc/fsl/qixis_ctrl.c b/drivers/soc/fsl/qixis_ctrl.c
index 9c8c519..f5da93c 100644
--- a/drivers/soc/fsl/qixis_ctrl.c
+++ b/drivers/soc/fsl/qixis_ctrl.c
@@ -11,27 +11,34 @@
 
 #include <linux/device.h>
 #include <linux/err.h>
+#include <linux/fsl/qixis_ctrl.h>
 #include <linux/io.h>
+#include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
-#include <linux/fsl/qixis_ctrl.h>
+#include <linux/regmap.h>
 
 #ifdef CONFIG_PPC
 #include <asm/machdep.h>
 #endif
 
-static struct fsl_qixis_regs __iomem *qixis;
+static struct regmap *qixis_regmap;
 
 /* QIXIS Power Management Control*/
 #define QIXIS_PWR_CTL2_PWR	0x80
 static void fsl_qixis_power_off(void)
 {
+	u32 val;
+
 	local_irq_disable();
 
-	iowrite8(ioread8(&qixis->pwr_ctrl2) | QIXIS_PWR_CTL2_PWR,
-		 &qixis->pwr_ctrl2);
+	regmap_read(qixis_regmap, offsetof(struct fsl_qixis_regs, pwr_ctrl2),
+		    &val);
+	val |= QIXIS_PWR_CTL2_PWR;
+	regmap_write(qixis_regmap, offsetof(struct fsl_qixis_regs, pwr_ctrl2),
+		     val);
 
 	while (1)
 		;
@@ -57,9 +64,16 @@ static void fsl_qixis_pm_release(void)
 #endif
 }
 
+static struct regmap_config qixis_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+};
+
 static int fsl_qixis_probe(struct platform_device *pdev)
 {
+	static struct fsl_qixis_regs __iomem *qixis;
 	struct resource *res;
+	u32 qver;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	qixis = devm_ioremap_resource(&pdev->dev, res);
@@ -68,8 +82,16 @@ static int fsl_qixis_probe(struct platform_device *pdev)
 		return PTR_ERR(qixis);
 	}
 
+	qixis_regmap = devm_regmap_init_mmio_clk(&pdev->dev, NULL, qixis,
+						 &qixis_regmap_config);
+
 	fsl_qixis_pm_init();
 
+	regmap_read(qixis_regmap, offsetof(struct fsl_qixis_regs, qixis_ver),
+		    &qver);
+
+	pr_info("Freescale QIXIS Version: 0x%08x\n", qver);
+
 	return 0;
 }
 
@@ -77,8 +99,6 @@ static int fsl_qixis_remove(struct platform_device *pdev)
 {
 	fsl_qixis_pm_release();
 
-	iounmap(qixis);
-
 	return 0;
 }
 
@@ -99,6 +119,51 @@ static struct platform_driver fsl_qixis_driver = {
 };
 module_platform_driver(fsl_qixis_driver);
 
+static int fsl_qixis_i2c_probe(struct i2c_client *client,
+			       const struct i2c_device_id *id)
+{
+	u32 qver;
+
+	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_BYTE_DATA))
+		return -EOPNOTSUPP;
+
+	qixis_regmap = regmap_init_i2c(client, &qixis_regmap_config);
+
+	fsl_qixis_pm_init();
+
+	regmap_read(qixis_regmap, offsetof(struct fsl_qixis_regs, qixis_ver),
+		    &qver);
+
+	pr_info("Freescale QIXIS Version: 0x%08x\n", qver);
+
+	return 0;
+}
+
+static int fsl_qixis_i2c_remove(struct i2c_client *client)
+{
+	fsl_qixis_pm_release();
+
+	return 0;
+}
+
+static const struct i2c_device_id fsl_qixis_id[] = {
+	{ "fpga-qixis-i2c", 0 },
+	{ "bsc9132qds-fpga", 0 },
+	{}
+};
+MODULE_DEVICE_TABLE(i2c, fsl_qixis_id);
+
+static struct i2c_driver fsl_qixis_i2c_driver = {
+	.driver = {
+		.name	= "fpga-qixis-i2c",
+		.owner	= THIS_MODULE,
+	},
+	.probe		= fsl_qixis_i2c_probe,
+	.remove		= fsl_qixis_i2c_remove,
+	.id_table	= fsl_qixis_id,
+};
+module_i2c_driver(fsl_qixis_i2c_driver);
+
 MODULE_AUTHOR("Wang Dongsheng <dongsheng.wang@freescale.com>");
 MODULE_DESCRIPTION("Freescale QIXIS system controller driver");
 MODULE_LICENSE("GPL v2");
diff --git a/include/linux/fsl/qixis_ctrl.h b/include/linux/fsl/qixis_ctrl.h
index 1907bf9..d62093a 100644
--- a/include/linux/fsl/qixis_ctrl.h
+++ b/include/linux/fsl/qixis_ctrl.h
@@ -16,8 +16,10 @@
 
 /* QIXIS MAP */
 struct fsl_qixis_regs {
-	u8		version;	/* Identification Registers */
-	u8		reserved1[0x20];
+	u8		id;		/* Identification Registers */
+	u8		version;	/* Version Register */
+	u8		qixis_ver;	/* QIXIS Version Register */
+	u8		reserved1[0x1e];
 	u8		pwr_ctrl2;	/* Power Control 2 Register */
 };