Merge git://git.denx.de/u-boot-usb

[u-boot] / arch / arm / include / asm / arch-exynos / cpu.h

diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h
index 78aceef17b18b90a278aa48e25533f3ca86ad2c6..cb3d2cc06fc4e3956e2857af2f9c54d723c33358 100644 (file)
--- a/arch/arm/include/asm/arch-exynos/cpu.h
+++ b/arch/arm/include/asm/arch-exynos/cpu.h
@@ -153,6 +153,10 @@
 #define EXYNOS5420_CLOCK_BASE          0x10010000
 #define EXYNOS5420_POWER_BASE          0x10040000
 #define EXYNOS5420_SWRESET             0x10040400
+#define EXYNOS5420_INFORM_BASE         0x10040800
+#define EXYNOS5420_SPARE_BASE          0x10040900
+#define EXYNOS5420_CPU_CONFIG_BASE     0x10042000
+#define EXYNOS5420_CPU_STATUS_BASE     0x10042004
 #define EXYNOS5420_SYSREG_BASE         0x10050000
 #define EXYNOS5420_TZPC_BASE           0x100E0000
 #define EXYNOS5420_WATCHDOG_BASE       0x101D0000
@@ -163,6 +167,7 @@
 #define EXYNOS5420_USB_HOST_EHCI_BASE  0x12110000
 #define EXYNOS5420_MMC_BASE            0x12200000
 #define EXYNOS5420_SROMC_BASE          0x12250000
+#define EXYNOS5420_USB3PHY_BASE        0x12500000
 #define EXYNOS5420_UART_BASE           0x12C00000
 #define EXYNOS5420_I2C_BASE            0x12C60000
 #define EXYNOS5420_I2C_8910_BASE       0x12E00000
@@ -183,9 +188,9 @@
 #define EXYNOS5420_FIMD_BASE           DEVICE_NOT_AVAILABLE
 #define EXYNOS5420_ADC_BASE            DEVICE_NOT_AVAILABLE
 #define EXYNOS5420_MODEM_BASE          DEVICE_NOT_AVAILABLE
-#define EXYNOS5420_USB3PHY_BASE                DEVICE_NOT_AVAILABLE
 #define EXYNOS5420_USB_HOST_XHCI_BASE  DEVICE_NOT_AVAILABLE
 
+
 #ifndef __ASSEMBLY__
 #include <asm/io.h>
 /* CPU detection macros */
@@ -227,6 +232,13 @@ static inline void s5p_set_cpu_id(void)
                /* Exynos5420 */
                s5p_cpu_id = 0x5420;
                break;
+       case 0x422:
+               /*
+                * Exynos5800 is a variant of Exynos5420
+                * and has product id 0x5422
+                */
+               s5p_cpu_id = 0x5800;
+               break;
        }
 }
 
@@ -255,6 +267,7 @@ IS_EXYNOS_TYPE(exynos4210, 0x4210)
 IS_EXYNOS_TYPE(exynos4412, 0x4412)
 IS_EXYNOS_TYPE(exynos5250, 0x5250)
 IS_EXYNOS_TYPE(exynos5420, 0x5420)
+IS_EXYNOS_TYPE(exynos5800, 0x5800)
 
 #define SAMSUNG_BASE(device, base)                             \
 static inline unsigned int __attribute__((no_instrument_function)) \
@@ -265,7 +278,7 @@ static inline unsigned int __attribute__((no_instrument_function)) \
                        return EXYNOS4X12_##base;               \
                return EXYNOS4_##base;                          \
        } else if (cpu_is_exynos5()) {                          \
-               if (proid_is_exynos5420())                      \
+               if (proid_is_exynos5420() || proid_is_exynos5800())     \
                        return EXYNOS5420_##base;               \
                return EXYNOS5_##base;                          \
        }                                                       \