u8500: shrm: Move shrm to drivers/modem

Moves shrm specific files from arch/arm/mach-ux500/mach/include
and drivers/misc to include/linux/modem/shrm and drivers/modem/shrm
respectively

ST-Ericsson ID: CR329459

Change-Id: I3a08f83e5302429d51eb865ee1c5e4e0ec73e31b
Signed-off-by: Kumar Sanghvi <kumar.sanghvi@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23980
Reviewed-by: QATEST
Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>

12 files changed, 45 insertions, 46 deletions

diff --git a/drivers/char/shrm_char.c b/drivers/char/shrm_char.c
index 6a6b3d7245a..32d975bf451 100644
--- a/drivers/char/shrm_char.c
+++ b/drivers/char/shrm_char.c
@@ -14,13 +14,13 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
+#include <linux/modem/shrm/shrm_driver.h>
+#include <linux/modem/shrm/shrm_private.h>
+#include <linux/modem/shrm/shrm_config.h>
+#include <linux/modem/shrm/shrm.h>
 #include <asm/atomic.h>
 
 #include <mach/isa_ioctl.h>
-#include <mach/shrm_driver.h>
-#include <mach/shrm_private.h>
-#include <mach/shrm_config.h>
-#include <mach/shrm.h>
 
 
 #define NAME "IPC_ISA"
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f893dbdd091..b98e359c447 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -487,7 +487,6 @@ source "drivers/misc/eeprom/Kconfig"
 source "drivers/misc/cb710/Kconfig"
 source "drivers/misc/iwmc3200top/Kconfig"
 source "drivers/misc/ti-st/Kconfig"
-source "drivers/misc/shrm/Kconfig"
 source "drivers/misc/i2s/Kconfig"
 source "drivers/misc/audio_io_dev/Kconfig"
 
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index 1cd74375540..24c30580fb5 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -45,7 +45,6 @@ obj-$(CONFIG_AB8500_PWM)	+= ab8500-pwm.o
 obj-$(CONFIG_DBX500_MLOADER) 	+= dbx500-mloader.o
 obj-$(CONFIG_STE_TRACE_MODEM) 	+= db8500-modem-trace.o
 obj-$(CONFIG_STM_TRACE) 	+= stm.o
-obj-$(CONFIG_U8500_SHRM)        += shrm/
 obj-$(CONFIG_STM_I2S)           += i2s/
 obj-$(CONFIG_STE_AUDIO_IO_DEV)	+= audio_io_dev/
 obj-$(CONFIG_HWMEM)             += hwmem/
diff --git a/drivers/modem/Kconfig b/drivers/modem/Kconfig
index a23b5c90e5e..95d4307775b 100644
--- a/drivers/modem/Kconfig
+++ b/drivers/modem/Kconfig
@@ -18,3 +18,5 @@ config MODEM_U8500
 	 Application processor.
 
 	 If unsure, say N.
+
+source "drivers/modem/shrm/Kconfig"
diff --git a/drivers/modem/Makefile b/drivers/modem/Makefile
index 57b50916c79..e1b3f376cce 100644
--- a/drivers/modem/Makefile
+++ b/drivers/modem/Makefile
@@ -1,3 +1,4 @@
 obj-$(CONFIG_MODEM)       := modem_access.o
 obj-$(CONFIG_MODEM_U8500) += modem_u8500.o
+obj-$(CONFIG_U8500_SHRM)  += shrm/
 
diff --git a/drivers/misc/shrm/Kconfig b/drivers/modem/shrm/Kconfig
index 6bafdeec5b9..465c8bb10a1 100644
--- a/drivers/misc/shrm/Kconfig
+++ b/drivers/modem/shrm/Kconfig
@@ -2,8 +2,8 @@
 # SHM HW kernel configuration
 #
 config U8500_SHRM
-	tristate "U8500 SHRM hardware driver"
-	depends on ARCH_U8500 && PHONET
+	bool "U8500 SHRM hardware driver"
+	depends on ARCH_U8500 && PHONET && MODEM_U8500
 	default Y
 	---help---
 	  If you say Y here, you will enable the STN8500 SHM hardware driver.
