shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 12:57:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

modify some files according to A22 hardware

Browse Source
This commit is contained in:
luowei
2011-04-09 10:50:46 +08:00
parent 774b961456
commit ff59b4ed4f
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-rk29/board-rk29-a22.c
View File

@@ -3009,10 +3009,10 @@ static void __init machine_rk29_fixup(struct machine_desc *desc, struct tag *tag
static void __init machine_rk29_mapio(void)
{
rk29_map_common_io(periph_pll_288mhz);
rk29_map_common_io();
rk29_setup_early_printk();
rk29_sram_init();
rk29_clock_init();
rk29_clock_init(periph_pll_288mhz);
rk29_iomux_init();
}

6
arch/arm/mach-rk29/ddr.c
View File

@@ -1226,8 +1226,10 @@ static int __init ddr_probe(void)
Hz = clk_get_rate(clk_get(NULL,"ddr"));
MHz = Hz/1000000;
value = ddr_change_freq(MHz);
#if defined(CONFIG_MACH_RK29_A22) //a22 should not change freq
#else
value = ddr_change_freq(MHz);
#endif
ddr_print("init success!!! freq=%dMHz\n", value);
return 0;
}

6
drivers/i2c/busses/i2c-rk29.c
View File

@@ -427,6 +427,9 @@ static int rk29_i2c_send_msg(struct rk29_i2c_data *i2c, struct i2c_msg *msg)
lsr = readl(i2c->regs + I2C_LSR);
if((lsr & I2C_LSR_RCV_NAK) && (i != msg->len -1) && !(msg->flags & I2C_M_IGNORE_NAK))
return -EINVAL;
if(msg->addr == 0x41) //delay for tp
udelay(50);
}
return ret;
@@ -455,6 +458,9 @@ static int rk29_i2c_recv_msg(struct rk29_i2c_data *i2c, struct i2c_msg *msg)
else
rk29_set_ack(i2c);
i2c_dbg(i2c->dev, "i2c recv >>>>>>>>>>>> buf[%d]: %x\n", i, msg->buf[i]);
if(msg->addr == 0x41) //delay for tp
udelay(50);
}
return ret;
}

4
drivers/mmc/host/rk29_sdmmc.c
View File

@@ -706,9 +706,13 @@ static int rk29_sdmmc_get_ro(struct mmc_host *mmc)
static int rk29_sdmmc_get_cd(struct mmc_host *mmc)
{
#if defined(CONFIG_MACH_RK29_A22) //A22's sdcard do not support detect pin
return 1;
#else
struct rk29_sdmmc *host = mmc_priv(mmc);
u32 cdetect = rk29_sdmmc_read(host->regs, SDMMC_CDETECT);
return (cdetect & SDMMC_CARD_DETECT_N)?0:1;
#endif
}
static void rk29_sdmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)