Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 344967
b: refs/heads/master
c: 5b8b1fe
h: refs/heads/master
i:
  344965: 409c321
  344963: f85c79c
  344959: 800b5bb
v: v3
  • Loading branch information
Laxman Dewangan authored and Samuel Ortiz committed Nov 13, 2012
1 parent cbcc948 commit 42396c2
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 605511a848ae3ac4b2ce272ae6cbf8930b29ebb3
refs/heads/master: 5b8b1fe2da98dbc4a10b9ad6d0f9f84e2815d4e4
12 changes: 11 additions & 1 deletion trunk/drivers/mfd/tps6586x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 42396c2

Please sign in to comment.