@@ -23,7 +23,7 @@ choice
 endchoice
 
 config U8500_SHRM_LOOP_BACK
-	tristate "U8500 SHRM loopback"
+	bool "U8500 SHRM loopback"
 	depends on U8500_SHRM
 	default n
 	---help---
diff --git a/drivers/misc/shrm/Makefile b/drivers/modem/shrm/Makefile
index 8115c24920b..8115c24920b 100644
--- a/drivers/misc/shrm/Makefile
+++ b/drivers/modem/shrm/Makefile
diff --git a/drivers/misc/shrm/modem_shrm_driver.c b/drivers/modem/shrm/modem_shrm_driver.c
index da55ab3d55c..91f30e74f27 100644
--- a/drivers/misc/shrm/modem_shrm_driver.c
+++ b/drivers/modem/shrm/modem_shrm_driver.c
@@ -20,14 +20,6 @@
 #include <linux/uaccess.h>
 #include <asm/atomic.h>
 #include <linux/io.h>
-
-#include <mach/isa_ioctl.h>
-#include <mach/shrm_driver.h>
-#include <mach/shrm_private.h>
-#include <mach/shrm_config.h>
-#include <mach/shrm_net.h>
-#include <mach/shrm.h>
-
 #include <linux/skbuff.h>
 #ifdef CONFIG_HIGH_RES_TIMERS
 #include <linux/hrtimer.h>
@@ -36,14 +28,20 @@ static struct hrtimer timer;
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
 #include <linux/phonet.h>
+#include <linux/modem/shrm/shrm_driver.h>
+#include <linux/modem/shrm/shrm_private.h>
+#include <linux/modem/shrm/shrm_config.h>
+#include <linux/modem/shrm/shrm_net.h>
+#include <linux/modem/shrm/shrm.h>
 
+#include <mach/isa_ioctl.h>
 /* debug functionality */
 #define ISA_DEBUG 0
 
 #define PHONET_TASKLET
 #define MAX_RCV_LEN	2048
 
-void do_phonet_rcv_tasklet(unsigned long unused);
+static void do_phonet_rcv_tasklet(unsigned long unused);
 struct tasklet_struct phonet_rcv_tasklet;
 
 /**
diff --git a/drivers/misc/shrm/shrm_driver.c b/drivers/modem/shrm/shrm_driver.c
index 6277794608a..11540831f95 100644
--- a/drivers/misc/shrm/shrm_driver.c
+++ b/drivers/modem/shrm/shrm_driver.c
@@ -22,12 +22,12 @@
 #include <asm/atomic.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+#include <linux/modem/shrm/shrm_driver.h>
+#include <linux/modem/shrm/shrm_private.h>
+#include <linux/modem/shrm/shrm_config.h>
+#include <linux/modem/shrm/shrm.h>
 
 #include <mach/isa_ioctl.h>
-#include <mach/shrm_driver.h>
-#include <mach/shrm_private.h>
-#include <mach/shrm_config.h>
-#include <mach/shrm.h>
 
 
 #ifdef CONFIG_HIGH_RES_TIMERS
@@ -956,14 +956,14 @@ static int isa_open(struct inode *inode, struct file *filp)
 }
 
 const struct file_operations isa_fops = {
-	.owner	= THIS_MODULE,
-	.open 	= isa_open,
+	.owner	 = THIS_MODULE,
+	.open	 = isa_open,
 	.release = isa_close,
-	.ioctl 	= isa_ioctl,
-	.mmap 	= isa_mmap,
-	.read 	= isa_read,
-	.write 	= isa_write,
-	.poll	= isa_select,
+	.ioctl	 = isa_ioctl,
+	.mmap	 = isa_mmap,
+	.read	 = isa_read,
+	.write	 = isa_write,
+	.poll	 = isa_select,
 };
 
 /**
@@ -1123,7 +1123,7 @@ static int __init shrm_probe(struct platform_device *pdev)
 	res = platform_get_resource(pdev, IORESOURCE_IRQ, 3);
 	if (!res) {
 		dev_err(shrm->dev,
-			"Unable to map Cmt_msg_pending_notif_common IRQ base\n");
+			"Unable to map Cmt_msg_pending_notif_common IRQbase\n");
 		err = -EBUSY;
 		goto rollback_intr;
 	}
diff --git a/drivers/misc/shrm/shrm_fifo.c b/drivers/modem/shrm/shrm_fifo.c
index cbe0949a56d..883966d4ab5 100644
--- a/drivers/misc/shrm/shrm_fifo.c
+++ b/drivers/modem/shrm/shrm_fifo.c
@@ -7,10 +7,10 @@
  * License terms: GNU General Public License (GPL) version 2
  */
 
