Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8fdd36d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:
 "Only two changes.

  One cleans up warnings in the ColdFire DMA code, the other stubs out
  (with warnings) ColdFire clock api functions not normally used"

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: Fix typos in Coldfire 5272 DMA debug code
  m68k: coldfire: Normalize clk API
parents 2ad0d526 58064e1f

arch/m68k/coldfire/clk.c

+29 −0
Original line number Diff line number Diff line
@@ -129,4 +129,33 @@ unsigned long clk_get_rate(struct clk *clk) 
}

EXPORT_SYMBOL(clk_get_rate);



/* dummy functions, should not be called */

long clk_round_rate(struct clk *clk, unsigned long rate)

{

	WARN_ON(clk);

	return 0;

}

EXPORT_SYMBOL(clk_round_rate);



int clk_set_rate(struct clk *clk, unsigned long rate)

{

	WARN_ON(clk);

	return 0;

}

EXPORT_SYMBOL(clk_set_rate);



int clk_set_parent(struct clk *clk, struct clk *parent)

{

	WARN_ON(clk);

	return 0;

}

EXPORT_SYMBOL(clk_set_parent);



struct clk *clk_get_parent(struct clk *clk)

{

	WARN_ON(clk);

	return NULL;

}

EXPORT_SYMBOL(clk_get_parent);



/***************************************************************************/

arch/m68k/include/asm/dma.h

+2 −2
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ static __inline__ void set_dma_mode(unsigned int dmanr, char mode) 


#ifdef DEBUG_DMA

  printk("%s(%d): dmanr=%d DMR[%x]=%x DIR[%x]=%x\n", __FILE__, __LINE__,

         dmanr, (int) &dmalp[MCFDMA_DMR], dmabp[MCFDMA_DMR],

	 dmanr, (int) &dmalp[MCFDMA_DMR], dmalp[MCFDMA_DMR],

	 (int) &dmawp[MCFDMA_DIR], dmawp[MCFDMA_DIR]);

#endif

}
@@ -421,7 +421,7 @@ static __inline__ void set_dma_addr(unsigned int dmanr, unsigned int a) 


#ifdef DEBUG_DMA

  printk("%s(%d): dmanr=%d DMR[%x]=%x SAR[%x]=%08x DAR[%x]=%08x\n",

	__FILE__, __LINE__, dmanr, (int) &dmawp[MCFDMA_DMR], dmawp[MCFDMA_DMR],

	__FILE__, __LINE__, dmanr, (int) &dmalp[MCFDMA_DMR], dmalp[MCFDMA_DMR],

	(int) &dmalp[MCFDMA_DSAR], dmalp[MCFDMA_DSAR],

	(int) &dmalp[MCFDMA_DDAR], dmalp[MCFDMA_DDAR]);

#endif