From: Sebastian Reichel <sre@kernel.org>
To: "Sebastian Reichel" <sre@kernel.org>,
"Tony Lindgren" <tony@atomide.com>,
"Benoît Cousson" <bcousson@baylibre.com>,
"Paul Walmsley" <paul@pwsan.com>,
"Aaro Koskinen" <aaro.koskinen@iki.fi>
Cc: Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
linux-omap@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] HSI: nokia-modem: add n950 and n9 support
Date: Sun, 17 Jan 2016 16:49:07 +0100 [thread overview]
Message-ID: <1453045749-22642-4-git-send-email-sre@kernel.org> (raw)
In-Reply-To: <1453045749-22642-1-git-send-email-sre@kernel.org>
The Nokia N950 and Nokia N9 also have a SSI connected
modem, which use the same protocols as the Nokia N900,
but with slightly other GPIO setup and increased link
speed (96000 kbps instead of 55000 kbps).
Since it's unclear, if the N950 and the N9 use exactly
the same modem, each of them gets their own compatible
string.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
---
Documentation/devicetree/bindings/hsi/nokia-modem.txt | 12 +++++++-----
drivers/hsi/clients/nokia-modem.c | 2 ++
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/hsi/nokia-modem.txt b/Documentation/devicetree/bindings/hsi/nokia-modem.txt
index 8a979780452b..53de1d9d0b95 100644
--- a/Documentation/devicetree/bindings/hsi/nokia-modem.txt
+++ b/Documentation/devicetree/bindings/hsi/nokia-modem.txt
@@ -7,6 +7,8 @@ properties are needed by the Nokia modem HSI client:
Required properties:
- compatible: Should be one of
"nokia,n900-modem"
+ "nokia,n950-modem"
+ "nokia,n9-modem"
- hsi-channel-names: Should contain the following strings
"mcsaab-control"
"speech-control"
@@ -15,11 +17,11 @@ Required properties:
- gpios: Should provide a GPIO handler for each GPIO listed in
gpio-names
- gpio-names: Should contain the following strings
- "cmt_apeslpx"
- "cmt_rst_rq"
- "cmt_en"
- "cmt_rst"
- "cmt_bsi"
+ "cmt_apeslpx" (for n900, n950, n9)
+ "cmt_rst_rq" (for n900, n950, n9)
+ "cmt_en" (for n900, n950, n9)
+ "cmt_rst" (for n900)
+ "cmt_bsi" (for n900)
- interrupts: Should be IRQ handle for modem's reset indication
Example:
diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c
index 7f82c911ad74..c000780d931f 100644
--- a/drivers/hsi/clients/nokia-modem.c
+++ b/drivers/hsi/clients/nokia-modem.c
@@ -281,6 +281,8 @@ static int nokia_modem_remove(struct device *dev)
#ifdef CONFIG_OF
static const struct of_device_id nokia_modem_of_match[] = {
{ .compatible = "nokia,n900-modem", },
+ { .compatible = "nokia,n950-modem", },
+ { .compatible = "nokia,n9-modem", },
{},
};
MODULE_DEVICE_TABLE(of, nokia_modem_of_match);
--
2.7.0.rc3
next prev parent reply other threads:[~2016-01-17 15:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-17 15:49 [PATCH 0/5] Nokia N950 modem support Sebastian Reichel
2016-01-17 15:49 ` [PATCH 1/5] ARM: OMAP2+: hwmod data: Add SSI data for omap36xx Sebastian Reichel
2016-01-26 22:07 ` Aaro Koskinen
2016-01-26 22:12 ` Aaro Koskinen
2016-02-02 17:05 ` Paul Walmsley
2016-01-17 15:49 ` [PATCH 2/5] ARM: dts: OMAP3-N950-N9: Enable SSI module Sebastian Reichel
2016-02-12 22:00 ` Tony Lindgren
2016-01-17 15:49 ` Sebastian Reichel [this message]
2016-01-20 16:49 ` [PATCH 3/5] HSI: nokia-modem: add n950 and n9 support Rob Herring
2016-01-21 12:30 ` Sebastian Reichel
2016-01-28 16:53 ` Sebastian Reichel
2016-01-17 15:49 ` [PATCH 4/5] HSI: ssi-protocol: Use handshake logic from n950 Sebastian Reichel
2016-01-28 16:54 ` Sebastian Reichel
2016-01-17 15:49 ` [PATCH 5/5] ARM: dts: OMAP3-N950-N9: Enable modem Sebastian Reichel
2016-02-12 22:01 ` Tony Lindgren
2016-01-28 17:04 ` [PATCH 0/5] Nokia N950 modem support Sebastian Reichel
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=1453045749-22642-4-git-send-email-sre@kernel.org \
--to=sre@kernel.org \
--cc=aaro.koskinen@iki.fi \
--cc=bcousson@baylibre.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=paul@pwsan.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.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;
as well as URLs for NNTP newsgroup(s).