1 files changed, 0 insertions, 73 deletions
diff --git a/recipes-kernel/linux/linux-yocto-3.14/h3600/0002-ARM-sa1100-add-Micro-ASIC-platform-device.patch b/recipes-kernel/linux/linux-yocto-3.14/h3600/0002-ARM-sa1100-add-Micro-ASIC-platform-device.patch
deleted file mode 100644
index 8bb2439..0000000
--- a/recipes-kernel/linux/linux-yocto-3.14/h3600/0002-ARM-sa1100-add-Micro-ASIC-platform-device.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From b8d45042ceaae1b0a5a86c8a0a9c1da7aae5c248 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Thu, 17 Oct 2013 15:03:17 +0200
-Subject: [PATCH 2/7] ARM: sa1100: add Micro ASIC platform device
-
-This adds the Atmel Micro ASIC platform device and selects it
-by default for h3100 and h3600.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- arch/arm/mach-sa1100/Kconfig |  2 ++
- arch/arm/mach-sa1100/h3xxx.c | 15 +++++++++++++++
- 2 files changed, 17 insertions(+)
-
-diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
-index 04f9784ff0ed..c6f6ed1cbed0 100644
---- a/arch/arm/mach-sa1100/Kconfig
-+++ b/arch/arm/mach-sa1100/Kconfig
-@@ -58,6 +58,7 @@ config SA1100_H3100
- 	bool "Compaq iPAQ H3100"
- 	select ARM_SA1110_CPUFREQ
- 	select HTC_EGPIO
-+	select MFD_IPAQ_MICRO
- 	help
- 	  Say Y here if you intend to run this kernel on the Compaq iPAQ
- 	  H3100 handheld computer.  Information about this machine and the
-@@ -69,6 +70,7 @@ config SA1100_H3600
- 	bool "Compaq iPAQ H3600/H3700"
- 	select ARM_SA1110_CPUFREQ
- 	select HTC_EGPIO
-+	select MFD_IPAQ_MICRO
- 	help
- 	  Say Y here if you intend to run this kernel on the Compaq iPAQ
- 	  H3600 handheld computer.  Information about this machine and the
-diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c
-index f17e7382242a..814dcecf00c4 100644
---- a/arch/arm/mach-sa1100/h3xxx.c
-+++ b/arch/arm/mach-sa1100/h3xxx.c
-@@ -25,6 +25,7 @@
- #include <asm/mach/map.h>
- 
- #include <mach/h3xxx.h>
-+#include <mach/irqs.h>
- 
- #include "generic.h"
- 
-@@ -248,9 +249,23 @@ static struct platform_device h3xxx_keys = {
- 	},
- };
- 
-+static struct resource h3xxx_micro_resources[] = {
-+	DEFINE_RES_MEM(0x80010000, SZ_4K),
-+	DEFINE_RES_MEM(0x80020000, SZ_4K),
-+	DEFINE_RES_IRQ(IRQ_Ser1UART),
-+};
-+
-+struct platform_device h3xxx_micro_asic = {
-+	.name = "ipaq-h3xxx-micro",
-+	.id = -1,
-+	.resource = h3xxx_micro_resources,
-+	.num_resources = ARRAY_SIZE(h3xxx_micro_resources),
-+};
-+
- static struct platform_device *h3xxx_devices[] = {
- 	&h3xxx_egpio,
- 	&h3xxx_keys,
-+	&h3xxx_micro_asic,
- };
- 
- void __init h3xxx_mach_init(void)
--- 
-1.9.0
-