dt: device tree support for TI EMIF driver for 3.6

From: Aneesh V <[email protected]>

Device tree support for the EMIF driver.

Reviewed-by Benoit Cousson <[email protected]>

Reviewed-by Grant Likely <[email protected]>

Tested-by Lokesh Vutla <[email protected]>

Signed-off-by Aneesh V <[email protected]>

[santosh.shilimkar at ti.com: Rebased against 3.5-rc]

Signed-off-by Santosh Shilimkar <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Quoted 11 lines · Santosh Shilimkar

From: Aneesh V <[email protected]>

Device tree support for the EMIF driver.

Reviewed-by Benoit Cousson <[email protected]>

Reviewed-by Grant Likely <[email protected]>

Tested-by Lokesh Vutla <[email protected]>

Signed-off-by Aneesh V <[email protected]>

[santosh.shilimkar at ti.com: Rebased against 3.5-rc]

Signed-off-by Santosh Shilimkar <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Am I the memory maintainer now taking these patches?

Quoted 5 lines

(quoted diff) +0 -0

@@ -1267,7 +1534,13 @@ static int __init_or_module emif_probe(struct
 platform_device *pdev)
 ? ? ? struct resource ? ? ? ? *res;
 ? ? ? int ? ? ? ? ? ? ? ? ? ? irq;
 

