* [PATCH 0/2] few trivial omap patches
@ 2012-12-14 19:44 Tony Lindgren
2012-12-14 19:44 ` [PATCH 1/2] ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible Tony Lindgren
2012-12-14 19:44 ` [PATCH 2/2] MAINTAINERS: Add an entry for omap related .dts files Tony Lindgren
0 siblings, 2 replies; 5+ messages in thread
From: Tony Lindgren @ 2012-12-14 19:44 UTC (permalink / raw)
To: linux-arm-kernel
Hi all,
Here's cleanup patch to remove plat/cpu.h usage
where possible, and to add a .dts file maintainers
entry for omaps.
Regards,
Tony
---
Tony Lindgren (2):
ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible
MAINTAINERS: Add an entry for omap related .dts files
MAINTAINERS | 9 +++++++++
arch/arm/mach-omap2/drm.c | 1 -
arch/arm/mach-omap2/dss-common.c | 3 +--
arch/arm/mach-omap2/prm2xxx.c | 3 +--
arch/arm/mach-omap2/prm3xxx.c | 3 +--
drivers/power/avs/smartreflex.c | 2 --
6 files changed, 12 insertions(+), 9 deletions(-)
--
Signature
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible
2012-12-14 19:44 [PATCH 0/2] few trivial omap patches Tony Lindgren
@ 2012-12-14 19:44 ` Tony Lindgren
2012-12-16 20:05 ` Tony Lindgren
2012-12-14 19:44 ` [PATCH 2/2] MAINTAINERS: Add an entry for omap related .dts files Tony Lindgren
1 sibling, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2012-12-14 19:44 UTC (permalink / raw)
To: linux-arm-kernel
These macros are now in local soc.h in arch/arm/mach-omap2,
and plat/cpu.h is around only until the remaining drivers
are fixed.
Also remove the unused plat/cpu.h from smartreflex.c as it
will cause compile errors with ARCH_MULTIPLATFORM enabled.
Cc: Jean Pihet <jean.pihet@newoldbits.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/drm.c | 1 -
arch/arm/mach-omap2/dss-common.c | 3 +--
arch/arm/mach-omap2/prm2xxx.c | 3 +--
arch/arm/mach-omap2/prm3xxx.c | 3 +--
drivers/power/avs/smartreflex.c | 2 --
5 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
index fce5aa3..4c7566c 100644
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@ -27,7 +27,6 @@
#include "omap_device.h"
#include "omap_hwmod.h"
-#include <plat/cpu.h>
#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c
index 679a047..4be5cfc 100644
--- a/arch/arm/mach-omap2/dss-common.c
+++ b/arch/arm/mach-omap2/dss-common.c
@@ -31,8 +31,7 @@
#include <video/omap-panel-nokia-dsi.h>
#include <video/omap-panel-picodlp.h>
-#include <plat/cpu.h>
-
+#include "soc.h"
#include "dss-common.h"
#include "mux.h"
diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c
index faeab18..cc0e714 100644
--- a/arch/arm/mach-omap2/prm2xxx.c
+++ b/arch/arm/mach-omap2/prm2xxx.c
@@ -18,9 +18,8 @@
#include <linux/io.h>
#include <linux/irq.h>
+#include "soc.h"
#include "common.h"
-#include <plat/cpu.h>
-
#include "vp.h"
#include "powerdomain.h"
#include "clockdomain.h"
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index db198d0..39822aa 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -18,9 +18,8 @@
#include <linux/io.h>
#include <linux/irq.h>
+#include "soc.h"
#include "common.h"
-#include <plat/cpu.h>
-
#include "vp.h"
#include "powerdomain.h"
#include "prm3xxx.h"
diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c
index a17d084..6b2238b 100644
--- a/drivers/power/avs/smartreflex.c
+++ b/drivers/power/avs/smartreflex.c
@@ -27,8 +27,6 @@
#include <linux/pm_runtime.h>
#include <linux/power/smartreflex.h>
-#include <plat/cpu.h>
-
#define SMARTREFLEX_NAME_LEN 16
#define NVALUE_NAME_LEN 40
#define SR_DISABLE_TIMEOUT 200
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] MAINTAINERS: Add an entry for omap related .dts files
2012-12-14 19:44 [PATCH 0/2] few trivial omap patches Tony Lindgren
2012-12-14 19:44 ` [PATCH 1/2] ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible Tony Lindgren
@ 2012-12-14 19:44 ` Tony Lindgren
2012-12-19 12:34 ` Grant Likely
1 sibling, 1 reply; 5+ messages in thread
From: Tony Lindgren @ 2012-12-14 19:44 UTC (permalink / raw)
To: linux-arm-kernel
All your omap .dts files are belong to us.
Beno?t has been doing a good job picking up most of the
omap .dts files so far. Let's make sure we both get
cc:ed for the related patches.
The .dts patches need to be queued by us as separate
patches from drivers and other code changes to avoid
pointless merge conflists like we saw with v3.8
networking changes.
Cc: Beno?t Cousson <b-cousson@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
MAINTAINERS | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 0bc485c..4927e80 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5253,6 +5253,15 @@ F: arch/arm/*omap*/
F: drivers/i2c/busses/i2c-omap.c
F: include/linux/i2c-omap.h
+OMAP DEVICE TREE SUPPORT
+M: Beno?t Cousson <b-cousson@ti.com>
+M: Tony Lindgren <tony@atomide.com>
+L: linux-omap at vger.kernel.org
+L: devicetree-discuss at lists.ozlabs.org (moderated for non-subscribers)
+S: Maintained
+F: arch/arm/boot/dts/*omap*
+F: arch/arm/boot/dts/*am3*
+
OMAP CLOCK FRAMEWORK SUPPORT
M: Paul Walmsley <paul@pwsan.com>
L: linux-omap at vger.kernel.org
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 1/2] ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible
2012-12-14 19:44 ` [PATCH 1/2] ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible Tony Lindgren
@ 2012-12-16 20:05 ` Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2012-12-16 20:05 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [121214 11:47]:
> These macros are now in local soc.h in arch/arm/mach-omap2,
> and plat/cpu.h is around only until the remaining drivers
> are fixed.
>
> Also remove the unused plat/cpu.h from smartreflex.c as it
> will cause compile errors with ARCH_MULTIPLATFORM enabled.
Looks like we can remove it completely, so posted an updated
patch.
Tony
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] MAINTAINERS: Add an entry for omap related .dts files
2012-12-14 19:44 ` [PATCH 2/2] MAINTAINERS: Add an entry for omap related .dts files Tony Lindgren
@ 2012-12-19 12:34 ` Grant Likely
0 siblings, 0 replies; 5+ messages in thread
From: Grant Likely @ 2012-12-19 12:34 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 14 Dec 2012 11:44:52 -0800, Tony Lindgren <tony@atomide.com> wrote:
> All your omap .dts files are belong to us.
>
> Beno??t has been doing a good job picking up most of the
> omap .dts files so far. Let's make sure we both get
> cc:ed for the related patches.
>
> The .dts patches need to be queued by us as separate
> patches from drivers and other code changes to avoid
> pointless merge conflists like we saw with v3.8
> networking changes.
>
> Cc: Beno??t Cousson <b-cousson@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
> ---
> MAINTAINERS | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0bc485c..4927e80 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -5253,6 +5253,15 @@ F: arch/arm/*omap*/
> F: drivers/i2c/busses/i2c-omap.c
> F: include/linux/i2c-omap.h
>
> +OMAP DEVICE TREE SUPPORT
> +M: Beno??t Cousson <b-cousson@ti.com>
> +M: Tony Lindgren <tony@atomide.com>
> +L: linux-omap at vger.kernel.org
> +L: devicetree-discuss at lists.ozlabs.org (moderated for non-subscribers)
> +S: Maintained
> +F: arch/arm/boot/dts/*omap*
> +F: arch/arm/boot/dts/*am3*
> +
> OMAP CLOCK FRAMEWORK SUPPORT
> M: Paul Walmsley <paul@pwsan.com>
> L: linux-omap at vger.kernel.org
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-12-19 12:34 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-14 19:44 [PATCH 0/2] few trivial omap patches Tony Lindgren
2012-12-14 19:44 ` [PATCH 1/2] ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible Tony Lindgren
2012-12-16 20:05 ` Tony Lindgren
2012-12-14 19:44 ` [PATCH 2/2] MAINTAINERS: Add an entry for omap related .dts files Tony Lindgren
2012-12-19 12:34 ` Grant Likely
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).