From: 黄涛 <huangtao@rock-chips.com>
Date: Wed, 16 Jan 2013 06:40:13 +0000 (+0800)
Subject: rfkill-rk: setup rts gpio with IOMUX_FMUX
X-Git-Tag: firefly_0821_release~7928
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=9530ed2dfd2c774fa8aa671ebbf4691c2f82e4f1;p=firefly-linux-kernel-4.4.55.git

rfkill-rk: setup rts gpio with IOMUX_FMUX
---

diff --git a/net/rfkill/rfkill-rk.c b/net/rfkill/rfkill-rk.c
index 835345d70542..ccfb6a88f882 100755
--- a/net/rfkill/rfkill-rk.c
+++ b/net/rfkill/rfkill-rk.c
@@ -460,11 +460,7 @@ static int rfkill_rk_probe(struct platform_device *pdev)
     ret = rfkill_rk_setup_wake_irq(rfkill);
     if (ret) goto fail_wake;
 
-#ifdef CONFIG_ARCH_RK2928
     ret = rfkill_rk_setup_gpio(&pdata->rts_gpio, IOMUX_FMUX, rfkill->pdata->name, "rts"); 
-#else
-    ret = rfkill_rk_setup_gpio(&(pdata->rts_gpio), IOMUX_FNORMAL, rfkill->pdata->name, "rts");
-#endif
     if (ret) goto fail_wake_host_irq;
 
     // ´´½¨²¢×¢²áRFKILLÉ豸