Hello.
Rodolfo Giometti wrote:
Protect code on "BCSR" device.
Signed-off-by: Rodolfo Giometti <giometti@xxxxxxxx>
------------------------------------------------------------------------
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/au1xmmc.c
index b0dc1d0..6084bb8 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/au1xmmc.c
@@ -65,8 +65,8 @@ #endif
const struct {
u32 iobase;
u32 tx_devid, rx_devid;
- u16 bcsrpwr;
- u16 bcsrstatus;
+ u16 power;
+ u16 status;
u16 wpstatus;
} au1xmmc_card_table[] = {
{ SD0_BASE, DSCR_CMD0_SDMS_TX0, DSCR_CMD0_SDMS_RX0,
@@ -138,24 +138,42 @@ static inline void SEND_STOP(struct au1x
static void au1xmmc_set_power(struct au1xmmc_host *host, int state)
{
- u32 val = au1xmmc_card_table[host->id].bcsrpwr;
+ u32 val;
+ val = au1xmmc_card_table[host->id].power;
+
+#if defined(CONFIG_MIPS_DB1200)
bcsr->board &= ~val;
if (state) bcsr->board |= val;
+#endif
au_sync_delay(1);
}
If DBAu1100 doesn't allow to control slot power, then I don't think
pretending it does is a good thing. Shouldn't these #ifdef's be in
au1xmmc_set_ios() instead (the function is void anyway but that would allow us
to save on the code size a bit more)?
static inline int au1xmmc_card_inserted(struct au1xmmc_host *host)
{
- return (bcsr->sig_status & au1xmmc_card_table[host->id].bcsrstatus)
- ? 1 : 0;
+ u32 val, data = 1;
+
+ val = au1xmmc_card_table[host->id].status;
+
+#if defined(CONFIG_MIPS_DB1200)
+ data = bcsr->sig_status & val;
+#endif
+
+ return !!data;
}
Hrm, are you sure there's no way to sense that the card is *really*
inserted or not?
static inline int au1xmmc_card_readonly(struct au1xmmc_host *host)
{
- return (bcsr->status & au1xmmc_card_table[host->id].wpstatus)
- ? 1 : 0;
+ u32 val, data = 0;
+
+ val = au1xmmc_card_table[host->id].wpstatus;
+
+#if defined(CONFIG_MIPS_DB1200)
+ data = bcsr->status & val;
+#endif
+
+ return !!data;
}
Ditto.
WBR, Sergei
