ENGR00318207 ARM:imx6x:Busfreq:Fix build warnings in busfreq driver.

Fix the following build warnings in busfreq driver:
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq-imx6.c: In function 'imx6_dt_find_ddr_sram':
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq-imx6.c:736:29: warning: assignment makes integer from pointer
without a cast [enabled by default]
   ddr_freq_change_iram_phys = (void *)ddr_iram_addr;
                             ^
  CC      drivers/base/firmware_class.o
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq_ddr3.c: In function 'init_mmdc_ddr3_settings_imx6sx':
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq_ddr3.c:404:22: warning: assignment makes pointer from integer
without a cast [enabled by default]
  iram_iomux_settings = ddr_freq_change_iram_base + ddr_code_size;
                      ^
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq_ddr3.c: In function 'init_mmdc_ddr3_settings_imx6q':
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq_ddr3.c:539:22: warning: assignment makes pointer from integer
without a cast [enabled by default]
  iram_iomux_settings = ddr_freq_change_iram_base + ddr_code_size;
                      ^
  CC      arch/arm/mach-imx/busfreq_lpddr2.o
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq_lpddr2.c: In function 'init_mmdc_lpddr2_settings':
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq_lpddr2.c:96:2: warning: ISO C90 forbids mixed declarations and
code [-Wdeclaration-after-statement]
  unsigned long ddr_code_size;
  ^
/home/ra5478/work/linux_3.10.x/arch/arm/mach-imx/busfreq_lpddr2.c:101:3: warning: passing argument 1 of 'memcpy' makes
pointer from integer without a cast [enabled by default]
   mx6_change_lpddr2_freq = (void *)fncpy(

Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>

3 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-imx/busfreq-imx6.c b/arch/arm/mach-imx/busfreq-imx6.c
index fdd0c40d6b66..e67bdbc21a83 100644
--- a/arch/arm/mach-imx/busfreq-imx6.c
+++ b/arch/arm/mach-imx/busfreq-imx6.c
@@ -733,7 +733,7 @@ static int __init imx6_dt_find_ddr_sram(unsigned long node,
                                 (ddr_iram_addr  & 0xFFF00000) | TT_ATTRIB_NON_CACHEABLE_1M;
 
                 }
-                ddr_freq_change_iram_phys = (void *)ddr_iram_addr;
+                ddr_freq_change_iram_phys = ddr_iram_addr;
                 ddr_freq_change_iram_base = IMX_IO_P2V(ddr_iram_addr);
         }
         return 0;
diff --git a/arch/arm/mach-imx/busfreq_ddr3.c b/arch/arm/mach-imx/busfreq_ddr3.c
index f2719205097b..6854f78d3f47 100644
--- a/arch/arm/mach-imx/busfreq_ddr3.c
+++ b/arch/arm/mach-imx/busfreq_ddr3.c
@@ -401,7 +401,7 @@ int init_mmdc_ddr3_settings_imx6sx(struct platform_device *busfreq_pdev)
          * Store the size of the array in iRAM also,
          * increase the size by 8 bytes.
          */
-        iram_iomux_settings = ddr_freq_change_iram_base + ddr_code_size;
+        iram_iomux_settings = (void *)(ddr_freq_change_iram_base + ddr_code_size);
         iram_ddr_settings = iram_iomux_settings + (iomux_settings_size * 8) + 8;
 
         if ((ddr_code_size + (iomux_settings_size + ddr_settings_size) * 8 + 16)
@@ -536,7 +536,7 @@ int init_mmdc_ddr3_settings_imx6q(struct platform_device *busfreq_pdev)
          * Store the size of the array in iRAM also,
          * increase the size by 8 bytes.
          */
-        iram_iomux_settings = ddr_freq_change_iram_base + ddr_code_size;
+        iram_iomux_settings = (void *)ddr_freq_change_iram_base + ddr_code_size;
         iram_ddr_settings = iram_iomux_settings + (iomux_settings_size * 8) + 8;
 
         if ((ddr_code_size + (iomux_settings_size + ddr_settings_size) * 8 + 16)
diff --git a/arch/arm/mach-imx/busfreq_lpddr2.c b/arch/arm/mach-imx/busfreq_lpddr2.c
index 5c96885f9fc5..e71b22f037b6 100644
--- a/arch/arm/mach-imx/busfreq_lpddr2.c
+++ b/arch/arm/mach-imx/busfreq_lpddr2.c
@@ -92,18 +92,18 @@ int update_lpddr2_freq(int ddr_rate)
 
 int init_mmdc_lpddr2_settings(struct platform_device *busfreq_pdev)
 {
-        busfreq_dev = &busfreq_pdev->dev;
         unsigned long ddr_code_size;
+        busfreq_dev = &busfreq_pdev->dev;
 
         ddr_code_size = (&imx6_lpddr2_freq_change_end -&imx6_lpddr2_freq_change_start) *4;
 
         if (cpu_is_imx6sl())
                 mx6_change_lpddr2_freq = (void *)fncpy(
-                        ddr_freq_change_iram_base,
+                        (void *)ddr_freq_change_iram_base,
                         &mx6_lpddr2_freq_change, ddr_code_size);
         else if (cpu_is_imx6sx())
                 mx6_change_lpddr2_freq = (void *)fncpy(
-                        ddr_freq_change_iram_base,
+                        (void *)ddr_freq_change_iram_base,
                         &imx6sx_lpddr2_freq_change, ddr_code_size);
 
         curr_ddr_rate = ddr_normal_rate;