drop plat/cpu.h for omap2plus

PATCH New Tony Lindgren 6 participants 9 messages Dec 16, 2012 – Dec 20, 2012

Subsystems (6)

Arm (32-bit) Media (V4L/DVB) Arm sub-architectures OMAP2+ support +2 more subsystems

lore

Share & tools

lore

Tony Lindgren

author maintainer

2012-12-16 20:03 UTC #0 lore raw

cover drop plat/cpu.h for omap2plus

Hi all,

Finally it can be dropped. Thanks for help everybody.

Regards,

Tony

---

Tony Lindgren (2):
ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage
ARM: OMAP2+: Drop plat/cpu.h for omap2plus

 arch/arm/mach-omap1/Makefile          |    2 -
 arch/arm/mach-omap1/fb.c              |   80 +++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/Makefile          |    2 -
 arch/arm/mach-omap2/drm.c             |    1 
 arch/arm/mach-omap2/dss-common.c      |    3 -
 arch/arm/mach-omap2/fb.c              |   50 +--------------------
 arch/arm/mach-omap2/prm2xxx.c         |    3 -
 arch/arm/mach-omap2/prm3xxx.c         |    3 -
 arch/arm/plat-omap/Makefile           |    2 -
 arch/arm/plat-omap/include/plat/cpu.h |    4 --
 drivers/media/platform/omap3isp/isp.c |    2 -
 drivers/power/avs/smartreflex.c       |    2 -
 12 files changed, 88 insertions(+), 66 deletions(-)
 create mode 100644 arch/arm/mach-omap1/fb.c
 rename arch/arm/{plat-omap/fb.c => mach-omap2/fb.c} (76%)

Signature · 1 line

Signature

Tony Lindgren

author maintainer

2012-12-16 20:03 UTC #1 lore raw

PATCH 1/2 ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage

Looks like we missed plat-omap/fb.c for cpu_is_omap usage mach-omap2. This is the last user of cpu_is_omap, so let's quickly fix it up so we can finally remove plat/cpu.h for omap2lus.

We want to limit cpu_is_omap macro usage to mach-omap2 only so we can make plat/cpu.h private. After this we can finally drop plat/cpu.h for omap2+.

Cc Tomi Valkeinen <[email protected]>

Signed-off-by Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap1/Makefile |    2 +
 arch/arm/mach-omap1/fb.c     |   80 ++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/Makefile |    2 +
 arch/arm/mach-omap2/fb.c     |   50 +-------------------------
 arch/arm/plat-omap/Makefile  |    2 +
 5 files changed, 85 insertions(+), 51 deletions(-)
 create mode 100644 arch/arm/mach-omap1/fb.c
 rename arch/arm/{plat-omap/fb.c => mach-omap2/fb.c} (76%)

arch/arm/mach-omap1/Makefile +1 -1

index f0e69cb..222d58c 100644
@@ -4,7 +4,7 @@
 
 # Common support
 obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \
-	 serial.o devices.o dma.o
+	 serial.o devices.o dma.o fb.o
 obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o
 
 ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

arch/arm/mach-omap1/fb.c new file +80 -0

80 lines not on this page · raw message

arch/arm/mach-omap2/Makefile +1 -1

index a8004f3..947cafe 100644
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
+obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \
 	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
 	 omap_device.o sram.o

arch/arm/mach-omap2/fb.c renamed from arch/arm/plat-omap/fb.c +2 ~~-48~~

70 lines not on this page · raw message

arch/arm/plat-omap/Makefile +1 -1

index 9d9aa2f..a14a78a 100644
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := sram.o dma.o fb.o counter_32k.o
+obj-y := sram.o dma.o counter_32k.o
 obj-m :=
 obj-n :=
 obj-  :=

Tomi Valkeinen

2012-12-17 09:31 UTC #2 lore raw

PATCH 1/2 ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage

Quoted 11 lines · Tony Lindgren

Looks like we missed plat-omap/fb.c for cpu_is_omap usage mach-omap2. This is the last user of cpu_is_omap, so let's quickly fix it up so we can finally remove plat/cpu.h for omap2lus.
We want to limit cpu_is_omap macro usage to mach-omap2 only so we can make plat/cpu.h private. After this we can finally drop plat/cpu.h for omap2+.
Cc Tomi Valkeinen <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

Quoted 9 lines

