Skip to contentSkip to conversation

74xx/7xx/86xx: Rename flush_data_cache to flush_dcache to match 85xx version

PATCH New Kumar Gala 3 participants 3 messages Oct 13, 2008 – Oct 30, 2008

lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

PATCH 1/1 74xx/7xx/86xx: Rename flush_data_cache to flush_dcache to match 85xx version

---
 cpu/74xx_7xx/cache.S |   10 +++++-----
 cpu/mpc86xx/cache.S  |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
cpu/74xx_7xx/cache.S +5 -5
index eac4544..62a6683 100644
@@ -52,7 +52,7 @@ _GLOBAL(invalidate_l1_data_cache)
 /*
  * Flush data cache.
  */
-_GLOBAL(flush_data_cache)
+_GLOBAL(flush_dcache)
 	lis	r3,0
 	lis	r5,CACHE_LINE_SIZE
 flush:
@@ -303,12 +303,12 @@ _GLOBAL(dcache_enable)
 
 /*
  * Disable data cache(s) - L1 and optionally L2
- * Calls flush_data_cache and l2cache_disable_no_flush.
+ * Calls flush_dcache and l2cache_disable_no_flush.
  * LR saved in r4
  */
 _GLOBAL(dcache_disable)
 	mflr	r4			/* save link register */
-	bl	flush_data_cache	/* uses r3 and r5 */
+	bl	flush_dcache	/* uses r3 and r5 */
 	sync
 	mfspr	r3, HID0
 	li	r5, HID0_DCFI|HID0_DLOCK
@@ -389,11 +389,11 @@ _GLOBAL(l2cache_enable)
 
 /*
  * Disable L2 cache
- * Calls flush_data_cache. LR is saved in r4
+ * Calls flush_dcache. LR is saved in r4
  */
 _GLOBAL(l2cache_disable)
 	mflr	r4			/* save link register */
-	bl	flush_data_cache	/* uses r3 and r5 */
+	bl	flush_dcache		/* uses r3 and r5 */
 	sync
 	mtlr	r4			/* restore link register */
 l2cache_disable_no_flush:		/* provide way to disable L2 w/o flushing */
cpu/mpc86xx/cache.S +5 -5
index 80ff688..dd38806 100644
@@ -53,7 +53,7 @@ _GLOBAL(invalidate_l1_data_cache)
 /*
  * Flush data cache.
  */
-_GLOBAL(flush_data_cache)
+_GLOBAL(flush_dcache)
 	lis	r3,0
 	lis	r5,CACHE_LINE_SIZE
 flush:
@@ -290,12 +290,12 @@ _GLOBAL(dcache_enable)
 
 /*
  * Disable data cache(s) - L1 and optionally L2
- * Calls flush_data_cache and l2cache_disable_no_flush.
+ * Calls flush_dcache and l2cache_disable_no_flush.
  * LR saved in r4
  */
 _GLOBAL(dcache_disable)
 	mflr	r4			/* save link register */
-	bl	flush_data_cache	/* uses r3 and r5 */
+	bl	flush_dcache	/* uses r3 and r5 */
 	sync
 	mfspr	r3, HID0
 	li	r5, HID0_DCFI|HID0_DLOCK
@@ -363,11 +363,11 @@ _GLOBAL(l2cache_enable)
 
 /*
  * Disable L2 cache
- * Calls flush_data_cache. LR is saved in r4
+ * Calls flush_dcache. LR is saved in r4
  */
 _GLOBAL(l2cache_disable)
 	mflr	r4			/* save link register */
-	bl	flush_data_cache	/* uses r3 and r5 */
+	bl	flush_dcache		/* uses r3 and r5 */
 	sync
 	mtlr	r4			/* restore link register */
 l2cache_disable_no_flush:		/* provide way to disable L2 w/o flushing */
Signature · 1 line
1.5.5.1
#1 lore raw

PATCH 1/1 74xx/7xx/86xx: Rename flush_data_cache to flush_dcache to match 85xx version

Dear Kumar Gala,

Quoted 5 lines · In message <[email protected]> you…
---
 cpu/74xx_7xx/cache.S |   10 +++++-----
 cpu/mpc86xx/cache.S  |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

Applied to "next" branch.

Jon, as this was for more than just 86xx I just went ahead. Hope that's OK with you.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Advice is seldom welcome; and those who want it the most always like
it the least.                         -- Philip Earl of Chesterfield
#2 lore raw

PATCH 1/1 74xx/7xx/86xx: Rename flush_data_cache to flush_dcache to match 85xx version

Quoted 9 lines · Wolfgang Denk

Dear Kumar Gala,

Quoted 5 lines · In message <[email protected]> you…
---
 cpu/74xx_7xx/cache.S |   10 +++++-----
 cpu/mpc86xx/cache.S  |   10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
Quoted 4 lines

Applied to "next" branch.

Jon, as this was for more than just 86xx I just went ahead. Hope that's OK with you.

Sounds good!

Thanks,
jdl