From: Grant Likely <grant.likely@secretlab.ca>
To: Benoit Cousson <b-cousson@ti.com>
Cc: devicetree-discuss@lists.ozlabs.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 2/4] arm/dts: OMAP4: Add SPI controller nodes
Date: Wed, 15 Feb 2012 13:02:40 -0700 [thread overview]
Message-ID: <20120215200240.GA25779@ponder.secretlab.ca> (raw)
In-Reply-To: <1329327457-2121-3-git-send-email-b-cousson@ti.com>
On Wed, Feb 15, 2012 at 06:37:35PM +0100, Benoit Cousson wrote:
> Add the 4 McSPI controller nodes present in an OMAP4 device.
>
> Remove SPI static device initialisation if DT is populated.
>
> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> ---
> arch/arm/boot/dts/omap4.dtsi | 32 ++++++++++++++++++++++++++++++++
> arch/arm/mach-omap2/devices.c | 4 +++-
> 2 files changed, 35 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 4b81f03..7fc0cbe 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -209,5 +209,37 @@
> #size-cells = <0>;
> ti,hwmods = "i2c4";
> };
> +
> + mcspi1: mcspi@1 {
> + compatible = "ti,omap4-mcspi";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + ti,hwmods = "mcspi1";
> + ti,spi-num-cs = <4>;
No reg or interrupts properties? And the @<num> in the name must match the
first entry in a reg property. This looks wrong.
> + };
> +
> + mcspi2: mcspi@2 {
> + compatible = "ti,omap4-mcspi";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + ti,hwmods = "mcspi2";
> + ti,spi-num-cs = <2>;
> + };
> +
> + mcspi3: mcspi@3 {
> + compatible = "ti,omap4-mcspi";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + ti,hwmods = "mcspi3";
> + ti,spi-num-cs = <2>;
> + };
> +
> + mcspi4: mcspi@4 {
> + compatible = "ti,omap4-mcspi";
> + #address-cells = <1>;
> + #size-cells = <0>;
> + ti,hwmods = "mcspi4";
> + ti,spi-num-cs = <1>;
> + };
> };
> };
> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
> index 283d11e..8a489ba 100644
> --- a/arch/arm/mach-omap2/devices.c
> +++ b/arch/arm/mach-omap2/devices.c
> @@ -725,7 +725,9 @@ static int __init omap2_init_devices(void)
> omap_init_dmic();
> omap_init_camera();
> omap_init_mbox();
> - omap_init_mcspi();
> + /* If dtb is there, the devices will be created dynamically */
> + if (!of_have_populated_dt())
> + omap_init_mcspi();
> omap_init_pmu();
> omap_hdq_init();
> omap_init_sti();
> --
> 1.7.0.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2012-02-15 20:02 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-15 17:37 [PATCH 0/4] spi/omap: Adaptation to Device Tree Benoit Cousson
2012-02-15 17:37 ` [PATCH 1/4] spi/omap: Add DT support to McSPI driver Benoit Cousson
2012-02-15 19:34 ` Rob Herring
2012-02-15 20:04 ` Grant Likely
2012-02-15 21:10 ` Cousson, Benoit
2012-02-15 17:37 ` [PATCH 2/4] arm/dts: OMAP4: Add SPI controller nodes Benoit Cousson
2012-02-15 20:02 ` Grant Likely [this message]
[not found] ` <20120215200240.GA25779-e0URQFbLeQY2iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2012-02-15 21:00 ` Cousson, Benoit
2012-02-15 17:37 ` [PATCH 3/4] arm/dts: OMAP3: " Benoit Cousson
2012-02-15 17:37 ` [PATCH 4/4] arm/dts: omap4-sdp: Add ks8851 ethernet SPI device Benoit Cousson
2012-02-15 20:03 ` [PATCH 0/4] spi/omap: Adaptation to Device Tree Grant Likely
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=20120215200240.GA25779@ponder.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=b-cousson@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
/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).