---
 arch/arm/mach-omap1/Makefile |    2 +
 arch/arm/mach-omap1/fb.c     |   80 ++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/Makefile |    2 +
 arch/arm/mach-omap2/fb.c     |   50 +-------------------------
 arch/arm/plat-omap/Makefile  |    2 +
 5 files changed, 85 insertions(+), 51 deletions(-)
 create mode 100644 arch/arm/mach-omap1/fb.c
 rename arch/arm/{plat-omap/fb.c => mach-omap2/fb.c} (76%)

Ok, I didn't realize that plat-omap cannot refer to cpu_is_omap either. The patch looks fine, except the subject should say "split fb.c", not "split vrfb.c".

Tomi

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121217/f46adcb7/attachment.sig>

Tony Lindgren

author maintainer

2012-12-17 17:19 UTC #3 lore raw

PATCH 1/2 ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage

Quoted 22 lines · Tomi Valkeinen

Quoted 11 lines · Tony Lindgren
Looks like we missed plat-omap/fb.c for cpu_is_omap usage mach-omap2. This is the last user of cpu_is_omap, so let's quickly fix it up so we can finally remove plat/cpu.h for omap2lus.
We want to limit cpu_is_omap macro usage to mach-omap2 only so we can make plat/cpu.h private. After this we can finally drop plat/cpu.h for omap2+.
Cc Tomi Valkeinen <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
Quoted 9 lines
---
 arch/arm/mach-omap1/Makefile |    2 +
 arch/arm/mach-omap1/fb.c     |   80 ++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-omap2/Makefile |    2 +
 arch/arm/mach-omap2/fb.c     |   50 +-------------------------
 arch/arm/plat-omap/Makefile  |    2 +
 5 files changed, 85 insertions(+), 51 deletions(-)
 create mode 100644 arch/arm/mach-omap1/fb.c
 rename arch/arm/{plat-omap/fb.c => mach-omap2/fb.c} (76%)

Quoted 1 line

Ok, I didn't realize that plat-omap cannot refer to cpu_is_omap either.

We could, but I'd rather not as what we have left in plat-omap should all be just drivers eventually. And in this case the fb code is already completely separate for omap1 and omap2+, so it's better just to split it up. It makes fixing up the initcalls for omap2+ multiplatform easier when booting on other SoCs than omap.

Quoted 2 lines

The patch looks fine, except the subject should say "split fb.c", not "split vrfb.c".

Thanks I'll update the subject.

Regards,

Tony

Tony Lindgren

author maintainer

2012-12-16 20:03 UTC #4 lore raw

PATCH 2/2 ARM: OMAP2+: Drop plat/cpu.h for omap2plus

In reply to Tony Lindgren

The cpu_is_omap macros are now local to arch/arm/mach-omap2 in soc.h and plat/cpu.h can finally be dropped for omap2+. Thanks everybody for help with fixing the drivers.

Note that we can now also remove the unused plat/cpu.h from smartreflex.c and isp.c as they will cause compile errors with ARCH_MULTIPLATFORM enabled.

Cc Jean Pihet <[email protected]>

Cc Kevin Hilman <[email protected]>

Cc Laurent Pinchart <[email protected]>

