LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edminiv2: orion5x: fix GPIO inits and values 

Orion5x did not actually write GPIO output values
or input polarities, and ED Mini V2 had bad or
missing values for GPIO settings.

Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net>
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>
This commit is contained in:
Albert ARIBAUD 2012-08-16 06:35:21 +00:00 committed by Prafulla Wadaskar
parent 6e2fbdea1b
commit 491f6c2f29
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/arm926ejs/orion5x/cpu.c
View File

@ -292,7 +292,9 @@ int arch_misc_init(void)
writel(ORION5X_MPP0_7, ORION5X_MPP_BASE+0x00); writel(ORION5X_MPP0_7, ORION5X_MPP_BASE+0x00);
writel(ORION5X_MPP8_15, ORION5X_MPP_BASE+0x04); writel(ORION5X_MPP8_15, ORION5X_MPP_BASE+0x04);
writel(ORION5X_MPP16_23, ORION5X_MPP_BASE+0x50); writel(ORION5X_MPP16_23, ORION5X_MPP_BASE+0x50);
writel(ORION5X_GPIO_OUT_VALUE, ORION5X_GPIO_BASE+0x00);
writel(ORION5X_GPIO_OUT_ENABLE, ORION5X_GPIO_BASE+0x04); writel(ORION5X_GPIO_OUT_ENABLE, ORION5X_GPIO_BASE+0x04);
writel(ORION5X_GPIO_IN_POLARITY, ORION5X_GPIO_BASE+0x0c);
/* initialize timer */ /* initialize timer */
timer_init_r(); timer_init_r();

13
include/configs/edminiv2.h
View File

@ -69,13 +69,18 @@
* - GPIO16 is Power LED control (0 = on, 1 = off) * - GPIO16 is Power LED control (0 = on, 1 = off)
* - GPIO17 is Power LED source select (0 = CPLD, 1 = GPIO16) * - GPIO17 is Power LED source select (0 = CPLD, 1 = GPIO16)
* - GPIO18 is Power Button status (0 = Released, 1 = Pressed) * - GPIO18 is Power Button status (0 = Released, 1 = Pressed)
* - Last GPIO is 26, further bits are supposed to be 0. * - GPIO19 is SATA disk power toggle (toggles on 0-to-1)
* - GPIO22 is SATA disk power status ()
* - GPIO23 is supply status for SATA disk ()
* - GPIO24 is supply control for board (write 1 to power off)
* Last GPIO is 25, further bits are supposed to be 0.
* Enable mask has ones for INPUT, 0 for OUTPUT. * Enable mask has ones for INPUT, 0 for OUTPUT.
* Default is LED ON. * Default is LED ON, board ON :)
*/ */
#define ORION5X_GPIO_OUT_ENABLE 0x03fcffff #define ORION5X_GPIO_OUT_ENABLE 0xfef4f0ca
#define ORION5X_GPIO_OUT_VALUE 0x03fcffff #define ORION5X_GPIO_OUT_VALUE 0x00000000
#define ORION5X_GPIO_IN_POLARITY 0x000000d0
/* /*
* NS16550 Configuration * NS16550 Configuration