staging: cg2900: Update for api change in 3.0

Add missing header file

Change-Id: I2e8b87b9b5de26e741374eb11b93f15cfa37d826
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>

6 files changed, 153 insertions, 38 deletions

diff --git a/arch/arm/mach-ux500/include/mach/prcmu-regs.h b/arch/arm/mach-ux500/include/mach/prcmu-regs.h
new file mode 100644
index 00000000000..9a8e9e4ddd3
--- /dev/null
+++ b/arch/arm/mach-ux500/include/mach/prcmu-regs.h
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) STMicroelectronics 2009
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * Author: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
+ * Author: Sundar Iyer <sundar.iyer@stericsson.com>
+ *
+ * License Terms: GNU General Public License v2
+ *
+ * PRCM Unit registers
+ */
+
+#ifndef __MACH_PRCMU_REGS_H
+#define __MACH_PRCMU_REGS_H
+
+#include <mach/hardware.h>
+
+#define PRCM_ARM_PLLDIVPS	(_PRCMU_BASE + 0x118)
+#define PRCM_ARM_PLLDIVPS_ARM_BRM_RATE		0x3f
+#define PRCM_ARM_PLLDIVPS_MAX_MASK		0xf
+
+#define PRCM_PLLARM_LOCKP       (_PRCMU_BASE + 0x0a8)
+#define PRCM_PLLARM_LOCKP_PRCM_PLLARM_LOCKP3	0x2
+
+#define PRCM_ARM_CHGCLKREQ	(_PRCMU_BASE + 0x114)
+#define PRCM_ARM_CHGCLKREQ_PRCM_ARM_CHGCLKREQ	0x1
+
+#define PRCM_PLLARM_ENABLE	(_PRCMU_BASE + 0x98)
+#define PRCM_PLLARM_ENABLE_PRCM_PLLARM_ENABLE	0x1
+#define PRCM_PLLARM_ENABLE_PRCM_PLLARM_COUNTON	0x100
+
+#define PRCM_ARMCLKFIX_MGT	(_PRCMU_BASE + 0x0)
+#define PRCM_A9_RESETN_CLR	(_PRCMU_BASE + 0x1f4)
+#define PRCM_A9_RESETN_SET	(_PRCMU_BASE + 0x1f0)
+#define PRCM_ARM_LS_CLAMP	(_PRCMU_BASE + 0x30c)
+#define PRCM_SRAM_A9		(_PRCMU_BASE + 0x308)
+
+/* ARM WFI Standby signal register */
+#define PRCM_ARM_WFI_STANDBY    (_PRCMU_BASE + 0x130)
+#define PRCM_IOCR		(_PRCMU_BASE + 0x310)
+#define PRCM_IOCR_IOFORCE			0x1
+
+/* CPU mailbox registers */
+#define PRCM_MBOX_CPU_VAL	(_PRCMU_BASE + 0x0fc)
+#define PRCM_MBOX_CPU_SET	(_PRCMU_BASE + 0x100)
+#define PRCM_MBOX_CPU_CLR	(_PRCMU_BASE + 0x104)
+
+/* Dual A9 core interrupt management unit registers */
+#define PRCM_A9_MASK_REQ	(_PRCMU_BASE + 0x328)
+#define PRCM_A9_MASK_REQ_PRCM_A9_MASK_REQ	0x1
+
+#define PRCM_A9_MASK_ACK	(_PRCMU_BASE + 0x32c)
+#define PRCM_ARMITMSK31TO0	(_PRCMU_BASE + 0x11c)
+#define PRCM_ARMITMSK63TO32	(_PRCMU_BASE + 0x120)
+#define PRCM_ARMITMSK95TO64	(_PRCMU_BASE + 0x124)
+#define PRCM_ARMITMSK127TO96	(_PRCMU_BASE + 0x128)
+#define PRCM_POWER_STATE_VAL	(_PRCMU_BASE + 0x25C)
+#define PRCM_ARMITVAL31TO0	(_PRCMU_BASE + 0x260)
+#define PRCM_ARMITVAL63TO32	(_PRCMU_BASE + 0x264)
+#define PRCM_ARMITVAL95TO64	(_PRCMU_BASE + 0x268)
+#define PRCM_ARMITVAL127TO96	(_PRCMU_BASE + 0x26C)
+
+#define PRCM_HOSTACCESS_REQ	(_PRCMU_BASE + 0x334)
+#define ARM_WAKEUP_MODEM	0x1
+
+#define PRCM_ARM_IT1_CLEAR	(_PRCMU_BASE + 0x48C)
+#define PRCM_ARM_IT1_VAL	(_PRCMU_BASE + 0x494)
+#define PRCM_HOLD_EVT		(_PRCMU_BASE + 0x174)
+
+#define PRCM_ITSTATUS0		(_PRCMU_BASE + 0x148)
+#define PRCM_ITSTATUS1		(_PRCMU_BASE + 0x150)
+#define PRCM_ITSTATUS2		(_PRCMU_BASE + 0x158)
+#define PRCM_ITSTATUS3		(_PRCMU_BASE + 0x160)
+#define PRCM_ITSTATUS4		(_PRCMU_BASE + 0x168)
+#define PRCM_ITSTATUS5		(_PRCMU_BASE + 0x484)
+#define PRCM_ITCLEAR5		(_PRCMU_BASE + 0x488)
+#define PRCM_ARMIT_MASKXP70_IT	(_PRCMU_BASE + 0x1018)
+
+/* System reset register */
+#define PRCM_APE_SOFTRST	(_PRCMU_BASE + 0x228)
+
+/* Level shifter and clamp control registers */
+#define PRCM_MMIP_LS_CLAMP_SET     (_PRCMU_BASE + 0x420)
+#define PRCM_MMIP_LS_CLAMP_CLR     (_PRCMU_BASE + 0x424)
+
+/* PRCMU clock/PLL/reset registers */
+#define PRCM_PLLDSI_FREQ           (_PRCMU_BASE + 0x500)
+#define PRCM_PLLDSI_ENABLE         (_PRCMU_BASE + 0x504)
+#define PRCM_PLLDSI_LOCKP          (_PRCMU_BASE + 0x508)
+#define PRCM_LCDCLK_MGT            (_PRCMU_BASE + 0x044)
+#define PRCM_MCDECLK_MGT           (_PRCMU_BASE + 0x064)
+#define PRCM_HDMICLK_MGT           (_PRCMU_BASE + 0x058)
+#define PRCM_TVCLK_MGT             (_PRCMU_BASE + 0x07c)
+#define PRCM_DSI_PLLOUT_SEL        (_PRCMU_BASE + 0x530)
+#define PRCM_DSITVCLK_DIV          (_PRCMU_BASE + 0x52C)
+#define PRCM_PLLDSI_LOCKP          (_PRCMU_BASE + 0x508)
+#define PRCM_APE_RESETN_SET        (_PRCMU_BASE + 0x1E4)
+#define PRCM_APE_RESETN_CLR        (_PRCMU_BASE + 0x1E8)
+#define PRCM_CLKOCR		   (_PRCMU_BASE + 0x1CC)
+
+/* ePOD and memory power signal control registers */
+#define PRCM_EPOD_C_SET            (_PRCMU_BASE + 0x410)
+#define PRCM_SRAM_LS_SLEEP         (_PRCMU_BASE + 0x304)
+
+/* Debug power control unit registers */
+#define PRCM_POWER_STATE_SET       (_PRCMU_BASE + 0x254)
+
+/* Miscellaneous unit registers */
+#define PRCM_DSI_SW_RESET          (_PRCMU_BASE + 0x324)
+#define PRCM_GPIOCR                (_PRCMU_BASE + 0x138)
+#define PRCM_GPIOCR_DBG_STM_MOD_CMD1            0x800
+#define PRCM_GPIOCR_DBG_UARTMOD_CMD0            0x1
+
+
+#endif /* __MACH_PRCMU__REGS_H */
diff --git a/drivers/staging/cg2900/bluetooth/btcg2900.c b/drivers/staging/cg2900/bluetooth/btcg2900.c
index 9c1c4413087..0eb39523c1e 100644
--- a/drivers/staging/cg2900/bluetooth/btcg2900.c
+++ b/drivers/staging/cg2900/bluetooth/btcg2900.c
@@ -913,7 +913,7 @@ static int probe_common(struct platform_device *pdev,
 
 	dev_set_drvdata(dev, info);
 
-	pf_data = mfd_get_data(pdev);
+	pf_data = mfd_get_cell(pdev)->platform_data;
 	pf_data->dev = dev;
 	pf_data->read_cb = hci_read_cb;
 	pf_data->reset_cb = hci_reset_cb;
@@ -1051,7 +1051,7 @@ static int remove_common(struct platform_device *pdev,
 	struct cg2900_user_data *pf_data;
 	struct dev_info *dev_info;
 
-	pf_data = mfd_get_data(pdev);
+	pf_data = mfd_get_cell(pdev)->platform_data;
 	dev_info = cg2900_get_usr(pf_data);
 
 	kfree(dev_info);
diff --git a/drivers/staging/cg2900/bluetooth/hci_ldisc.c b/drivers/staging/cg2900/bluetooth/hci_ldisc.c
index d7ff9d419a1..bb480317f6d 100644
--- a/drivers/staging/cg2900/bluetooth/hci_ldisc.c
+++ b/drivers/staging/cg2900/bluetooth/hci_ldisc.c
@@ -206,7 +206,7 @@ int cg2900_hci_uart_tiocmget(struct hci_uart *hu)
 	if (!tty->ops->tiocmget ||  !hu->fd)
 		return -EOPNOTSUPP;
 
-	return tty->ops->tiocmget(tty, hu->fd);
+	return tty->ops->tiocmget(tty);
 }
 
 void cg2900_hci_uart_flush_buffer(struct hci_uart *hu)
diff --git a/drivers/staging/cg2900/mfd/cg2900_char_devices.c b/drivers/staging/cg2900/mfd/cg2900_char_devices.c
index c7bacdf8889..0f1627e82ac 100644
--- a/drivers/staging/cg2900/mfd/cg2900_char_devices.c
+++ b/drivers/staging/cg2900/mfd/cg2900_char_devices.c
@@ -549,7 +549,7 @@ static int __devinit cg2900_char_probe(struct platform_device *pdev)
 
 	dev_dbg(&pdev->dev, "cg2900_char_probe\n");
 
-	user = mfd_get_data(pdev);
+	user = mfd_get_cell(pdev)->platform_data;
 	user->dev = dev;
 	user->read_cb = char_dev_read_cb;
 	user->reset_cb = char_dev_reset_cb;
diff --git a/drivers/staging/cg2900/mfd/cg2900_chip.c b/drivers/staging/cg2900/mfd/cg2900_chip.c
index ad42429d5f0..fa243dcab15 100644
--- a/drivers/staging/cg2900/mfd/cg2900_chip.c
+++ b/drivers/staging/cg2900/mfd/cg2900_chip.c
@@ -2937,47 +2937,47 @@ static struct cg2900_user_data audio_fm_data = {
 static struct mfd_cell cg2900_devs[] = {
 	{
 		.name = "cg2900-btcmd",
-		.mfd_data = &btcmd_data,
+		.platform_data = &btcmd_data,
 	},
 	{
 		.name = "cg2900-btacl",
-		.mfd_data = &btacl_data,
+		.platform_data = &btacl_data,
 	},
 	{
 		.name = "cg2900-btevt",
-		.mfd_data = &btevt_data,
+		.platform_data = &btevt_data,
 	},
 	{
 		.name = "cg2900-fm",
-		.mfd_data = &fm_data,
+		.platform_data = &fm_data,
 	},
 	{
 		.name = "cg2900-gnss",
-		.mfd_data = &gnss_data,
+		.platform_data = &gnss_data,
 	},
 	{
 		.name = "cg2900-debug",
-		.mfd_data = &debug_data,
+		.platform_data = &debug_data,
 	},
 	{
 		.name = "cg2900-stetools",
-		.mfd_data = &ste_tools_data,
+		.platform_data = &ste_tools_data,
 	},
 	{
 		.name = "cg2900-hcilogger",
-		.mfd_data = &hci_logger_data,
+		.platform_data = &hci_logger_data,
 	},
 	{
 		.name = "cg2900-core",
-		.mfd_data = &core_data,
+		.platform_data = &core_data,
 	},
 	{
 		.name = "cg2900-audiobt",
-		.mfd_data = &audio_bt_data,
+		.platform_data = &audio_bt_data,
 	},
 	{
 		.name = "cg2900-audiofm",
-		.mfd_data = &audio_fm_data,
+		.platform_data = &audio_fm_data,
 	},
 };
 
@@ -3059,57 +3059,57 @@ static struct mfd_cell cg2900_char_devs[] = {
 	{
 		.name = "cg2900-chardev",
 		.id = 0,
-		.mfd_data = &char_btcmd_data,
+		.platform_data = &char_btcmd_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 1,
-		.mfd_data = &char_btacl_data,
+		.platform_data = &char_btacl_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 2,
-		.mfd_data = &char_btevt_data,
+		.platform_data = &char_btevt_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 3,
-		.mfd_data = &char_fm_data,
+		.platform_data = &char_fm_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 4,
-		.mfd_data = &char_gnss_data,
+		.platform_data = &char_gnss_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 5,
-		.mfd_data = &char_debug_data,
+		.platform_data = &char_debug_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 6,
-		.mfd_data = &char_ste_tools_data,
+		.platform_data = &char_ste_tools_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 7,
-		.mfd_data = &char_hci_logger_data,
+		.platform_data = &char_hci_logger_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 8,
-		.mfd_data = &char_core_data,
+		.platform_data = &char_core_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 9,
-		.mfd_data = &char_audio_bt_data,
+		.platform_data = &char_audio_bt_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 10,
-		.mfd_data = &char_audio_fm_data,
+		.platform_data = &char_audio_fm_data,
 	},
 };
 
@@ -3122,7 +3122,7 @@ static struct mfd_cell cg2900_char_devs[] = {
  */
 static void set_plat_data(struct mfd_cell *cell, struct cg2900_chip_dev *dev)
 {
-	struct cg2900_user_data *pf_data = cell->mfd_data;
+	struct cg2900_user_data *pf_data = cell->platform_data;
 
 	if (!pf_data->open)
 		pf_data->open = cg2900_open;
diff --git a/drivers/staging/cg2900/mfd/stlc2690_chip.c b/drivers/staging/cg2900/mfd/stlc2690_chip.c
index 47d0cf1c0e5..3e394670f1f 100644
--- a/drivers/staging/cg2900/mfd/stlc2690_chip.c
+++ b/drivers/staging/cg2900/mfd/stlc2690_chip.c
@@ -1293,23 +1293,23 @@ static struct cg2900_user_data core_data = {
 static struct mfd_cell stlc2690_devs[] = {
 	{
 		.name = "cg2900-btcmd",
-		.mfd_data = &btcmd_data,
+		.platform_data = &btcmd_data,
 	},
 	{
 		.name = "cg2900-btacl",
-		.mfd_data = &btacl_data,
+		.platform_data = &btacl_data,
 	},
 	{
 		.name = "cg2900-btevt",
-		.mfd_data = &btevt_data,
+		.platform_data = &btevt_data,
 	},
 	{
 		.name = "cg2900-hcilogger",
-		.mfd_data = &hci_logger_data,
+		.platform_data = &hci_logger_data,
 	},
 	{
 		.name = "cg2900-core",
-		.mfd_data = &core_data,
+		.platform_data = &core_data,
 	},
 };
 
@@ -1353,27 +1353,27 @@ static struct mfd_cell stlc2690_char_devs[] = {
 	{
 		.name = "cg2900-chardev",
 		.id = 0,
-		.mfd_data = &char_btcmd_data,
+		.platform_data = &char_btcmd_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 1,
-		.mfd_data = &char_btacl_data,
+		.platform_data = &char_btacl_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 2,
-		.mfd_data = &char_btevt_data,
+		.platform_data = &char_btevt_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 7,
-		.mfd_data = &char_hci_logger_data,
+		.platform_data = &char_hci_logger_data,
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 8,
-		.mfd_data = &char_core_data,
+		.platform_data = &char_core_data,
 	},
 };
 
@@ -1386,7 +1386,7 @@ static struct mfd_cell stlc2690_char_devs[] = {
  */
 static void set_plat_data(struct mfd_cell *cell, struct cg2900_chip_dev *dev)
 {
-	struct cg2900_user_data *user = cell->mfd_data;
+	struct cg2900_user_data *user = cell->platform_data;
 
 	if (!user->open)
 		user->open = stlc2690_open;