From: Josh Wu <josh.wu@atmel.com>
To: devicetree@vger.kernel.org, nicolas.ferre@atmel.com
Cc: grant.likely@linaro.org, galak@codeaurora.org, rob@landley.net,
robh+dt@kernel.org, ijc+devicetree@hellion.org.uk,
pawel.moll@arm.com, linux-arm-kernel@lists.infradead.org,
voice.shen@atmel.com, laurent.pinchart@ideasonboard.com,
alexandre.belloni@free-electrons.com, plagnioj@jcrosoft.com,
boris.brezillon@free-electrons.com, linux-media@vger.kernel.org,
g.liakhovetski@gmx.de, Josh Wu <josh.wu@atmel.com>
Subject: [PATCH v2 2/8] ARM: at91: dts: sama5d3: split isi pinctrl
Date: Sun, 4 Jan 2015 17:02:27 +0800 [thread overview]
Message-ID: <1420362153-500-3-git-send-email-josh.wu@atmel.com> (raw)
In-Reply-To: <1420362153-500-1-git-send-email-josh.wu@atmel.com>
From: Bo Shen <voice.shen@atmel.com>
As the ISI has 12 data lines, however we only use 8 data lines with
sensor module. So, split the data line into two groups which make
it can be choosed depends on the hardware design.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
arch/arm/boot/dts/sama5d3.dtsi | 11 ++++++++---
arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 61746ef..595609f 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -547,7 +547,7 @@
};
isi {
- pinctrl_isi: isi-0 {
+ pinctrl_isi_data_0_7: isi-0-data-0-7 {
atmel,pins =
<AT91_PIOA 16 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA16 periph C ISI_D0, conflicts with LCDDAT16 */
AT91_PIOA 17 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA17 periph C ISI_D1, conflicts with LCDDAT17 */
@@ -559,10 +559,15 @@
AT91_PIOA 23 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA23 periph C ISI_D7, conflicts with LCDDAT23, PWML1 */
AT91_PIOC 30 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC30 periph C ISI_PCK, conflicts with UTXD0 */
AT91_PIOA 31 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA31 periph C ISI_HSYNC, conflicts with TWCK0, UTXD1 */
- AT91_PIOA 30 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
- AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
+ AT91_PIOA 30 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
+ };
+
+ pinctrl_isi_data_8_9: isi-0-data-8-9 {
+ atmel,pins =
+ <AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC28 periph C ISI_PD9, conflicts with SPI1_NPCS3, PWMFI0 */
};
+
pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
atmel,pins =
<AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 49c10d3..2530541 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -61,7 +61,7 @@
isi: isi@f0034000 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_isi &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
+ pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
};
mmc1: mmc@f8000000 {
--
1.9.1
next prev parent reply other threads:[~2015-01-04 9:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-04 9:02 [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Josh Wu
2015-01-04 9:02 ` [PATCH v2 1/8] ARM: at91: dts: sama5d3: add isi clock Josh Wu
2015-01-04 9:02 ` Josh Wu [this message]
[not found] ` <1420362153-500-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2015-01-04 9:02 ` [PATCH v2 3/8] ARM: at91: dts: sama5d3: add missing pins of isi Josh Wu
2015-01-14 2:41 ` [PATCH v2 7/8] ARM: at91: dts: sama5d3: add ov2640 camera sensor support Josh Wu
2015-01-14 2:41 ` [PATCH v2 8/8] ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig Josh Wu
2015-01-04 9:02 ` [PATCH v2 4/8] ARM: at91: dts: sama5d3: move the isi mck pin to mb Josh Wu
2015-01-04 9:02 ` [PATCH v2 5/8] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset} Josh Wu
2015-01-04 9:02 ` [PATCH v2 6/8] ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK Josh Wu
2015-01-13 15:05 ` [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Nicolas Ferre
2015-01-14 2:48 ` Josh Wu
2015-01-14 8:30 ` Alexandre Belloni
2015-01-15 15:16 ` Nicolas Ferre
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=1420362153-500-3-git-send-email-josh.wu@atmel.com \
--to=josh.wu@atmel.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=boris.brezillon@free-electrons.com \
--cc=devicetree@vger.kernel.org \
--cc=g.liakhovetski@gmx.de \
--cc=galak@codeaurora.org \
--cc=grant.likely@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-media@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=pawel.moll@arm.com \
--cc=plagnioj@jcrosoft.com \
--cc=rob@landley.net \
--cc=robh+dt@kernel.org \
--cc=voice.shen@atmel.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).