Review static int __init_or_module emif_probe(struct · line 1545

Quoted 9 lines

(quoted diff) +7 -1

- ? ? emif = get_device_details(pdev);
+#if defined(CONFIG_OF)
+ ? ? if (pdev->dev.of_node)
+ ? ? ? ? ? ? emif = of_get_device_details(pdev->dev.of_node,
 &pdev->dev);
+ ? ? else
+#endif
+ ? ? ? ? ? ? emif = get_device_details(pdev);
+

Can't you do this without the #ifdef?

Quoted 2 lines · Greg Kroah-Hartman

On Thu, Jun 14, 2012 at 03:59:24PM +0530, Santosh Shilimkar wrote:

Quoted 5 lines

Quoted 5 lines

(quoted diff) +0 -0

@@ -1267,7 +1534,13 @@ static int __init_or_module emif_probe(struct
 platform_device *pdev)
 ? ? ? struct resource ? ? ? ? *res;
 ? ? ? int ? ? ? ? ? ? ? ? ? ? irq;
 

Quoted 12 lines

Review static int __init_or_module emif_probe(struct · line 1545

Quoted 9 lines

(quoted diff) +7 -1

- ? ? emif = get_device_details(pdev);
+#if defined(CONFIG_OF)
+ ? ? if (pdev->dev.of_node)
+ ? ? ? ? ? ? emif = of_get_device_details(pdev->dev.of_node,
 &pdev->dev);
+ ? ? else
+#endif
+ ? ? ? ? ? ? emif = get_device_details(pdev);
+

Can't you do this without the #ifdef?

Can be done. Just need to have empty of_get_device_details() for the !CONFIG_OF build to avoid build break.

Will fix that.

From 85d38108fbf1f9f9be76a6086ca3b3ba8f53995a Mon Sep 17 00:00:00 2001

(quoted diff) +7 -0

@@ -1644,11 +1923,23 @@ static void __attribute__((unused))
 freq_post_notify_handling(void)
 	spin_unlock_irqrestore(&emif_lock, irq_state);
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id emif_of_match[] = {
+		{ .compatible = "ti,emif-4d" },
+		{ .compatible = "ti,emif-4d5" },
+		{},
+};
+MODULE_DEVICE_TABLE(of, emif_of_match);

Quoted 12 lines · Santosh

(quoted diff) +7 -0

@@ -1644,11 +1923,23 @@ static void __attribute__((unused))
 freq_post_notify_handling(void)
 ? ? ? spin_unlock_irqrestore(&emif_lock, irq_state);
 ?}
 
+#if defined(CONFIG_OF)
+static const struct of_device_id emif_of_match[] = {
+ ? ? ? ? ? ? { .compatible = "ti,emif-4d" },
+ ? ? ? ? ? ? { .compatible = "ti,emif-4d5" },
+ ? ? ? ? ? ? {},
+};
+MODULE_DEVICE_TABLE(of, emif_of_match);

Review static void __attribute__((unused)) · line 1943

Quoted 10 lines

(quoted diff) +5 -0

+#endif
+
 ?static struct platform_driver emif_driver = {
 ? ? ? .remove ? ? ? ? = __exit_p(emif_remove),
 ? ? ? .shutdown ? ? ? = emif_shutdown,
 ? ? ? .driver = {
 ? ? ? ? ? ? ? .name = "emif",
+#if defined(CONFIG_OF)
+ ? ? ? ? ? ? .of_match_table = of_match_ptr(emif_of_match),
+#endif

Are these two still #if defined needed?

Also, what about the IS_DEFINED macro?

And, if you resend, please resend the whole series, I don't have the old ones around anymore.

Quoted 18 lines

Quoted 18 lines

+#if defined(CONFIG_OF)

Quoted 16 lines

Quoted 16 lines

+static const struct of_device_id emif_of_match[] = {

 +             { .compatible = "ti,emif-4d" },
 +             { .compatible = "ti,emif-4d5" },
 +             {},

+};
+MODULE_DEVICE_TABLE(of, emif_of_match);
+#endif
+
static struct platform_driver emif_driver = {
.remove = __exit_p(emif_remove),
.shutdown = emif_shutdown,
.driver = {
.name = "emif",
+#if defined(CONFIG_OF)
+ .of_match_table = of_match_ptr(emif_of_match),
+#endif

Quoted 4 lines

Quoted 4 lines

Are these two still #if defined needed?

Also, what about the IS_DEFINED macro?

Yes. To avoid the build break in !DT build.

Quoted 22 lines · Santosh

Quoted 22 lines

Quoted 22 lines

+#if defined(CONFIG_OF)

Quoted 8 lines

?> ?+static const struct of_device_id emif_of_match[] = { ?> ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d" }, ?> ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d5" }, ?> ?+ ? ? ? ? ? ? {},
?> ?+};
?> ?+MODULE_DEVICE_TABLE(of, emif_of_match);
?> ?+#endif
?> ?+

Quoted 8 lines

?> ? ?static struct platform_driver emif_driver = {
?> ? ? ? ? .remove ? ? ? ? = __exit_p(emif_remove),
?> ? ? ? ? .shutdown ? ? ? = emif_shutdown,
?> ? ? ? ? .driver = {
?> ? ? ? ? ? ? ? ? .name = "emif",
?> ?+#if defined(CONFIG_OF)
?> ?+ ? ? ? ? ? ? .of_match_table = of_match_ptr(emif_of_match), ?> ?+#endif

?Are these two still #if defined needed?

Quoted 5 lines

Quoted 2 lines

Quoted 2 lines

?Also, what about the IS_DEFINED macro?

Yes. To avoid the build break in !DT build.

No, infact of_match_ptr is there just so you can avoid a #ifdef around and not break !CONFIG_OF.

Quoted 26 lines · Rajendra Nayak

Quoted 25 lines · Santosh

Quoted 24 lines

Quoted 24 lines

+#if defined(CONFIG_OF)

Quoted 8 lines

Quoted 8 lines

   +static const struct of_device_id emif_of_match[] = {
   +             { .compatible = "ti,emif-4d" },
   +             { .compatible = "ti,emif-4d5" },
   +             {},
   +};
   +MODULE_DEVICE_TABLE(of, emif_of_match);
   +#endif
   +

Quoted 8 lines

Quoted 8 lines

     static struct platform_driver emif_driver = {
          .remove         = __exit_p(emif_remove),
          .shutdown       = emif_shutdown,
          .driver = {
                  .name = "emif",

+#if defined(CONFIG_OF)
+ .of_match_table = of_match_ptr(emif_of_match),
+#endif

Are these two still #if defined needed?

Also, what about the IS_DEFINED macro?

Quoted 5 lines

Quoted 2 lines

Yes. To avoid the build break in !DT build.

No, infact of_match_ptr is there just so you can avoid a #ifdef around and not break !CONFIG_OF.

Need to recheck but the build was throwing error becasue of "emif_of_match" mostly.

Regards
Santosh

Quoted 35 lines · Santosh

Quoted 33 lines · On Tue, Jun 26, 2012 at 10:49 AM, Rajendra Nayak<[email protected]> ?wrote:

Quoted 30 lines · Santosh

Quoted 23 lines

Quoted 23 lines

+#if defined(CONFIG_OF)

Quoted 17 lines

?> ? ?+static const struct of_device_id emif_of_match[] = { ?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d" },
?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d5" },
?> ? ?+ ? ? ? ? ? ? {},
?> ? ?+};
?> ? ?+MODULE_DEVICE_TABLE(of, emif_of_match);
?> ? ?+#endif
?> ? ?+
?> ? ? ?static struct platform_driver emif_driver = { ?> ? ? ? ? ? .remove ? ? ? ? = __exit_p(emif_remove), ?> ? ? ? ? ? .shutdown ? ? ? = emif_shutdown,
?> ? ? ? ? ? .driver = {
?> ? ? ? ? ? ? ? ? ? .name = "emif",
?> ? ?+#if defined(CONFIG_OF)
?> ? ?+ ? ? ? ? ? ? .of_match_table = of_match_ptr(emif_of_match), ?> ? ?+#endif

Quoted 4 lines

Quoted 4 lines

?Are these two still #if defined needed?

?Also, what about the IS_DEFINED macro?

Yes. To avoid the build break in !DT build.

Quoted 7 lines

Quoted 2 lines

No, infact of_match_ptr is there just so you can avoid a #ifdef around and not break !CONFIG_OF.

Need to recheck but the build was throwing error becasue of "emif_of_match"
mostly.

You still need the first one. I meant the second one around 'of_match_ptr' should be removed.

With !CONFIG_OF, of_match_ptr(_ptr) is just defined as NULL.

Quoted 45 lines · Rajendra Nayak

Quoted 42 lines · Santosh

Quoted 27 lines · On Tue, Jun 26, 2012 at 10:49 AM, Rajendra Nayak<[email protected]> ?wrote:

Quoted 25 lines · Santosh

Quoted 25 lines

Quoted 25 lines

+#if defined(CONFIG_OF)

Quoted 17 lines

?> ? ?+static const struct of_device_id emif_of_match[] = { ?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d" },
?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d5" },
?> ? ?+ ? ? ? ? ? ? {},
?> ? ?+};
?> ? ?+MODULE_DEVICE_TABLE(of, emif_of_match);
?> ? ?+#endif
?> ? ?+
?> ? ? ?static struct platform_driver emif_driver = { ?> ? ? ? ? ? .remove ? ? ? ? = __exit_p(emif_remove), ?> ? ? ? ? ? .shutdown ? ? ? = emif_shutdown,
?> ? ? ? ? ? .driver = {
?> ? ? ? ? ? ? ? ? ? .name = "emif",
?> ? ?+#if defined(CONFIG_OF)
?> ? ?+ ? ? ? ? ? ? .of_match_table = of_match_ptr(emif_of_match), ?> ? ?+#endif

?Are these two still #if defined needed?

Quoted 8 lines

Quoted 5 lines

Quoted 2 lines

Quoted 2 lines

?Also, what about the IS_DEFINED macro?

Yes. To avoid the build break in !DT build.

No, infact of_match_ptr is there just so you can avoid a #ifdef around and not break !CONFIG_OF.

Need to recheck but the build was throwing error becasue of "emif_of_match"
mostly.

Quoted 5 lines

You still need the first one. I meant the second one around 'of_match_ptr' should be removed.

With !CONFIG_OF, of_match_ptr(_ptr) is just defined as NULL.

Yep. That make sense too.
Will drop the second check.

Greg,

Quoted 50 lines · Santosh

Quoted 48 lines · Rajendra Nayak

Quoted 35 lines · Santosh

Quoted 33 lines · On Tue, Jun 26, 2012 at 10:49 AM, Rajendra Nayak<[email protected]> ?wrote:

Quoted 30 lines · Santosh

Quoted 23 lines

Quoted 23 lines

+#if defined(CONFIG_OF)

Quoted 17 lines

?> ? ?+static const struct of_device_id emif_of_match[] = { ?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d" },
?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d5" },
?> ? ?+ ? ? ? ? ? ? {},
?> ? ?+};
?> ? ?+MODULE_DEVICE_TABLE(of, emif_of_match);
?> ? ?+#endif
?> ? ?+
?> ? ? ?static struct platform_driver emif_driver = { ?> ? ? ? ? ? .remove ? ? ? ? = __exit_p(emif_remove), ?> ? ? ? ? ? .shutdown ? ? ? = emif_shutdown,
?> ? ? ? ? ? .driver = {
?> ? ? ? ? ? ? ? ? ? .name = "emif",
?> ? ?+#if defined(CONFIG_OF)
?> ? ?+ ? ? ? ? ? ? .of_match_table = of_match_ptr(emif_of_match), ?> ? ?+#endif

Quoted 4 lines

Quoted 4 lines

?Are these two still #if defined needed?

?Also, what about the IS_DEFINED macro?

Yes. To avoid the build break in !DT build.

Quoted 7 lines

Quoted 2 lines

No, infact of_match_ptr is there just so you can avoid a #ifdef around and not break !CONFIG_OF.

Need to recheck but the build was throwing error becasue of "emif_of_match"
mostly.

You still need the first one. I meant the second one around 'of_match_ptr' should be removed.

Quoted 5 lines

Quoted 2 lines

With !CONFIG_OF, of_match_ptr(_ptr) is just defined as NULL.

Yep. That make sense too.
Will drop the second check.

Posted the entire series again with updated $subject patch. With your ack, I will ask Tony to pull this series for 3.6.

Quoted 56 lines · Santosh

Greg,

Quoted 52 lines · Santosh

Quoted 50 lines · Rajendra Nayak

Quoted 35 lines · Santosh

Quoted 33 lines · Rajendra Nayak

Quoted 30 lines · Santosh

Quoted 23 lines

Quoted 23 lines

+#if defined(CONFIG_OF)

Quoted 17 lines

Quoted 17 lines

   +static const struct of_device_id emif_of_match[] = {
   +             { .compatible = "ti,emif-4d" },
   +             { .compatible = "ti,emif-4d5" },
   +             {},
   +};
   +MODULE_DEVICE_TABLE(of, emif_of_match);
   +#endif
   +
     static struct platform_driver emif_driver = {
          .remove         = __exit_p(emif_remove),
          .shutdown       = emif_shutdown,
          .driver = {
                  .name = "emif",
   +#if defined(CONFIG_OF)
   +             .of_match_table = of_match_ptr(emif_of_match),
   +#endif

Quoted 4 lines

Quoted 4 lines

Are these two still #if defined needed?

Also, what about the IS_DEFINED macro?

Yes. To avoid the build break in !DT build.

Quoted 7 lines

Quoted 2 lines

No, infact of_match_ptr is there just so you can avoid a #ifdef around and not break !CONFIG_OF.

Need to recheck but the build was throwing error becasue of "emif_of_match"
mostly.

You still need the first one. I meant the second one around 'of_match_ptr' should be removed.

With !CONFIG_OF, of_match_ptr(_ptr) is just defined as NULL.

Quoted 5 lines

Quoted 3 lines

Yep. That make sense too.
Will drop the second check.

Posted the entire series again with updated $subject patch. With your ack, I will ask Tony to pull this series for 3.6.

Sent them where? I didn't see a copy here :(

Quoted 60 lines · Greg Kroah-Hartman

Quoted 59 lines · Santosh

Greg,

Quoted 55 lines · Santosh

Quoted 45 lines · Rajendra Nayak

Quoted 35 lines · Santosh

Quoted 33 lines · Rajendra Nayak

Quoted 30 lines · Santosh

Quoted 23 lines

Quoted 23 lines

+#if defined(CONFIG_OF)

Quoted 17 lines

Quoted 17 lines

   +static const struct of_device_id emif_of_match[] = {
   +             { .compatible = "ti,emif-4d" },
   +             { .compatible = "ti,emif-4d5" },
   +             {},
   +};
   +MODULE_DEVICE_TABLE(of, emif_of_match);
   +#endif
   +
     static struct platform_driver emif_driver = {
          .remove         = __exit_p(emif_remove),
          .shutdown       = emif_shutdown,
          .driver = {
                  .name = "emif",
   +#if defined(CONFIG_OF)
   +             .of_match_table = of_match_ptr(emif_of_match),
   +#endif

Quoted 4 lines

Quoted 4 lines

Are these two still #if defined needed?

Also, what about the IS_DEFINED macro?

Yes. To avoid the build break in !DT build.

Quoted 7 lines

Quoted 2 lines

No, infact of_match_ptr is there just so you can avoid a #ifdef around and not break !CONFIG_OF.

Need to recheck but the build was throwing error becasue of "emif_of_match"
mostly.

Quoted 5 lines

You still need the first one. I meant the second one around 'of_match_ptr' should be removed.

With !CONFIG_OF, of_match_ptr(_ptr) is just defined as NULL.

Yep. That make sense too.
Will drop the second check.

Quoted 4 lines

Quoted 2 lines

Posted the entire series again with updated $subject patch. With your ack, I will ask Tony to pull this series for 3.6.

Sent them where? I didn't see a copy here :(

Hi Greg, should have hit both linux-omap and linux-arm. See:

http://marc.info/?l=linux-omap&m=134097764625471&w=2

Quoted 59 lines · Jon Hunter

Quoted 57 lines · Greg Kroah-Hartman

Quoted 56 lines · Santosh

Greg,

Quoted 52 lines · Santosh

Quoted 50 lines · Rajendra Nayak

Quoted 35 lines · Santosh

Quoted 33 lines · On Tue, Jun 26, 2012 at 10:49 AM, Rajendra Nayak<[email protected]> ?wrote:

Quoted 30 lines · Santosh

Quoted 23 lines

Quoted 23 lines

+#if defined(CONFIG_OF)

Quoted 17 lines

?> ? ?+static const struct of_device_id emif_of_match[] = { ?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d" },
?> ? ?+ ? ? ? ? ? ? { .compatible = "ti,emif-4d5" },
?> ? ?+ ? ? ? ? ? ? {},
?> ? ?+};
?> ? ?+MODULE_DEVICE_TABLE(of, emif_of_match);
?> ? ?+#endif
?> ? ?+
?> ? ? ?static struct platform_driver emif_driver = { ?> ? ? ? ? ? .remove ? ? ? ? = __exit_p(emif_remove), ?> ? ? ? ? ? .shutdown ? ? ? = emif_shutdown,
?> ? ? ? ? ? .driver = {
?> ? ? ? ? ? ? ? ? ? .name = "emif",
?> ? ?+#if defined(CONFIG_OF)
?> ? ?+ ? ? ? ? ? ? .of_match_table = of_match_ptr(emif_of_match), ?> ? ?+#endif

Quoted 4 lines

Quoted 4 lines

?Are these two still #if defined needed?

?Also, what about the IS_DEFINED macro?

Yes. To avoid the build break in !DT build.

Quoted 7 lines

Quoted 2 lines

No, infact of_match_ptr is there just so you can avoid a #ifdef around and not break !CONFIG_OF.

Need to recheck but the build was throwing error becasue of "emif_of_match"
mostly.

You still need the first one. I meant the second one around 'of_match_ptr' should be removed.

With !CONFIG_OF, of_match_ptr(_ptr) is just defined as NULL.

Quoted 8 lines

Quoted 7 lines

Quoted 5 lines

Quoted 3 lines

Yep. That make sense too.
Will drop the second check.

Posted the entire series again with updated $subject patch. With your ack, I will ask Tony to pull this series for 3.6.

Sent them where? ?I didn't see a copy here :(

Quoted 3 lines

Hi Greg, should have hit both linux-omap and linux-arm. See:

http://marc.info/?l=linux-omap&m=134097764625471&w=2

Ah, two lists I am not on, so how would I know to be able to ack them? Please always cc: people you wish to review patches, otherwise it could get lost, or as in this case, the people might not even be on the lists you send the patches to.