From: b-cousson@ti•com (Cousson, Benoit)
To: linux-arm-kernel@lists•infradead.org
Subject: [RFC PATCH 02/10] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
Date: Fri, 9 Sep 2011 02:10:08 +0200 [thread overview]
Message-ID: <4E695960.8010905@ti.com> (raw)
In-Reply-To: <20110908180300.GB2967@ponder.secretlab.ca>
On 9/8/2011 8:03 PM, Grant Likely wrote:
> On Wed, Aug 24, 2011 at 03:09:08PM +0200, Benoit Cousson wrote:
>> Used the main OCP node to add bindings with the l3_noc driver.
>> Remove l3_noc static device creation if CONFIG_OF is defined.
>>
>> Signed-off-by: Benoit Cousson<b-cousson@ti•com>
>> Cc: Tony Lindgren<tony@atomide•com>
>> Cc: Santosh Shilimkar<santosh.shilimkar@ti•com>
>> ---
>> arch/arm/boot/dts/omap4.dtsi | 3 ++-
>> arch/arm/mach-omap2/devices.c | 2 ++
>> 2 files changed, 4 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
>> index 97a3ea7..928a74c 100644
>> --- a/arch/arm/boot/dts/omap4.dtsi
>> +++ b/arch/arm/boot/dts/omap4.dtsi
>> @@ -64,10 +64,11 @@
>> * hierarchy.
>> */
>> ocp {
>> - compatible = "simple-bus";
>> + compatible = "ti,l3-noc", "arteris,noc", "simple-bus";
>> #address-cells =<1>;
>> #size-cells =<1>;
>> ranges;
>> + hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
>>
>> gic: interrupt-controller at 48241000 {
>> compatible = "ti,omap4-gic", "arm,gic";
>> diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
>> index 2d4a199..5964650 100644
>> --- a/arch/arm/mach-omap2/devices.c
>> +++ b/arch/arm/mach-omap2/devices.c
>> @@ -70,6 +70,7 @@ static int __init omap3_l3_init(void)
>> }
>> postcore_initcall(omap3_l3_init);
>>
>> +#ifndef CONFIG_OF
>> static int __init omap4_l3_init(void)
>> {
>> int l, i;
>> @@ -100,6 +101,7 @@ static int __init omap4_l3_init(void)
>> return IS_ERR(pdev) ? PTR_ERR(pdev) : 0;
>> }
>> postcore_initcall(omap4_l3_init);
>> +#endif
>
> Don't do this. Turning on CONFIG_OF must not break non-DT booting.
> Instead, check at runtime if a DT is available, and if it does then
> don't run the hook.
Do you want to check only the availability of the DT or the availability
of that specific node inside the DT?
Benoit
next prev parent reply other threads:[~2011-09-09 0:10 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-24 13:09 [RFC PATCH 00/10] OMAP: Add DT support for early init OMAP4 devices Benoit Cousson
2011-08-24 13:09 ` [RFC PATCH 01/10] OMAP2+: l3-noc: Add support for device-tree Benoit Cousson
2011-09-08 18:01 ` Grant Likely
2011-09-08 21:59 ` Cousson, Benoit
2011-09-08 23:35 ` Grant Likely
2011-08-24 13:09 ` [RFC PATCH 02/10] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver Benoit Cousson
2011-09-08 18:03 ` Grant Likely
2011-09-09 0:10 ` Cousson, Benoit [this message]
2011-09-09 2:41 ` Grant Likely
2011-08-24 13:09 ` [RFC PATCH 03/10] documentation/dt: Add l3-noc bindings Benoit Cousson
2011-09-08 18:06 ` Grant Likely
2011-09-09 0:18 ` Cousson, Benoit
2011-08-24 13:09 ` [RFC PATCH 04/10] arm/dts: OMAP4: Add mpu, dsp and iva nodes Benoit Cousson
2011-09-08 18:07 ` Grant Likely
2011-08-24 13:09 ` [RFC PATCH 05/10] documentation/dt: Add mpu, dsp and iva bindings Benoit Cousson
2011-09-08 18:09 ` Grant Likely
2011-09-09 0:30 ` Cousson, Benoit
2011-09-09 2:40 ` Grant Likely
2011-08-24 13:09 ` [RFC PATCH 06/10] hwspinlock: OMAP4: Add spinlock support in DT Benoit Cousson
2011-09-07 19:58 ` Ohad Ben-Cohen
2011-09-08 7:14 ` Cousson, Benoit
2011-09-08 7:56 ` Ohad Ben-Cohen
2011-09-08 8:07 ` Cousson, Benoit
2011-09-08 8:11 ` Ohad Ben-Cohen
2011-09-08 14:47 ` Arnd Bergmann
2011-09-08 15:34 ` Cousson, Benoit
2011-09-08 16:03 ` Arnd Bergmann
2011-09-08 16:36 ` Ohad Ben-Cohen
2011-09-09 12:58 ` Arnd Bergmann
2011-09-11 7:57 ` Ohad Ben-Cohen
2011-09-12 14:32 ` Arnd Bergmann
2011-08-24 13:09 ` [RFC PATCH 07/10] documentation/dt: Add spinlock bindings Benoit Cousson
2011-09-08 18:10 ` Grant Likely
2011-09-09 0:32 ` Cousson, Benoit
2011-08-24 13:09 ` [RFC PATCH 08/10] gpio/omap: Adapt GPIO driver to DT Benoit Cousson
2011-09-08 18:15 ` Grant Likely
2011-09-09 1:48 ` Cousson, Benoit
2011-08-24 13:09 ` [RFC PATCH 09/10] arm/dts: OMAP4: Add gpio nodes Benoit Cousson
2011-09-08 18:16 ` Grant Likely
2011-08-24 13:09 ` [RFC PATCH 10/10] documentation/dt: Add OMAP GPIO properties Benoit Cousson
2011-09-08 18:18 ` Grant Likely
2011-09-09 1:51 ` Cousson, Benoit
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=4E695960.8010905@ti.com \
--to=b-cousson@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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