ARM: imx/mxs: fixes for 3.10-rc1
cover ARM: imx/mxs: fixes for 3.10-rc1
Hi Arnd, Olof,
It seems that you will have a few other fixes to send mainline for 3.10-rc1 inclusion before merge window closes. In that case, can you please include the following 3 which fix imx/mxs compile errors that are currently seen on mainline?
Shawn
Fabio Estevam (2):
ARM: imx: Select GENERIC_ALLOCATOR
video: mxsfb: Adapt to new videomode API
Shawn Guo (1):
ARM: imx: compile fix for hotplug.c
arch/arm/mach-imx/Kconfig | 5 +-- arch/arm/mach-imx/Makefile | 1 - arch/arm/mach-imx/common.h | 1 + arch/arm/mach-imx/hotplug.c | 2 + arch/arm/mach-imx/iram_alloc.c | 73 -------------------------------- drivers/video/Kconfig | 2 +- drivers/video/mxsfb.c | 8 ++-- include/linux/platform_data/imx-iram.h | 41 ------------------ 8 files changed, 9 insertions(+), 124 deletions(-) delete mode 100644 arch/arm/mach-imx/iram_alloc.c delete mode 100644 include/linux/platform_data/imx-iram.h
Signature · 1 line
1.7.9.5
PATCH 1/3 ARM: imx: compile fix for hotplug.c
Commit bca7a5a (ARM: cpu hotplug: remove majority of cache flushing from platforms) removes include of <asm/cacheflush.h> and hence discovers a few indirect inclusion and declaration problems as below.
CC arch/arm/mach-imx/hotplug.o
In file included from arch/arm/mach-imx/hotplug.c:16:0:arch/arm/mach-imx/common.h:100:29: warning: ?struct pt_regs? declared inside parameter list [enabled by default] arch/arm/mach-imx/common.h:100:29: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] arch/arm/mach-imx/common.h:101:29: warning: ?struct pt_regs? declared inside parameter list [enabled by default] arch/arm/mach-imx/hotplug.c: In function ?imx_cpu_die?:arch/arm/mach-imx/hotplug.c:53:2: error: implicit declaration of function ?cpu_do_idle? [-Werror=implicit-function-declaration] arch/arm/mach-imx/hotplug.c: In function ?imx_cpu_kill?:arch/arm/mach-imx/hotplug.c:58:26: error: ?jiffies? undeclared (first use in this function) arch/arm/mach-imx/hotplug.c:58:26: note: each undeclared identifier is reported only once for each function it appears in arch/arm/mach-imx/hotplug.c:58:2: error: implicit declaration of function ?msecs_to_jiffies? [-Werror=implicit-function-declaration] arch/arm/mach-imx/hotplug.c:61:3: error: implicit declaration of function ?time_after? [-Werror=implicit-function-declaration]
Fix them by adding the needed inclusion and declaration.
--- arch/arm/mach-imx/common.h | 1 + arch/arm/mach-imx/hotplug.c | 2 ++ 2 files changed, 3 insertions(+)
arch/arm/mach-imx/common.h +1 -0
@@ -12,6 +12,7 @@#define __ASM_ARCH_MXC_COMMON_H__struct platform_device ; +struct pt_regs ;struct clk ;enum mxc_cpu_pwr_mode ;
arch/arm/mach-imx/hotplug.c +2 -0
@@ -11,7 +11,9 @@*/ #include <linux/errno.h> +#include <linux/jiffies.h> #include <asm/cp15.h> +#include <asm/proc-fns.h> #include "common.h"
Signature · 1 line
1.7.9.5
PATCH 2/3 ARM: imx: Select GENERIC_ALLOCATOR
In reply to Shawn GuoFrom: Fabio Estevam <[email protected]>
Since commit 657eee7 (media: coda: use genalloc API) the following build error happens with imx_v4_v5_defconfig:
drivers/built-in.o: In function 'coda_remove':
clk-composite.c:(.text+0x112180): undefined reference to 'gen_pool_free' drivers/built-in.o: In function 'coda_probe':
clk-composite.c:(.text+0x112310): undefined reference to 'of_get_named_gen_pool' clk-composite.c:(.text+0x1123f4): undefined reference to 'gen_pool_alloc' clk-composite.c:(.text+0x11240c): undefined reference to 'gen_pool_virt_to_phys' clk-composite.c:(.text+0x112458): undefined reference to 'dev_get_gen_pool'
Select GENERIC_ALLOCATOR and get rid of the custom IRAM_ALLOC.
--- arch/arm/mach-imx/Kconfig | 5 +-- arch/arm/mach-imx/Makefile | 1 - arch/arm/mach-imx/iram_alloc.c | 73 -------------------------------- include/linux/platform_data/imx-iram.h | 41 ------------------ 4 files changed, 1 insertion(+), 119 deletions(-) delete mode 100644 arch/arm/mach-imx/iram_alloc.c delete mode 100644 include/linux/platform_data/imx-iram.h
arch/arm/mach-imx/Kconfig +1 -4
@@ -5,6 +5,7 @@ config ARCH_MXC select AUTO_ZRELADDR if !ZBOOT_ROM select CLKDEV_LOOKUP select CLKSRC_MMIO + select GENERIC_ALLOCATOR select GENERIC_CLOCKEVENTS select GENERIC_IRQ_CHIP select MULTI_IRQ_HANDLER
@@ -61,10 +62,6 @@ config MXC_ULPI config ARCH_HAS_RNGA bool -config IRAM_ALLOC - bool - select GENERIC_ALLOCATOR - config HAVE_IMX_ANATOP bool
arch/arm/mach-imx/Makefile +0 -1
@@ -23,7 +23,6 @@ obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o obj-$(CONFIG_MXC_TZIC) += tzic.o obj-$(CONFIG_MXC_AVIC) += avic.o -obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o obj-$(CONFIG_MXC_ULPI) += ulpi.o obj-$(CONFIG_MXC_USE_EPIT) += epit.o obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
arch/arm/mach-imx/iram_alloc.c deleted +0 -73
73 lines not on this page · raw message
include/linux/platform_data/imx-iram.h deleted +0 -41
41 lines not on this page · raw message
Signature · 1 line
1.7.9.5
PATCH 3/3 video: mxsfb: Adapt to new videomode API
In reply to Shawn GuoFrom: Fabio Estevam <[email protected]>
commit 6cd2c7db4 (videomode: videomode_from_timing work) changed the name of the function from videomode_from_timing() to videomode_from_timings().
commit 32ed6ef1 (videomode: create enum for videomode's display flags) changed the 'data_flags' field in videomode structure to 'flags'
Adapt to these changes in order to fix the following errors:
drivers/video/mxsfb.c:761:3: error: too many arguments to function 'videomode_from_timing' drivers/video/mxsfb.c:761:7: error: void value not ignored as it ought to be drivers/video/mxsfb.c:768:9: error: 'struct videomode' has no member named 'data_flags' drivers/video/mxsfb.c:770:9: error: 'struct videomode' has no member named 'data_flags'
Also, select VIDEOMODE_HELPER instead of OF_VIDEOMODE, as this one is deprecated.
--- drivers/video/Kconfig | 2 +- drivers/video/mxsfb.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/video/Kconfig +1 -1
@@ -2429,7 +2429,7 @@ config FB_MXS select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_MODE_HELPERS - select OF_VIDEOMODE + select VIDEOMODE_HELPERS help Framebuffer support for the MXS SoC.
drivers/video/mxsfb.c +4 -4
@@ -42,7 +42,6 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/of_device.h> -#include <video/of_display_timing.h> #include <linux/platform_device.h> #include <linux/clk.h> #include <linux/dma-mapping.h>
@@ -50,6 +49,7 @@#include <linux/pinctrl/consumer.h> #include <linux/fb.h> #include <linux/regulator/consumer.h> +#include <video/of_display_timing.h> #include <video/videomode.h> #define REG_SET 4
@@ -777,16 +777,16 @@ static int mxsfb_init_fbinfo_dt(struct mxsfb_info *host)struct videomode vm;struct fb_videomode fb_vm; - ret =videomode_from_timing (timings, &vm, i); + ret =videomode_from_timings (timings, &vm, i);if (ret <0 ) goto put_timings_node; ret =fb_videomode_from_videomode (&vm, &fb_vm);if (ret <0 ) goto put_timings_node; -if (vm.data_flags &DISPLAY_FLAGS_DE_HIGH ) +if (vm.flags &DISPLAY_FLAGS_DE_HIGH ) host->sync |=MXSFB_SYNC_DATA_ENABLE_HIGH_ACT ; -if (vm.data_flags &DISPLAY_FLAGS_PIXDATA_NEGEDGE ) +if (vm.flags &DISPLAY_FLAGS_PIXDATA_NEGEDGE ) host->sync |=MXSFB_SYNC_DOTCLK_FALLING_ACT ;fb_add_videomode (&fb_vm, &fb_info->modelist); }
Signature · 1 line
1.7.9.5
Olof Johansson
Appliedcover ARM: imx/mxs: fixes for 3.10-rc1
In reply to Shawn GuoQuoted 6 lines · Shawn Guo
Hi Arnd, Olof,
It seems that you will have a few other fixes to send mainline for 3.10-rc1 inclusion before merge window closes. In that case, can you please include the following 3 which fix imx/mxs compile errors that are currently seen on mainline?
Thanks, applied all three. For framebuffer fixes, it seems that we tend to route them through Andrew Morton for the most part, so future patches should probably go through him.
-Olof