Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16765
b: refs/heads/master
c: 5b2e98c
h: refs/heads/master
i:
  16763: d622a9d
v: v3
  • Loading branch information
Jared Hulbert authored and Russell King committed Jan 5, 2006
1 parent 3e9ce59 commit 6921a85
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 54e269ead6e672325866037b0617a72edd1396b9
refs/heads/master: 5b2e98cdf3a6ac6c57de6a2156c673d4b0262684
6 changes: 6 additions & 0 deletions trunk/arch/arm/mach-pxa/mainstone.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,12 @@ static void __init mainstone_init(void)
printk(KERN_NOTICE "Mainstone configured to boot from %s\n",
mst_flash_data[0].name);

/* system bus arbiter setting
* - Core_Park
* - LCD_wt:DMA_wt:CORE_Wt = 2:3:4
*/
ARB_CNTRL = ARB_CORE_PARK | 0x234;

/*
* On Mainstone, we route AC97_SYSCLK via GPIO45 to
* the audio daughter card
Expand Down
12 changes: 12 additions & 0 deletions trunk/include/asm-arm/arch-pxa/pxa-regs.h
Original file line number Diff line number Diff line change
Expand Up @@ -2042,6 +2042,18 @@

#ifdef CONFIG_PXA27x

#define ARB_CNTRL __REG(0x48000048) /* Arbiter Control Register */

#define ARB_DMA_SLV_PARK (1<<31) /* Be parked with DMA slave when idle */
#define ARB_CI_PARK (1<<30) /* Be parked with Camera Interface when idle */
#define ARB_EX_MEM_PARK (1<<29) /* Be parked with external MEMC when idle */
#define ARB_INT_MEM_PARK (1<<28) /* Be parked with internal MEMC when idle */
#define ARB_USB_PARK (1<<27) /* Be parked with USB when idle */
#define ARB_LCD_PARK (1<<26) /* Be parked with LCD when idle */
#define ARB_DMA_PARK (1<<25) /* Be parked with DMA when idle */
#define ARB_CORE_PARK (1<<24) /* Be parked with core when idle */
#define ARB_LOCK_FLAG (1<<23) /* Only Locking masters gain access to the bus */

/*
* Keypad
*/
Expand Down

0 comments on commit 6921a85

Please sign in to comment.