2 files changed, 4 insertions, 57 deletions
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
index 2e6f8aa4acb6..a408100f4c30 100644
--- a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
+++ b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
@@ -771,63 +771,6 @@
 #define EMU_RUN                 0x0200  /* Emulation Behavior Select                    */
 #define ERR_TYP                 0xC000  /* Error Type                                                   */
-/* ******************   GPIO PORTS F, G, H MASKS  ***********************/
-/*  General Purpose IO (0xFFC00700 - 0xFFC007FF)  Masks                                 */
-/* Port F Masks                                                                                                                 */
-#define PF0             0x0001
-#define PF1             0x0002
-#define PF2             0x0004
-#define PF3             0x0008
-#define PF4             0x0010
-#define PF5             0x0020
-#define PF6             0x0040
-#define PF7             0x0080
-#define PF8             0x0100
-#define PF9             0x0200
-#define PF10    0x0400
-#define PF11    0x0800
-#define PF12    0x1000
-#define PF13    0x2000
-#define PF14    0x4000
-#define PF15    0x8000
-/* Port G Masks                                                                                                                 */
-#define PG0             0x0001
-#define PG1             0x0002
-#define PG2             0x0004
-#define PG3             0x0008
-#define PG4             0x0010
-#define PG5             0x0020
-#define PG6             0x0040
-#define PG7             0x0080
-#define PG8             0x0100
-#define PG9             0x0200
-#define PG10    0x0400
-#define PG11    0x0800
-#define PG12    0x1000
-#define PG13    0x2000
-#define PG14    0x4000
-#define PG15    0x8000
-/* Port H Masks                                                                                                                 */
-#define PH0             0x0001
-#define PH1             0x0002
-#define PH2             0x0004
-#define PH3             0x0008
-#define PH4             0x0010
-#define PH5             0x0020
-#define PH6             0x0040
-#define PH7             0x0080
-#define PH8             0x0100
-#define PH9             0x0200
-#define PH10    0x0400
-#define PH11    0x0800
-#define PH12    0x1000
-#define PH13    0x2000
-#define PH14    0x4000
-#define PH15    0x8000
 /* *********************  ASYNCHRONOUS MEMORY CONTROLLER MASKS  *************************/
 /* EBIU_AMGCTL Masks                                                                                                                                    */
 #define AMCKEN                  0x0001          /* Enable CLKOUT                                                                        */
diff --git a/arch/blackfin/mach-bf527/include/mach/gpio.h b/arch/blackfin/mach-bf527/include/mach/gpio.h
index f80c2995efdb..fba606b699c3 100644
--- a/arch/blackfin/mach-bf527/include/mach/gpio.h
+++ b/arch/blackfin/mach-bf527/include/mach/gpio.h
@@ -62,4 +62,8 @@
 #define PORT_G GPIO_PG0
 #define PORT_H GPIO_PH0
+#include <mach-common/ports-f.h>
+#include <mach-common/ports-g.h>
+#include <mach-common/ports-h.h>
 #endif /* _MACH_GPIO_H_ */

diff --git a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h index 2e6f8aa4acb6..a408100f4c30 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF52x_base.h
@@ -771,63 +771,6 @@
771	#define EMU_RUN 0x0200 /* Emulation Behavior Select */	771	#define EMU_RUN 0x0200 /* Emulation Behavior Select */
772	#define ERR_TYP 0xC000 /* Error Type */	772	#define ERR_TYP 0xC000 /* Error Type */
773		773
774
775	/* **************** GPIO PORTS F, G, H MASKS *********************/
776	/* General Purpose IO (0xFFC00700 - 0xFFC007FF) Masks */
777	/* Port F Masks */
778	#define PF0 0x0001
779	#define PF1 0x0002
780	#define PF2 0x0004
781	#define PF3 0x0008
782	#define PF4 0x0010
783	#define PF5 0x0020
784	#define PF6 0x0040
785	#define PF7 0x0080
786	#define PF8 0x0100
787	#define PF9 0x0200
788	#define PF10 0x0400
789	#define PF11 0x0800
790	#define PF12 0x1000
791	#define PF13 0x2000
792	#define PF14 0x4000
793	#define PF15 0x8000
794
795	/* Port G Masks */
796	#define PG0 0x0001
797	#define PG1 0x0002
798	#define PG2 0x0004
799	#define PG3 0x0008
800	#define PG4 0x0010
801	#define PG5 0x0020
802	#define PG6 0x0040
803	#define PG7 0x0080
804	#define PG8 0x0100
805	#define PG9 0x0200
806	#define PG10 0x0400
807	#define PG11 0x0800
808	#define PG12 0x1000
809	#define PG13 0x2000
810	#define PG14 0x4000
811	#define PG15 0x8000
812
813	/* Port H Masks */
814	#define PH0 0x0001
815	#define PH1 0x0002
816	#define PH2 0x0004
817	#define PH3 0x0008
818	#define PH4 0x0010
819	#define PH5 0x0020
820	#define PH6 0x0040
821	#define PH7 0x0080
822	#define PH8 0x0100
823	#define PH9 0x0200
824	#define PH10 0x0400
825	#define PH11 0x0800
826	#define PH12 0x1000
827	#define PH13 0x2000
828	#define PH14 0x4000
829	#define PH15 0x8000
830
831	/* ******************* ASYNCHRONOUS MEMORY CONTROLLER MASKS ***********************/	774	/* ******************* ASYNCHRONOUS MEMORY CONTROLLER MASKS ***********************/
832	/* EBIU_AMGCTL Masks */	775	/* EBIU_AMGCTL Masks */
833	#define AMCKEN 0x0001 /* Enable CLKOUT */	776	#define AMCKEN 0x0001 /* Enable CLKOUT */


diff --git a/arch/blackfin/mach-bf527/include/mach/gpio.h b/arch/blackfin/mach-bf527/include/mach/gpio.h index f80c2995efdb..fba606b699c3 100644 --- a/arch/blackfin/mach-bf527/include/mach/gpio.h +++ b/arch/blackfin/mach-bf527/include/mach/gpio.h
@@ -62,4 +62,8 @@
62	#define PORT_G GPIO_PG0	62	#define PORT_G GPIO_PG0
63	#define PORT_H GPIO_PH0	63	#define PORT_H GPIO_PH0
64		64
		65	#include <mach-common/ports-f.h>
		66	#include <mach-common/ports-g.h>
		67	#include <mach-common/ports-h.h>
		68
65	#endif /* _MACH_GPIO_H_ */	69	#endif /* _MACH_GPIO_H_ */