mach-snapdragon: do carveouts for qcs404 only

The newly introduced carve_out_reserved_memory causes issues when
U-Boot is chained from the lk2nd bootloader. lk2nd provides a
simple-framebuffer device and marks the framebuffer region as no-map in
the supplied /reserved-memory. Consequently, the simple_video driver
triggers a page fault when it tries to write to this region.

As per Caleb's advice, this simple patch only does the carveouts for the
qcs404 SoC for which it was originally designed. The intent is to do the
carveouts for more Qualcomm SoCs in future.

Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/arch/arm/mach-snapdragon/board.c b/arch/arm/mach-snapdragon/board.c
index 3d5994c87886768b4ce993734eace9a6ccd2cb36..b439a19ec7eb0b2ec17d5c209c6b58900c102f9c 100644 (file)
--- a/arch/arm/mach-snapdragon/board.c
+++ b/arch/arm/mach-snapdragon/board.c
@@ -467,10 +467,12 @@ void enable_caches(void)
        gd->arch.tlb_addr = tlb_addr;
        gd->arch.tlb_size = tlb_size;
 
-       carveout_start = get_timer(0);
-       /* Takes ~20-50ms on SDM845 */
-       carve_out_reserved_memory();
-       debug("carveout time: %lums\n", get_timer(carveout_start));
-
+       /* We do the carveouts only for QCS404, for now. */
+       if (fdt_node_check_compatible(gd->fdt_blob, 0, "qcom,qcs404") == 0) {
+               carveout_start = get_timer(0);
+               /* Takes ~20-50ms on SDM845 */
+               carve_out_reserved_memory();
+               debug("carveout time: %lums\n", get_timer(carveout_start));
+       }
        dcache_enable();
 }