All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/2] drop plat/cpu.h for omap2plus
@ 2012-12-16 20:03 ` Tony Lindgren
  0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2012-12-16 20:03 UTC (permalink / raw)
  To: linux-arm-kernel; +Cc: linux-omap

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

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 0/2] drop plat/cpu.h for omap2plus
@ 2012-12-16 20:03 ` Tony Lindgren
  0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2012-12-16 20:03 UTC (permalink / raw)
  To: linux-arm-kernel

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

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 1/2] ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage
  2012-12-16 20:03 ` Tony Lindgren
@ 2012-12-16 20:03   ` Tony Lindgren
  -1 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2012-12-16 20:03 UTC (permalink / raw)
  To: linux-arm-kernel; +Cc: Tomi Valkeinen, linux-omap

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 <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 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%)

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index f0e69cb..222d58c 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -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),)
diff --git a/arch/arm/mach-omap1/fb.c b/arch/arm/mach-omap1/fb.c
new file mode 100644
index 0000000..c770d45
--- /dev/null
+++ b/arch/arm/mach-omap1/fb.c
@@ -0,0 +1,80 @@
+/*
+ * File: arch/arm/plat-omap/fb.c
+ *
+ * Framebuffer device registration for TI OMAP platforms
+ *
+ * Copyright (C) 2006 Nokia Corporation
+ * Author: Imre Deak <imre.deak@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/memblock.h>
+#include <linux/io.h>
+#include <linux/omapfb.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/mach/map.h>
+
+#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
+
+static bool omapfb_lcd_configured;
+static struct omapfb_platform_data omapfb_config;
+
+static u64 omap_fb_dma_mask = ~(u32)0;
+
+static struct platform_device omap_fb_device = {
+	.name		= "omapfb",
+	.id		= -1,
+	.dev = {
+		.dma_mask		= &omap_fb_dma_mask,
+		.coherent_dma_mask	= DMA_BIT_MASK(32),
+		.platform_data		= &omapfb_config,
+	},
+	.num_resources = 0,
+};
+
+void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
+{
+	omapfb_config.lcd = *config;
+	omapfb_lcd_configured = true;
+}
+
+static int __init omap_init_fb(void)
+{
+	/*
+	 * If the board file has not set the lcd config with
+	 * omapfb_set_lcd_config(), don't bother registering the omapfb device
+	 */
+	if (!omapfb_lcd_configured)
+		return 0;
+
+	return platform_device_register(&omap_fb_device);
+}
+
+arch_initcall(omap_init_fb);
+
+#else
+
+void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
+{
+}
+
+#endif
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index a8004f3..947cafe 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -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
 
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/mach-omap2/fb.c
similarity index 76%
rename from arch/arm/plat-omap/fb.c
rename to arch/arm/mach-omap2/fb.c
index a3367b7..d9bd965 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/mach-omap2/fb.c
@@ -1,6 +1,4 @@
 /*
- * File: arch/arm/plat-omap/fb.c
- *
  * Framebuffer device registration for TI OMAP platforms
  *
  * Copyright (C) 2006 Nokia Corporation
@@ -33,7 +31,7 @@
 
 #include <asm/mach/map.h>
 
-#include <plat/cpu.h>
+#include "soc.h"
 
 #ifdef CONFIG_OMAP2_VRFB
 
@@ -94,45 +92,7 @@ static int __init omap_init_vrfb(void)
 arch_initcall(omap_init_vrfb);
 #endif
 
-#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
-
-static bool omapfb_lcd_configured;
-static struct omapfb_platform_data omapfb_config;
-
-static u64 omap_fb_dma_mask = ~(u32)0;
-
-static struct platform_device omap_fb_device = {
-	.name		= "omapfb",
-	.id		= -1,
-	.dev = {
-		.dma_mask		= &omap_fb_dma_mask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-		.platform_data		= &omapfb_config,
-	},
-	.num_resources = 0,
-};
-
-void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
-{
-	omapfb_config.lcd = *config;
-	omapfb_lcd_configured = true;
-}
-
-static int __init omap_init_fb(void)
-{
-	/*
-	 * If the board file has not set the lcd config with
-	 * omapfb_set_lcd_config(), don't bother registering the omapfb device
-	 */
-	if (!omapfb_lcd_configured)
-		return 0;
-
-	return platform_device_register(&omap_fb_device);
-}
-
-arch_initcall(omap_init_fb);
-
-#elif defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
 
 static u64 omap_fb_dma_mask = ~(u32)0;
 static struct omapfb_platform_data omapfb_config;
