Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / arch / sh / boards / board-ap325rxa.c

diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
index a3783ee6b0788c0620891c5fa2f299a0e513adda..8881a643ac320c86cb3b2473b4e466e27c7151ae 100644 (file)
--- a/arch/sh/boards/board-ap325rxa.c
+++ b/arch/sh/boards/board-ap325rxa.c
@@ -145,14 +145,9 @@ static struct platform_device nand_flash_device = {
 #define FPGA_BKLREG    0xB4100212
 #define FPGA_LCDREG_VAL        0x0018
 #define PORT_MSELCRB   0xA4050182
-#define PORT_PUCR      0xA4050142
-#define PORT_PVCR      0xA4050144
-#define PORT_PXCR      0xA4050148
 #define PORT_HIZCRC    0xA405015C
 #define PORT_DRVCRA    0xA405018A
 #define PORT_DRVCRB    0xA405018C
-#define PORT_PXDR      0xA4050168
-#define PORT_PSELC     0xA4050152
 
 static void ap320_wvga_power_on(void *board_data)
 {
@@ -407,17 +402,25 @@ static int __init ap325rxa_devices_setup(void)
        ctrl_outw(ctrl_inw(PORT_MSELCRB) & ~0x0001, PORT_MSELCRB);
 
        /* FLCTL */
-       ctrl_outw(0, PORT_PUCR);
-       ctrl_outw(0, PORT_PVCR);
-       ctrl_outw(0, PORT_PSELC);
+       gpio_request(GPIO_FN_FCE, NULL);
+       gpio_request(GPIO_FN_NAF7, NULL);
+       gpio_request(GPIO_FN_NAF6, NULL);
+       gpio_request(GPIO_FN_NAF5, NULL);
+       gpio_request(GPIO_FN_NAF4, NULL);
+       gpio_request(GPIO_FN_NAF3, NULL);
+       gpio_request(GPIO_FN_NAF2, NULL);
+       gpio_request(GPIO_FN_NAF1, NULL);
+       gpio_request(GPIO_FN_NAF0, NULL);
+       gpio_request(GPIO_FN_FCDE, NULL);
+       gpio_request(GPIO_FN_FOE, NULL);
+       gpio_request(GPIO_FN_FSC, NULL);
+       gpio_request(GPIO_FN_FWE, NULL);
+       gpio_request(GPIO_FN_FRB, NULL);
 
        ctrl_outw(0, PORT_HIZCRC);
        ctrl_outw(0xFFFF, PORT_DRVCRA);
        ctrl_outw(0xFFFF, PORT_DRVCRB);
 
-       ctrl_outw((ctrl_inw(PORT_PXCR) & 0x3fff) | 0x4000, PORT_PXCR);
-       ctrl_outb(0x80, PORT_PXDR);
-
        platform_resource_setup_memory(&ceu_device, "ceu", 4 << 20);
 
        i2c_register_board_info(0, ap325rxa_i2c_devices,