diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2011-02-27 16:43:01 +0100 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2011-02-27 17:12:29 +0100 |
| commit | 286cdd2ae5d13b665d9c86dbf1abdd57c644f31c (patch) | |
| tree | 62cef02d1edcc7fb919c205fd72fdb7cbce149e8 /recipes | |
| parent | e82010f2365c266f03737a7f31c9b7ddfed7a573 (diff) | |
| download | openembedded-286cdd2ae5d13b665d9c86dbf1abdd57c644f31c.tar.gz | |
linux-kexecboot: pick collie fix from upstream for 2.6.36
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/linux/linux-kexecboot-2.6.36/collie/collie-locomo-kb.patch | 31 | ||||
| -rw-r--r-- | recipes/linux/linux-kexecboot_2.6.36.bb | 4 |
2 files changed, 34 insertions, 1 deletions
diff --git a/recipes/linux/linux-kexecboot-2.6.36/collie/collie-locomo-kb.patch b/recipes/linux/linux-kexecboot-2.6.36/collie/collie-locomo-kb.patch new file mode 100644 index 0000000000..8b783e7906 --- /dev/null +++ b/recipes/linux/linux-kexecboot-2.6.36/collie/collie-locomo-kb.patch @@ -0,0 +1,31 @@ +ARM: 6658/1: collie: do actually pass locomo_info to locomo driver + +locomo_info isn't actually used as a platform_data on collie platform: + arm/mach-sa1100/collie.c:237: warning: locomo_info defined but not used + +So locomo driver doesn't setup IRQs correctly. Pass locomo_info to the +driver. + +Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> +Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> +--- + arch/arm/mach-sa1100/collie.c | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c +index d43c5ef..bd3e1bf 100644 +--- a/arch/arm/mach-sa1100/collie.c ++++ b/arch/arm/mach-sa1100/collie.c +@@ -241,6 +241,9 @@ static struct locomo_platform_data locomo_info = { + struct platform_device collie_locomo_device = { + .name = "locomo", + .id = 0, ++ .dev = { ++ .platform_data = &locomo_info, ++ }, + .num_resources = ARRAY_SIZE(locomo_resources), + .resource = locomo_resources, + }; +-- +1.7.4.1 + diff --git a/recipes/linux/linux-kexecboot_2.6.36.bb b/recipes/linux/linux-kexecboot_2.6.36.bb index 02b09ae00c..d36328faa7 100644 --- a/recipes/linux/linux-kexecboot_2.6.36.bb +++ b/recipes/linux/linux-kexecboot_2.6.36.bb @@ -1,6 +1,6 @@ require linux-kexecboot.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" S = "${WORKDIR}/linux-${PV}" @@ -10,5 +10,7 @@ DEFAULT_PREFERENCE = "-1" SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2;name=kernel \ file://defconfig" +SRC_URI_append_collie = " file://collie-locomo-kb.patch;status=upstream " + SRC_URI[kernel.md5sum] = "61f3739a73afb6914cb007f37fb09b62" SRC_URI[kernel.sha256sum] = "15a076d1a435a6bf8e92834eba4b390b4ec094ce06d47f89d071ca9e5788ce04" |