浏览代码

pinctrl: sh-pfc: Stop including <linux/platform_data/gpio-rcar.h>

This header file will be removed soon.

Copy the helper macro RCAR_GP_PIN(), which is used by the pinctrl
drivers only, to sh_pfc.h, and drop the #include.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Geert Uytterhoeven 10 年之前
父节点
当前提交
69af775a18

+ 0 - 1
drivers/pinctrl/sh-pfc/pfc-r8a7778.c

@@ -23,7 +23,6 @@
 #include <linux/io.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/kernel.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinconf-generic.h>
-#include <linux/platform_data/gpio-rcar.h>
 #include "core.h"
 #include "core.h"
 #include "sh_pfc.h"
 #include "sh_pfc.h"
 
 

+ 0 - 1
drivers/pinctrl/sh-pfc/pfc-r8a7779.c

@@ -20,7 +20,6 @@
  */
  */
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/gpio-rcar.h>
 
 
 #include "sh_pfc.h"
 #include "sh_pfc.h"
 
 

+ 0 - 1
drivers/pinctrl/sh-pfc/pfc-r8a7790.c

@@ -22,7 +22,6 @@
  */
  */
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/gpio-rcar.h>
 
 
 #include "core.h"
 #include "core.h"
 #include "sh_pfc.h"
 #include "sh_pfc.h"

+ 0 - 1
drivers/pinctrl/sh-pfc/pfc-r8a7791.c

@@ -9,7 +9,6 @@
  */
  */
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/gpio-rcar.h>
 
 
 #include "core.h"
 #include "core.h"
 #include "sh_pfc.h"
 #include "sh_pfc.h"

+ 0 - 1
drivers/pinctrl/sh-pfc/pfc-r8a7794.c

@@ -11,7 +11,6 @@
  */
  */
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/gpio-rcar.h>
 
 
 #include "core.h"
 #include "core.h"
 #include "sh_pfc.h"
 #include "sh_pfc.h"

+ 0 - 1
drivers/pinctrl/sh-pfc/pfc-r8a7795.c

@@ -9,7 +9,6 @@
  */
  */
 
 
 #include <linux/kernel.h>
 #include <linux/kernel.h>
-#include <linux/platform_data/gpio-rcar.h>
 
 
 #include "core.h"
 #include "core.h"
 #include "sh_pfc.h"
 #include "sh_pfc.h"

+ 5 - 0
drivers/pinctrl/sh-pfc/sh_pfc.h

@@ -346,4 +346,9 @@ struct sh_pfc_soc_info {
 		}							\
 		}							\
 	}
 	}
 
 
+/*
+ * GPIO number helper macro for R-Car
+ */
+#define RCAR_GP_PIN(bank, pin)		(((bank) * 32) + (pin))
+
 #endif /* __SH_PFC_H */
 #endif /* __SH_PFC_H */