浏览代码

[MIPS] Alchemy: SMBus resource fix

The Alchemy platform code registers the SMBus device using the virtual
address of its registers instead of the physical one -- fix this, taking
into account that actually the whole megabyte is decoded by any of the
programmable serial controllers (one of which is SMBus), and that all the
Alchemy peripherals are directly mappable into KSEG1 kernel space and
therefore ioremap() call would just boil down to CKSEG1ADDR() invocation.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Sergei Shtylyov 17 年之前
父节点
当前提交
8e07c2c6af
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      arch/mips/au1000/common/platform.c
  2. 1 1
      drivers/i2c/busses/i2c-au1550.c

+ 2 - 2
arch/mips/au1000/common/platform.c

@@ -269,8 +269,8 @@ static struct platform_device au1x00_pcmcia_device = {
 #ifdef SMBUS_PSC_BASE
 #ifdef SMBUS_PSC_BASE
 static struct resource pbdb_smbus_resources[] = {
 static struct resource pbdb_smbus_resources[] = {
 	{
 	{
-		.start	= SMBUS_PSC_BASE,
-		.end	= SMBUS_PSC_BASE + 0x24 - 1,
+		.start	= CPHYSADDR(SMBUS_PSC_BASE),
+		.end	= CPHYSADDR(SMBUS_PSC_BASE + 0xfffff),
 		.flags	= IORESOURCE_MEM,
 		.flags	= IORESOURCE_MEM,
 	},
 	},
 };
 };

+ 1 - 1
drivers/i2c/busses/i2c-au1550.c

@@ -335,7 +335,7 @@ i2c_au1550_probe(struct platform_device *pdev)
 		goto out_mem;
 		goto out_mem;
 	}
 	}
 
 
-	priv->psc_base = r->start;
+	priv->psc_base = CKSEG1ADDR(r->start);
 	priv->xfer_timeout = 200;
 	priv->xfer_timeout = 200;
 	priv->ack_timeout = 200;
 	priv->ack_timeout = 200;