From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Linus Walleij <linus.walleij@linaro.org>,
Maxime Coquelin <maxime.coquelin@stericsson.com>,
Alex Macro <alex.macro@stericsson.com>,
Michel Jaouen <michel.jaouen@stericsson.com>,
Samuel Ortiz <sameo@linux.intel.com>
Subject: linux-next: manual merge of the moduleh tree with the mfd tree
Date: Fri, 9 Mar 2012 17:19:45 +1100 [thread overview]
Message-ID: <20120309171945.925bdfceddfdcf2f810f37e6@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1507 bytes --]
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in
include/linux/mfd/abx500/ab8500.h between commit 0f6208375951 ("mfd: Add
ab8500 version detection and enforcing") from the mfd tree and commit
3a55cc4f6e53 ("device.h: audit and cleanup users in main include dir")
from the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc include/linux/mfd/abx500/ab8500.h
index 4b2df29,dca9439..0000000
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@@ -7,31 -7,11 +7,34 @@@
#ifndef MFD_AB8500_H
#define MFD_AB8500_H
- #include <linux/device.h>
+ #include <linux/mutex.h>
+
+ struct device;
+
/*
+ * AB IC versions
+ *
+ * AB8500_VERSION_AB8500 should be 0xFF but will never be read as need a
+ * non-supported multi-byte I2C access via PRCMU. Set to 0x00 to ease the
+ * print of version string.
+ */
+enum ab8500_version {
+ AB8500_VERSION_AB8500 = 0x0,
+ AB8500_VERSION_AB8505 = 0x1,
+ AB8500_VERSION_AB9540 = 0x2,
+ AB8500_VERSION_AB8540 = 0x3,
+ AB8500_VERSION_UNDEFINED,
+};
+
+/* AB8500 CIDs*/
+#define AB8500_CUTEARLY 0x00
+#define AB8500_CUT1P0 0x10
+#define AB8500_CUT1P1 0x11
+#define AB8500_CUT2P0 0x20
+#define AB8500_CUT3P0 0x30
+#define AB8500_CUT3P3 0x33
+
+/*
* AB8500 bank addresses
*/
#define AB8500_SYS_CTRL1_BLOCK 0x1
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-09 6:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 6:19 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-11-01 7:05 Stephen Rothwell
2011-10-05 7:36 Stephen Rothwell
2011-10-05 19:59 ` Paul Gortmaker
2011-09-27 6:29 Stephen Rothwell
2011-09-27 14:54 ` Paul Gortmaker
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=20120309171945.925bdfceddfdcf2f810f37e6@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alex.macro@stericsson.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maxime.coquelin@stericsson.com \
--cc=michel.jaouen@stericsson.com \
--cc=paul.gortmaker@windriver.com \
--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®