--- zzzz-none-000/linux-3.10.107/arch/arm/mach-msm/include/mach/uncompress.h	2017-06-27 09:49:32.000000000 +0000
+++ vr9-7490-729/linux-3.10.107/arch/arm/mach-msm/include/mach/uncompress.h	2021-11-10 11:53:52.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -16,9 +16,14 @@
 #ifndef __ASM_ARCH_MSM_UNCOMPRESS_H
 #define __ASM_ARCH_MSM_UNCOMPRESS_H
 
-#include <asm/barrier.h>
+#include <linux/io.h>
+#include <asm/mach-types.h>
 #include <asm/processor.h>
 #include <mach/msm_iomap.h>
+#include <mach/msm_serial_hsl_regs.h>
+
+#define __raw_readl_no_log __raw_readl
+#define __raw_writel_no_log __raw_writel
 
 #define UART_CSR      (*(volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x08))
 #define UART_TF       (*(volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x0c))
@@ -29,28 +34,33 @@
 #define UART_DM_NCHAR (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x40)))
 #define UART_DM_TF    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x70)))
 
+#ifndef CONFIG_DEBUG_ICEDCC
 static void putc(int c)
 {
 #if defined(MSM_DEBUG_UART_PHYS)
+	unsigned long base = MSM_DEBUG_UART_PHYS;
+
 #ifdef CONFIG_MSM_HAS_DEBUG_UART_HS
 	/*
 	 * Wait for TX_READY to be set; but skip it if we have a
 	 * TX underrun.
 	 */
-	if (!(UART_DM_SR & 0x08))
-		while (!(UART_DM_ISR & 0x80))
+	if (!(__raw_readl_no_log(base + UARTDM_SR_OFFSET) & 0x08))
+		while (!(__raw_readl_no_log(base + UARTDM_ISR_OFFSET) & 0x80))
 			cpu_relax();
 
-	UART_DM_CR = 0x300;
-	UART_DM_NCHAR = 0x1;
-	UART_DM_TF = c;
+	__raw_writel_no_log(0x300, base + UARTDM_CR_OFFSET);
+	__raw_writel_no_log(0x1, base + UARTDM_NCF_TX_OFFSET);
+	__raw_writel_no_log(c, base + UARTDM_TF_OFFSET);
 #else
-	while (!(UART_CSR & 0x04))
+	/* Wait for TX_READY to be set */
+	while (!(__raw_readl_no_log(base + 0x08) & 0x04))
 		cpu_relax();
-	UART_TF = c;
+	__raw_writel_no_log(c, base + 0x0c);
 #endif
 #endif
 }
+#endif
 
 static inline void flush(void)
 {
@@ -60,4 +70,8 @@
 {
 }
 
+static inline void arch_decomp_wdog(void)
+{
+}
+
 #endif