sugar/linux
1
0
Fork 0
Code Activity

Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest

Browse Source 
Conflicts:
	arch/arm/mach-shmobile/Kconfig

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt
2011-01-05 17:25:29 +09:00
parent 6bf45a1018 f7dd3611c8 c070c203cd d0fb0c4b3f
commit 025a10a768
6 changed files with 373 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-shmobile/board-ap4evb.c
View File

@@ -1191,7 +1191,7 @@ static void __init ap4evb_init(void)
gpio_request(GPIO_FN_OVCN2_1, NULL);
/* setup USB phy */
__raw_writew(0x8a0a, 0xE6058130); /* USBCR2 */
__raw_writew(0x8a0a, 0xE6058130); /* USBCR4 */
/* enable FSI2 port A (ak4643) */
gpio_request(GPIO_FN_FSIAIBT, NULL);