Permalink
Browse files

dlxj: fix for FeliCa

Conflicts:
	drivers/felica/felica_cxd2235.c
	include/linux/felica_cxd2235.h

Change-Id: Ic52f756ea82b1000baff28b1d380b15e7a732ce2
  • Loading branch information...
173210 committed Feb 25, 2014
1 parent c89f50a commit e8b4003115aa75011d9c992cb8508dc2f8fd9067
Showing with 11 additions and 0 deletions.
  1. +11 −0 arch/arm/mach-msm/clock-8960.c
@@ -5493,7 +5493,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
@@ -6259,7 +6263,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"),
@@ -6313,6 +6321,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"),

0 comments on commit e8b4003

Please sign in to comment.