platform/sprd: remove build warnings

Remove build warnings from sprd platform drivers.

Change-Id: Ifd838abc5d012a908e94fdeec0ec320667a7e9d5
Signed-off-by: Seung-Woo Kim <sw0312.kim@samsung.com>

diff --git a/drivers/platform/sprd/adi.c b/drivers/platform/sprd/adi.c
index 9fc9f30..62dea66 100644 (file)
--- a/drivers/platform/sprd/adi.c
+++ b/drivers/platform/sprd/adi.c
@@ -352,7 +352,7 @@ int __init sci_adi_init(void)
        if (of_can_translate_address(np)) {
                of_address_to_resource(np, 0, &res);
                sprd_adi_phys = res.start;
-               sprd_adi_base = ioremap_nocache(res.start,
+               sprd_adi_base = (uintptr_t)ioremap_nocache(res.start,
                                resource_size(&res));
                if (!sprd_adi_base) {
                        printk("%s: no such memory!\n", __func__);

diff --git a/drivers/platform/sprd/arch_misc.c b/drivers/platform/sprd/arch_misc.c
index 1b70abc..a7f43dd 100644 (file)
--- a/drivers/platform/sprd/arch_misc.c
+++ b/drivers/platform/sprd/arch_misc.c
@@ -83,7 +83,6 @@ void set_section_ro(unsigned long virt, unsigned long numsections)
        pud_t *pud;
        unsigned long start = virt;
        unsigned long end = virt + (numsections << SECTION_SHIFT);
-       unsigned long pmd_end;
 
        while (virt < end) {
                //pmd = pmd_off_k(virt);
@@ -95,7 +94,7 @@ void set_section_ro(unsigned long virt, unsigned long numsections)
                pmd = pmd_offset(pud,virt);
                if ((pmd_val(*pmd) & PMD_TYPE_MASK) != PMD_TYPE_SECT) {
                        pr_err("%s: pmd %p=%08lx for %08lx not section map\n",
-                               __func__, pmd, pmd_val(*pmd), virt);
+                               __func__, pmd, (unsigned long)pmd_val(*pmd), virt);
                        return;
                }
 
@@ -105,7 +104,7 @@ void set_section_ro(unsigned long virt, unsigned long numsections)
                 */
                *pmd |= PAGE_READONLY;
                pr_debug("%s: pmd %p=%08lx for %08lx ok\n",
-                               __func__, pmd, pmd_val(*pmd), virt);
+                               __func__, pmd, (unsigned long)pmd_val(*pmd), virt);
                virt += SECTION_SIZE;
        }
 

diff --git a/drivers/platform/sprd/busmonitor.c b/drivers/platform/sprd/busmonitor.c
index fd1359f..21ee4b6 100644 (file)
--- a/drivers/platform/sprd/busmonitor.c
+++ b/drivers/platform/sprd/busmonitor.c
@@ -112,6 +112,8 @@ static u32 bm_count = 0;
 
 static DEFINE_SPINLOCK(bm_lock);
 
+static unsigned char *errname = "ERROR_NAME";
+
 static ulong __sci_get_bm_base(u32 bm_index)
 {
        switch (bm_index) {
@@ -666,7 +668,7 @@ int sci_bm_set_point(enum sci_bm_index bm_index, enum sci_bm_chn chn,
                        ddr_size = res.end - res.start;
        }
        /* if monitor ddr addr, it needs addr wrap*/
-       if(cfg->addr_min >= 0x80000000 && "ERROR_NAME" != bm_chn_name[bm_index].chn_name){
+       if(cfg->addr_min >= 0x80000000 && errname /*"ERROR_NAME"*/ != bm_chn_name[bm_index].chn_name){
                if(ddr_size == 0x1fffffff)//512M
                        bm_store_vale[bm_index].bm_mask = 0xE0000000;
                else if(ddr_size == 0x3fffffff)//1G
@@ -677,7 +679,7 @@ int sci_bm_set_point(enum sci_bm_index bm_index, enum sci_bm_chn chn,
                bm_store_vale[bm_index].bm_mask = 0x00000000;
 #endif
 
-       if ("ERROR_NAME" != bm_chn_name[bm_index].chn_name){
+       if (errname /*"ERROR_NAME"*/ != bm_chn_name[bm_index].chn_name){
                if (bm_index < AHB_BM0) {
                        bm_reg->addr_min = cfg->addr_min & (~bm_store_vale[bm_index].bm_mask);
                        bm_reg->addr_max = cfg->addr_max & (~bm_store_vale[bm_index].bm_mask);
@@ -807,7 +809,7 @@ static void sci_bm_def_val_set_by_dts(void)
        }
 }
 
-static void sci_bm_def_val_set(void)
+static __maybe_unused void sci_bm_def_val_set(void)
 {
        u32 bm_chn, ret;
        struct sci_bm_cfg bm_cfg;
@@ -916,7 +918,8 @@ static ssize_t sci_bm_axi_dbg_store(struct device *dev,
                                size_t count)
 {
        unsigned char start[12], end[12], chn[6], mod[3];
-       unsigned long start_addr, end_addr, channel, bm_index;
+       unsigned long start_addr, end_addr, channel;
+       /*unsigned long bm_index;*/
        struct sci_bm_cfg bm_cfg;
        u32 rd_wt;
        int ret,i;
@@ -1006,7 +1009,7 @@ static ssize_t sci_bm_ahb_dbg_store(struct device *dev,
 {
        unsigned char addr_start[12], data_min[12];
        unsigned char addr_end[12], data_max[12];
-       unsigned long start_addr, end_addr, min_data, max_data, channel, chn_sel, bm_index;
+       unsigned long start_addr, end_addr, min_data, max_data, channel, chn_sel;
        struct sci_bm_cfg bm_cfg;
        int ret;
 
@@ -1265,7 +1268,7 @@ static ssize_t sci_bm_disable_store(struct device *dev,
 }
 
 static ssize_t sci_bm_bus_status_show(struct device * dev,
-                               struct device_attribute * attr,const char * buf)
+                               struct device_attribute * attr, char * buf)
 {
        u32 bm_index;
        ulong reg_addr, axi_val;
@@ -1464,7 +1467,7 @@ static void sci_bm_init_name_info(void)
                        }
                }
                if (NULL == bm_chn_name[bm_chn].chn_name)
-                       bm_chn_name[bm_chn].chn_name = "ERROR_NAME";
+                       bm_chn_name[bm_chn].chn_name = errname; /*"ERROR_NAME"*/
        }
        //init ahb bm name info.
        for(bm_chn = bm_st_info.axi_bm_cnt; bm_chn < BM_AXI_TOTAL_CHN_NAME + BM_AHB_TOTAL_CHN_NAME + 3; bm_chn++){
@@ -1474,7 +1477,7 @@ static void sci_bm_init_name_info(void)
                                break;
                        }
                }
-               if("ERROR_NAME" == bm_chn_name[bm_chn - bm_no_name].chn_name){
+               if(errname /*"ERROR_NAME"*/ == bm_chn_name[bm_chn - bm_no_name].chn_name){
                        //del the no name chn. to get a continue name list.
                        bm_no_name++;
                }
@@ -1850,7 +1853,7 @@ static long sci_bm_ioctl(struct file *filp, unsigned int cmd, unsigned long args
        struct sci_bm_cfg bm_cfg;
        struct task_struct *t;
        struct timeval tv;
-       struct rtc_time tm;
+       /*struct rtc_time tm;*/
        volatile struct sci_bm_reg *bm_reg;
        unsigned long bm_user;
        unsigned char bm_name[18] = {0};
@@ -1999,42 +2002,42 @@ static long sci_bm_ioctl(struct file *filp, unsigned int cmd, unsigned long args
                                return -EFAULT;
                        break;
                case BM_RD_CNT:
-                       copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
+                       ret = copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
                        bm_reg = (struct sci_bm_reg *)__sci_get_bm_base(bm_user);
                        bm_user = (unsigned long)(bm_reg->rtrans_in_win);
                        if(copy_to_user((unsigned long __user *)args, &bm_user, sizeof(unsigned long)))
                                return -EFAULT;
                        break;
                case BM_WR_CNT:
-                       copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
+                       ret = copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
                        bm_reg = (struct sci_bm_reg *)__sci_get_bm_base(bm_user);
                        bm_user = (unsigned long)(bm_reg->wtrans_in_win);
                        if(copy_to_user((unsigned long __user *)args, &bm_user, sizeof(unsigned long)))
                                return -EFAULT;
                        break;
                case BM_RD_BW:
-                       copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
+                       ret = copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
                        bm_reg = (struct sci_bm_reg *)__sci_get_bm_base(bm_user);
                        bm_user = (unsigned long)(bm_reg->rbw_in_win);
                        if(copy_to_user((unsigned long __user *)args, &bm_user, sizeof(unsigned long)))
                                return -EFAULT;
                        break;
                case BM_WR_BW:
-                       copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
+                       ret = copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
                        bm_reg = (struct sci_bm_reg *)__sci_get_bm_base(bm_user);
                        bm_user = (unsigned long)(bm_reg->wbw_in_win);
                        if(copy_to_user((unsigned long __user *)args, &bm_user, sizeof(unsigned long)))
                                return -EFAULT;
                        break;
                case BM_RD_LATENCY:
-                       copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
+                       ret = copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
                        bm_reg = (struct sci_bm_reg *)__sci_get_bm_base(bm_user);
                        bm_user = (unsigned long)(bm_reg->rlatency_in_win);
                        if(copy_to_user((unsigned long __user *)args, &bm_user, sizeof(unsigned long)))
                                return -EFAULT;
                        break;
                case BM_WR_LATENCY:
-                       copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
+                       ret = copy_from_user(&bm_user, (unsigned long __user *)args, sizeof(unsigned long));
                        bm_reg = (struct sci_bm_reg *)__sci_get_bm_base(bm_user);
                        bm_user = (unsigned long)(bm_reg->wlatency_in_win);
                        if(copy_to_user((unsigned long __user *)args, &bm_user, sizeof(unsigned long)))

diff --git a/drivers/platform/sprd/cpuidle-scx35.c b/drivers/platform/sprd/cpuidle-scx35.c
index b3ee9d9..5039a29 100644 (file)
--- a/drivers/platform/sprd/cpuidle-scx35.c
+++ b/drivers/platform/sprd/cpuidle-scx35.c
@@ -110,7 +110,7 @@ int sc_cpuidle_notifier_call_chain(unsigned long val)
        return notifier_to_errno(ret);
 }
 
-static void set_cpu_pd(void *data)
+static void __maybe_unused set_cpu_pd(void *data)
 {
        int cpu_id = *((int*)data);
        int on_cpu = smp_processor_id();
@@ -125,7 +125,7 @@ static void set_cpu_pd(void *data)
 
        /*
         * TODO: set cpu power down
-       while (!(__raw_readl(REG_AP_AHB_CA7_STANDBY_STATUS) & (1<<cpu_id))) {
+       while (!(__raw_readl((void __iomem __force *)REG_AP_AHB_CA7_STANDBY_STATUS) & (1<<cpu_id))) {
                if (time_after(jiffies, timeout)) {
                        printk(" waiting for cpu%d wfi time out \n", cpu_id);
                        return;
@@ -155,7 +155,7 @@ static void sc_cpuidle_debug(void)
                                __func__, sci_glb_read(REG_PMU_APB_CP_SLP_STATUS_DBG1, -1UL));
 #endif
                printk("*** %s, DDR_OP_MODE:0x%x ***\n",
-                               __func__, __raw_readl(SPRD_LPDDR2_BASE + 0x03fc) );
+                               __func__, __raw_readl((void __iomem __force *)(SPRD_LPDDR2_BASE + 0x03fc)) );
        }else
                printk("*** %s, LIGHT_SLEEP_EN can not be set ***\n", __func__ );
 }
@@ -202,11 +202,11 @@ static int sc_cpuidle_light_sleep_en(int cpu)
         if(light_sleep_en){
                if (cpu == 0) {
 #if defined(CONFIG_ARCH_SCX15)
-                       if (__raw_readl(REG_AP_AHB_AHB_EB) & BIT_ZIPDEC_EB) {
+                       if (__raw_readl((void __iomem __force *)REG_AP_AHB_AHB_EB) & BIT_ZIPDEC_EB) {
                                sci_glb_clr(REG_AP_AHB_AHB_EB, BIT_ZIPDEC_EB);
                                zipdec_status  = 1;
                        }
-                       if (__raw_readl(REG_AP_AHB_AHB_EB) & BIT_ZIPENC_EB) {
+                       if (__raw_readl((void __iomem __force *)REG_AP_AHB_AHB_EB) & BIT_ZIPENC_EB) {
                                sci_glb_clr(REG_AP_AHB_AHB_EB, BIT_ZIPENC_EB);
                                zipenc_status  = 1;
                        }
@@ -253,6 +253,8 @@ static void sc_cpuidle_light_sleep_dis(void)
        }
        return;
 }
+
+#if defined(CONFIG_ARCH_SCX15)
 extern void deep_sleep(int);
 static void idle_into_deep(void)
 {
@@ -294,6 +296,7 @@ static void idle_into_deep(void)
        deep_sleep(1);
        sci_glb_clr(REG_AP_AHB_MCU_PAUSE, BIT_MCU_DEEP_SLEEP_EN /*| BIT_MCU_SLEEP_FOLLOW_CA7_EN*/);
 }
+#endif
 
 /**
  * sc_enter_idle - Programs arm core to enter the specified state
@@ -401,7 +404,6 @@ static inline void sc_fill_cstate(struct cpuidle_driver *drv, struct cpuidle_dev
 {
        char *descr = sc_cpuidle_desc[idx];
        struct cpuidle_state *state = &drv->states[idx];
-       struct cpuidle_state_usage *state_usage = &dev->states_usage[idx];
 
        sprintf(state->name, "C%d", idx + 1);
        strncpy(state->desc, descr, CPUIDLE_DESC_LEN - 1);
@@ -411,9 +413,6 @@ static inline void sc_fill_cstate(struct cpuidle_driver *drv, struct cpuidle_dev
        /*state->power_usage = cpuidle_params_table[idx].power_usage;*/
        state->target_residency = cpuidle_params_table[idx].target_residency;
        state->enter            = sc_enter_idle;
-
-       /*TODO*/
-       /*state_usage->driver_data =  ;*/
 }
 
 static int sc_cpuidle_register_device(struct cpuidle_driver *drv, unsigned int cpu)

diff --git a/drivers/platform/sprd/pin_switch.c b/drivers/platform/sprd/pin_switch.c
index ba336c7..254d1cd 100755 (executable)
--- a/drivers/platform/sprd/pin_switch.c
+++ b/drivers/platform/sprd/pin_switch.c
@@ -171,7 +171,7 @@ static struct sci_pin_switch_dir {
 
 u32 pinmap_get(u32 offset)
 {
-       return readl(SPRD_PIN_BASE + offset);
+       return readl((void __iomem __force *)SPRD_PIN_BASE + offset);
 }
 
 EXPORT_SYMBOL(pinmap_get);
@@ -179,7 +179,7 @@ int pinmap_set(u32 offset, u32 value)
 {
        unsigned long flags;
        __arch_default_lock(HWLOCK_GLB, &flags);
-       writel(value, SPRD_PIN_BASE + offset);
+       writel(value, (void __iomem __force *)SPRD_PIN_BASE + offset);
        __arch_default_unlock(HWLOCK_GLB, &flags);
        return 0;
 }
@@ -282,7 +282,7 @@ static ssize_t pin_switch_dir_proc_write(struct file *file,
        int ret = 0;
        struct sci_pin_switch *p =
            (struct sci_pin_switch *)(PDE_DATA(file_inode(file)));
-       ret = kstrtol_from_user(buffer, count, 0, &val);
+       ret = kstrtoint_from_user(buffer, count, 0, &val);
        if (ret) {
                pr_err("input err\n");
                return -EINVAL;
@@ -349,10 +349,9 @@ static int __init pin_switch_proc_add_dir(struct sci_pin_switch_dir
 static int sc271x_regulator_event(struct notifier_block *regu_nb,
                                  unsigned long event, void *data)
 {
-       unsigned long flags;
        struct pin_reg_desc *p_pin_reg_desc =
            container_of(regu_nb, struct pin_reg_desc, nb);
-       unsigned long best_data = (unsigned long *)data;
+       unsigned long best_data = (uintptr_t)data;
        const char *regu_name;
        u32 bit;
        u32 reg;
@@ -363,7 +362,7 @@ static int sc271x_regulator_event(struct notifier_block *regu_nb,
        regu_name = p_pin_reg_desc->supplies.supply;
        bit = p_pin_reg_desc->platform_data->bit_offset;
        reg = p_pin_reg_desc->platform_data->reg;
-       pr_info("event:0x%x, best_data:0x%x\n", event, best_data);
+       pr_info("event:0x%lx, best_data:0x%lx\n", event, best_data);
 
        if (event & REGULATOR_EVENT_VOLTAGE_CHANGE) {
                if (p_pin_reg_desc) {
@@ -458,7 +457,7 @@ static int sprd_pin_switch_probe(struct platform_device *pdev)
                        panic("pin_switch get address failed!\n");
 
 
-       pr_info("-----SPRD_PIN_BASE:0x%x-----\n", SPRD_PIN_BASE);
+       pr_info("-----SPRD_PIN_BASE:0x%lx-----\n", SPRD_PIN_BASE);
 
        for (i = 0; i < PD_CNT; i++) {
                /*1. get pin power domain vddname */

diff --git a/drivers/platform/sprd/platsmp.c b/drivers/platform/sprd/platsmp.c
index 6e92fdc..deac03c 100644 (file)
--- a/drivers/platform/sprd/platsmp.c
+++ b/drivers/platform/sprd/platsmp.c
@@ -41,8 +41,8 @@ static int __cpuinit boot_secondary_cpus(int cpu_id, u32 paddr)
 {
        if (cpu_id != 1)
                return -1;
-       writel(paddr,CPU_JUMP_VADDR);
-       writel(1 << (cpu_id * 4),HOLDING_PEN_VADDR);
+       writel(paddr,(void __iomem __force *)CPU_JUMP_VADDR);
+       writel(1 << (cpu_id * 4),(void __iomem __force *)HOLDING_PEN_VADDR);
        return 0;
 }
 
@@ -91,21 +91,21 @@ int poweron_cpus(int cpu)
        val = BITS_PD_CA7_C3_PWR_ON_DLY(4) | BITS_PD_CA7_C3_PWR_ON_SEQ_DLY(4) | BITS_PD_CA7_C3_ISO_ON_DLY(4);
        sci_glb_write(poweron, val, -1UL);
 
-       val = (BIT_PD_CA7_C3_AUTO_SHUTDOWN_EN | __raw_readl(poweron)) &~(BIT_PD_CA7_C3_FORCE_SHUTDOWN);
+       val = (BIT_PD_CA7_C3_AUTO_SHUTDOWN_EN | __raw_readl((void __iomem __force *)poweron)) &~(BIT_PD_CA7_C3_FORCE_SHUTDOWN);
        sci_glb_write(poweron, val, -1UL);
        dmb();
        udelay(1000);
 
-       while((__raw_readl(poweron)&BIT_PD_CA7_C3_FORCE_SHUTDOWN) ||
-               !(__raw_readl(REG_AP_AHB_CA7_RST_SET)&(1 << cpu)) ){
+       while((__raw_readl((void __iomem __force *)poweron)&BIT_PD_CA7_C3_FORCE_SHUTDOWN) ||
+               !(__raw_readl((void __iomem __force *)REG_AP_AHB_CA7_RST_SET)&(1 << cpu)) ){
                pr_debug("??? %s set regs failed ???\n", __func__ );
-               writel((__raw_readl(REG_AP_AHB_CA7_RST_SET) | (1 << cpu)), REG_AP_AHB_CA7_RST_SET);
-               val = (BIT_PD_CA7_C3_AUTO_SHUTDOWN_EN | __raw_readl(poweron)) &~(BIT_PD_CA7_C3_FORCE_SHUTDOWN);
-               writel(val,poweron);
+               writel((__raw_readl((void __iomem __force *)REG_AP_AHB_CA7_RST_SET) | (1 << cpu)), (void __iomem __force *)REG_AP_AHB_CA7_RST_SET);
+               val = (BIT_PD_CA7_C3_AUTO_SHUTDOWN_EN | __raw_readl((void __iomem __force *)poweron)) &~(BIT_PD_CA7_C3_FORCE_SHUTDOWN);
+               writel(val,(void __iomem __force *)poweron);
                dmb();
                udelay(500);
        }
-       writel((__raw_readl(REG_AP_AHB_CA7_RST_SET) & ~(1 << cpu)), REG_AP_AHB_CA7_RST_SET);
+       writel((__raw_readl((void __iomem __force *)REG_AP_AHB_CA7_RST_SET) & ~(1 << cpu)), (void __iomem __force *)REG_AP_AHB_CA7_RST_SET);
        return 0;
 }
 
@@ -121,13 +121,13 @@ int powerdown_cpus(int cpu)
        else
                return -1;
 
-       val = (BIT_PD_CA7_C3_FORCE_SHUTDOWN | __raw_readl(poweron)) &~(BIT_PD_CA7_C3_AUTO_SHUTDOWN_EN);
-       writel(val, poweron);
+       val = (BIT_PD_CA7_C3_FORCE_SHUTDOWN | __raw_readl((void __iomem __force *)poweron)) &~(BIT_PD_CA7_C3_AUTO_SHUTDOWN_EN);
+       writel(val, (void __iomem __force *)poweron);
 
 
        while (i < 20) {
                //check power down?
-               if (((__raw_readl(REG_PMU_APB_PWR_STATUS0_DBG) >> (4 * (cpu_logical_map(cpu) + 1))) & 0x0f) == 0x07) {
+               if (((__raw_readl((void __iomem __force *)REG_PMU_APB_PWR_STATUS0_DBG) >> (4 * (cpu_logical_map(cpu) + 1))) & 0x0f) == 0x07) {
                        break;
                }
                udelay(60);
@@ -145,8 +145,8 @@ static int __cpuinit boot_secondary_cpus(int cpu_id, u32 paddr)
        if (cpu_id < 1 || cpu_id > 3)
                return -1;
 
-       writel(paddr,(CPU_JUMP_VADDR + (cpu_id << 2)));
-       writel(readl(HOLDING_PEN_VADDR) | (1 << cpu_id),HOLDING_PEN_VADDR);
+       writel(paddr,(void __iomem __force *)(CPU_JUMP_VADDR + (cpu_id << 2)));
+       writel(readl((void __iomem __force *)HOLDING_PEN_VADDR) | (1 << cpu_id),(void __iomem __force *)HOLDING_PEN_VADDR);
        poweron_cpus(cpu_id);
 
        return 0;

diff --git a/drivers/platform/sprd/reserve.c b/drivers/platform/sprd/reserve.c
index 14412be..f4ef2f1 100755 (executable)
--- a/drivers/platform/sprd/reserve.c
+++ b/drivers/platform/sprd/reserve.c
@@ -24,9 +24,12 @@
 
 #include <asm/setup.h>
 
+#ifndef CONFIG_OF
 static int __init __iomem_reserve_memblock(void)
 {
+#if !defined(CONFIG_CMA) && defined(CONFIG_OF)
        int ret;
+#endif
 
 #ifndef CONFIG_CMA
        if (memblock_is_region_reserved(SPRD_ION_MEM_BASE, SPRD_ION_MEM_SIZE))
@@ -46,6 +49,7 @@ static int __init __iomem_reserve_memblock(void)
 #endif
        return 0;
 }
+#endif
 
 #ifdef CONFIG_PSTORE_RAM
 int __init __ramconsole_reserve_memblock(void)
@@ -58,6 +62,7 @@ int __init __ramconsole_reserve_memblock(void)
 }
 #endif
 
+#ifndef CONFIG_OF
 #ifdef CONFIG_FB_LCD_RESERVE_MEM
 static int __init __fbmem_reserve_memblock(void)
 {
@@ -70,6 +75,7 @@ static int __init __fbmem_reserve_memblock(void)
        return 0;
 }
 #endif
+#endif
 
 #if defined(CONFIG_SIPC) && !defined(CONFIG_ARCH_SC8825)
 int __init __sipc_reserve_memblock(void)
@@ -147,7 +153,9 @@ static int __ddr_training_memblock(void)
 }
 void __init sci_reserve(void)
 {
+#ifndef CONFIG_OF
        int ret;
+#endif
 #if defined(CONFIG_ARCH_SCX30G) || defined(CONFIG_ARCH_SCX35L)
        __ddr_training_memblock();
 #endif

diff --git a/drivers/platform/sprd/sec_debug.c b/drivers/platform/sprd/sec_debug.c
index 642c639..965c4a4 100755 (executable)
--- a/drivers/platform/sprd/sec_debug.c
+++ b/drivers/platform/sprd/sec_debug.c
@@ -796,7 +796,7 @@ static void simulate_bus_hang(void)
 
        /* simulate */
        hang_address = ioremap(address, SZ_4K);
-       pr_emerg("Simulating bus hang. addr=0x%x time=%lu\n", hang_address, jiffies);
+       pr_emerg("Simulating bus hang. addr=%p time=%lu\n", hang_address, jiffies);
        dummy_value = readl_relaxed(hang_address);
        mdelay(DELAY_TIME);
        /* if we hit here, test had failed */
@@ -1175,8 +1175,6 @@ static void sec_debug_set_build_info(void)
 
 __init int sec_debug_init(void)
 {
-       unsigned int addr;
-
        register_reboot_notifier(&nb_reboot_block);
        atomic_notifier_chain_register(&panic_notifier_list, &nb_panic_block);
 

diff --git a/drivers/platform/sprd/sec_getlog.c b/drivers/platform/sprd/sec_getlog.c
index c139e05..439e1ff 100755 (executable)
--- a/drivers/platform/sprd/sec_getlog.c
+++ b/drivers/platform/sprd/sec_getlog.c
@@ -126,7 +126,7 @@ void sec_getlog_supply_kloginfo(void *klog_buf)
        else
 #ifdef CONFIG_SEC_LOG_BUF_NOCACHE
        //This is ugly code to support getlog tool(getlog tool doesnt support various vitual addr)
-       kernel_log_mark.klog_buf = 0xC6B00010;
+       kernel_log_mark.klog_buf = (void *)(uintptr_t)0xC6B00010;
 #else
        kernel_log_mark.klog_buf = klog_buf;
 #endif

diff --git a/drivers/platform/sprd/sec_log.c b/drivers/platform/sprd/sec_log.c
index 79191e7..bb344c0 100644 (file)
--- a/drivers/platform/sprd/sec_log.c
+++ b/drivers/platform/sprd/sec_log.c
@@ -152,9 +152,9 @@ void sec_debug_set_last_regs_access(void)
 
        size_struct_sec_log_buffer = (((size_struct_sec_log_buffer + 4) / 4)* 4);
        offset = sec_logbuf_size + sizeof(*sec_log_ptr) + sizeof(*sec_log_mag);
-       sec_debug_last_regs_access = addr + offset;
-       sec_debug_last_regs_paddr = sec_logbuf_base_addr + size_struct_sec_log_buffer + offset;
-       sec_debug_local_hwlocks_status = sec_debug_last_regs_access + NR_CPUS;
+       sec_debug_last_regs_access = (void *)(uintptr_t)(addr + offset);
+       sec_debug_last_regs_paddr = (uintptr_t)(sec_logbuf_base_addr + size_struct_sec_log_buffer + offset);
+       sec_debug_local_hwlocks_status = (void *)(uintptr_t)(sec_debug_last_regs_access + NR_CPUS);
        memset(sec_debug_local_hwlocks_status, 0, HWSPINLOCK_ID_TOTAL_NUMS);
 
        pr_info("sec_debug_last_regs_access: 0x%p (A:0x%x), size: %d\n",
@@ -230,12 +230,12 @@ static int __init sec_logbuf_conf_memtype(void)
                sec_log_size = sec_logbuf_size;
        }
        else if(sec_log_buf_nocache_enable == 0) {
-               base = sec_logbuf_base_addr;
-               sec_log_mag = phys_to_virt(base) + size_struct_sec_log_buffer +
+               base = (void *)(uintptr_t)sec_logbuf_base_addr;
+               sec_log_mag = phys_to_virt((uintptr_t)base) + size_struct_sec_log_buffer +
                                                        sec_logbuf_size + size_of_log_ptr;
-               sec_log_ptr = phys_to_virt(base) + size_struct_sec_log_buffer + sec_logbuf_size;
-               sec_log_buffer = phys_to_virt(base);
-               sec_log_buf = phys_to_virt(base) + size_struct_sec_log_buffer;
+               sec_log_ptr = phys_to_virt((uintptr_t)base) + size_struct_sec_log_buffer + sec_logbuf_size;
+               sec_log_buffer = phys_to_virt((uintptr_t)base);
+               sec_log_buf = phys_to_virt((uintptr_t)base) + size_struct_sec_log_buffer;
                sec_log_size = sec_logbuf_size;
 
        }