Cc Mauro Carvalho Chehab <[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 +--
 arch/arm/plat-omap/include/plat/cpu.h |    4 ----
 drivers/media/platform/omap3isp/isp.c |    2 --
 drivers/power/avs/smartreflex.c       |    2 --
 7 files changed, 3 insertions(+), 15 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"

arch/arm/plat-omap/include/plat/cpu.h +0 -4

index b4516ab..c9a66bf 100644
@@ -32,8 +32,4 @@
 #include <mach/soc.h>
 #endif
 
-#ifdef CONFIG_ARCH_OMAP2PLUS
-#include "../../mach-omap2/soc.h"
-#endif
-
 #endif

drivers/media/platform/omap3isp/isp.c +0 -2

index a9f6de5..2e8c0cb 100644
@@ -71,8 +71,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 
-#include <plat/cpu.h>
-
 #include "isp.h"
 #include "ispreg.h"
 #include "ispccdc.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

Laurent Pinchart

2012-12-17 09:03 UTC #5 lore raw

PATCH 2/2 ARM: OMAP2+: Drop plat/cpu.h for omap2plus

Hi Tony,

Thanks for the patch.

Quoted 8 lines · On Sunday 16 December 2012 12:03:17 Tony Lindgren wrote:

The cpu_is_omap macros are now local to arch/arm/mach-omap2 in soc.h and plat/cpu.h can finally be dropped for omap2+. Thanks everybody for help with fixing the drivers.
Note that we can now also remove the unused plat/cpu.h from smartreflex.c and isp.c as they will cause compile errors with ARCH_MULTIPLATFORM enabled.

Quoted 5 lines

Cc Jean Pihet <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Laurent Pinchart <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

For the OMAP3 ISP part,

Acked-by Laurent Pinchart <[email protected]>

Quoted 9 lines

---
 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 +--
 arch/arm/plat-omap/include/plat/cpu.h |    4 ----
 drivers/media/platform/omap3isp/isp.c |    2 --
 drivers/power/avs/smartreflex.c       |    2 --
 7 files changed, 3 insertions(+), 15 deletions(-)

Signature · 3 lines

Regards,

Laurent Pinchart

Jean Pihet

2012-12-17 10:48 UTC #6 lore raw

PATCH 2/2 ARM: OMAP2+: Drop plat/cpu.h for omap2plus

In reply to Tony Lindgren

Hi Tony,

Quoted 3 lines · Tony Lindgren

The cpu_is_omap macros are now local to arch/arm/mach-omap2 in soc.h and plat/cpu.h can finally be dropped for omap2+. Thanks everybody for help with fixing the drivers.

Great!

Quoted 9 lines

Note that we can now also remove the unused plat/cpu.h from smartreflex.c and isp.c as they will cause compile errors with ARCH_MULTIPLATFORM enabled.
Cc Jean Pihet <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Laurent Pinchart <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

Quoted 9 lines

---
 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 +--
 arch/arm/plat-omap/include/plat/cpu.h |    4 ----
 drivers/media/platform/omap3isp/isp.c |    2 --
 drivers/power/avs/smartreflex.c       |    2 --
 7 files changed, 3 insertions(+), 15 deletions(-)

For the smartreflex driver:

Acked-by Jean Pihet <[email protected]>

Regards,
Jean

...

Quoted 14 lines

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

Mauro Carvalho Chehab

2012-12-17 14:59 UTC #7 lore raw

PATCH 2/2 ARM: OMAP2+: Drop plat/cpu.h for omap2plus

In reply to Tony Lindgren

Em Sun, 16 Dec 2012 12:03:17 -0800
Tony Lindgren <[email protected]> escreveu:

Quoted 13 lines

The cpu_is_omap macros are now local to arch/arm/mach-omap2 in soc.h and plat/cpu.h can finally be dropped for omap2+. Thanks everybody for help with fixing the drivers.
Note that we can now also remove the unused plat/cpu.h from smartreflex.c and isp.c as they will cause compile errors with ARCH_MULTIPLATFORM enabled.
Cc Jean Pihet <[email protected]>
Cc Kevin Hilman <[email protected]>
Cc Laurent Pinchart <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>

Quoted 8 lines

---
 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 +--
 arch/arm/plat-omap/include/plat/cpu.h |    4 ----

 drivers/media/platform/omap3isp/isp.c |    2 --

Acked-by Mauro Carvalho Chehab <[email protected]>

Quoted 100 lines

 drivers/power/avs/smartreflex.c       |    2 --

 7 files changed, 3 insertions(+), 15 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"

arch/arm/plat-omap/include/plat/cpu.h +0 -4

index b4516ab..c9a66bf 100644
@@ -32,8 +32,4 @@
 #include <mach/soc.h>
 #endif
 
-#ifdef CONFIG_ARCH_OMAP2PLUS
-#include "../../mach-omap2/soc.h"
-#endif
-
 #endif

drivers/media/platform/omap3isp/isp.c +0 -2

index a9f6de5..2e8c0cb 100644
@@ -71,8 +71,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-device.h>
 
-#include <plat/cpu.h>
-
 #include "isp.h"
 #include "ispreg.h"
 #include "ispccdc.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

Signature · 2 lines

Cheers,
Mauro

Santosh Shilimkar

2012-12-20 06:41 UTC #8 lore raw

cover drop plat/cpu.h for omap2plus

In reply to Tony Lindgren

Quoted 4 lines · Tony Lindgren

Hi all,
Finally it can be dropped. Thanks for help everybody.

Looks fine to me with update plat/cpu.h patch. Thanks to you as well for all those patches.

Acked-by Santosh Shilimkar <[email protected]>