Merge branch 'soc' into pinmux-base

[firefly-linux-kernel-4.4.55.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 d488e2b26e3f190d679e935e62d09313ba60d1fd..eb7a4320d487e1327dc6c961fa5bbae033f0770d 100644 (file)
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -124,13 +124,13 @@ enum {
        GPIO_FN_XWUP,
        GPIO_FN_VACK,
        GPIO_FN_XTAL1L,
-       GPIO_FN_PORT49_IRDA_OUT, GPIO_FN_PORT49_IROUT,
+       GPIO_FN_PORT49_IROUT,
        GPIO_FN_BBIF2_TSYNC2, GPIO_FN_TPU2TO2,
 
        GPIO_FN_BBIF2_TSCK2, GPIO_FN_TPU2TO3,
        GPIO_FN_BBIF2_TXD2,
-       GPIO_FN_PORT53_IRDA_IN, GPIO_FN_TPU3TO3,
-       GPIO_FN_PORT54_IRDA_FIRSEL, GPIO_FN_TPU3TO2,
+       GPIO_FN_TPU3TO3,
+       GPIO_FN_TPU3TO2,
        GPIO_FN_TPU0TO0,
        GPIO_FN_A0, GPIO_FN_BS_,
        GPIO_FN_A12, GPIO_FN_TPU4TO2,
@@ -255,10 +255,10 @@ enum {
        GPIO_FN_MSIOF1_MCK1,
        GPIO_FN_MSIOF1_SS1, GPIO_FN_VIO2_FIELD2,
        GPIO_FN_MSIOF1_SS2, GPIO_FN_VIO2_HD2,
-       GPIO_FN_PORT241_IRDA_OUT, GPIO_FN_PORT241_IROUT, GPIO_FN_MFG4_OUT1, \
+       GPIO_FN_PORT241_IROUT, GPIO_FN_MFG4_OUT1, \
        GPIO_FN_TPU4TO0,
-       GPIO_FN_PORT242_IRDA_IN, GPIO_FN_MFG4_IN2,
-       GPIO_FN_PORT243_IRDA_FIRSEL, GPIO_FN_PORT243_VIO_CKO2,
+       GPIO_FN_MFG4_IN2,
+       GPIO_FN_PORT243_VIO_CKO2,
        GPIO_FN_MFG2_IN1,
        GPIO_FN_MSIOF2R_RXD,
        GPIO_FN_MFG2_IN2,
@@ -444,6 +444,21 @@ enum {
 #define SH73A0_PINT0_IRQ(irq) ((irq) + 700)
 #define SH73A0_PINT1_IRQ(irq) ((irq) + 732)
 
+extern void sh73a0_init_delay(void);
+extern void sh73a0_init_irq(void);
+extern void sh73a0_init_irq_dt(void);
+extern void sh73a0_map_io(void);
+extern void sh73a0_earlytimer_init(void);
+extern void sh73a0_add_early_devices(void);
+extern void sh73a0_add_standard_devices(void);
+extern void sh73a0_add_standard_devices_dt(void);
+extern void sh73a0_clock_init(void);
+extern void sh73a0_pinmux_init(void);
+extern void sh73a0_pm_init(void);
+extern struct clk sh73a0_extal1_clk;
+extern struct clk sh73a0_extal2_clk;
+extern struct clk sh73a0_extcki_clk;
+extern struct clk sh73a0_extalr_clk;
 extern struct smp_operations sh73a0_smp_ops;
 
 #endif /* __ASM_SH73A0_H__ */