arm: socfpga: Add FPGA driver support for Arria 10

[u-boot] / board / atmark-techno / armadillo-800eva / armadillo-800eva.c

diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
index 2f91666a7866a778732857857a38fd83faaae892..abe69abcc8db6aca5eb303eca6b68184f51afcb4 100644 (file)
--- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
+++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c
@@ -243,6 +243,9 @@ void s_init(void)
 #define I2C1_MSTP323    (1 << 23)
 #define GETHER_MSTP309 (1 << 9)
 
+#define GPIO_SCIFA1_TXD (0xE60520C4)
+#define GPIO_SCIFA1_RXD (0xE60520C3)
+
 int board_early_init_f(void)
 {
        /* TMU */
@@ -256,9 +259,8 @@ int board_early_init_f(void)
        clrbits_le32(MSTPCR3, I2C1_MSTP323);
 
        /* SCIFA1 */
-       r8a7740_pinmux_init();
-       gpio_request(GPIO_FN_SCIFA1_RXD, NULL);
-       gpio_request(GPIO_FN_SCIFA1_TXD, NULL);
+       writeb(1, GPIO_SCIFA1_TXD); /* SCIFA1_TXD */
+       writeb(1, GPIO_SCIFA1_RXD); /* SCIFA1_RXD */
 
        /* IICCR */
        writew(GPIO_ICCR_DATA, GPIO_ICCR);
@@ -270,7 +272,7 @@ DECLARE_GLOBAL_DATA_PTR;
 int board_init(void)
 {
        /* board id for linux */
-       gd->bd->bi_arch_number = MACH_TYPE_ARMADILLO_800EVA;
+       gd->bd->bi_arch_number = MACH_TYPE_ARMADILLO800EVA;
        /* adress of boot parameters */
        gd->bd->bi_boot_params = ARMADILLO_800EVA_SDRAM_BASE + 0x100;
 
@@ -312,13 +314,8 @@ int dram_init(void)
        return 0;
 }
 
-int board_eth_init(bd_t *bis)
-{
-       return sh_eth_initialize(bis);
-}
-
 const struct rmobile_sysinfo sysinfo = {
-       CONFIG_RMOBILE_BOARD_STRING
+       CONFIG_ARCH_RMOBILE_BOARD_STRING
 };
 
 int board_late_init(void)