@@ -155,10 +115,4 @@ static int __init omap_init_fb(void)
 
 arch_initcall(omap_init_fb);
 
-#else
-
-void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
-{
-}
-
 #endif
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 9d9aa2f..a14a78a 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -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-  :=


^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 1/2] ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage
@ 2012-12-16 20:03   ` Tony Lindgren
  0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2012-12-16 20:03 UTC (permalink / raw)
  To: linux-arm-kernel

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 <tomi.valkeinen@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 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%)

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index f0e69cb..222d58c 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -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),)
diff --git a/arch/arm/mach-omap1/fb.c b/arch/arm/mach-omap1/fb.c
new file mode 100644
index 0000000..c770d45
--- /dev/null
+++ b/arch/arm/mach-omap1/fb.c
@@ -0,0 +1,80 @@
+/*
+ * File: arch/arm/plat-omap/fb.c
+ *
+ * Framebuffer device registration for TI OMAP platforms
+ *
+ * Copyright (C) 2006 Nokia Corporation
+ * Author: Imre Deak <imre.deak@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/memblock.h>
+#include <linux/io.h>
+#include <linux/omapfb.h>
+#include <linux/dma-mapping.h>
+
+#include <asm/mach/map.h>
+
+#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
+
+static bool omapfb_lcd_configured;
+static struct omapfb_platform_data omapfb_config;
+
+static u64 omap_fb_dma_mask = ~(u32)0;
+
+static struct platform_device omap_fb_device = {
+	.name		= "omapfb",
+	.id		= -1,
+	.dev = {
+		.dma_mask		= &omap_fb_dma_mask,
+		.coherent_dma_mask	= DMA_BIT_MASK(32),
+		.platform_data		= &omapfb_config,
+	},
+	.num_resources = 0,
+};
+
+void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
+{
+	omapfb_config.lcd = *config;
+	omapfb_lcd_configured = true;
+}
+
+static int __init omap_init_fb(void)
+{
+	/*
+	 * If the board file has not set the lcd config with
+	 * omapfb_set_lcd_config(), don't bother registering the omapfb device
+	 */
+	if (!omapfb_lcd_configured)
+		return 0;
+
+	return platform_device_register(&omap_fb_device);
+}
+
+arch_initcall(omap_init_fb);
+
+#else
+
+void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
+{
+}
+
+#endif
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index a8004f3..947cafe 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -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
 
diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/mach-omap2/fb.c
similarity index 76%
rename from arch/arm/plat-omap/fb.c
rename to arch/arm/mach-omap2/fb.c
index a3367b7..d9bd965 100644
--- a/arch/arm/plat-omap/fb.c
+++ b/arch/arm/mach-omap2/fb.c
@@ -1,6 +1,4 @@
 /*
- * File: arch/arm/plat-omap/fb.c
- *
  * Framebuffer device registration for TI OMAP platforms
  *
  * Copyright (C) 2006 Nokia Corporation
@@ -33,7 +31,7 @@
 
 #include <asm/mach/map.h>
 
-#include <plat/cpu.h>
+#include "soc.h"
 
 #ifdef CONFIG_OMAP2_VRFB
 
@@ -94,45 +92,7 @@ static int __init omap_init_vrfb(void)
 arch_initcall(omap_init_vrfb);
 #endif
 
-#if defined(CONFIG_FB_OMAP) || defined(CONFIG_FB_OMAP_MODULE)
-
-static bool omapfb_lcd_configured;
-static struct omapfb_platform_data omapfb_config;
-
-static u64 omap_fb_dma_mask = ~(u32)0;
-
-static struct platform_device omap_fb_device = {
-	.name		= "omapfb",
-	.id		= -1,
-	.dev = {
-		.dma_mask		= &omap_fb_dma_mask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-		.platform_data		= &omapfb_config,
-	},
-	.num_resources = 0,
-};
-
-void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
-{
-	omapfb_config.lcd = *config;
-	omapfb_lcd_configured = true;
-}
-
-static int __init omap_init_fb(void)
-{
-	/*
-	 * If the board file has not set the lcd config with
-	 * omapfb_set_lcd_config(), don't bother registering the omapfb device
-	 */
-	if (!omapfb_lcd_configured)
-		return 0;
-
-	return platform_device_register(&omap_fb_device);
-}
-
-arch_initcall(omap_init_fb);
-
-#elif defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
+#if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
 
 static u64 omap_fb_dma_mask = ~(u32)0;
 static struct omapfb_platform_data omapfb_config;
@@ -155,10 +115,4 @@ static int __init omap_init_fb(void)
 
 arch_initcall(omap_init_fb);
 
-#else
-
-void __init omapfb_set_lcd_config(const struct omap_lcd_config *config)
-{
-}
-
 #endif
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 9d9aa2f..a14a78a 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -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-  :=

^ permalink raw reply related	[flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
  2012-12-16 20:03 ` Tony Lindgren