-#include <mach/shrm.h>
-#include <mach/shrm_driver.h>
-#include <mach/shrm_private.h>
-#include <mach/shrm_net.h>
+#include <linux/modem/shrm/shrm.h>
+#include <linux/modem/shrm/shrm_driver.h>
+#include <linux/modem/shrm/shrm_private.h>
+#include <linux/modem/shrm/shrm_net.h>
 
 #define L1_BOOT_INFO_REQ	1
 #define L1_BOOT_INFO_RESP	2
diff --git a/drivers/misc/shrm/shrm_protocol.c b/drivers/modem/shrm/shrm_protocol.c
index 686bebcb451..99a58aa6f71 100644
--- a/drivers/misc/shrm/shrm_protocol.c
+++ b/drivers/modem/shrm/shrm_protocol.c
@@ -11,16 +11,15 @@
 #include <linux/delay.h>
 #include <linux/netlink.h>
 #include <linux/workqueue.h>
-
-#include <mach/shrm.h>
-#include <mach/shrm_driver.h>
-#include <mach/shrm_private.h>
-#include <mach/shrm_net.h>
+#include <linux/modem/shrm/shrm.h>
+#include <linux/modem/shrm/shrm_driver.h>
+#include <linux/modem/shrm/shrm_private.h>
+#include <linux/modem/shrm/shrm_net.h>
+#include <linux/modem/modem_client.h>
 #include <mach/prcmu.h>
 #include <mach/prcmu-regs.h>
 #include <mach/suspend.h>
 #include <mach/reboot_reasons.h>
-#include <linux/modem/modem_client.h>
 
 #define L2_HEADER_ISI		0x0
 #define L2_HEADER_RPC		0x1
@@ -375,7 +374,8 @@ void shm_ac_read_notif_0_tasklet(unsigned long tasklet_data)
 			shrm->msr_flag = 0;
 
 			/* multicast that modem is online */
-			nl_send_multicast_message(SHRM_NL_STATUS_MOD_ONLINE, GFP_ATOMIC);
+			nl_send_multicast_message(SHRM_NL_STATUS_MOD_ONLINE,
+					GFP_ATOMIC);
 		}
 
 	} else if (boot_state == BOOT_DONE) {
diff --git a/drivers/net/u8500_shrm.c b/drivers/net/u8500_shrm.c
index 488f96f2c04..0e813bbb3cc 100644
--- a/drivers/net/u8500_shrm.c
+++ b/drivers/net/u8500_shrm.c
@@ -12,15 +12,15 @@
 #include <linux/phonet.h>
 #include <linux/if_phonet.h>
 #include <linux/if_arp.h>
+#include <linux/modem/shrm/shrm_driver.h>
+#include <linux/modem/shrm/shrm_private.h>
+#include <linux/modem/shrm/shrm_config.h>
+#include <linux/modem/shrm/shrm_net.h>
+#include <linux/modem/shrm/shrm.h>
 #include <net/sock.h>
 #include <net/phonet/phonet.h>
 #include <net/phonet/pep.h>
 
-#include <mach/shrm_driver.h>
-#include <mach/shrm_private.h>
-#include <mach/shrm_config.h>
-#include <mach/shrm_net.h>
-#include <mach/shrm.h>
 
 /**
  * shrm_net_receive() - receive data and copy to user space buffer