stm32mp1: remove the second TAMP_BOOT_CONTEXT update
authorPatrick Delaunay <patrick.delaunay@st.com>
Thu, 17 May 2018 13:24:04 +0000 (15:24 +0200)
committerTom Rini <trini@konsulko.com>
Sat, 26 May 2018 22:19:18 +0000 (18:19 -0400)
The register TAMP_BOOT_CONTEXT is already updated in
get_bootmode() in cpu.c and no need to be done
twice.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
arch/arm/mach-stm32mp/spl.c

index b56f0c5381c3b5b8ffdddddb7305a61fcdceea29..790973e8b6e9101bcfb9a10f896f36c68776c8cc 100644 (file)
@@ -14,9 +14,6 @@ u32 spl_boot_device(void)
 
        boot_mode = (readl(TAMP_BOOT_CONTEXT) & TAMP_BOOT_MODE_MASK) >>
                    TAMP_BOOT_MODE_SHIFT;
-       clrsetbits_le32(TAMP_BOOT_CONTEXT,
-                       TAMP_BOOT_MODE_MASK,
-                       boot_mode << TAMP_BOOT_MODE_SHIFT);
 
        switch (boot_mode) {
        case BOOT_FLASH_SD_1: