Skip to contentSkip to conversation

few trivial omap patches

PATCH New Tony Lindgren 2 participants 5 messages Dec 14, 2012 – Dec 19, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP powerdomain SoC adaptation layer support
lore
Share & tools
lore

Tony Lindgren

author maintainer
#0 lore raw

cover few trivial omap patches

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 · 1 line
Signature
author maintainer
#1 lore raw

PATCH 1/2 ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible

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 <[email protected]>
Cc Kevin Hilman <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
---
 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(-)
arch/arm/mach-omap2/drm.c +0 -1
index fce5aa3..4c7566c 100644
@@ -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)
arch/arm/mach-omap2/dss-common.c +1 -2
index 679a047..4be5cfc 100644
@@ -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"
arch/arm/mach-omap2/prm2xxx.c +1 -2
index faeab18..cc0e714 100644
@@ -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"
arch/arm/mach-omap2/prm3xxx.c +1 -2
index db198d0..39822aa 100644
@@ -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"
drivers/power/avs/smartreflex.c +0 -2
index a17d084..6b2238b 100644
@@ -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
author maintainer
#2 lore raw

PATCH 1/2 ARM: OMAP2+: Drop remaining plat/cpu.h usage where possible

Quoted 6 lines · Tony Lindgren

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

author maintainer
#3 lore raw

PATCH 2/2 MAINTAINERS: Add an entry for omap related .dts files

In reply to Tony Lindgren

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 <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
---
 MAINTAINERS |    9 +++++++++
 1 file changed, 9 insertions(+)
MAINTAINERS +9 -0
index 0bc485c..4927e80 100644
@@ -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 <[email protected]>
+M:	Tony Lindgren <[email protected]>
+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 <[email protected]>
 L:	linux-omap at vger.kernel.org
#4 lore raw

PATCH 2/2 MAINTAINERS: Add an entry for omap related .dts files

Quoted 6 lines · Tony Lindgren

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.

Quoted 7 lines

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 <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
Acked-by Grant Likely <[email protected]>
Quoted 30 lines
---
 MAINTAINERS |    9 +++++++++
 1 file changed, 9 insertions(+)
MAINTAINERS +9 -0
index 0bc485c..4927e80 100644
@@ -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 <[email protected]>
+M:	Tony Lindgren <[email protected]>
+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 <[email protected]>
 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

Signature · 2 lines
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.