From: Alex Gershgorin <alexg@meprolight.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: <sameo@linux.intel.com>, <linux-kernel@vger.kernel.org>,
<s.hauer@pengutronix.de>, <fabio.estevam@freescale.com>,
<linux-arm-kernel@lists.infradead.org>,
Alex Gershgorin <alexg@meprolight.com>
Subject: [PATCH] mfd: mc13xxx: add I2C support fix building for v3.4
Date: Wed, 28 Mar 2012 16:01:13 +0200 [thread overview]
Message-ID: <1332943273-22447-1-git-send-email-alexg@meprolight.com> (raw)
This patch fixes the compilation errors after the patches
from series mc13xxx-add-I2C-support-V4 were applied.
Signed-off-by: Alex Gershgorin <alexg@meprolight.com>
---
drivers/mfd/Kconfig | 2 ++
drivers/mfd/mc13xxx-core.c | 2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index c3fbc5e..2119732 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -577,6 +577,8 @@ config MFD_MC13XXX
depends on SPI_MASTER || I2C
select MFD_CORE
select MFD_MC13783
+ select REGMAP_I2C if I2C
+ select REGMAP_SPI if SPI_MASTER
help
Enable support for the Freescale MC13783 and MC13892 PMICs.
This driver provides common support for accessing the device,
diff --git a/drivers/mfd/mc13xxx-core.c b/drivers/mfd/mc13xxx-core.c
index 31dbf91..5a60273 100644
--- a/drivers/mfd/mc13xxx-core.c
+++ b/drivers/mfd/mc13xxx-core.c
@@ -616,7 +616,7 @@ static int mc13xxx_add_subdevice(struct mc13xxx *mc13xxx, const char *format)
#ifdef CONFIG_OF
static int mc13xxx_probe_flags_dt(struct mc13xxx *mc13xxx)
{
- struct device_node *np = mc13xxx->dev.of_node;
+ struct device_node *np = mc13xxx->dev->of_node;
if (!np)
return -ENODEV;
--
1.7.0.4
next reply other threads:[~2012-03-28 14:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-28 14:01 Alex Gershgorin [this message]
2012-03-28 14:40 ` Mark Brown
2012-03-28 16:31 ` Alex Gershgorin
2012-03-28 16:35 ` Mark Brown
2012-03-28 17:38 ` Alex Gershgorin
2012-03-28 20:47 ` Marc Reilly
2012-03-29 7:51 ` Alex Gershgorin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332943273-22447-1-git-send-email-alexg@meprolight.com \
--to=alexg@meprolight.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=fabio.estevam@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®