ST1.5 board support and some ST1.0/1.5 common changes.

cpu/armv7Scorpion/QSD8x50/proc_comm_clients.c

 /*
  * Copyright (c) 2007-2010, Code Aurora Forum. 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
  * may be copied, distributed, and modified under those terms.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  */
 
 #include <common.h>
-#include <asm/arch/QSD8x50_reg.h>
 
 #ifdef USE_PROC_COMM
 
 #include <asm/arch/proc_comm.h>
 
 extern int msm_proc_comm(proc_comm_t *cmd_pkt);
 
 extern void gpio_tlmm_config(uint32_t gpio, uint8_t func,
                              uint8_t dir, uint8_t pull,
                              uint8_t drvstr, uint32_t enable);
@@ skipping 26 matching lines @@
     pc_pkt.command = PROC_COMM_VREG_SWITCH;
     pc_pkt.data1 = vreg;
     pc_pkt.data2 = state ? PROC_COMM_ENABLE : PROC_COMM_DISABLE;
     pc_pkt.status  = PROC_COMM_INVALID_STATUS;
 
     do{
         msm_proc_comm((proc_comm_t *)&pc_pkt);
     }while(PROC_COMM_CMD_SUCCESS != pc_pkt.status);
 }
 
+#ifndef CONFIG_GENERIC_MMC
 void proc_comm_sdcard_power(int state)
 {
     volatile proc_comm_t pc_pkt;
     while(1) {
         pc_pkt.command = PROC_COMM_VREG_SWITCH;
         pc_pkt.data1 = PROC_COMM_VREG_SDC;
         pc_pkt.data2 = state ? PROC_COMM_ENABLE : PROC_COMM_DISABLE;
 
         msm_proc_comm((proc_comm_t *)&pc_pkt);
         debug("PROC_COMM_VREG_SWITCH TRY\n");
         if(PROC_COMM_CMD_SUCCESS != pc_pkt.status) {
             debug("Error: PROC_COMM_VREG_SWITCH failed...retrying\n");
         } else {
             debug("PROC_COMM_VREG_SWITCH DONE\n");
             break;
         }
       }
 
 }
+#endif
 
 void proc_comm_sdcard_gpio_config(int instance)
 {
 
 //Note: GPIO_NO_PULL is for clock lines.
 switch (instance) {
 case 1:
         gpio_tlmm_config(51, 1, GPIO_OUTPUT, GPIO_PULL_UP,
                          GPIO_8MA, GPIO_ENABLE);
         gpio_tlmm_config(52, 1, GPIO_OUTPUT, GPIO_PULL_UP,
@@ skipping 349 matching lines @@
         proc_comm_clk_enable(PROC_COMM_MDP_LCDC_PCLK_CLK);
 }
 
 /* enables LCD_NS_REG->MNCNTR_EN,LCD_ROOT_ENA, LCD_CLK_EXT_BRANCH_ENA */
 uint32_t proc_comm_get_lcdc_clk(void)
 {
         return proc_comm_get_clk_rate(PROC_COMM_MDP_LCDC_PCLK_CLK);
 }
 
 #endif /*USE_PROC_COMM*/