From 42396c243d1dec6422f44785a80ca20b221bd7ad Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Tue, 13 Nov 2012 19:18:06 +0530 Subject: [PATCH] --- yaml --- r: 344967 b: refs/heads/master c: 5b8b1fe2da98dbc4a10b9ad6d0f9f84e2815d4e4 h: refs/heads/master i: 344965: 409c321825f996ec2a4ee3a00c41409c1328dcd9 344963: f85c79c07b36e838617c0406bbebdc376dfc607a 344959: 800b5bb8041493ac3a58baeb711b5846cce737d8 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps6586x.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 653f8e1de1e4..76eba063285b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 605511a848ae3ac4b2ce272ae6cbf8930b29ebb3 +refs/heads/master: 5b8b1fe2da98dbc4a10b9ad6d0f9f84e2815d4e4 diff --git a/trunk/drivers/mfd/tps6586x.c b/trunk/drivers/mfd/tps6586x.c index 2cdf1e6c00c8..c11539a80fc5 100644 --- a/trunk/drivers/mfd/tps6586x.c +++ b/trunk/drivers/mfd/tps6586x.c @@ -96,12 +96,22 @@ static const struct tps6586x_irq_data tps6586x_irqs[] = { [TPS6586X_INT_RTC_ALM2] = TPS6586X_IRQ(TPS6586X_INT_MASK4, 1 << 1), }; +static struct resource tps6586x_rtc_resources[] = { + { + .start = TPS6586X_INT_RTC_ALM1, + .end = TPS6586X_INT_RTC_ALM1, + .flags = IORESOURCE_IRQ, + }, +}; + static struct mfd_cell tps6586x_cell[] = { { .name = "tps6586x-gpio", }, { .name = "tps6586x-rtc", + .num_resources = ARRAY_SIZE(tps6586x_rtc_resources), + .resources = &tps6586x_rtc_resources[0], }, { .name = "tps6586x-onkey", @@ -562,7 +572,7 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client, ret = mfd_add_devices(tps6586x->dev, -1, tps6586x_cell, ARRAY_SIZE(tps6586x_cell), - NULL, 0, NULL); + NULL, 0, tps6586x->irq_domain); if (ret < 0) { dev_err(&client->dev, "mfd_add_devices failed: %d\n", ret); goto err_mfd_add;