efi_memory: return MapKey

[oweals/u-boot.git] / board / renesas / blanche / blanche.c

diff --git a/board/renesas/blanche/blanche.c b/board/renesas/blanche/blanche.c
index 717c169867e639d218d1da21f079854e5af9e941..5156eafeb4040d6e7102711729dccd7f3cc6fa5c 100644 (file)
--- a/board/renesas/blanche/blanche.c
+++ b/board/renesas/blanche/blanche.c
@@ -15,7 +15,7 @@
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/arch/sys_proto.h>
 #include <asm/gpio.h>
 #include <asm/arch/rmobile.h>
@@ -36,8 +36,23 @@ struct pin_db {
 };
 
 #define        PMMR            0xE6060000
+#define        GPSR0           0xE6060004
+#define        GPSR1           0xE6060008
+#define        GPSR4           0xE6060014
+#define        GPSR5           0xE6060018
+#define        GPSR6           0xE606001C
+#define        GPSR7           0xE6060020
+#define        GPSR8           0xE6060024
+#define        GPSR9           0xE6060028
 #define        GPSR10          0xE606002C
+#define        GPSR11          0xE6060030
+#define        IPSR6           0xE6060058
+#define        PUPR2           0xE6060108
 #define        PUPR3           0xE606010C
+#define        PUPR4           0xE6060110
+#define        PUPR5           0xE6060114
+#define        PUPR7           0xE606011C
+#define        PUPR9           0xE6060124
 #define        PUPR10          0xE6060128
 #define        PUPR11          0xE606012C
 
@@ -56,11 +71,26 @@ struct pin_db {
 }
 
 struct pin_db  pin_guard[] = {
+       { GPSR0,        0xFFFFFFFF,     0x0BFFFFFF },
+       { GPSR1,        0xFFFFFFFF,     0x002FFFFF },
+       { GPSR4,        0xFFFFFFFF,     0x00000FFF },
+       { GPSR5,        0xFFFFFFFF,     0x00010FFF },
+       { GPSR6,        0xFFFFFFFF,     0x00010FFF },
+       { GPSR7,        0xFFFFFFFF,     0x00010FFF },
+       { GPSR8,        0xFFFFFFFF,     0x00010FFF },
+       { GPSR9,        0xFFFFFFFF,     0x00010FFF },
        { GPSR10,       0xFFFFFFFF,     0x04006000 },
+       { GPSR11,       0xFFFFFFFF,     0x303FEFE0 },
+       { IPSR6,        0xFFFFFFFF,     0x0002000E },
 };
 
 struct pin_db  pin_tbl[] = {
+       { PUPR2,        0xFFFFFFFF,     0x00000000 },
        { PUPR3,        0xFFFFFFFF,     0x0803FF40 },
+       { PUPR4,        0xFFFFFFFF,     0x0000FFFF },
+       { PUPR5,        0xFFFFFFFF,     0x00010FFF },
+       { PUPR7,        0xFFFFFFFF,     0x0001AFFF },
+       { PUPR9,        0xFFFFFFFF,     0x0001CFFF },
        { PUPR10,       0xFFFFFFFF,     0xC0438001 },
        { PUPR11,       0xFFFFFFFF,     0x0FC00007 },
 };
@@ -106,7 +136,7 @@ void s_init(void)
        /* SCIF Init */
        pin_init();
 
-#if !defined(CONFIG_SYS_NO_FLASH)
+#if defined(CONFIG_MTD_NOR_FLASH)
        struct rcar_lbsc *lbsc = (struct rcar_lbsc *)LBSC_BASE;
        struct rcar_dbsc3 *dbsc3_0 = (struct rcar_dbsc3 *)DBSC3_0_BASE;
 
@@ -270,7 +300,7 @@ void s_init(void)
 
        /* This locks the access to the PHY unit registers */
        writel(0x00000000, &dbsc3_0->dbpdlck);
-#endif /* CONFIG_SYS_NO_FLASH */
+#endif /* CONFIG_MTD_NOR_FLASH */
 
 }
 
@@ -338,21 +368,21 @@ int board_init(void)
        gpio_request(GPIO_FN_A17, NULL);
        gpio_request(GPIO_FN_A18, NULL);
        gpio_request(GPIO_FN_A19, NULL);
-#if defined(CONFIG_SYS_NO_FLASH)
+#if !defined(CONFIG_MTD_NOR_FLASH)
        gpio_request(GPIO_FN_MOSI_IO0, NULL);
        gpio_request(GPIO_FN_MISO_IO1, NULL);
        gpio_request(GPIO_FN_IO2, NULL);
        gpio_request(GPIO_FN_IO3, NULL);
        gpio_request(GPIO_FN_SPCLK, NULL);
        gpio_request(GPIO_FN_SSL, NULL);
-#else  /* CONFIG_SYS_NO_FLASH */
+#else  /* CONFIG_MTD_NOR_FLASH */
        gpio_request(GPIO_FN_A20, NULL);
        gpio_request(GPIO_FN_A21, NULL);
        gpio_request(GPIO_FN_A22, NULL);
        gpio_request(GPIO_FN_A23, NULL);
        gpio_request(GPIO_FN_A24, NULL);
        gpio_request(GPIO_FN_A25, NULL);
-#endif /* CONFIG_SYS_NO_FLASH */
+#endif /* CONFIG_MTD_NOR_FLASH */
 
        gpio_request(GPIO_FN_CS1_A26, NULL);
        gpio_request(GPIO_FN_EX_CS0, NULL);