@ 2012-12-16 20:03   ` Tony Lindgren
  -1 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2012-12-16 20:03 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Kevin Hilman, Mauro Carvalho Chehab, linux-omap, Jean Pihet,
	Laurent Pinchart

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 <jean.pihet@newoldbits.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.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 +--
 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(-)

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/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index b4516ab..c9a66bf 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -32,8 +32,4 @@
 #include <mach/soc.h>
 #endif
 
-#ifdef CONFIG_ARCH_OMAP2PLUS
-#include "../../mach-omap2/soc.h"
-#endif
-
 #endif
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index a9f6de5..2e8c0cb 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -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"
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] 18+ messages in thread
* [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
@ 2012-12-16 20:03   ` Tony Lindgren
  0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2012-12-16 20:03 UTC (permalink / raw)
  To: linux-arm-kernel

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 <jean.pihet@newoldbits.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Mauro Carvalho Chehab <mchehab@redhat.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 +--
 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(-)

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/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index b4516ab..c9a66bf 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -32,8 +32,4 @@
 #include <mach/soc.h>
 #endif
 
-#ifdef CONFIG_ARCH_OMAP2PLUS
-#include "../../mach-omap2/soc.h"
-#endif
-
 #endif
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index a9f6de5..2e8c0cb 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -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"
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] 18+ messages in thread
* Re: [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
  2012-12-16 20:03   ` Tony Lindgren
@ 2012-12-17  9:04     ` Laurent Pinchart
  -1 siblings, 0 replies; 18+ messages in thread
From: Laurent Pinchart @ 2012-12-17  9:04 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: linux-arm-kernel, Kevin Hilman, Mauro Carvalho Chehab,
	linux-omap, Jean Pihet

Hi Tony,

Thanks for the patch.

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.
> 
> Cc: Jean Pihet <jean.pihet@newoldbits.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

For the OMAP3 ISP part,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.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 +--
>  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(-)

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
@ 2012-12-17  9:04     ` Laurent Pinchart
  0 siblings, 0 replies; 18+ messages in thread
From: Laurent Pinchart @ 2012-12-17  9:04 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Tony,

Thanks for the patch.

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.
> 
> Cc: Jean Pihet <jean.pihet@newoldbits.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

For the OMAP3 ISP part,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.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 +--
>  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(-)

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage
  2012-12-16 20:03   ` Tony Lindgren
@ 2012-12-17  9:31     ` Tomi Valkeinen
  -1 siblings, 0 replies; 18+ messages in thread
From: Tomi Valkeinen @ 2012-12-17  9:31 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: linux-arm-kernel, linux-omap

[-- Attachment #1: Type: text/plain, Size: 1127 bytes --]

On 2012-12-16 22:03, Tony Lindgren wrote:
> 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 <tomi.valkeinen@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
>  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



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 899 bytes --]

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 1/2] ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage
@ 2012-12-17  9:31     ` Tomi Valkeinen
  0 siblings, 0 replies; 18+ messages in thread
From: Tomi Valkeinen @ 2012-12-17  9:31 UTC (permalink / raw)
  To: linux-arm-kernel

On 2012-12-16 22:03, Tony Lindgren wrote:
> 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 <tomi.valkeinen@ti.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
>  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>

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
  2012-12-16 20:03   ` Tony Lindgren
@ 2012-12-17 10:48     ` Jean Pihet
  -1 siblings, 0 replies; 18+ messages in thread
From: Jean Pihet @ 2012-12-17 10:48 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: linux-arm, Kevin Hilman, Mauro Carvalho Chehab, linux-omap,
	Laurent Pinchart

Hi Tony,

On Sun, Dec 16, 2012 at 9:03 PM, Tony Lindgren <tony@atomide.com> 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.
Great!

> 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 <jean.pihet@newoldbits.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.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 +--
>  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 <j-pihet@ti.com>

Regards,
Jean

...

> 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	[flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
@ 2012-12-17 10:48     ` Jean Pihet
  0 siblings, 0 replies; 18+ messages in thread
From: Jean Pihet @ 2012-12-17 10:48 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Tony,

On Sun, Dec 16, 2012 at 9:03 PM, Tony Lindgren <tony@atomide.com> 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.
Great!

> 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 <jean.pihet@newoldbits.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.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 +--
>  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 <j-pihet@ti.com>

Regards,
Jean

...

> 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	[flat|nested] 18+ messages in thread
* Re: [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
  2012-12-16 20:03   ` Tony Lindgren
@ 2012-12-17 14:59     ` Mauro Carvalho Chehab
  -1 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2012-12-17 14:59 UTC (permalink / raw)
  To: Tony Lindgren
  Cc: linux-arm-kernel, Kevin Hilman, linux-omap, Jean Pihet, Laurent Pinchart

Em Sun, 16 Dec 2012 12:03:17 -0800
Tony Lindgren <tony@atomide.com> escreveu:

> 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 <jean.pihet@newoldbits.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.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 +--
>  arch/arm/plat-omap/include/plat/cpu.h |    4 ----

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

Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>


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

>  7 files changed, 3 insertions(+), 15 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/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
> index b4516ab..c9a66bf 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -32,8 +32,4 @@
>  #include <mach/soc.h>
>  #endif
>  
> -#ifdef CONFIG_ARCH_OMAP2PLUS
> -#include "../../mach-omap2/soc.h"
> -#endif
> -
>  #endif
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index a9f6de5..2e8c0cb 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -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"
> 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
> 


-- 

Cheers,
Mauro

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus
@ 2012-12-17 14:59     ` Mauro Carvalho Chehab
  0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2012-12-17 14:59 UTC (permalink / raw)
  To: linux-arm-kernel

Em Sun, 16 Dec 2012 12:03:17 -0800
Tony Lindgren <tony@atomide.com> escreveu:

> 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 <jean.pihet@newoldbits.com>
> Cc: Kevin Hilman <khilman@deeprootsystems.com>
> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> Cc: Mauro Carvalho Chehab <mchehab@redhat.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 +--
>  arch/arm/plat-omap/include/plat/cpu.h |    4 ----

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

Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com>


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

>  7 files changed, 3 insertions(+), 15 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/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
> index b4516ab..c9a66bf 100644
> --- a/arch/arm/plat-omap/include/plat/cpu.h
> +++ b/arch/arm/plat-omap/include/plat/cpu.h
> @@ -32,8 +32,4 @@
>  #include <mach/soc.h>
>  #endif
>  
> -#ifdef CONFIG_ARCH_OMAP2PLUS
> -#include "../../mach-omap2/soc.h"
> -#endif
> -
>  #endif
> diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
> index a9f6de5..2e8c0cb 100644
> --- a/drivers/media/platform/omap3isp/isp.c
> +++ b/drivers/media/platform/omap3isp/isp.c
> @@ -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"
> 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
> 


-- 

Cheers,
Mauro

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH 1/2] ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage
  2012-12-17  9:31     ` Tomi Valkeinen
@ 2012-12-17 17:19       ` Tony Lindgren
  -1 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2012-12-17 17:19 UTC (permalink / raw)
  To: Tomi Valkeinen; +Cc: linux-arm-kernel, linux-omap

* Tomi Valkeinen <tomi.valkeinen@ti.com> [121217 01:33]:
> On 2012-12-16 22:03, Tony Lindgren wrote:
> > 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 <tomi.valkeinen@ti.com>
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > ---
> >  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.

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.

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

Thanks I'll update the subject.

Regards,

Tony

^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 1/2] ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage
@ 2012-12-17 17:19       ` Tony Lindgren
  0 siblings, 0 replies; 18+ messages in thread
From: Tony Lindgren @ 2012-12-17 17:19 UTC (permalink / raw)
  To: linux-arm-kernel

* Tomi Valkeinen <tomi.valkeinen@ti.com> [121217 01:33]:
> On 2012-12-16 22:03, Tony Lindgren wrote:
> > 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 <tomi.valkeinen@ti.com>
> > Signed-off-by: Tony Lindgren <tony@atomide.com>
> > ---
> >  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.

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.

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

Thanks I'll update the subject.

Regards,

Tony

^ permalink raw reply	[flat|nested] 18+ messages in thread
* Re: [PATCH 0/2] drop plat/cpu.h for omap2plus
  2012-12-16 20:03 ` Tony Lindgren
