This ifdef wrapped code apparently was introduced as a unification
of sun4i/sun5i and sun7i codebases and assumed that the non-sun7i
part of it was correct. However experiments show that this 4-bit
bitfield behaves in the same way at least on sun4i and sun7i.

Also see the definition in 'include/synopsys/dwcddr21mctl.h':
    #define DWCDDR21MCTL_DLLCR_PHASE(x) (((x) & 0xf) << 14)

Signed-off-by: Siarhei Siamashka <[email protected]>
---
 arch/arm/cpu/armv7/sunxi/dram.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/cpu/armv7/sunxi/dram.c b/arch/arm/cpu/armv7/sunxi/dram.c
index 0fdab2f..caf94e9 100644
--- a/arch/arm/cpu/armv7/sunxi/dram.c
+++ b/arch/arm/cpu/armv7/sunxi/dram.c
@@ -122,11 +122,7 @@ static void mctl_enable_dllx(u32 phase)
                n = DRAM_DCR_NR_DLLCR_16BIT;
 
        for (i = 1; i < n; i++) {
-#ifdef CONFIG_SUN7I
                clrsetbits_le32(&dram->dllcr[i], 0xf << 14,
-#else
-               clrsetbits_le32(&dram->dllcr[i], 0x4 << 14,
-#endif
                                (phase & 0xf) << 14);
                clrsetbits_le32(&dram->dllcr[i], DRAM_DLLCR_NRESET,
                                DRAM_DLLCR_DISABLE);
-- 
1.8.3.2

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to