ARM: SPRD: fix build warnings for sc8830

Fix build warnings including implicit function, unused variable and
incompatible pointer in sc8830 directory. It also removes not used
ldo functions causing building.

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

diff --git a/arch/arm/cpu/armv7/sc8830/ldo.c b/arch/arm/cpu/armv7/sc8830/ldo.c
index 416ea11..342b290 100644 (file)
--- a/arch/arm/cpu/armv7/sc8830/ldo.c
+++ b/arch/arm/cpu/armv7/sc8830/ldo.c
@@ -40,33 +40,6 @@
                } \
        }while(0)
 
-struct ldo_ctl_info {
-/**
-  need config area
- */
-       LDO_ID_E id;
-       unsigned int bp_reg;
-       unsigned int bp_bits;
-       unsigned int bp_rst_reg;
-       unsigned int bp_rst;//bits
-               
-       unsigned int level_reg_b0;
-       unsigned int b0;
-       unsigned int b0_rst;
-               
-       unsigned int level_reg_b1;
-       unsigned int b1;
-       unsigned int b1_rst;
-
-       unsigned int init_level;
-/**
-  not need config area
- */
-       int ref;
-       int current_status;
-       int current_volt_level;
-};
-
 #if defined(CONFIG_SPX15) || defined(CONFIG_ADIE_SC2723) || defined(CONFIG_ADIE_SC2723S)
 struct {
        LDO_ID_E id;
@@ -114,7 +87,7 @@ struct {
 };
 
 struct s_ldo_ctl_info {
-       SLP_LDO_E id;
+       LDO_ID_E id;
        unsigned int reg;
        unsigned int bit;
 };
@@ -154,6 +127,7 @@ const char* __LDO_NAME(LDO_ID_E ldo_id)
 
 int LDO_Init(void)
 {
+       extern int regulator_init(void);
        return regulator_init();
 }
 
@@ -207,77 +181,6 @@ LDO_ERR_E LDO_TurnOnLDO(LDO_ID_E ldo_id)
 #endif
 }
 
