Blackfin: bf527-ezkit: convert to portmux framework

Rather than bang MMRs directly, use the new portmux framework to handle
the details.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/board/bf527-ezkit/bf527-ezkit.c b/board/bf527-ezkit/bf527-ezkit.c
index a911880ee3d9507feab190ae44a3ff735785de6e..211cf24ac303fc889b760ca02a91a897cc2304ae 100644 (file)
--- a/board/bf527-ezkit/bf527-ezkit.c
+++ b/board/bf527-ezkit/bf527-ezkit.c
@@ -12,6 +12,7 @@
 #include <net.h>
 #include <netdev.h>
 #include <asm/blackfin.h>
+#include <asm/gpio.h>
 #include <asm/net.h>
 #include <asm/mach-common/bits/otp.h>
 
@@ -75,9 +76,7 @@ void board_musb_init(void)
        /*
         * BF527 EZ-KITs require PG13 to be high for HOST mode
         */
-       bfin_write_PORTG_FER(bfin_read_PORTG_FER() & ~PG13);
-       bfin_write_PORTGIO_DIR(bfin_read_PORTGIO_DIR() | PG13);
-       bfin_write_PORTGIO_SET(PG13);
-       SSYNC();
+       gpio_request(GPIO_PG13, "musb-vbus");
+       gpio_direction_output(GPIO_PG13, 1);
 }
 #endif

diff --git a/board/bf527-ezkit/video.c b/board/bf527-ezkit/video.c
index 8f6ea2308f6bb49fb4cdbf0e5199367b2253a1b8..891070b575bc51ca5f29304a349f23811127439f 100644 (file)
--- a/board/bf527-ezkit/video.c
+++ b/board/bf527-ezkit/video.c
@@ -11,6 +11,7 @@
 #include <config.h>
 #include <malloc.h>
 #include <asm/blackfin.h>
+#include <asm/portmux.h>
 #include <asm/mach-common/bits/dma.h>
 #include <spi.h>
 #include <linux/types.h>
@@ -171,13 +172,11 @@ void DisablePPI(void)
 
 void Init_Ports(void)
 {
-       *pPORTF_MUX &= ~PORT_x_MUX_0_MASK;
-       *pPORTF_MUX |= PORT_x_MUX_0_FUNC_1;
-       *pPORTF_FER |= PF0 | PF1 | PF2 | PF3 | PF4 | PF5 | PF6 | PF7;
-
-       *pPORTG_MUX &= ~PORT_x_MUX_1_MASK;
-       *pPORTG_MUX |= PORT_x_MUX_1_FUNC_1;
-       *pPORTG_FER |= PG5;
+       const unsigned short pins[] = {
+               P_PPI0_D0, P_PPI0_D1, P_PPI0_D2, P_PPI0_D3, P_PPI0_D4,
+               P_PPI0_D5, P_PPI0_D6, P_PPI0_D7, P_PPI0_FS2, 0,
+       };
+       peripheral_request_list(pins, "lcd");
 }
 
 void Init_PPI(void)