sunxi: Groundwork to support new dram type for A83T

Different A83T boards have different DRAM types. Banapi M3 has LPDDR3,
Allwinner Homlet v1.2 has DDR3.

This adds groundwork to support for new DRAM type for A83T.

Introduce CONFIG_DRAM_TYPE, It'll be 3 for DDR3 and 7 for LPDDR3, must
be set in respective board defconfig.

Signed-off-by: Vishnu Patekar <vishnupatekar0510@gmail.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/arch/arm/cpu/armv7/sunxi/dram_sun8i_a83t.c b/arch/arm/cpu/armv7/sunxi/dram_sun8i_a83t.c
index 75e97465677e7a4b261437d76fc58f6b1444fe95..35b6c5e4641705b28a82acfc29ee1d75ba7547b8 100644 (file)
--- a/arch/arm/cpu/armv7/sunxi/dram_sun8i_a83t.c
+++ b/arch/arm/cpu/armv7/sunxi/dram_sun8i_a83t.c
@@ -25,6 +25,7 @@ struct dram_para {
        u8 rank;
        u8 rows;
        u8 bus_width;
+       u8 dram_type;
        u16 page_size;
 };
 
@@ -34,7 +35,7 @@ static void mctl_set_cr(struct dram_para *para)
                        (struct sunxi_mctl_com_reg *)SUNXI_DRAM_COM_BASE;
 
        writel(MCTL_CR_CS1_CONTROL(para->cs1) | MCTL_CR_UNKNOWN |
-               MCTL_CR_CHANNEL(1) | MCTL_CR_DDR3 |
+               MCTL_CR_CHANNEL(1) | MCTL_CR_DRAM_TYPE(para->dram_type) |
                (para->seq ? MCTL_CR_SEQUENCE : 0) |
                ((para->bus_width == 16) ? MCTL_CR_BUSW16 : MCTL_CR_BUSW8) |
                MCTL_CR_PAGE_SIZE(para->page_size) | MCTL_CR_ROW(para->rows) |
@@ -86,6 +87,7 @@ static void auto_set_timing_para(struct dram_para *para)
 {
        struct sunxi_mctl_ctl_reg * const mctl_ctl =
                (struct sunxi_mctl_ctl_reg *)SUNXI_DRAM_CTL0_BASE;
+
        u32 reg_val;
 
        u8 tccd         = 2;
@@ -393,6 +395,13 @@ unsigned long sunxi_dram_init(void)
                .page_size = 2048,
        };
 
+#if defined(CONFIG_MACH_SUN8I_A83T)
+#if (CONFIG_DRAM_TYPE == 3) || (CONFIG_DRAM_TYPE == 7)
+       para.dram_type = CONFIG_DRAM_TYPE;
+#else
+#error Unsupported DRAM type, Please set DRAM type (3:DDR3, 7:LPDDR3)
+#endif
+#endif
        setbits_le32(SUNXI_PRCM_BASE + 0x1e0, 0x1 << 8);
 
        writel(0, (SUNXI_PRCM_BASE + 0x1e8));

diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
index 2891b71b334eb144c7a0ec5715b0898533cc36d7..05b6a89e8ee86dc085d4da1c86e51e45fe13b501 100644 (file)
--- a/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
+++ b/arch/arm/include/asm/arch-sunxi/dram_sun8i_a83t.h
@@ -186,7 +186,7 @@ struct sunxi_mctl_ctl_reg {
 #define MCTL_CR_BUSW8                  (0 << 12)
 #define MCTL_CR_BUSW16                 (1 << 12)
 #define MCTL_CR_SEQUENCE               (1 << 15)
-#define MCTL_CR_DDR3                   (3 << 16)
+#define MCTL_CR_DRAM_TYPE(x)           ((x) << 16)
 #define MCTL_CR_CHANNEL_MASK           (1 << 19)
 #define MCTL_CR_CHANNEL(x)             (((x) - 1) << 19)
 #define MCTL_CR_UNKNOWN                        (0x4 << 20)
@@ -198,4 +198,6 @@ struct sunxi_mctl_ctl_reg {
 #define MCTL_MR2                       0x18 /* CWL=8 */
 #define MCTL_MR3                       0x0
 
+#define DRAM_TYPE_DDR3         3
+#define DRAM_TYPE_LPDDR3       7
 #endif /* _SUNXI_DRAM_SUN8I_A83T_H */

diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig
index 8a30d0846736134002c82dda3073501cf57df6c5..a334aa336d14c18af8e5447ae1b16d6ee4810b4a 100644 (file)
--- a/board/sunxi/Kconfig
+++ b/board/sunxi/Kconfig
@@ -95,6 +95,12 @@ config MACH_SUN8I
        bool
        default y if MACH_SUN8I_A23 || MACH_SUN8I_A33 || MACH_SUN8I_H3 || MACH_SUN8I_A83T
 
+config DRAM_TYPE
+       int "sunxi dram type"
+       depends on MACH_SUN8I_A83T
+       default 3
+       ---help---
+       Set the dram type, 3: DDR3, 7: LPDDR3
 
 config DRAM_CLK
        int "sunxi dram clock speed"