5 files changed, 28 insertions, 28 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index fb4714f486fa..fac1ec365fbd 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -903,10 +903,10 @@ void __init setup_arch(char **cmdline_p)
        bfin_write_EBIU_FCTL(CONFIG_EBIU_FCTLVAL);
 #endif
 #ifdef CONFIG_BFIN_HYSTERESIS_CONTROL
-        bfin_write_PORTF_HYSTERISIS(HYST_PORTF_0_15);
+        bfin_write_PORTF_HYSTERESIS(HYST_PORTF_0_15);
-        bfin_write_PORTG_HYSTERISIS(HYST_PORTG_0_15);
+        bfin_write_PORTG_HYSTERESIS(HYST_PORTG_0_15);
-        bfin_write_PORTH_HYSTERISIS(HYST_PORTH_0_15);
+        bfin_write_PORTH_HYSTERESIS(HYST_PORTH_0_15);
-        bfin_write_MISCPORT_HYSTERISIS((bfin_read_MISCPORT_HYSTERISIS() &
+        bfin_write_MISCPORT_HYSTERESIS((bfin_read_MISCPORT_HYSTERESIS() &
                                        ~HYST_NONEGPIO_MASK) | HYST_NONEGPIO);
 #endif
diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF512.h b/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
index b657d37a3402..bb79627f0929 100644
--- a/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
+++ b/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
@@ -990,18 +990,18 @@
 #define bfin_write_PORTG_SLEW(val)              bfin_write16(PORTG_SLEW, val)
 #define bfin_read_PORTH_SLEW()                  bfin_read16(PORTH_SLEW)
 #define bfin_write_PORTH_SLEW(val)              bfin_write16(PORTH_SLEW, val)
-#define bfin_read_PORTF_HYSTERISIS()            bfin_read16(PORTF_HYSTERISIS)
+#define bfin_read_PORTF_HYSTERESIS()            bfin_read16(PORTF_HYSTERESIS)
-#define bfin_write_PORTF_HYSTERISIS(val)        bfin_write16(PORTF_HYSTERISIS, val)
+#define bfin_write_PORTF_HYSTERESIS(val)        bfin_write16(PORTF_HYSTERESIS, val)
-#define bfin_read_PORTG_HYSTERISIS()            bfin_read16(PORTG_HYSTERISIS)
+#define bfin_read_PORTG_HYSTERESIS()            bfin_read16(PORTG_HYSTERESIS)
-#define bfin_write_PORTG_HYSTERISIS(val)        bfin_write16(PORTG_HYSTERISIS, val)
+#define bfin_write_PORTG_HYSTERESIS(val)        bfin_write16(PORTG_HYSTERESIS, val)
-#define bfin_read_PORTH_HYSTERISIS()            bfin_read16(PORTH_HYSTERISIS)
+#define bfin_read_PORTH_HYSTERESIS()            bfin_read16(PORTH_HYSTERESIS)
-#define bfin_write_PORTH_HYSTERISIS(val)        bfin_write16(PORTH_HYSTERISIS, val)
+#define bfin_write_PORTH_HYSTERESIS(val)        bfin_write16(PORTH_HYSTERESIS, val)
 #define bfin_read_MISCPORT_DRIVE()              bfin_read16(MISCPORT_DRIVE)
 #define bfin_write_MISCPORT_DRIVE(val)          bfin_write16(MISCPORT_DRIVE, val)
 #define bfin_read_MISCPORT_SLEW()               bfin_read16(MISCPORT_SLEW)
 #define bfin_write_MISCPORT_SLEW(val)           bfin_write16(MISCPORT_SLEW, val)
-#define bfin_read_MISCPORT_HYSTERISIS()         bfin_read16(MISCPORT_HYSTERISIS)
+#define bfin_read_MISCPORT_HYSTERESIS()         bfin_read16(MISCPORT_HYSTERESIS)
-#define bfin_write_MISCPORT_HYSTERISIS(val)     bfin_write16(MISCPORT_HYSTERISIS, val)
+#define bfin_write_MISCPORT_HYSTERESIS(val)     bfin_write16(MISCPORT_HYSTERESIS, val)
 /* HOST Port Registers */
diff --git a/arch/blackfin/mach-bf518/include/mach/defBF512.h b/arch/blackfin/mach-bf518/include/mach/defBF512.h
index cb1172f50757..729704078cd7 100644
--- a/arch/blackfin/mach-bf518/include/mach/defBF512.h
+++ b/arch/blackfin/mach-bf518/include/mach/defBF512.h
@@ -561,12 +561,12 @@
 #define PORTF_SLEW              0xFFC03230      /* Port F slew control */
 #define PORTG_SLEW              0xFFC03234      /* Port G slew control */
 #define PORTH_SLEW              0xFFC03238      /* Port H slew control */
-#define PORTF_HYSTERISIS        0xFFC03240      /* Port F Schmitt trigger control */
+#define PORTF_HYSTERESIS        0xFFC03240      /* Port F Schmitt trigger control */
-#define PORTG_HYSTERISIS        0xFFC03244      /* Port G Schmitt trigger control */
+#define PORTG_HYSTERESIS        0xFFC03244      /* Port G Schmitt trigger control */
-#define PORTH_HYSTERISIS        0xFFC03248      /* Port H Schmitt trigger control */
+#define PORTH_HYSTERESIS        0xFFC03248      /* Port H Schmitt trigger control */
 #define MISCPORT_DRIVE          0xFFC03280      /* Misc Port drive strength control */
 #define MISCPORT_SLEW           0xFFC03284      /* Misc Port slew control */
-#define MISCPORT_HYSTERISIS     0xFFC03288      /* Misc Port Schmitt trigger control */
+#define MISCPORT_HYSTERESIS     0xFFC03288      /* Misc Port Schmitt trigger control */
 /***********************************************************************************
diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
index 618dfcdfa91a..2c12e879aa4e 100644
--- a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
+++ b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
@@ -1007,18 +1007,18 @@
 #define bfin_write_PORTG_SLEW(val)              bfin_write16(PORTG_SLEW, val)
 #define bfin_read_PORTH_SLEW()                  bfin_read16(PORTH_SLEW)
 #define bfin_write_PORTH_SLEW(val)              bfin_write16(PORTH_SLEW, val)
-#define bfin_read_PORTF_HYSTERISIS()            bfin_read16(PORTF_HYSTERISIS)
+#define bfin_read_PORTF_HYSTERESIS()            bfin_read16(PORTF_HYSTERESIS)
-#define bfin_write_PORTF_HYSTERISIS(val)        bfin_write16(PORTF_HYSTERISIS, val)
+#define bfin_write_PORTF_HYSTERESIS(val)        bfin_write16(PORTF_HYSTERESIS, val)
-#define bfin_read_PORTG_HYSTERISIS()            bfin_read16(PORTG_HYSTERISIS)
+#define bfin_read_PORTG_HYSTERESIS()            bfin_read16(PORTG_HYSTERESIS)
-#define bfin_write_PORTG_HYSTERISIS(val)        bfin_write16(PORTG_HYSTERISIS, val)
+#define bfin_write_PORTG_HYSTERESIS(val)        bfin_write16(PORTG_HYSTERESIS, val)
-#define bfin_read_PORTH_HYSTERISIS()            bfin_read16(PORTH_HYSTERISIS)
+#define bfin_read_PORTH_HYSTERESIS()            bfin_read16(PORTH_HYSTERESIS)
-#define bfin_write_PORTH_HYSTERISIS(val)        bfin_write16(PORTH_HYSTERISIS, val)
+#define bfin_write_PORTH_HYSTERESIS(val)        bfin_write16(PORTH_HYSTERESIS, val)
 #define bfin_read_MISCPORT_DRIVE()              bfin_read16(MISCPORT_DRIVE)
 #define bfin_write_MISCPORT_DRIVE(val)          bfin_write16(MISCPORT_DRIVE, val)
 #define bfin_read_MISCPORT_SLEW()               bfin_read16(MISCPORT_SLEW)
 #define bfin_write_MISCPORT_SLEW(val)           bfin_write16(MISCPORT_SLEW, val)
-#define bfin_read_MISCPORT_HYSTERISIS()         bfin_read16(MISCPORT_HYSTERISIS)
+#define bfin_read_MISCPORT_HYSTERESIS()         bfin_read16(MISCPORT_HYSTERESIS)
-#define bfin_write_MISCPORT_HYSTERISIS(val)     bfin_write16(MISCPORT_HYSTERISIS, val)
+#define bfin_write_MISCPORT_HYSTERESIS(val)     bfin_write16(MISCPORT_HYSTERESIS, val)
 /* HOST Port Registers */
diff --git a/arch/blackfin/mach-bf527/include/mach/defBF522.h b/arch/blackfin/mach-bf527/include/mach/defBF522.h
index 84ef11e52644..37d353a19722 100644
--- a/arch/blackfin/mach-bf527/include/mach/defBF522.h
+++ b/arch/blackfin/mach-bf527/include/mach/defBF522.h
@@ -562,12 +562,12 @@
 #define PORTF_SLEW              0xFFC03230      /* Port F slew control */
 #define PORTG_SLEW              0xFFC03234      /* Port G slew control */
 #define PORTH_SLEW              0xFFC03238      /* Port H slew control */
-#define PORTF_HYSTERISIS        0xFFC03240      /* Port F Schmitt trigger control */
+#define PORTF_HYSTERESIS        0xFFC03240      /* Port F Schmitt trigger control */
-#define PORTG_HYSTERISIS        0xFFC03244      /* Port G Schmitt trigger control */
+#define PORTG_HYSTERESIS        0xFFC03244      /* Port G Schmitt trigger control */
-#define PORTH_HYSTERISIS        0xFFC03248      /* Port H Schmitt trigger control */
+#define PORTH_HYSTERESIS        0xFFC03248      /* Port H Schmitt trigger control */
 #define MISCPORT_DRIVE          0xFFC03280      /* Misc Port drive strength control */
 #define MISCPORT_SLEW           0xFFC03284      /* Misc Port slew control */
-#define MISCPORT_HYSTERISIS     0xFFC03288      /* Misc Port Schmitt trigger control */
+#define MISCPORT_HYSTERESIS     0xFFC03288      /* Misc Port Schmitt trigger control */
 /***********************************************************************************

diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index fb4714f486fa..fac1ec365fbd 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c
@@ -903,10 +903,10 @@ void __init setup_arch(char **cmdline_p)
903	bfin_write_EBIU_FCTL(CONFIG_EBIU_FCTLVAL);	903	bfin_write_EBIU_FCTL(CONFIG_EBIU_FCTLVAL);
904	#endif	904	#endif
905	#ifdef CONFIG_BFIN_HYSTERESIS_CONTROL	905	#ifdef CONFIG_BFIN_HYSTERESIS_CONTROL
906	bfin_write_PORTF_HYSTERISIS(HYST_PORTF_0_15);	906	bfin_write_PORTF_HYSTERESIS(HYST_PORTF_0_15);
907	bfin_write_PORTG_HYSTERISIS(HYST_PORTG_0_15);	907	bfin_write_PORTG_HYSTERESIS(HYST_PORTG_0_15);
908	bfin_write_PORTH_HYSTERISIS(HYST_PORTH_0_15);	908	bfin_write_PORTH_HYSTERESIS(HYST_PORTH_0_15);
909	bfin_write_MISCPORT_HYSTERISIS((bfin_read_MISCPORT_HYSTERISIS() &	909	bfin_write_MISCPORT_HYSTERESIS((bfin_read_MISCPORT_HYSTERESIS() &
910	~HYST_NONEGPIO_MASK) \| HYST_NONEGPIO);	910	~HYST_NONEGPIO_MASK) \| HYST_NONEGPIO);
911	#endif	911	#endif
912		912


diff --git a/arch/blackfin/mach-bf518/include/mach/cdefBF512.h b/arch/blackfin/mach-bf518/include/mach/cdefBF512.h index b657d37a3402..bb79627f0929 100644 --- a/arch/blackfin/mach-bf518/include/mach/cdefBF512.h +++ b/arch/blackfin/mach-bf518/include/mach/cdefBF512.h
@@ -990,18 +990,18 @@
990	#define bfin_write_PORTG_SLEW(val) bfin_write16(PORTG_SLEW, val)	990	#define bfin_write_PORTG_SLEW(val) bfin_write16(PORTG_SLEW, val)
991	#define bfin_read_PORTH_SLEW() bfin_read16(PORTH_SLEW)	991	#define bfin_read_PORTH_SLEW() bfin_read16(PORTH_SLEW)
992	#define bfin_write_PORTH_SLEW(val) bfin_write16(PORTH_SLEW, val)	992	#define bfin_write_PORTH_SLEW(val) bfin_write16(PORTH_SLEW, val)
993	#define bfin_read_PORTF_HYSTERISIS() bfin_read16(PORTF_HYSTERISIS)	993	#define bfin_read_PORTF_HYSTERESIS() bfin_read16(PORTF_HYSTERESIS)
994	#define bfin_write_PORTF_HYSTERISIS(val) bfin_write16(PORTF_HYSTERISIS, val)	994	#define bfin_write_PORTF_HYSTERESIS(val) bfin_write16(PORTF_HYSTERESIS, val)
995	#define bfin_read_PORTG_HYSTERISIS() bfin_read16(PORTG_HYSTERISIS)	995	#define bfin_read_PORTG_HYSTERESIS() bfin_read16(PORTG_HYSTERESIS)
996	#define bfin_write_PORTG_HYSTERISIS(val) bfin_write16(PORTG_HYSTERISIS, val)	996	#define bfin_write_PORTG_HYSTERESIS(val) bfin_write16(PORTG_HYSTERESIS, val)
997	#define bfin_read_PORTH_HYSTERISIS() bfin_read16(PORTH_HYSTERISIS)	997	#define bfin_read_PORTH_HYSTERESIS() bfin_read16(PORTH_HYSTERESIS)
998	#define bfin_write_PORTH_HYSTERISIS(val) bfin_write16(PORTH_HYSTERISIS, val)	998	#define bfin_write_PORTH_HYSTERESIS(val) bfin_write16(PORTH_HYSTERESIS, val)
999	#define bfin_read_MISCPORT_DRIVE() bfin_read16(MISCPORT_DRIVE)	999	#define bfin_read_MISCPORT_DRIVE() bfin_read16(MISCPORT_DRIVE)
1000	#define bfin_write_MISCPORT_DRIVE(val) bfin_write16(MISCPORT_DRIVE, val)	1000	#define bfin_write_MISCPORT_DRIVE(val) bfin_write16(MISCPORT_DRIVE, val)
1001	#define bfin_read_MISCPORT_SLEW() bfin_read16(MISCPORT_SLEW)	1001	#define bfin_read_MISCPORT_SLEW() bfin_read16(MISCPORT_SLEW)
1002	#define bfin_write_MISCPORT_SLEW(val) bfin_write16(MISCPORT_SLEW, val)	1002	#define bfin_write_MISCPORT_SLEW(val) bfin_write16(MISCPORT_SLEW, val)
1003	#define bfin_read_MISCPORT_HYSTERISIS() bfin_read16(MISCPORT_HYSTERISIS)	1003	#define bfin_read_MISCPORT_HYSTERESIS() bfin_read16(MISCPORT_HYSTERESIS)
1004	#define bfin_write_MISCPORT_HYSTERISIS(val) bfin_write16(MISCPORT_HYSTERISIS, val)	1004	#define bfin_write_MISCPORT_HYSTERESIS(val) bfin_write16(MISCPORT_HYSTERESIS, val)
1005		1005
1006	/* HOST Port Registers */	1006	/* HOST Port Registers */
1007		1007


diff --git a/arch/blackfin/mach-bf518/include/mach/defBF512.h b/arch/blackfin/mach-bf518/include/mach/defBF512.h index cb1172f50757..729704078cd7 100644 --- a/arch/blackfin/mach-bf518/include/mach/defBF512.h +++ b/arch/blackfin/mach-bf518/include/mach/defBF512.h
@@ -561,12 +561,12 @@
561	#define PORTF_SLEW 0xFFC03230 /* Port F slew control */	561	#define PORTF_SLEW 0xFFC03230 /* Port F slew control */
562	#define PORTG_SLEW 0xFFC03234 /* Port G slew control */	562	#define PORTG_SLEW 0xFFC03234 /* Port G slew control */
563	#define PORTH_SLEW 0xFFC03238 /* Port H slew control */	563	#define PORTH_SLEW 0xFFC03238 /* Port H slew control */
564	#define PORTF_HYSTERISIS 0xFFC03240 /* Port F Schmitt trigger control */	564	#define PORTF_HYSTERESIS 0xFFC03240 /* Port F Schmitt trigger control */
565	#define PORTG_HYSTERISIS 0xFFC03244 /* Port G Schmitt trigger control */	565	#define PORTG_HYSTERESIS 0xFFC03244 /* Port G Schmitt trigger control */
566	#define PORTH_HYSTERISIS 0xFFC03248 /* Port H Schmitt trigger control */	566	#define PORTH_HYSTERESIS 0xFFC03248 /* Port H Schmitt trigger control */
567	#define MISCPORT_DRIVE 0xFFC03280 /* Misc Port drive strength control */	567	#define MISCPORT_DRIVE 0xFFC03280 /* Misc Port drive strength control */
568	#define MISCPORT_SLEW 0xFFC03284 /* Misc Port slew control */	568	#define MISCPORT_SLEW 0xFFC03284 /* Misc Port slew control */
569	#define MISCPORT_HYSTERISIS 0xFFC03288 /* Misc Port Schmitt trigger control */	569	#define MISCPORT_HYSTERESIS 0xFFC03288 /* Misc Port Schmitt trigger control */
570		570
571		571
572	/***********************************************************************************	572	/***********************************************************************************


diff --git a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h index 618dfcdfa91a..2c12e879aa4e 100644 --- a/arch/blackfin/mach-bf527/include/mach/cdefBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/cdefBF522.h
@@ -1007,18 +1007,18 @@
1007	#define bfin_write_PORTG_SLEW(val) bfin_write16(PORTG_SLEW, val)	1007	#define bfin_write_PORTG_SLEW(val) bfin_write16(PORTG_SLEW, val)
1008	#define bfin_read_PORTH_SLEW() bfin_read16(PORTH_SLEW)	1008	#define bfin_read_PORTH_SLEW() bfin_read16(PORTH_SLEW)
1009	#define bfin_write_PORTH_SLEW(val) bfin_write16(PORTH_SLEW, val)	1009	#define bfin_write_PORTH_SLEW(val) bfin_write16(PORTH_SLEW, val)
1010	#define bfin_read_PORTF_HYSTERISIS() bfin_read16(PORTF_HYSTERISIS)	1010	#define bfin_read_PORTF_HYSTERESIS() bfin_read16(PORTF_HYSTERESIS)
1011	#define bfin_write_PORTF_HYSTERISIS(val) bfin_write16(PORTF_HYSTERISIS, val)	1011	#define bfin_write_PORTF_HYSTERESIS(val) bfin_write16(PORTF_HYSTERESIS, val)
1012	#define bfin_read_PORTG_HYSTERISIS() bfin_read16(PORTG_HYSTERISIS)	1012	#define bfin_read_PORTG_HYSTERESIS() bfin_read16(PORTG_HYSTERESIS)
1013	#define bfin_write_PORTG_HYSTERISIS(val) bfin_write16(PORTG_HYSTERISIS, val)	1013	#define bfin_write_PORTG_HYSTERESIS(val) bfin_write16(PORTG_HYSTERESIS, val)
1014	#define bfin_read_PORTH_HYSTERISIS() bfin_read16(PORTH_HYSTERISIS)	1014	#define bfin_read_PORTH_HYSTERESIS() bfin_read16(PORTH_HYSTERESIS)
1015	#define bfin_write_PORTH_HYSTERISIS(val) bfin_write16(PORTH_HYSTERISIS, val)	1015	#define bfin_write_PORTH_HYSTERESIS(val) bfin_write16(PORTH_HYSTERESIS, val)
1016	#define bfin_read_MISCPORT_DRIVE() bfin_read16(MISCPORT_DRIVE)	1016	#define bfin_read_MISCPORT_DRIVE() bfin_read16(MISCPORT_DRIVE)
1017	#define bfin_write_MISCPORT_DRIVE(val) bfin_write16(MISCPORT_DRIVE, val)	1017	#define bfin_write_MISCPORT_DRIVE(val) bfin_write16(MISCPORT_DRIVE, val)
1018	#define bfin_read_MISCPORT_SLEW() bfin_read16(MISCPORT_SLEW)	1018	#define bfin_read_MISCPORT_SLEW() bfin_read16(MISCPORT_SLEW)
1019	#define bfin_write_MISCPORT_SLEW(val) bfin_write16(MISCPORT_SLEW, val)	1019	#define bfin_write_MISCPORT_SLEW(val) bfin_write16(MISCPORT_SLEW, val)
1020	#define bfin_read_MISCPORT_HYSTERISIS() bfin_read16(MISCPORT_HYSTERISIS)	1020	#define bfin_read_MISCPORT_HYSTERESIS() bfin_read16(MISCPORT_HYSTERESIS)
1021	#define bfin_write_MISCPORT_HYSTERISIS(val) bfin_write16(MISCPORT_HYSTERISIS, val)	1021	#define bfin_write_MISCPORT_HYSTERESIS(val) bfin_write16(MISCPORT_HYSTERESIS, val)
1022		1022
1023	/* HOST Port Registers */	1023	/* HOST Port Registers */
1024		1024


diff --git a/arch/blackfin/mach-bf527/include/mach/defBF522.h b/arch/blackfin/mach-bf527/include/mach/defBF522.h index 84ef11e52644..37d353a19722 100644 --- a/arch/blackfin/mach-bf527/include/mach/defBF522.h +++ b/arch/blackfin/mach-bf527/include/mach/defBF522.h
@@ -562,12 +562,12 @@
562	#define PORTF_SLEW 0xFFC03230 /* Port F slew control */	562	#define PORTF_SLEW 0xFFC03230 /* Port F slew control */
563	#define PORTG_SLEW 0xFFC03234 /* Port G slew control */	563	#define PORTG_SLEW 0xFFC03234 /* Port G slew control */
564	#define PORTH_SLEW 0xFFC03238 /* Port H slew control */	564	#define PORTH_SLEW 0xFFC03238 /* Port H slew control */
565	#define PORTF_HYSTERISIS 0xFFC03240 /* Port F Schmitt trigger control */	565	#define PORTF_HYSTERESIS 0xFFC03240 /* Port F Schmitt trigger control */
566	#define PORTG_HYSTERISIS 0xFFC03244 /* Port G Schmitt trigger control */	566	#define PORTG_HYSTERESIS 0xFFC03244 /* Port G Schmitt trigger control */
567	#define PORTH_HYSTERISIS 0xFFC03248 /* Port H Schmitt trigger control */	567	#define PORTH_HYSTERESIS 0xFFC03248 /* Port H Schmitt trigger control */
568	#define MISCPORT_DRIVE 0xFFC03280 /* Misc Port drive strength control */	568	#define MISCPORT_DRIVE 0xFFC03280 /* Misc Port drive strength control */
569	#define MISCPORT_SLEW 0xFFC03284 /* Misc Port slew control */	569	#define MISCPORT_SLEW 0xFFC03284 /* Misc Port slew control */
570	#define MISCPORT_HYSTERISIS 0xFFC03288 /* Misc Port Schmitt trigger control */	570	#define MISCPORT_HYSTERESIS 0xFFC03288 /* Misc Port Schmitt trigger control */
571		571
572		572
573	/***********************************************************************************	573	/***********************************************************************************