From 6a63af15bb64a3cbafc33edd5db551167f9b8129 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Sun, 5 Aug 2012 14:01:26 +0800 Subject: [PATCH] --- yaml --- r: 321556 b: refs/heads/master c: 7e6086d9e54a159a6257c02bb7fc5805c614aad2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpio/gpio-mxc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c125ecb9001f..c79d467e4e1d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6b0ca25ee402f714487b31c35f8e11f2bf4310b +refs/heads/master: 7e6086d9e54a159a6257c02bb7fc5805c614aad2 diff --git a/trunk/drivers/gpio/gpio-mxc.c b/trunk/drivers/gpio/gpio-mxc.c index 76e8cda9c06f..80f44bb64a87 100644 --- a/trunk/drivers/gpio/gpio-mxc.c +++ b/trunk/drivers/gpio/gpio-mxc.c @@ -465,7 +465,8 @@ static int __devinit mxc_gpio_probe(struct platform_device *pdev) goto out_iounmap; port->bgc.gc.to_irq = mxc_gpio_to_irq; - port->bgc.gc.base = pdev->id * 32; + port->bgc.gc.base = (pdev->id < 0) ? of_alias_get_id(np, "gpio") * 32 : + pdev->id * 32; err = gpiochip_add(&port->bgc.gc); if (err)