Merge branch 'imx/compile-fixes' of git://git.linaro.org/people/shawnguo/linux-2...

[pandora-kernel.git] / arch / arm / mach-shmobile / include / mach / sh73a0.h

diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h
index 216c3d6..18ae6a9 100644 (file)
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -451,11 +451,23 @@ enum {
        GPIO_FN_KEYIN5_PU,
        GPIO_FN_KEYIN6_PU,
        GPIO_FN_KEYIN7_PU,
+       GPIO_FN_SDHICD0_PU,
+       GPIO_FN_SDHID0_0_PU,
+       GPIO_FN_SDHID0_1_PU,
+       GPIO_FN_SDHID0_2_PU,
+       GPIO_FN_SDHID0_3_PU,
+       GPIO_FN_SDHICMD0_PU,
+       GPIO_FN_SDHIWP0_PU,
        GPIO_FN_SDHID1_0_PU,
        GPIO_FN_SDHID1_1_PU,
        GPIO_FN_SDHID1_2_PU,
        GPIO_FN_SDHID1_3_PU,
        GPIO_FN_SDHICMD1_PU,
+       GPIO_FN_SDHID2_0_PU,
+       GPIO_FN_SDHID2_1_PU,
+       GPIO_FN_SDHID2_2_PU,
+       GPIO_FN_SDHID2_3_PU,
+       GPIO_FN_SDHICMD2_PU,
        GPIO_FN_MMCCMD0_PU,
        GPIO_FN_MMCCMD1_PU,
        GPIO_FN_FSIACK_PU,
@@ -463,6 +475,7 @@ enum {
        GPIO_FN_FSIAIBT_PU,
        GPIO_FN_FSIAISLD_PU,
 };
+
 /* DMA slave IDs */
 enum {
        SHDMA_SLAVE_INVALID,
@@ -494,4 +507,8 @@ enum {
        SHDMA_SLAVE_MMCIF_RX,
 };
 
+/* PINT interrupts are located at Linux IRQ 768 and up */
+#define SH73A0_PINT0_IRQ(irq) ((irq) + 768)
+#define SH73A0_PINT1_IRQ(irq) ((irq) + 800)
+
 #endif /* __ASM_SH73A0_H__ */