-static struct ldo_ctl_info* LDO_GetLdoCtl(LDO_ID_E ldo_id)
-{
-       int i = 0;
-       struct ldo_ctl_info* ctl = NULL;
-
-       for ( i = 0; i < ARRAY_SIZE(s_ldo_ctl_data); ++i)
-       {
-               if (s_ldo_ctl_data[i].id == ldo_id)
-               {
-                       ctl = &s_ldo_ctl_data[i];
-                       break;
-               }
-       }
-
-       SCI_PASSERT(ctl != NULL, ("ldo_id = %d", ldo_id));
-       return ctl;
-}
-
-LDO_ERR_E LDO_SetVoltLevel(LDO_ID_E ldo_id, LDO_VOLT_LEVEL_E volt_level)
-{
-       unsigned short reg_data;
-       struct ldo_ctl_info* ctl = NULL;
-
-       ctl = LDO_GetLdoCtl(ldo_id);
-       SCI_PASSERT(ctl != NULL, ("ldo_id = %d", ldo_id));
-
-       if (ctl->level_reg_b0 == LDO_INVALID_REG_ADDR)
-       {
-               goto Err_Exit;
-       }
-
-       if (ctl->level_reg_b0 != ctl->level_reg_b1)
-       {
-               printf("ldo_id:%d, level_reg_b0:%08x, level_reg_b1:%08x\r\n", ldo_id, ctl->level_reg_b0, ctl->level_reg_b1);
-               goto Err_Exit;
-       }
-
-       switch (volt_level)
-       {
-               case LDO_VOLT_LEVEL0:
-                       ANA_REG_AND(ctl->level_reg_b0, (~(ctl->b0|ctl->b1)));
-                       break;
-
-               case LDO_VOLT_LEVEL1:
-                       reg_data = ANA_REG_GET(ctl->level_reg_b0);
-                       reg_data &=~ctl->b1;
-                       reg_data |= ctl->b0;
-                       ANA_REG_SET(ctl->level_reg_b0, reg_data);
-                       break;
-
-               case LDO_VOLT_LEVEL2:
-                       reg_data = ANA_REG_GET(ctl->level_reg_b0);
-                       reg_data &=~ctl->b0;
-                       reg_data |= ctl->b1;
-                       ANA_REG_SET(ctl->level_reg_b0, reg_data);
-                       break;
-
-               case LDO_VOLT_LEVEL3:
-                       ANA_REG_OR (ctl->level_reg_b0, (ctl->b0|ctl->b1));
-                       break;
-
-               default:
-                       goto Err_Exit;
-       }
-
-       ctl->current_volt_level = volt_level;
-       return LDO_ERR_OK;
-Err_Exit:
-       return LDO_ERR_ERR;
-}
-
 #else
 
 struct ldo_ctl_info {

diff --git a/arch/arm/cpu/armv7/sc8830/mfp_sprd.c b/arch/arm/cpu/armv7/sc8830/mfp_sprd.c
index ac080b9..51d8617 100644 (file)
--- a/arch/arm/cpu/armv7/sc8830/mfp_sprd.c
+++ b/arch/arm/cpu/armv7/sc8830/mfp_sprd.c
@@ -41,6 +41,7 @@ const static unsigned long pin_gpio_map[MFP_PIN_MAX] = {
 unsigned long mfp_to_gpio(int pin)
 {
        BUG_ON(1);
+       return 0;
 }
 
 static  int __mfp_validate(unsigned long c)
@@ -108,8 +109,6 @@ static int __mfp_config_pin(unsigned long c)
        return 0;
 }
 
-static unsigned long spi_cs1_gpio_cfg = MFP_CFG_X(SPI_CSN0, GPIO, DS1, F_PULL_NONE, S_PULL_DOWN, IO_NONE);
-
 void sprd_mfp_config(unsigned long *mfp_cfgs, int num)
 {
        unsigned long *c;

diff --git a/arch/arm/cpu/armv7/sc8830/mmu.c b/arch/arm/cpu/armv7/sc8830/mmu.c
index 8c4d12b..828af8a 100644 (file)
--- a/arch/arm/cpu/armv7/sc8830/mmu.c
+++ b/arch/arm/cpu/armv7/sc8830/mmu.c
@@ -1,6 +1,7 @@
 
 #include <asm/arch/sci_types.h>
 extern void MMU_EnableIDCM (void);
+extern void MMU_InvalideICACHEALL(void);
 /**********************************************************************
   Section Descriptor:
   31                   20 19        12 11 10  9  8   5  4  3  2  1  0
@@ -52,7 +53,7 @@ void MMU_Init (unsigned pageBaseAddr)
     int i;
 
     // 15Mb physical addr for page table
-    g_mmu_page_table = const_MMUTableStartAddr;
+    g_mmu_page_table = (unsigned int *)const_MMUTableStartAddr;
 
     // Create page table 1mb entries
     for (i = 0; i < 0x1000; i++)

diff --git a/arch/arm/cpu/armv7/sc8830/reset.c b/arch/arm/cpu/armv7/sc8830/reset.c
index e2aceda..82541ba 100644 (file)
--- a/arch/arm/cpu/armv7/sc8830/reset.c
+++ b/arch/arm/cpu/armv7/sc8830/reset.c
@@ -43,6 +43,7 @@
  */
 void reset_cpu (ulong ignored)
 {
+       extern void start_watchdog(uint32_t init_time_ms);
        start_watchdog(5);
        while (1) ;
 }

diff --git a/arch/arm/cpu/armv7/sc8830/rtc-sprd.c b/arch/arm/cpu/armv7/sc8830/rtc-sprd.c
index 528be9b..95f9138 100644 (file)
--- a/arch/arm/cpu/armv7/sc8830/rtc-sprd.c
+++ b/arch/arm/cpu/armv7/sc8830/rtc-sprd.c
@@ -180,7 +180,6 @@ void sprd_rtc_set_alarm_sec(unsigned long secs)
 
 int sprd_clean_rtc(void)
 {
-       int err;
        ANA_REG_AND(ANA_RTC_INT_EN, ~(RTC_INT_ALL_MSK)); // disable all interrupt
 
        ANA_REG_OR(ANA_REG_GLB_ARM_MODULE_EN, BIT_ANA_RTC_EN); //rtc enable

diff --git a/arch/arm/cpu/armv7/sc8830/sec_boot.c b/arch/arm/cpu/armv7/sc8830/sec_boot.c
index 6c08c73..c6c5412 100644 (file)
--- a/arch/arm/cpu/armv7/sc8830/sec_boot.c
+++ b/arch/arm/cpu/armv7/sc8830/sec_boot.c
@@ -295,7 +295,7 @@ int harshVerify(uint8_t * data, uint32_t data_len, uint8_t * data_hash, uint8_t
        bsc_info = (bsc_info_t *) data_key;
        SHA1Reset_32(&sha);
        SHA1Input_32(&sha, (uint32_t *) data, data_len >> 2);
-       SHA1Result_32(&sha, soft_hash_data);
+       SHA1Result_32(&sha, (unsigned char *)soft_hash_data);
        memcpy(hash_copy, vlr_info->hash, sizeof(vlr_info->hash));
 
        RSA_Decrypt(hash_copy, bsc_info->key.m, bsc_info->key.r2, (unsigned char *)(&bsc_info->key.e));

diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index e91a131..ff02661 100644 (file)
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -680,6 +680,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #ifdef SPRD_EVM_TAG_ON
                SPRD_EVM_TAG(11);
 #endif
+    extern void MMU_Init (unsigned pageBaseAddr);
     MMU_Init(CONFIG_MMU_TABLE_ADDR);
 
 #if !defined(CONFIG_FPGA)
@@ -696,6 +697,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #if defined(CONFIG_SC8830) || defined(CONFIG_SC9630)
         if (sprdbat_get_vbatauxadc_caltype() != 0)
         {
+            extern int DCDC_Cal_ArmCore(void);
             DCDC_Cal_ArmCore();
            performance_debug("6:");
         }
@@ -703,6 +705,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif
 #endif
 
+    extern void board_keypad_init(void);
     board_keypad_init();
     boot_pwr_check();