dlxj: fix for FeliCa

173210 · Feb 25, 2014 · e97390c · e97390c
1 parent 43b93b7
commit e97390c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
@@ -5458,7 +5458,11 @@ static struct clk_lookup msm_clocks_8960_common[] = {
 	CLK_LOOKUP("core_clk",		gsbi6_uart_clk.c, "msm_serial_hs.0"),
 	CLK_LOOKUP("core_clk",		gsbi7_uart_clk.c,	""),
 	CLK_LOOKUP("core_clk",		gsbi8_uart_clk.c,	"msm_serial_hsl.0"),
+#if defined(CONFIG_GSBI4_UARTDM) || defined(CONFIG_GSBI5_UARTDM)
+	CLK_LOOKUP("core_clk",		gsbi9_uart_clk.c, ""),
+#else
 	CLK_LOOKUP("core_clk",		gsbi9_uart_clk.c, "msm_serial_hs.1"),
+#endif
 	CLK_LOOKUP("core_clk",		gsbi10_uart_clk.c, "msm_serial_hsl.2"),
 	CLK_LOOKUP("core_clk",		gsbi11_uart_clk.c,	""),
 #ifdef CONFIG_SERIAL_IRDA
@@ -6206,7 +6210,11 @@ static struct clk_lookup msm_clocks_8930[] = {
 	CLK_LOOKUP("core_clk",		gsbi1_uart_clk.c,	""),
 	CLK_LOOKUP("core_clk",		gsbi2_uart_clk.c,	""),
 	CLK_LOOKUP("core_clk",		gsbi3_uart_clk.c,	"msm_serial_hsl.1"),
+#ifdef CONFIG_GSBI4_UARTDM
+	CLK_LOOKUP("core_clk",		gsbi4_uart_clk.c,	"msm_serial_hs.1"),
+#else
 	CLK_LOOKUP("core_clk",		gsbi4_uart_clk.c,	""),
+#endif
 	CLK_LOOKUP("core_clk",		gsbi5_uart_clk.c, NULL),
 	CLK_LOOKUP("core_clk",		gsbi6_uart_clk.c, "msm_serial_hs.0"),
 	CLK_LOOKUP("core_clk",		gsbi6_uart_clk.c, "msm_serial_hs_brcm.0"),
@@ -6260,6 +6268,9 @@ static struct clk_lookup msm_clocks_8930[] = {
 	CLK_LOOKUP("iface_clk",		gsbi2_p_clk.c,		"qup_i2c.2"),
 	CLK_LOOKUP("iface_clk",		gsbi3_p_clk.c,		"qup_i2c.3"),
 	CLK_LOOKUP("iface_clk",		gsbi3_p_clk.c,		"msm_serial_hsl.1"),
+#ifdef CONFIG_GSBI4_UARTDM
+	CLK_LOOKUP("iface_clk",		gsbi4_p_clk.c,		"msm_serial_hs.1"),
+#endif
 	CLK_LOOKUP("iface_clk",		gsbi4_p_clk.c,		"qup_i2c.4"),
 	CLK_LOOKUP("iface_clk",		gsbi5_p_clk.c,	"qup_i2c.5"),
 	CLK_LOOKUP("iface_clk",		gsbi6_p_clk.c,  "msm_serial_hs.0"),

diff --git a/drivers/felica/Kconfig b/drivers/felica/Kconfig
@@ -1,8 +1,3 @@
-config FELICA_DD
-	tristate "FELICA driver support"
-	help
-	  Say Y here if you want to support felica feature...
-
 config FELICA_CXD2235_DD
 	tristate "FELICA_CXD2235 driver support"
 	help

diff --git a/drivers/felica/Makefile b/drivers/felica/Makefile
@@ -1,2 +1 @@
-obj-$(CONFIG_FELICA_DD) +=felica.o
 obj-$(CONFIG_FELICA_CXD2235_DD) +=felica_cxd2235.o
diff --git a/drivers/felica/felica_cxd2235.c b/drivers/felica/felica_cxd2235.c
@@ -1694,13 +1694,15 @@ int felica_uid_open(struct inode *inode, struct file *file)
 	memcpy( cmdline,cmdpos ,leng );
 	cmdline[leng] = '\0';
 
+#ifdef FELICA_CONFIG_ACCESS_RESTRICTION
 	if( ( strncmp(cmdline,gdiag_name,leng) != 0 ) &&
 		( strncmp(cmdline,PROCESS_NAME_FELICA_DAEMON,leng) != 0 ) )
 	{
 		FELICA_LOG_ERR("[FELICA_DD] %s ERROR, %s", __func__, cmdline);
 		return -EACCES;
 	}
 	FELICA_LOG_DEBUG("[FELICA_DD] %s END", __func__);
+#endif
 	return 0;
 }
 

diff --git a/include/linux/felica_cxd2235.h b/include/linux/felica_cxd2235.h
@@ -42,7 +42,7 @@
 #define SNFC_LOG_WARN(fmt, args...) printk(KERN_WARNING fmt,## args)
 
 
-#define FELICA_CONFIG_ACCESS_RESTRICTION
+//#define FELICA_CONFIG_ACCESS_RESTRICTION
 
 struct felica_platform_data {
 	unsigned int int_irq;