* [PATCH 0/3] more omap clean-up for ARCH_MULTIPLATFORM
@ 2012-11-01 22:48 ` Tony Lindgren
0 siblings, 0 replies; 32+ messages in thread
From: Tony Lindgren @ 2012-11-01 22:48 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: linux-omap
Hi all,
Here are patches to remove some now unnecessary code
in preparation for enabling ARCH_MULTIPLATFORM for
omap2+.
These are based on omap-for-v3.8/cleanup-headers-relative
branch.
Regards,
Tony
---
Tony Lindgren (3):
ARM: OMAP: Remove unnecessary mach and plat includes
ARM: OMAP: Remove NEED_MACH_GPIO_H
ARM: OMAP: Remove plat-omap/common.c
arch/arm/Kconfig | 1 -
arch/arm/mach-omap1/gpio15xx.c | 2 ++
arch/arm/mach-omap1/gpio16xx.c | 2 ++
arch/arm/mach-omap1/gpio7xx.c | 2 ++
arch/arm/mach-omap1/include/mach/gpio.h | 3 ---
arch/arm/mach-omap2/board-2430sdp.c | 1 -
arch/arm/mach-omap2/board-cm-t35.c | 2 --
arch/arm/mach-omap2/hsmmc.c | 1 -
arch/arm/mach-omap2/include/mach/gpio.h | 3 ---
arch/arm/plat-omap/Makefile | 2 +-
arch/arm/plat-omap/common.c | 26 --------------------------
arch/arm/plat-omap/debug-devices.c | 1 -
arch/arm/plat-omap/dma.c | 8 ++++++++
arch/arm/plat-omap/dmtimer.c | 4 +---
arch/arm/plat-omap/fb.c | 1 -
arch/arm/plat-omap/i2c.c | 2 --
include/linux/platform_data/gpio-omap.h | 1 -
sound/soc/omap/am3517evm.c | 2 --
sound/soc/omap/n810.c | 1 -
sound/soc/omap/osk5912.c | 1 -
sound/soc/omap/sdp3430.c | 2 --
sound/soc/omap/zoom2.c | 3 ---
22 files changed, 16 insertions(+), 55 deletions(-)
delete mode 100644 arch/arm/mach-omap1/include/mach/gpio.h
delete mode 100644 arch/arm/mach-omap2/include/mach/gpio.h
delete mode 100644 arch/arm/plat-omap/common.c
--
Signature
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 0/3] more omap clean-up for ARCH_MULTIPLATFORM @ 2012-11-01 22:48 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 22:48 UTC (permalink / raw) To: linux-arm-kernel Hi all, Here are patches to remove some now unnecessary code in preparation for enabling ARCH_MULTIPLATFORM for omap2+. These are based on omap-for-v3.8/cleanup-headers-relative branch. Regards, Tony --- Tony Lindgren (3): ARM: OMAP: Remove unnecessary mach and plat includes ARM: OMAP: Remove NEED_MACH_GPIO_H ARM: OMAP: Remove plat-omap/common.c arch/arm/Kconfig | 1 - arch/arm/mach-omap1/gpio15xx.c | 2 ++ arch/arm/mach-omap1/gpio16xx.c | 2 ++ arch/arm/mach-omap1/gpio7xx.c | 2 ++ arch/arm/mach-omap1/include/mach/gpio.h | 3 --- arch/arm/mach-omap2/board-2430sdp.c | 1 - arch/arm/mach-omap2/board-cm-t35.c | 2 -- arch/arm/mach-omap2/hsmmc.c | 1 - arch/arm/mach-omap2/include/mach/gpio.h | 3 --- arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/common.c | 26 -------------------------- arch/arm/plat-omap/debug-devices.c | 1 - arch/arm/plat-omap/dma.c | 8 ++++++++ arch/arm/plat-omap/dmtimer.c | 4 +--- arch/arm/plat-omap/fb.c | 1 - arch/arm/plat-omap/i2c.c | 2 -- include/linux/platform_data/gpio-omap.h | 1 - sound/soc/omap/am3517evm.c | 2 -- sound/soc/omap/n810.c | 1 - sound/soc/omap/osk5912.c | 1 - sound/soc/omap/sdp3430.c | 2 -- sound/soc/omap/zoom2.c | 3 --- 22 files changed, 16 insertions(+), 55 deletions(-) delete mode 100644 arch/arm/mach-omap1/include/mach/gpio.h delete mode 100644 arch/arm/mach-omap2/include/mach/gpio.h delete mode 100644 arch/arm/plat-omap/common.c -- Signature ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/3] ARM: OMAP: Remove unnecessary mach and plat includes 2012-11-01 22:48 ` Tony Lindgren @ 2012-11-01 22:48 ` Tony Lindgren -1 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 22:48 UTC (permalink / raw) To: linux-arm-kernel; +Cc: linux-omap Now mach/hardware.h is empty for omap2+ and can be removed except for plat-omap/dmtimer.c for omap1. Also the include of mach/irqs.h can now be removed for shared plat-omap/i2c.c as it's no longer needed. Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/board-2430sdp.c | 1 - arch/arm/mach-omap2/board-cm-t35.c | 2 -- arch/arm/mach-omap2/hsmmc.c | 1 - arch/arm/plat-omap/debug-devices.c | 1 - arch/arm/plat-omap/dmtimer.c | 4 +--- arch/arm/plat-omap/fb.c | 1 - arch/arm/plat-omap/i2c.c | 2 -- 7 files changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 3fc6d83..d1c0162 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -28,7 +28,6 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index cf9449b..a8cad22 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -44,8 +44,6 @@ #include <video/omap-panel-tfp410.h> #include <linux/platform_data/spi-omap2-mcspi.h> -#include <mach/hardware.h> - #include "common.h" #include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index e3406dc..4a96433 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -14,7 +14,6 @@ #include <linux/string.h> #include <linux/delay.h> #include <linux/gpio.h> -#include <mach/hardware.h> #include <linux/platform_data/gpio-omap.h> #include "soc.h" diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c index b49be51..a609e21 100644 --- a/arch/arm/plat-omap/debug-devices.c +++ b/arch/arm/plat-omap/debug-devices.c @@ -15,7 +15,6 @@ #include <linux/io.h> #include <linux/smc91x.h> -#include <mach/hardware.h> #include <plat/debug-devices.h> /* Many OMAP development platforms reuse the same "debug board"; these diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 9a0bbc4..82231a7 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -43,8 +43,6 @@ #include <plat/dmtimer.h> -#include <mach/hardware.h> - static u32 omap_reserved_systimers; static LIST_HEAD(omap_timer_list); static DEFINE_SPINLOCK(dm_timer_lock); @@ -270,7 +268,7 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) EXPORT_SYMBOL_GPL(omap_dm_timer_get_irq); #if defined(CONFIG_ARCH_OMAP1) - +#include <mach/hardware.h> /** * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR * @inputmask: current value of idlect mask diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index f868cae..3a77b30 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -30,7 +30,6 @@ #include <linux/io.h> #include <linux/omapfb.h> -#include <mach/hardware.h> #include <asm/mach/map.h> #include <plat/cpu.h> diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 4645dd4..f9df624 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c @@ -33,8 +33,6 @@ #include <plat/i2c.h> -#include <mach/irqs.h> - #define OMAP_I2C_MAX_CONTROLLERS 4 static struct omap_i2c_bus_platform_data i2c_pdata[OMAP_I2C_MAX_CONTROLLERS]; ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 1/3] ARM: OMAP: Remove unnecessary mach and plat includes @ 2012-11-01 22:48 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 22:48 UTC (permalink / raw) To: linux-arm-kernel Now mach/hardware.h is empty for omap2+ and can be removed except for plat-omap/dmtimer.c for omap1. Also the include of mach/irqs.h can now be removed for shared plat-omap/i2c.c as it's no longer needed. Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/mach-omap2/board-2430sdp.c | 1 - arch/arm/mach-omap2/board-cm-t35.c | 2 -- arch/arm/mach-omap2/hsmmc.c | 1 - arch/arm/plat-omap/debug-devices.c | 1 - arch/arm/plat-omap/dmtimer.c | 4 +--- arch/arm/plat-omap/fb.c | 1 - arch/arm/plat-omap/i2c.c | 2 -- 7 files changed, 1 insertion(+), 11 deletions(-) diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c index 3fc6d83..d1c0162 100644 --- a/arch/arm/mach-omap2/board-2430sdp.c +++ b/arch/arm/mach-omap2/board-2430sdp.c @@ -28,7 +28,6 @@ #include <linux/io.h> #include <linux/gpio.h> -#include <mach/hardware.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <asm/mach/map.h> diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index cf9449b..a8cad22 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -44,8 +44,6 @@ #include <video/omap-panel-tfp410.h> #include <linux/platform_data/spi-omap2-mcspi.h> -#include <mach/hardware.h> - #include "common.h" #include "mux.h" #include "sdram-micron-mt46h32m32lf-6.h" diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index e3406dc..4a96433 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -14,7 +14,6 @@ #include <linux/string.h> #include <linux/delay.h> #include <linux/gpio.h> -#include <mach/hardware.h> #include <linux/platform_data/gpio-omap.h> #include "soc.h" diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c index b49be51..a609e21 100644 --- a/arch/arm/plat-omap/debug-devices.c +++ b/arch/arm/plat-omap/debug-devices.c @@ -15,7 +15,6 @@ #include <linux/io.h> #include <linux/smc91x.h> -#include <mach/hardware.h> #include <plat/debug-devices.h> /* Many OMAP development platforms reuse the same "debug board"; these diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 9a0bbc4..82231a7 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -43,8 +43,6 @@ #include <plat/dmtimer.h> -#include <mach/hardware.h> - static u32 omap_reserved_systimers; static LIST_HEAD(omap_timer_list); static DEFINE_SPINLOCK(dm_timer_lock); @@ -270,7 +268,7 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer) EXPORT_SYMBOL_GPL(omap_dm_timer_get_irq); #if defined(CONFIG_ARCH_OMAP1) - +#include <mach/hardware.h> /** * omap_dm_timer_modify_idlect_mask - Check if any running timers use ARMXOR * @inputmask: current value of idlect mask diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index f868cae..3a77b30 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -30,7 +30,6 @@ #include <linux/io.h> #include <linux/omapfb.h> -#include <mach/hardware.h> #include <asm/mach/map.h> #include <plat/cpu.h> diff --git a/arch/arm/plat-omap/i2c.c b/arch/arm/plat-omap/i2c.c index 4645dd4..f9df624 100644 --- a/arch/arm/plat-omap/i2c.c +++ b/arch/arm/plat-omap/i2c.c @@ -33,8 +33,6 @@ #include <plat/i2c.h> -#include <mach/irqs.h> - #define OMAP_I2C_MAX_CONTROLLERS 4 static struct omap_i2c_bus_platform_data i2c_pdata[OMAP_I2C_MAX_CONTROLLERS]; ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 2/3] ARM: OMAP: Remove NEED_MACH_GPIO_H 2012-11-01 22:48 ` Tony Lindgren @ 2012-11-01 22:48 ` Tony Lindgren -1 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 22:48 UTC (permalink / raw) To: linux-arm-kernel Cc: alsa-devel, Mark Brown, Peter Ujfalusi, linux-omap, Liam Girdwood, Jarkko Nikula Omap no longer needs this option, mach/gpio.h is empty. Also remove mach/irqs.h from gpio-omap.h and include it directly from the related omap1 gpio init files. Otherwise omap2+ build fails for MULTI_PLATFORM. Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: alsa-devel@alsa-project.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/Kconfig | 1 - arch/arm/mach-omap1/gpio15xx.c | 2 ++ arch/arm/mach-omap1/gpio16xx.c | 2 ++ arch/arm/mach-omap1/gpio7xx.c | 2 ++ arch/arm/mach-omap1/include/mach/gpio.h | 3 --- arch/arm/mach-omap2/include/mach/gpio.h | 3 --- include/linux/platform_data/gpio-omap.h | 1 - sound/soc/omap/am3517evm.c | 2 -- sound/soc/omap/n810.c | 1 - sound/soc/omap/osk5912.c | 1 - sound/soc/omap/sdp3430.c | 2 -- sound/soc/omap/zoom2.c | 3 --- 12 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 arch/arm/mach-omap1/include/mach/gpio.h delete mode 100644 arch/arm/mach-omap2/include/mach/gpio.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 73067ef..6207cf7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -937,7 +937,6 @@ config ARCH_OMAP select CLKSRC_MMIO select GENERIC_CLOCKEVENTS select HAVE_CLK - select NEED_MACH_GPIO_H help Support for TI's OMAP platform (OMAP1/2/3/4). diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c index 98e6f39..02b3eb2 100644 --- a/arch/arm/mach-omap1/gpio15xx.c +++ b/arch/arm/mach-omap1/gpio15xx.c @@ -19,6 +19,8 @@ #include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> +#include <mach/irqs.h> + #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE #define OMAP1510_GPIO_BASE 0xFFFCE000 diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c index 33f4192..b9952a2 100644 --- a/arch/arm/mach-omap1/gpio16xx.c +++ b/arch/arm/mach-omap1/gpio16xx.c @@ -19,6 +19,8 @@ #include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> +#include <mach/irqs.h> + #define OMAP1610_GPIO1_BASE 0xfffbe400 #define OMAP1610_GPIO2_BASE 0xfffbec00 #define OMAP1610_GPIO3_BASE 0xfffbb400 diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c index 958ce9a..f5819b2 100644 --- a/arch/arm/mach-omap1/gpio7xx.c +++ b/arch/arm/mach-omap1/gpio7xx.c @@ -19,6 +19,8 @@ #include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> +#include <mach/irqs.h> + #define OMAP7XX_GPIO1_BASE 0xfffbc000 #define OMAP7XX_GPIO2_BASE 0xfffbc800 #define OMAP7XX_GPIO3_BASE 0xfffbd000 diff --git a/arch/arm/mach-omap1/include/mach/gpio.h b/arch/arm/mach-omap1/include/mach/gpio.h deleted file mode 100644 index ebf86c0..0000000 --- a/arch/arm/mach-omap1/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * arch/arm/mach-omap1/include/mach/gpio.h - */ diff --git a/arch/arm/mach-omap2/include/mach/gpio.h b/arch/arm/mach-omap2/include/mach/gpio.h deleted file mode 100644 index 5621cc5..0000000 --- a/arch/arm/mach-omap2/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * arch/arm/mach-omap2/include/mach/gpio.h - */ diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h index e8741c2..5d50b25 100644 --- a/include/linux/platform_data/gpio-omap.h +++ b/include/linux/platform_data/gpio-omap.h @@ -26,7 +26,6 @@ #include <linux/io.h> #include <linux/platform_device.h> -#include <mach/irqs.h> #define OMAP1_MPUIO_BASE 0xfffb5000 diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index fad3506..c1900b2 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c @@ -25,8 +25,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/gpio.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap-mcbsp.h" diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 521bfc3..230b8c1 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -29,7 +29,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> #include <linux/gpio.h> #include <linux/module.h> #include <linux/platform_data/asoc-ti-mcbsp.h> diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index 3960e8d..06ef8d6 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c @@ -28,7 +28,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> #include <linux/gpio.h> #include <linux/module.h> #include <linux/platform_data/asoc-ti-mcbsp.h> diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index 597cae7..b462a2c 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c @@ -31,8 +31,6 @@ #include <sound/jack.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/asoc-ti-mcbsp.h> diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 677b567..27c501c 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -26,9 +26,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/gpio.h> -#include <mach/board-zoom.h> #include <linux/platform_data/asoc-ti-mcbsp.h> /* Register descriptions for twl4030 codec part */ ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 2/3] ARM: OMAP: Remove NEED_MACH_GPIO_H @ 2012-11-01 22:48 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 22:48 UTC (permalink / raw) To: linux-arm-kernel Omap no longer needs this option, mach/gpio.h is empty. Also remove mach/irqs.h from gpio-omap.h and include it directly from the related omap1 gpio init files. Otherwise omap2+ build fails for MULTI_PLATFORM. Cc: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Jarkko Nikula <jarkko.nikula@bitmer.com> Cc: Liam Girdwood <lrg@ti.com> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: alsa-devel at alsa-project.org Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/Kconfig | 1 - arch/arm/mach-omap1/gpio15xx.c | 2 ++ arch/arm/mach-omap1/gpio16xx.c | 2 ++ arch/arm/mach-omap1/gpio7xx.c | 2 ++ arch/arm/mach-omap1/include/mach/gpio.h | 3 --- arch/arm/mach-omap2/include/mach/gpio.h | 3 --- include/linux/platform_data/gpio-omap.h | 1 - sound/soc/omap/am3517evm.c | 2 -- sound/soc/omap/n810.c | 1 - sound/soc/omap/osk5912.c | 1 - sound/soc/omap/sdp3430.c | 2 -- sound/soc/omap/zoom2.c | 3 --- 12 files changed, 6 insertions(+), 17 deletions(-) delete mode 100644 arch/arm/mach-omap1/include/mach/gpio.h delete mode 100644 arch/arm/mach-omap2/include/mach/gpio.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 73067ef..6207cf7 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -937,7 +937,6 @@ config ARCH_OMAP select CLKSRC_MMIO select GENERIC_CLOCKEVENTS select HAVE_CLK - select NEED_MACH_GPIO_H help Support for TI's OMAP platform (OMAP1/2/3/4). diff --git a/arch/arm/mach-omap1/gpio15xx.c b/arch/arm/mach-omap1/gpio15xx.c index 98e6f39..02b3eb2 100644 --- a/arch/arm/mach-omap1/gpio15xx.c +++ b/arch/arm/mach-omap1/gpio15xx.c @@ -19,6 +19,8 @@ #include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> +#include <mach/irqs.h> + #define OMAP1_MPUIO_VBASE OMAP1_MPUIO_BASE #define OMAP1510_GPIO_BASE 0xFFFCE000 diff --git a/arch/arm/mach-omap1/gpio16xx.c b/arch/arm/mach-omap1/gpio16xx.c index 33f4192..b9952a2 100644 --- a/arch/arm/mach-omap1/gpio16xx.c +++ b/arch/arm/mach-omap1/gpio16xx.c @@ -19,6 +19,8 @@ #include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> +#include <mach/irqs.h> + #define OMAP1610_GPIO1_BASE 0xfffbe400 #define OMAP1610_GPIO2_BASE 0xfffbec00 #define OMAP1610_GPIO3_BASE 0xfffbb400 diff --git a/arch/arm/mach-omap1/gpio7xx.c b/arch/arm/mach-omap1/gpio7xx.c index 958ce9a..f5819b2 100644 --- a/arch/arm/mach-omap1/gpio7xx.c +++ b/arch/arm/mach-omap1/gpio7xx.c @@ -19,6 +19,8 @@ #include <linux/gpio.h> #include <linux/platform_data/gpio-omap.h> +#include <mach/irqs.h> + #define OMAP7XX_GPIO1_BASE 0xfffbc000 #define OMAP7XX_GPIO2_BASE 0xfffbc800 #define OMAP7XX_GPIO3_BASE 0xfffbd000 diff --git a/arch/arm/mach-omap1/include/mach/gpio.h b/arch/arm/mach-omap1/include/mach/gpio.h deleted file mode 100644 index ebf86c0..0000000 --- a/arch/arm/mach-omap1/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * arch/arm/mach-omap1/include/mach/gpio.h - */ diff --git a/arch/arm/mach-omap2/include/mach/gpio.h b/arch/arm/mach-omap2/include/mach/gpio.h deleted file mode 100644 index 5621cc5..0000000 --- a/arch/arm/mach-omap2/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -/* - * arch/arm/mach-omap2/include/mach/gpio.h - */ diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h index e8741c2..5d50b25 100644 --- a/include/linux/platform_data/gpio-omap.h +++ b/include/linux/platform_data/gpio-omap.h @@ -26,7 +26,6 @@ #include <linux/io.h> #include <linux/platform_device.h> -#include <mach/irqs.h> #define OMAP1_MPUIO_BASE 0xfffb5000 diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index fad3506..c1900b2 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c @@ -25,8 +25,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/gpio.h> #include <linux/platform_data/asoc-ti-mcbsp.h> #include "omap-mcbsp.h" diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 521bfc3..230b8c1 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -29,7 +29,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> #include <linux/gpio.h> #include <linux/module.h> #include <linux/platform_data/asoc-ti-mcbsp.h> diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index 3960e8d..06ef8d6 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c @@ -28,7 +28,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> #include <linux/gpio.h> #include <linux/module.h> #include <linux/platform_data/asoc-ti-mcbsp.h> diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index 597cae7..b462a2c 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c @@ -31,8 +31,6 @@ #include <sound/jack.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/gpio.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/asoc-ti-mcbsp.h> diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 677b567..27c501c 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c @@ -26,9 +26,6 @@ #include <sound/soc.h> #include <asm/mach-types.h> -#include <mach/hardware.h> -#include <mach/gpio.h> -#include <mach/board-zoom.h> #include <linux/platform_data/asoc-ti-mcbsp.h> /* Register descriptions for twl4030 codec part */ ^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH 2/3] ARM: OMAP: Remove NEED_MACH_GPIO_H 2012-11-01 22:48 ` Tony Lindgren @ 2012-11-02 14:25 ` Mark Brown -1 siblings, 0 replies; 32+ messages in thread From: Mark Brown @ 2012-11-02 14:25 UTC (permalink / raw) To: Tony Lindgren Cc: linux-arm-kernel, alsa-devel, Peter Ujfalusi, linux-omap, Liam Girdwood, Jarkko Nikula [-- Attachment #1: Type: text/plain, Size: 362 bytes --] On Thu, Nov 01, 2012 at 03:48:23PM -0700, Tony Lindgren wrote: > Omap no longer needs this option, mach/gpio.h is > empty. > > Also remove mach/irqs.h from gpio-omap.h and > include it directly from the related omap1 > gpio init files. > > Otherwise omap2+ build fails for MULTI_PLATFORM. Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 2/3] ARM: OMAP: Remove NEED_MACH_GPIO_H @ 2012-11-02 14:25 ` Mark Brown 0 siblings, 0 replies; 32+ messages in thread From: Mark Brown @ 2012-11-02 14:25 UTC (permalink / raw) To: linux-arm-kernel On Thu, Nov 01, 2012 at 03:48:23PM -0700, Tony Lindgren wrote: > Omap no longer needs this option, mach/gpio.h is > empty. > > Also remove mach/irqs.h from gpio-omap.h and > include it directly from the related omap1 > gpio init files. > > Otherwise omap2+ build fails for MULTI_PLATFORM. Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121102/00a04e77/attachment-0001.sig> ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-01 22:48 ` Tony Lindgren @ 2012-11-01 22:48 ` Tony Lindgren -1 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 22:48 UTC (permalink / raw) To: linux-arm-kernel; +Cc: linux-omap This file has only omap_init_consistent_dma_size() left that can be moved to plat-omap/dma.c. Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/common.c | 26 -------------------------- arch/arm/plat-omap/dma.c | 8 ++++++++ 3 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 arch/arm/plat-omap/common.c diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 50da9bf..8d88584 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := common.o sram.o dma.o fb.o counter_32k.o +obj-y := sram.o dma.o fb.o counter_32k.o obj-m := obj-n := obj- := diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c deleted file mode 100644 index bf6cd80..0000000 --- a/arch/arm/plat-omap/common.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * linux/arch/arm/plat-omap/common.c - * - * Code common to all OMAP machines. - * The file is created by Tony Lindgren <tony@atomide.com> - * - * Copyright (C) 2009 Texas Instruments - * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/io.h> -#include <linux/dma-mapping.h> - -#include <plat-omap/dma-omap.h> - -void __init omap_init_consistent_dma_size(void) -{ -#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE - init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); -#endif -} diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c288b76..00a3a53 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -2146,6 +2146,14 @@ static struct platform_driver omap_system_dma_driver = { }, }; +/* This must be called from init_early() */ +void __init omap_init_consistent_dma_size(void) +{ +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); +#endif +} + static int __init omap_system_dma_init(void) { return platform_driver_register(&omap_system_dma_driver); ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-01 22:48 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 22:48 UTC (permalink / raw) To: linux-arm-kernel This file has only omap_init_consistent_dma_size() left that can be moved to plat-omap/dma.c. Signed-off-by: Tony Lindgren <tony@atomide.com> --- arch/arm/plat-omap/Makefile | 2 +- arch/arm/plat-omap/common.c | 26 -------------------------- arch/arm/plat-omap/dma.c | 8 ++++++++ 3 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 arch/arm/plat-omap/common.c diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 50da9bf..8d88584 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := common.o sram.o dma.o fb.o counter_32k.o +obj-y := sram.o dma.o fb.o counter_32k.o obj-m := obj-n := obj- := diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c deleted file mode 100644 index bf6cd80..0000000 --- a/arch/arm/plat-omap/common.c +++ /dev/null @@ -1,26 +0,0 @@ -/* - * linux/arch/arm/plat-omap/common.c - * - * Code common to all OMAP machines. - * The file is created by Tony Lindgren <tony@atomide.com> - * - * Copyright (C) 2009 Texas Instruments - * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#include <linux/kernel.h> -#include <linux/init.h> -#include <linux/io.h> -#include <linux/dma-mapping.h> - -#include <plat-omap/dma-omap.h> - -void __init omap_init_consistent_dma_size(void) -{ -#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE - init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); -#endif -} diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c288b76..00a3a53 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -2146,6 +2146,14 @@ static struct platform_driver omap_system_dma_driver = { }, }; +/* This must be called from init_early() */ +void __init omap_init_consistent_dma_size(void) +{ +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); +#endif +} + static int __init omap_system_dma_init(void) { return platform_driver_register(&omap_system_dma_driver); ^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-01 22:48 ` Tony Lindgren @ 2012-11-01 23:14 ` Tony Lindgren -1 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 23:14 UTC (permalink / raw) To: linux-arm-kernel; +Cc: linux-omap * Tony Lindgren <tony@atomide.com> [121101 15:50]: > This file has only omap_init_consistent_dma_size() > left that can be moved to plat-omap/dma.c. And this one needs the following compile fix for omap1 at least for Nokia 770. I'll fold it in. Regards, Tony --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -35,6 +35,7 @@ #include <linux/io.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <plat-omap/dma-omap.h> ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-01 23:14 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-01 23:14 UTC (permalink / raw) To: linux-arm-kernel * Tony Lindgren <tony@atomide.com> [121101 15:50]: > This file has only omap_init_consistent_dma_size() > left that can be moved to plat-omap/dma.c. And this one needs the following compile fix for omap1 at least for Nokia 770. I'll fold it in. Regards, Tony --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -35,6 +35,7 @@ #include <linux/io.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/dma-mapping.h> #include <plat-omap/dma-omap.h> ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-01 22:48 ` Tony Lindgren @ 2012-11-02 6:37 ` Santosh Shilimkar -1 siblings, 0 replies; 32+ messages in thread From: Santosh Shilimkar @ 2012-11-02 6:37 UTC (permalink / raw) To: Tony Lindgren, Tomi Valkeinen; +Cc: linux-arm-kernel, linux-omap Tony, On Friday 02 November 2012 04:18 AM, Tony Lindgren wrote: > This file has only omap_init_consistent_dma_size() > left that can be moved to plat-omap/dma.c. > > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > arch/arm/plat-omap/Makefile | 2 +- > arch/arm/plat-omap/common.c | 26 -------------------------- > arch/arm/plat-omap/dma.c | 8 ++++++++ > 3 files changed, 9 insertions(+), 27 deletions(-) > delete mode 100644 arch/arm/plat-omap/common.c > [..] > diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c > index c288b76..00a3a53 100644 > --- a/arch/arm/plat-omap/dma.c > +++ b/arch/arm/plat-omap/dma.c > @@ -2146,6 +2146,14 @@ static struct platform_driver omap_system_dma_driver = { > }, > }; > > +/* This must be called from init_early() */ > +void __init omap_init_consistent_dma_size(void) > +{ > +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE > + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); > +#endif > +} > + Lets not move this in DMA code since the above is really related to frame buffer. It reserves more DMA area for dma_alloc_coherent() etc than default 2 MB. Infact, we should no longer need this with CMA and memblock in place. Tomi, Can we not get rid of the above memory reservation ? Regards santosh ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-02 6:37 ` Santosh Shilimkar 0 siblings, 0 replies; 32+ messages in thread From: Santosh Shilimkar @ 2012-11-02 6:37 UTC (permalink / raw) To: linux-arm-kernel Tony, On Friday 02 November 2012 04:18 AM, Tony Lindgren wrote: > This file has only omap_init_consistent_dma_size() > left that can be moved to plat-omap/dma.c. > > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > arch/arm/plat-omap/Makefile | 2 +- > arch/arm/plat-omap/common.c | 26 -------------------------- > arch/arm/plat-omap/dma.c | 8 ++++++++ > 3 files changed, 9 insertions(+), 27 deletions(-) > delete mode 100644 arch/arm/plat-omap/common.c > [..] > diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c > index c288b76..00a3a53 100644 > --- a/arch/arm/plat-omap/dma.c > +++ b/arch/arm/plat-omap/dma.c > @@ -2146,6 +2146,14 @@ static struct platform_driver omap_system_dma_driver = { > }, > }; > > +/* This must be called from init_early() */ > +void __init omap_init_consistent_dma_size(void) > +{ > +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE > + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); > +#endif > +} > + Lets not move this in DMA code since the above is really related to frame buffer. It reserves more DMA area for dma_alloc_coherent() etc than default 2 MB. Infact, we should no longer need this with CMA and memblock in place. Tomi, Can we not get rid of the above memory reservation ? Regards santosh ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-01 22:48 ` Tony Lindgren @ 2012-11-02 6:38 ` Santosh Shilimkar -1 siblings, 0 replies; 32+ messages in thread From: Santosh Shilimkar @ 2012-11-02 6:38 UTC (permalink / raw) To: Tony Lindgren, Tomi Valkeinen; +Cc: linux-arm-kernel, linux-omap Tony, On Friday 02 November 2012 04:18 AM, Tony Lindgren wrote: > This file has only omap_init_consistent_dma_size() > left that can be moved to plat-omap/dma.c. > > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > arch/arm/plat-omap/Makefile | 2 +- > arch/arm/plat-omap/common.c | 26 -------------------------- > arch/arm/plat-omap/dma.c | 8 ++++++++ > 3 files changed, 9 insertions(+), 27 deletions(-) > delete mode 100644 arch/arm/plat-omap/common.c > [..] > diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c > index c288b76..00a3a53 100644 > --- a/arch/arm/plat-omap/dma.c > +++ b/arch/arm/plat-omap/dma.c > @@ -2146,6 +2146,14 @@ static struct platform_driver omap_system_dma_driver = { > }, > }; > > +/* This must be called from init_early() */ > +void __init omap_init_consistent_dma_size(void) > +{ > +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE > + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); > +#endif > +} > + Lets not move this in DMA code since the above is really related to frame buffer. It reserves more DMA area for dma_alloc_coherent() etc than default 2 MB. Infact, we should no longer need this with CMA and memblock in place. Tomi, Can we not get rid of the above memory reservation ? Regards santosh ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-02 6:38 ` Santosh Shilimkar 0 siblings, 0 replies; 32+ messages in thread From: Santosh Shilimkar @ 2012-11-02 6:38 UTC (permalink / raw) To: linux-arm-kernel Tony, On Friday 02 November 2012 04:18 AM, Tony Lindgren wrote: > This file has only omap_init_consistent_dma_size() > left that can be moved to plat-omap/dma.c. > > Signed-off-by: Tony Lindgren <tony@atomide.com> > --- > arch/arm/plat-omap/Makefile | 2 +- > arch/arm/plat-omap/common.c | 26 -------------------------- > arch/arm/plat-omap/dma.c | 8 ++++++++ > 3 files changed, 9 insertions(+), 27 deletions(-) > delete mode 100644 arch/arm/plat-omap/common.c > [..] > diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c > index c288b76..00a3a53 100644 > --- a/arch/arm/plat-omap/dma.c > +++ b/arch/arm/plat-omap/dma.c > @@ -2146,6 +2146,14 @@ static struct platform_driver omap_system_dma_driver = { > }, > }; > > +/* This must be called from init_early() */ > +void __init omap_init_consistent_dma_size(void) > +{ > +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE > + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); > +#endif > +} > + Lets not move this in DMA code since the above is really related to frame buffer. It reserves more DMA area for dma_alloc_coherent() etc than default 2 MB. Infact, we should no longer need this with CMA and memblock in place. Tomi, Can we not get rid of the above memory reservation ? Regards santosh ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-02 6:38 ` Santosh Shilimkar @ 2012-11-02 8:49 ` Tomi Valkeinen -1 siblings, 0 replies; 32+ messages in thread From: Tomi Valkeinen @ 2012-11-02 8:49 UTC (permalink / raw) To: Santosh Shilimkar, Tony Lindgren; +Cc: linux-arm-kernel, linux-omap [-- Attachment #1.1: Type: text/plain, Size: 6463 bytes --] On 2012-11-02 08:38, Santosh Shilimkar wrote: > Tony, > > On Friday 02 November 2012 04:18 AM, Tony Lindgren wrote: >> This file has only omap_init_consistent_dma_size() >> left that can be moved to plat-omap/dma.c. >> >> Signed-off-by: Tony Lindgren <tony@atomide.com> >> --- >> arch/arm/plat-omap/Makefile | 2 +- >> arch/arm/plat-omap/common.c | 26 -------------------------- >> arch/arm/plat-omap/dma.c | 8 ++++++++ >> 3 files changed, 9 insertions(+), 27 deletions(-) >> delete mode 100644 arch/arm/plat-omap/common.c >> > > [..] > >> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c >> index c288b76..00a3a53 100644 >> --- a/arch/arm/plat-omap/dma.c >> +++ b/arch/arm/plat-omap/dma.c >> @@ -2146,6 +2146,14 @@ static struct platform_driver >> omap_system_dma_driver = { >> }, >> }; >> >> +/* This must be called from init_early() */ >> +void __init omap_init_consistent_dma_size(void) >> +{ >> +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE >> + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); >> +#endif >> +} >> + > Lets not move this in DMA code since the above is really related > to frame buffer. It reserves more DMA area for dma_alloc_coherent() > etc than default 2 MB. Infact, we should no longer need this with > CMA and memblock in place. > > Tomi, > Can we not get rid of the above memory reservation ? Yes, I think so. This one is only used for the old omapfb, i.e. omap1, and I have no means to test it out, though. But below is a patch to remove it. I also attached the patch, as it looks like thunderbird wants to reformat the pasted patch... I'll remove the CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file in my tree later. From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@ti.com> Date: Fri, 2 Nov 2012 10:36:13 +0200 Subject: [PATCH] ARM: OMAP: Remove omap_init_consistent_dma_size() The only thing omap_init_consistent_dma_size() does is increase the consistent DMA size if CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE is defined. Increasing the consistent DMA size should no longer be needed with CMA in place. This patch removes omap_init_consistent_dma_size() and also arch/arm/mach-omap2/io.c:omap_common_init_early() which becomes an empty function. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- arch/arm/mach-omap1/io.c | 1 - arch/arm/mach-omap2/io.c | 12 ------------ arch/arm/plat-omap/common.c | 7 ------- arch/arm/plat-omap/include/plat/dma.h | 1 - 4 files changed, 21 deletions(-) diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 6a5baab..b3d0fb3 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -134,7 +134,6 @@ void __init omap1_init_early(void) */ omap1_clk_init(); omap1_mux_init(); - omap_init_consistent_dma_size(); } void __init omap1_init_late(void) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 4234d28..2597846 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -354,11 +354,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); } -static void __init omap_common_init_early(void) -{ - omap_init_consistent_dma_size(); -} - static void __init omap_hwmod_init_postsetup(void) { u8 postsetup_state; @@ -379,7 +374,6 @@ void __init omap2420_init_early(void) { omap2_set_globals_242x(); omap2xxx_check_revision(); - omap_common_init_early(); omap2xxx_voltagedomains_init(); omap242x_powerdomains_init(); omap242x_clockdomains_init(); @@ -401,7 +395,6 @@ void __init omap2430_init_early(void) { omap2_set_globals_243x(); omap2xxx_check_revision(); - omap_common_init_early(); omap2xxx_voltagedomains_init(); omap243x_powerdomains_init(); omap243x_clockdomains_init(); @@ -428,7 +421,6 @@ void __init omap3_init_early(void) omap2_set_globals_3xxx(); omap3xxx_check_revision(); omap3xxx_check_features(); - omap_common_init_early(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); omap3xxx_clockdomains_init(); @@ -462,7 +454,6 @@ void __init ti81xx_init_early(void) omap2_set_globals_ti81xx(); omap3xxx_check_revision(); ti81xx_check_features(); - omap_common_init_early(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); omap3xxx_clockdomains_init(); @@ -520,7 +511,6 @@ void __init am33xx_init_early(void) omap2_set_globals_am33xx(); omap3xxx_check_revision(); ti81xx_check_features(); - omap_common_init_early(); am33xx_voltagedomains_init(); am33xx_powerdomains_init(); am33xx_clockdomains_init(); @@ -536,7 +526,6 @@ void __init omap4430_init_early(void) omap2_set_globals_443x(); omap4xxx_check_revision(); omap4xxx_check_features(); - omap_common_init_early(); omap44xx_voltagedomains_init(); omap44xx_powerdomains_init(); omap44xx_clockdomains_init(); @@ -558,7 +547,6 @@ void __init omap5_init_early(void) { omap2_set_globals_5xxx(); omap5xxx_check_revision(); - omap_common_init_early(); } #endif diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 111315a..ab44d34 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -31,13 +31,6 @@ void __init omap_reserve(void) omap_barrier_reserve_memblock(); } -void __init omap_init_consistent_dma_size(void) -{ -#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE - init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); -#endif -} - /* * Stub function for OMAP2 so that common files * continue to build when custom builds are used diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h index 0a87b05..f1b2ad3 100644 --- a/arch/arm/plat-omap/include/plat/dma.h +++ b/arch/arm/plat-omap/include/plat/dma.h @@ -449,7 +449,6 @@ struct omap_system_dma_plat_info { u32 (*dma_read)(int reg, int lch); }; -extern void __init omap_init_consistent_dma_size(void); extern void omap_set_dma_priority(int lch, int dst_port, int priority); extern int omap_request_dma(int dev_id, const char *dev_name, void (*callback)(int lch, u16 ch_status, void *data), -- 1.7.10.4 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1.2: 0001-ARM-OMAP-Remove-omap_init_consistent_dma_size.patch --] [-- Type: text/x-patch; name="0001-ARM-OMAP-Remove-omap_init_consistent_dma_size.patch", Size: 4665 bytes --] From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@ti.com> Date: Fri, 2 Nov 2012 10:36:13 +0200 Subject: [PATCH] ARM: OMAP: Remove omap_init_consistent_dma_size() The only thing omap_init_consistent_dma_size() does is increase the consistent DMA size if CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE is defined. Increasing the consistent DMA size should no longer be needed with CMA in place. This patch removes omap_init_consistent_dma_size() and also arch/arm/mach-omap2/io.c:omap_common_init_early() which becomes an empty function. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- arch/arm/mach-omap1/io.c | 1 - arch/arm/mach-omap2/io.c | 12 ------------ arch/arm/plat-omap/common.c | 7 ------- arch/arm/plat-omap/include/plat/dma.h | 1 - 4 files changed, 21 deletions(-) diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 6a5baab..b3d0fb3 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -134,7 +134,6 @@ void __init omap1_init_early(void) */ omap1_clk_init(); omap1_mux_init(); - omap_init_consistent_dma_size(); } void __init omap1_init_late(void) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 4234d28..2597846 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -354,11 +354,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); } -static void __init omap_common_init_early(void) -{ - omap_init_consistent_dma_size(); -} - static void __init omap_hwmod_init_postsetup(void) { u8 postsetup_state; @@ -379,7 +374,6 @@ void __init omap2420_init_early(void) { omap2_set_globals_242x(); omap2xxx_check_revision(); - omap_common_init_early(); omap2xxx_voltagedomains_init(); omap242x_powerdomains_init(); omap242x_clockdomains_init(); @@ -401,7 +395,6 @@ void __init omap2430_init_early(void) { omap2_set_globals_243x(); omap2xxx_check_revision(); - omap_common_init_early(); omap2xxx_voltagedomains_init(); omap243x_powerdomains_init(); omap243x_clockdomains_init(); @@ -428,7 +421,6 @@ void __init omap3_init_early(void) omap2_set_globals_3xxx(); omap3xxx_check_revision(); omap3xxx_check_features(); - omap_common_init_early(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); omap3xxx_clockdomains_init(); @@ -462,7 +454,6 @@ void __init ti81xx_init_early(void) omap2_set_globals_ti81xx(); omap3xxx_check_revision(); ti81xx_check_features(); - omap_common_init_early(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); omap3xxx_clockdomains_init(); @@ -520,7 +511,6 @@ void __init am33xx_init_early(void) omap2_set_globals_am33xx(); omap3xxx_check_revision(); ti81xx_check_features(); - omap_common_init_early(); am33xx_voltagedomains_init(); am33xx_powerdomains_init(); am33xx_clockdomains_init(); @@ -536,7 +526,6 @@ void __init omap4430_init_early(void) omap2_set_globals_443x(); omap4xxx_check_revision(); omap4xxx_check_features(); - omap_common_init_early(); omap44xx_voltagedomains_init(); omap44xx_powerdomains_init(); omap44xx_clockdomains_init(); @@ -558,7 +547,6 @@ void __init omap5_init_early(void) { omap2_set_globals_5xxx(); omap5xxx_check_revision(); - omap_common_init_early(); } #endif diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 111315a..ab44d34 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -31,13 +31,6 @@ void __init omap_reserve(void) omap_barrier_reserve_memblock(); } -void __init omap_init_consistent_dma_size(void) -{ -#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE - init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); -#endif -} - /* * Stub function for OMAP2 so that common files * continue to build when custom builds are used diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h index 0a87b05..f1b2ad3 100644 --- a/arch/arm/plat-omap/include/plat/dma.h +++ b/arch/arm/plat-omap/include/plat/dma.h @@ -449,7 +449,6 @@ struct omap_system_dma_plat_info { u32 (*dma_read)(int reg, int lch); }; -extern void __init omap_init_consistent_dma_size(void); extern void omap_set_dma_priority(int lch, int dst_port, int priority); extern int omap_request_dma(int dev_id, const char *dev_name, void (*callback)(int lch, u16 ch_status, void *data), -- 1.7.10.4 [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-02 8:49 ` Tomi Valkeinen 0 siblings, 0 replies; 32+ messages in thread From: Tomi Valkeinen @ 2012-11-02 8:49 UTC (permalink / raw) To: linux-arm-kernel On 2012-11-02 08:38, Santosh Shilimkar wrote: > Tony, > > On Friday 02 November 2012 04:18 AM, Tony Lindgren wrote: >> This file has only omap_init_consistent_dma_size() >> left that can be moved to plat-omap/dma.c. >> >> Signed-off-by: Tony Lindgren <tony@atomide.com> >> --- >> arch/arm/plat-omap/Makefile | 2 +- >> arch/arm/plat-omap/common.c | 26 -------------------------- >> arch/arm/plat-omap/dma.c | 8 ++++++++ >> 3 files changed, 9 insertions(+), 27 deletions(-) >> delete mode 100644 arch/arm/plat-omap/common.c >> > > [..] > >> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c >> index c288b76..00a3a53 100644 >> --- a/arch/arm/plat-omap/dma.c >> +++ b/arch/arm/plat-omap/dma.c >> @@ -2146,6 +2146,14 @@ static struct platform_driver >> omap_system_dma_driver = { >> }, >> }; >> >> +/* This must be called from init_early() */ >> +void __init omap_init_consistent_dma_size(void) >> +{ >> +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE >> + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); >> +#endif >> +} >> + > Lets not move this in DMA code since the above is really related > to frame buffer. It reserves more DMA area for dma_alloc_coherent() > etc than default 2 MB. Infact, we should no longer need this with > CMA and memblock in place. > > Tomi, > Can we not get rid of the above memory reservation ? Yes, I think so. This one is only used for the old omapfb, i.e. omap1, and I have no means to test it out, though. But below is a patch to remove it. I also attached the patch, as it looks like thunderbird wants to reformat the pasted patch... I'll remove the CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file in my tree later. >From 65c22c93928fbaaae846dd7df53343050bbcfc64 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen <tomi.valkeinen@ti.com> Date: Fri, 2 Nov 2012 10:36:13 +0200 Subject: [PATCH] ARM: OMAP: Remove omap_init_consistent_dma_size() The only thing omap_init_consistent_dma_size() does is increase the consistent DMA size if CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE is defined. Increasing the consistent DMA size should no longer be needed with CMA in place. This patch removes omap_init_consistent_dma_size() and also arch/arm/mach-omap2/io.c:omap_common_init_early() which becomes an empty function. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> --- arch/arm/mach-omap1/io.c | 1 - arch/arm/mach-omap2/io.c | 12 ------------ arch/arm/plat-omap/common.c | 7 ------- arch/arm/plat-omap/include/plat/dma.h | 1 - 4 files changed, 21 deletions(-) diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c index 6a5baab..b3d0fb3 100644 --- a/arch/arm/mach-omap1/io.c +++ b/arch/arm/mach-omap1/io.c @@ -134,7 +134,6 @@ void __init omap1_init_early(void) */ omap1_clk_init(); omap1_mux_init(); - omap_init_consistent_dma_size(); } void __init omap1_init_late(void) diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 4234d28..2597846 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -354,11 +354,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); } -static void __init omap_common_init_early(void) -{ - omap_init_consistent_dma_size(); -} - static void __init omap_hwmod_init_postsetup(void) { u8 postsetup_state; @@ -379,7 +374,6 @@ void __init omap2420_init_early(void) { omap2_set_globals_242x(); omap2xxx_check_revision(); - omap_common_init_early(); omap2xxx_voltagedomains_init(); omap242x_powerdomains_init(); omap242x_clockdomains_init(); @@ -401,7 +395,6 @@ void __init omap2430_init_early(void) { omap2_set_globals_243x(); omap2xxx_check_revision(); - omap_common_init_early(); omap2xxx_voltagedomains_init(); omap243x_powerdomains_init(); omap243x_clockdomains_init(); @@ -428,7 +421,6 @@ void __init omap3_init_early(void) omap2_set_globals_3xxx(); omap3xxx_check_revision(); omap3xxx_check_features(); - omap_common_init_early(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); omap3xxx_clockdomains_init(); @@ -462,7 +454,6 @@ void __init ti81xx_init_early(void) omap2_set_globals_ti81xx(); omap3xxx_check_revision(); ti81xx_check_features(); - omap_common_init_early(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); omap3xxx_clockdomains_init(); @@ -520,7 +511,6 @@ void __init am33xx_init_early(void) omap2_set_globals_am33xx(); omap3xxx_check_revision(); ti81xx_check_features(); - omap_common_init_early(); am33xx_voltagedomains_init(); am33xx_powerdomains_init(); am33xx_clockdomains_init(); @@ -536,7 +526,6 @@ void __init omap4430_init_early(void) omap2_set_globals_443x(); omap4xxx_check_revision(); omap4xxx_check_features(); - omap_common_init_early(); omap44xx_voltagedomains_init(); omap44xx_powerdomains_init(); omap44xx_clockdomains_init(); @@ -558,7 +547,6 @@ void __init omap5_init_early(void) { omap2_set_globals_5xxx(); omap5xxx_check_revision(); - omap_common_init_early(); } #endif diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c index 111315a..ab44d34 100644 --- a/arch/arm/plat-omap/common.c +++ b/arch/arm/plat-omap/common.c @@ -31,13 +31,6 @@ void __init omap_reserve(void) omap_barrier_reserve_memblock(); } -void __init omap_init_consistent_dma_size(void) -{ -#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE - init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); -#endif -} - /* * Stub function for OMAP2 so that common files * continue to build when custom builds are used diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h index 0a87b05..f1b2ad3 100644 --- a/arch/arm/plat-omap/include/plat/dma.h +++ b/arch/arm/plat-omap/include/plat/dma.h @@ -449,7 +449,6 @@ struct omap_system_dma_plat_info { u32 (*dma_read)(int reg, int lch); }; -extern void __init omap_init_consistent_dma_size(void); extern void omap_set_dma_priority(int lch, int dst_port, int priority); extern int omap_request_dma(int dev_id, const char *dev_name, void (*callback)(int lch, u16 ch_status, void *data), -- 1.7.10.4 -------------- next part -------------- A non-text attachment was scrubbed... Name: 0001-ARM-OMAP-Remove-omap_init_consistent_dma_size.patch Type: text/x-patch Size: 4526 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121102/5d1308d7/attachment-0001.bin> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 897 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121102/5d1308d7/attachment-0001.sig> ^ permalink raw reply related [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-02 8:49 ` Tomi Valkeinen @ 2012-11-02 8:55 ` Santosh Shilimkar -1 siblings, 0 replies; 32+ messages in thread From: Santosh Shilimkar @ 2012-11-02 8:55 UTC (permalink / raw) To: Tomi Valkeinen; +Cc: Tony Lindgren, linux-arm-kernel, linux-omap On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > On 2012-11-02 08:38, Santosh Shilimkar wrote: >> Tony, >> >> On Friday 02 November 2012 04:18 AM, Tony Lindgren wrote: >>> This file has only omap_init_consistent_dma_size() >>> left that can be moved to plat-omap/dma.c. >>> >>> Signed-off-by: Tony Lindgren <tony@atomide.com> >>> --- >>> arch/arm/plat-omap/Makefile | 2 +- >>> arch/arm/plat-omap/common.c | 26 -------------------------- >>> arch/arm/plat-omap/dma.c | 8 ++++++++ >>> 3 files changed, 9 insertions(+), 27 deletions(-) >>> delete mode 100644 arch/arm/plat-omap/common.c >>> >> >> [..] >> >>> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c >>> index c288b76..00a3a53 100644 >>> --- a/arch/arm/plat-omap/dma.c >>> +++ b/arch/arm/plat-omap/dma.c >>> @@ -2146,6 +2146,14 @@ static struct platform_driver >>> omap_system_dma_driver = { >>> }, >>> }; >>> >>> +/* This must be called from init_early() */ >>> +void __init omap_init_consistent_dma_size(void) >>> +{ >>> +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE >>> + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); >>> +#endif >>> +} >>> + >> Lets not move this in DMA code since the above is really related >> to frame buffer. It reserves more DMA area for dma_alloc_coherent() >> etc than default 2 MB. Infact, we should no longer need this with >> CMA and memblock in place. >> >> Tomi, >> Can we not get rid of the above memory reservation ? > > Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > and I have no means to test it out, though. But below is a patch to > remove it. I also attached the patch, as it looks like thunderbird wants > to reformat the pasted patch... I'll remove the > CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > in my tree later. > Great !! Thanks for the patches Tomi. For both the patches, feel free add. Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-02 8:55 ` Santosh Shilimkar 0 siblings, 0 replies; 32+ messages in thread From: Santosh Shilimkar @ 2012-11-02 8:55 UTC (permalink / raw) To: linux-arm-kernel On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > On 2012-11-02 08:38, Santosh Shilimkar wrote: >> Tony, >> >> On Friday 02 November 2012 04:18 AM, Tony Lindgren wrote: >>> This file has only omap_init_consistent_dma_size() >>> left that can be moved to plat-omap/dma.c. >>> >>> Signed-off-by: Tony Lindgren <tony@atomide.com> >>> --- >>> arch/arm/plat-omap/Makefile | 2 +- >>> arch/arm/plat-omap/common.c | 26 -------------------------- >>> arch/arm/plat-omap/dma.c | 8 ++++++++ >>> 3 files changed, 9 insertions(+), 27 deletions(-) >>> delete mode 100644 arch/arm/plat-omap/common.c >>> >> >> [..] >> >>> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c >>> index c288b76..00a3a53 100644 >>> --- a/arch/arm/plat-omap/dma.c >>> +++ b/arch/arm/plat-omap/dma.c >>> @@ -2146,6 +2146,14 @@ static struct platform_driver >>> omap_system_dma_driver = { >>> }, >>> }; >>> >>> +/* This must be called from init_early() */ >>> +void __init omap_init_consistent_dma_size(void) >>> +{ >>> +#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE >>> + init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20); >>> +#endif >>> +} >>> + >> Lets not move this in DMA code since the above is really related >> to frame buffer. It reserves more DMA area for dma_alloc_coherent() >> etc than default 2 MB. Infact, we should no longer need this with >> CMA and memblock in place. >> >> Tomi, >> Can we not get rid of the above memory reservation ? > > Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > and I have no means to test it out, though. But below is a patch to > remove it. I also attached the patch, as it looks like thunderbird wants > to reformat the pasted patch... I'll remove the > CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > in my tree later. > Great !! Thanks for the patches Tomi. For both the patches, feel free add. Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-02 8:55 ` Santosh Shilimkar @ 2012-11-02 15:49 ` Tony Lindgren -1 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-02 15:49 UTC (permalink / raw) To: Santosh Shilimkar; +Cc: Tomi Valkeinen, linux-arm-kernel, linux-omap * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: > On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > >On 2012-11-02 08:38, Santosh Shilimkar wrote: > >> > >>Lets not move this in DMA code since the above is really related > >>to frame buffer. It reserves more DMA area for dma_alloc_coherent() > >>etc than default 2 MB. Infact, we should no longer need this with > >>CMA and memblock in place. > >> > >>Tomi, > >>Can we not get rid of the above memory reservation ? > > > >Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > >and I have no means to test it out, though. But below is a patch to > >remove it. I also attached the patch, as it looks like thunderbird wants > >to reformat the pasted patch... I'll remove the > >CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > >in my tree later. > > > Great !! > Thanks for the patches Tomi. > > For both the patches, feel free add. > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Great thanks, will swap in Tomi's patch. Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-02 15:49 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-02 15:49 UTC (permalink / raw) To: linux-arm-kernel * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: > On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > >On 2012-11-02 08:38, Santosh Shilimkar wrote: > >> > >>Lets not move this in DMA code since the above is really related > >>to frame buffer. It reserves more DMA area for dma_alloc_coherent() > >>etc than default 2 MB. Infact, we should no longer need this with > >>CMA and memblock in place. > >> > >>Tomi, > >>Can we not get rid of the above memory reservation ? > > > >Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > >and I have no means to test it out, though. But below is a patch to > >remove it. I also attached the patch, as it looks like thunderbird wants > >to reformat the pasted patch... I'll remove the > >CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > >in my tree later. > > > Great !! > Thanks for the patches Tomi. > > For both the patches, feel free add. > Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Great thanks, will swap in Tomi's patch. Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-02 15:49 ` Tony Lindgren @ 2012-11-02 18:54 ` Tony Lindgren -1 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-02 18:54 UTC (permalink / raw) To: Santosh Shilimkar; +Cc: Tomi Valkeinen, linux-arm-kernel, linux-omap > * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: > > On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > > >On 2012-11-02 08:38, Santosh Shilimkar wrote: > > >> > > >>Lets not move this in DMA code since the above is really related > > >>to frame buffer. It reserves more DMA area for dma_alloc_coherent() > > >>etc than default 2 MB. Infact, we should no longer need this with > > >>CMA and memblock in place. > > >> > > >>Tomi, > > >>Can we not get rid of the above memory reservation ? > > > > > >Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > > >and I have no means to test it out, though. But below is a patch to > > >remove it. I also attached the patch, as it looks like thunderbird wants > > >to reformat the pasted patch... I'll remove the > > >CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > > >in my tree later. Hmm actually, is it safe to remove for omap1, or should we still keep it around for omap1? Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-02 18:54 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-02 18:54 UTC (permalink / raw) To: linux-arm-kernel > * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: > > On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > > >On 2012-11-02 08:38, Santosh Shilimkar wrote: > > >> > > >>Lets not move this in DMA code since the above is really related > > >>to frame buffer. It reserves more DMA area for dma_alloc_coherent() > > >>etc than default 2 MB. Infact, we should no longer need this with > > >>CMA and memblock in place. > > >> > > >>Tomi, > > >>Can we not get rid of the above memory reservation ? > > > > > >Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > > >and I have no means to test it out, though. But below is a patch to > > >remove it. I also attached the patch, as it looks like thunderbird wants > > >to reformat the pasted patch... I'll remove the > > >CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > > >in my tree later. Hmm actually, is it safe to remove for omap1, or should we still keep it around for omap1? Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-02 18:54 ` Tony Lindgren @ 2012-11-05 8:04 ` Tomi Valkeinen -1 siblings, 0 replies; 32+ messages in thread From: Tomi Valkeinen @ 2012-11-05 8:04 UTC (permalink / raw) To: Tony Lindgren; +Cc: Santosh Shilimkar, linux-arm-kernel, linux-omap [-- Attachment #1: Type: text/plain, Size: 1230 bytes --] On 2012-11-02 20:54, Tony Lindgren wrote: >> * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: >>> On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: >>>> On 2012-11-02 08:38, Santosh Shilimkar wrote: >>>>> >>>>> Lets not move this in DMA code since the above is really related >>>>> to frame buffer. It reserves more DMA area for dma_alloc_coherent() >>>>> etc than default 2 MB. Infact, we should no longer need this with >>>>> CMA and memblock in place. >>>>> >>>>> Tomi, >>>>> Can we not get rid of the above memory reservation ? >>>> >>>> Yes, I think so. This one is only used for the old omapfb, i.e. omap1, >>>> and I have no means to test it out, though. But below is a patch to >>>> remove it. I also attached the patch, as it looks like thunderbird wants >>>> to reformat the pasted patch... I'll remove the >>>> CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file >>>> in my tree later. > > Hmm actually, is it safe to remove for omap1, or should we > still keep it around for omap1? Why wouldn't it be safe? Do you mean that CMA doesn't work on omap1, or...? I'm no expert on CMA, but as far as I can see with it's ARM generic stuff. Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-05 8:04 ` Tomi Valkeinen 0 siblings, 0 replies; 32+ messages in thread From: Tomi Valkeinen @ 2012-11-05 8:04 UTC (permalink / raw) To: linux-arm-kernel On 2012-11-02 20:54, Tony Lindgren wrote: >> * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: >>> On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: >>>> On 2012-11-02 08:38, Santosh Shilimkar wrote: >>>>> >>>>> Lets not move this in DMA code since the above is really related >>>>> to frame buffer. It reserves more DMA area for dma_alloc_coherent() >>>>> etc than default 2 MB. Infact, we should no longer need this with >>>>> CMA and memblock in place. >>>>> >>>>> Tomi, >>>>> Can we not get rid of the above memory reservation ? >>>> >>>> Yes, I think so. This one is only used for the old omapfb, i.e. omap1, >>>> and I have no means to test it out, though. But below is a patch to >>>> remove it. I also attached the patch, as it looks like thunderbird wants >>>> to reformat the pasted patch... I'll remove the >>>> CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file >>>> in my tree later. > > Hmm actually, is it safe to remove for omap1, or should we > still keep it around for omap1? Why wouldn't it be safe? Do you mean that CMA doesn't work on omap1, or...? I'm no expert on CMA, but as far as I can see with it's ARM generic stuff. Tomi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 897 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121105/106f3a2e/attachment.sig> ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-05 8:04 ` Tomi Valkeinen @ 2012-11-05 15:36 ` Tony Lindgren -1 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-05 15:36 UTC (permalink / raw) To: Tomi Valkeinen; +Cc: Santosh Shilimkar, linux-arm-kernel, linux-omap * Tomi Valkeinen <tomi.valkeinen@ti.com> [121105 00:06]: > On 2012-11-02 20:54, Tony Lindgren wrote: > >> * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: > >>> On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > >>>> On 2012-11-02 08:38, Santosh Shilimkar wrote: > >>>>> > >>>>> Lets not move this in DMA code since the above is really related > >>>>> to frame buffer. It reserves more DMA area for dma_alloc_coherent() > >>>>> etc than default 2 MB. Infact, we should no longer need this with > >>>>> CMA and memblock in place. > >>>>> > >>>>> Tomi, > >>>>> Can we not get rid of the above memory reservation ? > >>>> > >>>> Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > >>>> and I have no means to test it out, though. But below is a patch to > >>>> remove it. I also attached the patch, as it looks like thunderbird wants > >>>> to reformat the pasted patch... I'll remove the > >>>> CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > >>>> in my tree later. > > > > Hmm actually, is it safe to remove for omap1, or should we > > still keep it around for omap1? > > Why wouldn't it be safe? Do you mean that CMA doesn't work on omap1, > or...? I'm no expert on CMA, but as far as I can see with it's ARM > generic stuff. Just wondering after your comment "This one is only used for the old omapfb, i.e. omap1". But sounds like it should no longer be needed there either if I parse that right. Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-05 15:36 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-05 15:36 UTC (permalink / raw) To: linux-arm-kernel * Tomi Valkeinen <tomi.valkeinen@ti.com> [121105 00:06]: > On 2012-11-02 20:54, Tony Lindgren wrote: > >> * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: > >>> On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > >>>> On 2012-11-02 08:38, Santosh Shilimkar wrote: > >>>>> > >>>>> Lets not move this in DMA code since the above is really related > >>>>> to frame buffer. It reserves more DMA area for dma_alloc_coherent() > >>>>> etc than default 2 MB. Infact, we should no longer need this with > >>>>> CMA and memblock in place. > >>>>> > >>>>> Tomi, > >>>>> Can we not get rid of the above memory reservation ? > >>>> > >>>> Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > >>>> and I have no means to test it out, though. But below is a patch to > >>>> remove it. I also attached the patch, as it looks like thunderbird wants > >>>> to reformat the pasted patch... I'll remove the > >>>> CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > >>>> in my tree later. > > > > Hmm actually, is it safe to remove for omap1, or should we > > still keep it around for omap1? > > Why wouldn't it be safe? Do you mean that CMA doesn't work on omap1, > or...? I'm no expert on CMA, but as far as I can see with it's ARM > generic stuff. Just wondering after your comment "This one is only used for the old omapfb, i.e. omap1". But sounds like it should no longer be needed there either if I parse that right. Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-05 15:36 ` Tony Lindgren @ 2012-11-05 15:48 ` Tomi Valkeinen -1 siblings, 0 replies; 32+ messages in thread From: Tomi Valkeinen @ 2012-11-05 15:48 UTC (permalink / raw) To: Tony Lindgren; +Cc: Santosh Shilimkar, linux-arm-kernel, linux-omap [-- Attachment #1: Type: text/plain, Size: 1916 bytes --] On 2012-11-05 17:36, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@ti.com> [121105 00:06]: >> On 2012-11-02 20:54, Tony Lindgren wrote: >>>> * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: >>>>> On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: >>>>>> On 2012-11-02 08:38, Santosh Shilimkar wrote: >>>>>>> >>>>>>> Lets not move this in DMA code since the above is really related >>>>>>> to frame buffer. It reserves more DMA area for dma_alloc_coherent() >>>>>>> etc than default 2 MB. Infact, we should no longer need this with >>>>>>> CMA and memblock in place. >>>>>>> >>>>>>> Tomi, >>>>>>> Can we not get rid of the above memory reservation ? >>>>>> >>>>>> Yes, I think so. This one is only used for the old omapfb, i.e. omap1, >>>>>> and I have no means to test it out, though. But below is a patch to >>>>>> remove it. I also attached the patch, as it looks like thunderbird wants >>>>>> to reformat the pasted patch... I'll remove the >>>>>> CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file >>>>>> in my tree later. >>> >>> Hmm actually, is it safe to remove for omap1, or should we >>> still keep it around for omap1? >> >> Why wouldn't it be safe? Do you mean that CMA doesn't work on omap1, >> or...? I'm no expert on CMA, but as far as I can see with it's ARM >> generic stuff. > > Just wondering after your comment "This one is only used for the old > omapfb, i.e. omap1". But sounds like it should no longer be needed > there either if I parse that right. I meant that the code that was moved in the patch "Remove plat-omap/common.c" is only compiled and ran on omap1, when the old omapfb has been enabled in the Kconfig. It's not used on omap2+. old omapfb uses dma_alloc_*() to allocate memory, so if CMA works on omap1, I think this code in question can be removed, as done in my patch. Tomi [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 897 bytes --] ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-05 15:48 ` Tomi Valkeinen 0 siblings, 0 replies; 32+ messages in thread From: Tomi Valkeinen @ 2012-11-05 15:48 UTC (permalink / raw) To: linux-arm-kernel On 2012-11-05 17:36, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@ti.com> [121105 00:06]: >> On 2012-11-02 20:54, Tony Lindgren wrote: >>>> * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: >>>>> On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: >>>>>> On 2012-11-02 08:38, Santosh Shilimkar wrote: >>>>>>> >>>>>>> Lets not move this in DMA code since the above is really related >>>>>>> to frame buffer. It reserves more DMA area for dma_alloc_coherent() >>>>>>> etc than default 2 MB. Infact, we should no longer need this with >>>>>>> CMA and memblock in place. >>>>>>> >>>>>>> Tomi, >>>>>>> Can we not get rid of the above memory reservation ? >>>>>> >>>>>> Yes, I think so. This one is only used for the old omapfb, i.e. omap1, >>>>>> and I have no means to test it out, though. But below is a patch to >>>>>> remove it. I also attached the patch, as it looks like thunderbird wants >>>>>> to reformat the pasted patch... I'll remove the >>>>>> CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file >>>>>> in my tree later. >>> >>> Hmm actually, is it safe to remove for omap1, or should we >>> still keep it around for omap1? >> >> Why wouldn't it be safe? Do you mean that CMA doesn't work on omap1, >> or...? I'm no expert on CMA, but as far as I can see with it's ARM >> generic stuff. > > Just wondering after your comment "This one is only used for the old > omapfb, i.e. omap1". But sounds like it should no longer be needed > there either if I parse that right. I meant that the code that was moved in the patch "Remove plat-omap/common.c" is only compiled and ran on omap1, when the old omapfb has been enabled in the Kconfig. It's not used on omap2+. old omapfb uses dma_alloc_*() to allocate memory, so if CMA works on omap1, I think this code in question can be removed, as done in my patch. Tomi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 897 bytes Desc: OpenPGP digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121105/72bf2fc7/attachment.sig> ^ permalink raw reply [flat|nested] 32+ messages in thread
* Re: [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c 2012-11-05 15:48 ` Tomi Valkeinen @ 2012-11-05 16:12 ` Tony Lindgren -1 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-05 16:12 UTC (permalink / raw) To: Tomi Valkeinen; +Cc: Santosh Shilimkar, linux-arm-kernel, linux-omap * Tomi Valkeinen <tomi.valkeinen@ti.com> [121105 07:50]: > On 2012-11-05 17:36, Tony Lindgren wrote: > > * Tomi Valkeinen <tomi.valkeinen@ti.com> [121105 00:06]: > >> On 2012-11-02 20:54, Tony Lindgren wrote: > >>>> * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: > >>>>> On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > >>>>>> On 2012-11-02 08:38, Santosh Shilimkar wrote: > >>>>>>> > >>>>>>> Lets not move this in DMA code since the above is really related > >>>>>>> to frame buffer. It reserves more DMA area for dma_alloc_coherent() > >>>>>>> etc than default 2 MB. Infact, we should no longer need this with > >>>>>>> CMA and memblock in place. > >>>>>>> > >>>>>>> Tomi, > >>>>>>> Can we not get rid of the above memory reservation ? > >>>>>> > >>>>>> Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > >>>>>> and I have no means to test it out, though. But below is a patch to > >>>>>> remove it. I also attached the patch, as it looks like thunderbird wants > >>>>>> to reformat the pasted patch... I'll remove the > >>>>>> CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > >>>>>> in my tree later. > >>> > >>> Hmm actually, is it safe to remove for omap1, or should we > >>> still keep it around for omap1? > >> > >> Why wouldn't it be safe? Do you mean that CMA doesn't work on omap1, > >> or...? I'm no expert on CMA, but as far as I can see with it's ARM > >> generic stuff. > > > > Just wondering after your comment "This one is only used for the old > > omapfb, i.e. omap1". But sounds like it should no longer be needed > > there either if I parse that right. > > I meant that the code that was moved in the patch "Remove > plat-omap/common.c" is only compiled and ran on omap1, when the old > omapfb has been enabled in the Kconfig. It's not used on omap2+. > > old omapfb uses dma_alloc_*() to allocate memory, so if CMA works on > omap1, I think this code in question can be removed, as done in my patch. OK thanks for clarifying it. Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c @ 2012-11-05 16:12 ` Tony Lindgren 0 siblings, 0 replies; 32+ messages in thread From: Tony Lindgren @ 2012-11-05 16:12 UTC (permalink / raw) To: linux-arm-kernel * Tomi Valkeinen <tomi.valkeinen@ti.com> [121105 07:50]: > On 2012-11-05 17:36, Tony Lindgren wrote: > > * Tomi Valkeinen <tomi.valkeinen@ti.com> [121105 00:06]: > >> On 2012-11-02 20:54, Tony Lindgren wrote: > >>>> * Santosh Shilimkar <santosh.shilimkar@ti.com> [121102 01:56]: > >>>>> On Friday 02 November 2012 02:19 PM, Tomi Valkeinen wrote: > >>>>>> On 2012-11-02 08:38, Santosh Shilimkar wrote: > >>>>>>> > >>>>>>> Lets not move this in DMA code since the above is really related > >>>>>>> to frame buffer. It reserves more DMA area for dma_alloc_coherent() > >>>>>>> etc than default 2 MB. Infact, we should no longer need this with > >>>>>>> CMA and memblock in place. > >>>>>>> > >>>>>>> Tomi, > >>>>>>> Can we not get rid of the above memory reservation ? > >>>>>> > >>>>>> Yes, I think so. This one is only used for the old omapfb, i.e. omap1, > >>>>>> and I have no means to test it out, though. But below is a patch to > >>>>>> remove it. I also attached the patch, as it looks like thunderbird wants > >>>>>> to reformat the pasted patch... I'll remove the > >>>>>> CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE from the omapfb driver's Kconfig file > >>>>>> in my tree later. > >>> > >>> Hmm actually, is it safe to remove for omap1, or should we > >>> still keep it around for omap1? > >> > >> Why wouldn't it be safe? Do you mean that CMA doesn't work on omap1, > >> or...? I'm no expert on CMA, but as far as I can see with it's ARM > >> generic stuff. > > > > Just wondering after your comment "This one is only used for the old > > omapfb, i.e. omap1". But sounds like it should no longer be needed > > there either if I parse that right. > > I meant that the code that was moved in the patch "Remove > plat-omap/common.c" is only compiled and ran on omap1, when the old > omapfb has been enabled in the Kconfig. It's not used on omap2+. > > old omapfb uses dma_alloc_*() to allocate memory, so if CMA works on > omap1, I think this code in question can be removed, as done in my patch. OK thanks for clarifying it. Regards, Tony ^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2012-11-05 16:12 UTC | newest] Thread overview: 32+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-11-01 22:48 [PATCH 0/3] more omap clean-up for ARCH_MULTIPLATFORM Tony Lindgren 2012-11-01 22:48 ` Tony Lindgren 2012-11-01 22:48 ` [PATCH 1/3] ARM: OMAP: Remove unnecessary mach and plat includes Tony Lindgren 2012-11-01 22:48 ` Tony Lindgren 2012-11-01 22:48 ` [PATCH 2/3] ARM: OMAP: Remove NEED_MACH_GPIO_H Tony Lindgren 2012-11-01 22:48 ` Tony Lindgren 2012-11-02 14:25 ` Mark Brown 2012-11-02 14:25 ` Mark Brown 2012-11-01 22:48 ` [PATCH 3/3] ARM: OMAP: Remove plat-omap/common.c Tony Lindgren 2012-11-01 22:48 ` Tony Lindgren 2012-11-01 23:14 ` Tony Lindgren 2012-11-01 23:14 ` Tony Lindgren 2012-11-02 6:37 ` Santosh Shilimkar 2012-11-02 6:37 ` Santosh Shilimkar 2012-11-02 6:38 ` Santosh Shilimkar 2012-11-02 6:38 ` Santosh Shilimkar 2012-11-02 8:49 ` Tomi Valkeinen 2012-11-02 8:49 ` Tomi Valkeinen 2012-11-02 8:55 ` Santosh Shilimkar 2012-11-02 8:55 ` Santosh Shilimkar 2012-11-02 15:49 ` Tony Lindgren 2012-11-02 15:49 ` Tony Lindgren 2012-11-02 18:54 ` Tony Lindgren 2012-11-02 18:54 ` Tony Lindgren 2012-11-05 8:04 ` Tomi Valkeinen 2012-11-05 8:04 ` Tomi Valkeinen 2012-11-05 15:36 ` Tony Lindgren 2012-11-05 15:36 ` Tony Lindgren 2012-11-05 15:48 ` Tomi Valkeinen 2012-11-05 15:48 ` Tomi Valkeinen 2012-11-05 16:12 ` Tony Lindgren 2012-11-05 16:12 ` Tony Lindgren
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.