From: Grant Likely <grant.likely@secretlab.ca>
To: Benoit Cousson <b-cousson@ti.com>
Cc: tony@atomide.com, paul@pwsan.com, khilman@ti.com, rnayak@ti.com,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org
Subject: Re: [PATCH 11/11] arm/dts: OMAP3+: Add mpu, dsp and iva nodes
Date: Fri, 23 Sep 2011 17:26:52 -0600 [thread overview]
Message-ID: <20110923232652.GH24631@ponder.secretlab.ca> (raw)
In-Reply-To: <1316809399-19579-12-git-send-email-b-cousson@ti.com>
On Fri, Sep 23, 2011 at 10:23:19PM +0200, Benoit Cousson wrote:
> Add nodes for devices used by PM code (mpu, dsp, iva).
>
> Add an empty cpus node as well as recommended in the DT spec.
>
> Remove mpu, dsp, iva devices init if dt is populated.
>
> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Kevin Hilman <khilman@ti.com>
Series looks good to me on brief review.
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> Documentation/devicetree/bindings/arm/omap/dsp.txt | 14 ++++++++++
> Documentation/devicetree/bindings/arm/omap/iva.txt | 19 ++++++++++++++
> Documentation/devicetree/bindings/arm/omap/mpu.txt | 27 ++++++++++++++++++++
> arch/arm/boot/dts/omap3.dtsi | 19 ++++++++++++++
> arch/arm/boot/dts/omap4.dtsi | 23 +++++++++++++++++
> arch/arm/mach-omap2/pm.c | 3 +-
> 6 files changed, 104 insertions(+), 1 deletions(-)
> create mode 100644 Documentation/devicetree/bindings/arm/omap/dsp.txt
> create mode 100644 Documentation/devicetree/bindings/arm/omap/iva.txt
> create mode 100644 Documentation/devicetree/bindings/arm/omap/mpu.txt
>
> diff --git a/Documentation/devicetree/bindings/arm/omap/dsp.txt b/Documentation/devicetree/bindings/arm/omap/dsp.txt
> new file mode 100644
> index 0000000..325feef
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/omap/dsp.txt
> @@ -0,0 +1,14 @@
> +* TI - DSP (Digital Signal Processor)
> +
> +TI DSP included in OMAP SoC
> +
> +Required properties:
> +- compatible : Should be "ti,omap3-c64" for OMAP3 & 4
> +- ti,hwmods: "dsp"
> +
> +Examples:
> +
> +dsp {
> + compatible = "ti,omap3-c64";
> + ti,hwmods = "dsp";
> +};
> diff --git a/Documentation/devicetree/bindings/arm/omap/iva.txt b/Documentation/devicetree/bindings/arm/omap/iva.txt
> new file mode 100644
> index 0000000..b889475
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/omap/iva.txt
> @@ -0,0 +1,19 @@
> +* TI - IVA (Imaging and Video Accelerator) subsystem
> +
> +The IVA contain various audio, video or imaging HW accelerator
> +depending of the version.
> +
> +Required properties:
> +- compatible : Should be:
> + - "ti,ivahd" for OMAP4
> + - "ti,iva2.2" for OMAP3
> + - "ti,iva2.1" for OMAP2430
> + - "ti,iva1" for OMAP2420
> +- ti,hwmods: "iva"
> +
> +Examples:
> +
> +iva {
> + compatible = "ti,ivahd", "ti,iva";
> + ti,hwmods = "iva";
> +};
> diff --git a/Documentation/devicetree/bindings/arm/omap/mpu.txt b/Documentation/devicetree/bindings/arm/omap/mpu.txt
> new file mode 100644
> index 0000000..5ffbacd
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/omap/mpu.txt
> @@ -0,0 +1,27 @@
> +* TI - MPU (Main Processor Unit) subsystem
> +
> +The MPU subsystem contain one or several ARM cores
> +depending of the version.
> +The MPU contain CPUs, GIC, L2 cache and a local PRCM.
> +
> +Required properties:
> +- compatible : Should be "ti,omap3-mpu" for OMAP3
> + Should be "ti,omap4-mpu" for OMAP4
> +- ti,hwmods: "mpu"
> +
> +Examples:
> +
> +- For an OMAP4 SMP system:
> +
> +mpu {
> + compatible = "ti,omap4-mpu";
> + ti,hwmods = "mpu";
> +};
> +
> +
> +- For an OMAP3 monocore system:
> +
> +mpu {
> + compatible = "ti,omap3-mpu";
> + ti,hwmods = "mpu";
> +};
> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
> index d558785..d202bb5 100644
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -13,12 +13,31 @@
> / {
> compatible = "ti,omap3430", "ti,omap3";
>
> + cpus {
> + cpu@0 {
> + compatible = "arm,cortex-a8";
> + };
> + };
> +
> /*
> * The soc node represents the soc top level view. It is uses for IPs
> * that are not memory mapped in the MPU view or for the MPU itself.
> */
> soc {
> compatible = "ti,omap-infra";
> + mpu {
> + compatible = "ti,omap3-mpu";
> + ti,hwmods = "mpu";
> + };
> +
> + iva {
> + compatible = "ti,iva2.2";
> + ti,hwmods = "iva";
> +
> + dsp {
> + compatible = "ti,omap3-c64";
> + };
> + };
> };
>
> /*
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index b85a39d..4c61c82 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -23,12 +23,35 @@
> aliases {
> };
>
> + cpus {
> + cpu@0 {
> + compatible = "arm,cortex-a9";
> + };
> + cpu@1 {
> + compatible = "arm,cortex-a9";
> + };
> + };
> +
> /*
> * The soc node represents the soc top level view. It is uses for IPs
> * that are not memory mapped in the MPU view or for the MPU itself.
> */
> soc {
> compatible = "ti,omap-infra";
> + mpu {
> + compatible = "ti,omap4-mpu";
> + ti,hwmods = "mpu";
> + };
> +
> + dsp {
> + compatible = "ti,omap3-c64";
> + ti,hwmods = "dsp";
> + };
> +
> + iva {
> + compatible = "ti,ivahd";
> + ti,hwmods = "iva";
> + };
> };
>
> /*
> diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
> index 1fd9576..640c266 100644
> --- a/arch/arm/mach-omap2/pm.c
> +++ b/arch/arm/mach-omap2/pm.c
> @@ -217,7 +217,8 @@ static void __init omap4_init_voltages(void)
>
> static int __init omap2_common_pm_init(void)
> {
> - omap2_init_processor_devices();
> + if (!of_have_populated_dt())
> + omap2_init_processor_devices();
> omap_pm_if_init();
>
> return 0;
> --
> 1.7.0.4
>
prev parent reply other threads:[~2011-09-23 23:26 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-23 20:23 [PATCH 00/11] OMAP: Add initial support for DT on OMAP3 & OMAP4 Benoit Cousson
2011-09-23 20:23 ` [PATCH 01/11] OMAP2+: Add SoC specific map_io functions Benoit Cousson
2011-09-23 23:00 ` Tony Lindgren
2011-09-26 23:15 ` Tony Lindgren
2011-09-26 23:16 ` [PATCH] ARM: OMAP2+: Use SoC specifc map_io Tony Lindgren
2011-09-26 23:18 ` [PATCH] ARM: OMAP2+: Remove custom init_irq for remaining boards Tony Lindgren
2012-05-04 15:59 ` [PATCH 01/11] OMAP2+: Add SoC specific map_io functions Thomas Petazzoni
2012-05-14 15:06 ` Cousson, Benoit
2012-05-14 19:55 ` Nicolas Pitre
2011-09-23 20:23 ` [PATCH 02/11] arm/dts: Add initial device tree support for OMAP4 SoC Benoit Cousson
2011-09-23 20:23 ` [PATCH 03/11] arm/dts: Add support for OMAP4 PandaBoard Benoit Cousson
2011-09-23 23:21 ` Grant Likely
2011-09-26 12:38 ` Cousson, Benoit
2011-09-23 20:23 ` [PATCH 04/11] arm/dts: Add support for OMAP4 SDP board Benoit Cousson
2011-09-23 20:23 ` [PATCH 05/11] arm/dts: Add initial device tree support for OMAP3 SoC Benoit Cousson
2011-09-23 20:23 ` [PATCH 06/11] arm/dts: Add support for OMAP3 Beagle board Benoit Cousson
2011-09-23 20:23 ` [PATCH 07/11] OMAP2+: board-generic: Add DT support to generic board Benoit Cousson
2011-09-23 23:08 ` Tony Lindgren
2011-09-26 12:35 ` Cousson, Benoit
2011-09-26 21:37 ` Tony Lindgren
2011-09-26 6:32 ` Rajendra Nayak
[not found] ` <4E801C62.5020700-l0cyMroinI0@public.gmane.org>
2011-09-26 9:00 ` Cousson, Benoit
2011-09-23 20:23 ` [PATCH 08/11] OMAP2+: board-generic: Add i2c static init Benoit Cousson
2011-09-23 23:12 ` Tony Lindgren
2011-09-23 23:47 ` Grant Likely
2011-09-26 16:45 ` Tony Lindgren
2011-09-23 20:23 ` [PATCH 09/11] OMAP2+: l3-noc: Add support for device-tree Benoit Cousson
2011-09-23 20:23 ` [PATCH 10/11] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver Benoit Cousson
2011-09-23 22:58 ` Tony Lindgren
2011-09-26 12:13 ` Cousson, Benoit
2011-09-26 21:44 ` Tony Lindgren
2011-09-23 20:23 ` [PATCH 11/11] arm/dts: OMAP3+: Add mpu, dsp and iva nodes Benoit Cousson
2011-09-23 23:26 ` Grant Likely [this message]
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=20110923232652.GH24631@ponder.secretlab.ca \
--to=grant.likely@secretlab.ca \
--cc=b-cousson@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=rnayak@ti.com \
--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).