@ 2012-12-20  6:42   ` Santosh Shilimkar
  -1 siblings, 0 replies; 18+ messages in thread
From: Santosh Shilimkar @ 2012-12-20  6:42 UTC (permalink / raw)
  To: Tony Lindgren; +Cc: linux-arm-kernel, linux-omap

On Monday 17 December 2012 01:33 AM, Tony Lindgren wrote:
> 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 <santosh.shilimkar@ti.com>


^ permalink raw reply	[flat|nested] 18+ messages in thread
* [PATCH 0/2] drop plat/cpu.h for omap2plus
@ 2012-12-20  6:42   ` Santosh Shilimkar
  0 siblings, 0 replies; 18+ messages in thread
From: Santosh Shilimkar @ 2012-12-20  6:42 UTC (permalink / raw)
  To: linux-arm-kernel

On Monday 17 December 2012 01:33 AM, Tony Lindgren wrote:
> 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 <santosh.shilimkar@ti.com>

^ permalink raw reply	[flat|nested] 18+ messages in thread
end of thread, other threads:[~2012-12-20  6:42 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-16 20:03 [PATCH 0/2] drop plat/cpu.h for omap2plus Tony Lindgren
2012-12-16 20:03 ` Tony Lindgren
2012-12-16 20:03 ` [PATCH 1/2] ARM: OMAP: Split vrfb.c to remove last remaining cpu_is_omap usage Tony Lindgren
2012-12-16 20:03   ` Tony Lindgren
2012-12-17  9:31   ` Tomi Valkeinen
2012-12-17  9:31     ` Tomi Valkeinen
2012-12-17 17:19     ` Tony Lindgren
2012-12-17 17:19       ` Tony Lindgren
2012-12-16 20:03 ` [PATCH 2/2] ARM: OMAP2+: Drop plat/cpu.h for omap2plus Tony Lindgren
2012-12-16 20:03   ` Tony Lindgren
2012-12-17  9:04   ` Laurent Pinchart
2012-12-17  9:04     ` Laurent Pinchart
2012-12-17 10:48   ` Jean Pihet
2012-12-17 10:48     ` Jean Pihet
2012-12-17 14:59   ` Mauro Carvalho Chehab
2012-12-17 14:59     ` Mauro Carvalho Chehab
2012-12-20  6:42 ` [PATCH 0/2] drop " Santosh Shilimkar
2012-12-20  6:42   ` Santosh Shilimkar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.