aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2015-02-27 00:07:08 +0100
committerAndrea Adami <andrea.adami@gmail.com>2015-04-13 23:03:06 +0200
commitfe26ab3ef2029de12641d5749fdf0dbbe9c23658 (patch)
tree333d80166b52818ae890d58c4adb027186a2ab57
parent318318c74f0e37f4cf54a4c8f3aab9e59555111d (diff)
downloadmeta-handheld-fe26ab3ef2029de12641d5749fdf0dbbe9c23658.tar.gz
linux-yocto(-tiny-kexecboot)_3.10: remove orphans
(kernel 3.10 has been removed from oe-core and meta-initramfs) Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/akita/akita-standard.scc7
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/akita/akita.cfg4
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/akita/akita.scc8
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0-standard.scc7
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0.cfg52
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0.scc6
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/collie/collie-standard.scc7
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg130
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc21
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/feature-top.scc1
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/h3600/0001-MFD-driver-for-Atmel-Microcontroller-on-iPaq-h3xxx.patch527
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/h3600/0002-ARM-sa1100-add-Micro-ASIC-platform-device.patch71
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/h3600/0003-input-driver-for-microcontroller-keys-on-the-iPaq-h3.patch189
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/h3600/0004-input-driver-for-touchscreen-on-iPaq-h3xxx.patch199
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/h3600/0005-power-add-driver-for-battery-reading-on-iPaq-h3xxx.patch295
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/h3600/0006-leds-add-driver-for-the-iPAQ-micro.patch189
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/h3600/0007-fb-backlight-add-driver-for-iPAQ-micro-backlight.patch142
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/h3600/defconfig91
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/hx4700/defconfig182
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/hx4700/hx4700-change-led-trigger-assignments.patch33
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomo/locomo-fix-SCL-SDA.patch28
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomo/locomolcd-suspend-resume.patch92
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch84
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-mfd/mcp-device.patch30
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-mfd/ucb1x00-device.patch28
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-LH28F640BF.patch97
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-cfi-probe-again.patch29
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-eraseinfo.patch55
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-jedec-probe.patch35
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch41
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-power/collie_battery-dev-pm.patch39
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-power/tosa_battery_irq_to_gpio.patch39
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-pxa/sharpsl_param.patch47
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-pxa/tosa-keys-mapping.patch136
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch95
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/collie-add-bootblock.patch29
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/collie-irda.patch88
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch115
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/pcmcia-sa1100-device-clock.patch100
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/patches/revert-check-on-console-device.patch41
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/poodle/poodle-standard.scc7
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/poodle/poodle.cfg57
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/poodle/poodle.scc7
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/shrink_kernel.cfg28
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/spitz/spitz-standard.scc7
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/spitz/spitz.cfg61
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/spitz/spitz.scc7
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/tosa/tosa-standard.scc7
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/tosa/tosa.cfg65
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/tosa/tosa.scc9
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-common.scc14
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg276
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-non-hardware.cfg396
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-common-non-hw.cfg9
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-common.cfg103
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-only.scc2
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-host.scc6
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-ohci-non-hw.cfg4
-rw-r--r--recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-ohci.cfg105
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/defconfig138
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/defconfig139
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig145
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/defconfig143
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/3200-mtd.patch13
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/defconfig137
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/defconfig141
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend94
-rw-r--r--recipes-kernel/linux/linux-yocto_3.10.bbappend90
68 files changed, 0 insertions, 5619 deletions
diff --git a/recipes-kernel/linux/linux-yocto-3.10/akita/akita-standard.scc b/recipes-kernel/linux/linux-yocto-3.10/akita/akita-standard.scc
deleted file mode 100644
index 21096d0..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/akita/akita-standard.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE akita
-define KTYPE standard
-define KARCH arm
-
-include ktypes/standard/standard.scc
-
-include akita.scc
diff --git a/recipes-kernel/linux/linux-yocto-3.10/akita/akita.cfg b/recipes-kernel/linux/linux-yocto-3.10/akita/akita.cfg
deleted file mode 100644
index f6eb8f2..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/akita/akita.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# System Type
-#
-CONFIG_GPIO_PCA953X=y
diff --git a/recipes-kernel/linux/linux-yocto-3.10/akita/akita.scc b/recipes-kernel/linux/linux-yocto-3.10/akita/akita.scc
deleted file mode 100644
index 11b9e94..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/akita/akita.scc
+++ /dev/null
@@ -1,8 +0,0 @@
-kconf hardware ../spitz/spitz.cfg
-kconf hardware akita.cfg
-
-include ../zaurus-pxa-only.scc
-include ../zaurus-common.scc
-include ../zaurus-usb-host.scc
-
-patch ../patches/patches-pxa/sharpsl_param.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0-standard.scc b/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0-standard.scc
deleted file mode 100644
index 325c7c7..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0-standard.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE c7x0
-define KTYPE standard
-define KARCH arm
-
-include ktypes/standard/standard.scc
-
-include c7x0.scc
diff --git a/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0.cfg b/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0.cfg
deleted file mode 100644
index 7da7c19..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# End-user Products (sorted by vendor name)
-#
-CONFIG_MACH_CORGI=y
-CONFIG_MACH_SHEPHERD=y
-CONFIG_MACH_HUSKY=y
-CONFIG_PXA25x=y
-CONFIG_PXA_SHARP_C7xx=y
-CONFIG_SHARPSL_PM=y
-CONFIG_SHARPSL_PM_MAX1111=y
-
-#
-# Boot options
-#
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 loglevel=3"
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_NAND_SHARPSL=y
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_MATRIX=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_W100=y
-CONFIG_LCD_CORGI=y
-CONFIG_BACKLIGHT_GENERIC=y
-
-#
-# Console display driver support
-#
-CONFIG_FONT_8x16=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_PXA25X=m
-CONFIG_SND_PXA2XX_SOC_I2S=m
-CONFIG_SND_PXA2XX_SOC_CORGI=m
-CONFIG_SND_SOC_WM8731=m
diff --git a/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0.scc b/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0.scc
deleted file mode 100644
index ddd5c49..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/c7x0/c7x0.scc
+++ /dev/null
@@ -1,6 +0,0 @@
-kconf hardware c7x0.cfg
-
-include ../zaurus-pxa-only.scc
-include ../zaurus-common.scc
-
-patch ../patches/patches-pxa/sharpsl_param.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie-standard.scc b/recipes-kernel/linux/linux-yocto-3.10/collie/collie-standard.scc
deleted file mode 100644
index 7283ad9..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie-standard.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE collie
-define KTYPE standard
-define KARCH arm
-
-include ktypes/standard/standard.scc
-
-include collie.scc
diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg
deleted file mode 100644
index 5238c69..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.cfg
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# System Type
-#
-CONFIG_ARCH_SA1100=y
-
-#
-# SA11x0 Implementations
-#
-CONFIG_SA1100_COLLIE=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_SA1100=y
-CONFIG_CPU_32v4=y
-CONFIG_CPU_ABRT_EV4=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_CACHE_V4WB=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WB=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_USE_DOMAINS=y
-
-#
-# Processor Features
-#
-CONFIG_SHARP_LOCOMO=y
-
-#
-# PC-card bridges
-#
-CONFIG_PCMCIA_SA11XX_BASE=y
-CONFIG_PCMCIA_SA1100=y
-
-#
-# Kernel Features
-#
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_DEFAULT=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_HAVE_MEMORY_PRESENT=y
-CONFIG_SPARSEMEM_EXTREME=y
-
-#
-# Boot options
-#
-CONFIG_CMDLINE="console=ttySA0,115200n8 console=tty1 mem=64M fbcon=rotate:1 loglevel=3"
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_NOSWAP=y
-CONFIG_MTD_CFI_GEOMETRY=y
-
-# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-
-# CONFIG_MTD_CFI_I1 is not set
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_CFI_UTIL=y
-
-CONFIG_MTD_OTP=y
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_SA1100=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_SA1100=y
-CONFIG_SERIAL_SA1100_CONSOLE=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-
-#
-# Multimedia Capabilities Port drivers
-#
-CONFIG_MCP=y
-CONFIG_MCP_SA11X0=y
-CONFIG_MCP_UCB1200=y
-CONFIG_MCP_UCB1200_TS=y
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_LOCOMO=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_SA1100=y
-CONFIG_BACKLIGHT_LOCOMO=y
-
-#
-# Console display driver support
-#
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONT_8x8=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LOCOMO=y
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_BATTERY_COLLIE=y
diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
deleted file mode 100644
index e3f9c54..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
+++ /dev/null
@@ -1,21 +0,0 @@
-kconf hardware collie.cfg
-
-include ../zaurus-common.scc
-
-patch ../patches/patches-locomokbd/locomo_kbd_tweak-r2.patch
-patch ../patches/patches-power/collie_battery-dev-pm.patch
-patch ../patches/patches-mfd/mcp-device.patch
-patch ../patches/patches-mfd/ucb1x00-device.patch
-patch ../patches/patches-mtd/collie-jedec-probe.patch
-patch ../patches/patches-mtd/collie-eraseinfo.patch
-// for 3.12
-patch ../patches/patches-mtd/collie-cfi-probe-again.patch
-patch ../patches/patches-mtd/collie-mtd-resize.patch
-patch ../patches/patches-mtd/collie-LH28F640BF.patch
-patch ../patches/patches-sa1100/collie-irda.patch
-patch ../patches/patches-sa1100/collie-add-bootblock.patch
-patch ../patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch
-patch ../patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch
-patch ../patches/patches-sa1100/pcmcia-sa1100-device-clock.patch
-patch ../patches/patches-locomo/locomo-fix-SCL-SDA.patch
-patch ../patches/patches-locomo/locomolcd-suspend-resume.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/feature-top.scc b/recipes-kernel/linux/linux-yocto-3.10/feature-top.scc
deleted file mode 100644
index fdffa2a..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/feature-top.scc
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/recipes-kernel/linux/linux-yocto-3.10/h3600/0001-MFD-driver-for-Atmel-Microcontroller-on-iPaq-h3xxx.patch b/recipes-kernel/linux/linux-yocto-3.10/h3600/0001-MFD-driver-for-Atmel-Microcontroller-on-iPaq-h3xxx.patch
deleted file mode 100644
index e056605..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/h3600/0001-MFD-driver-for-Atmel-Microcontroller-on-iPaq-h3xxx.patch
+++ /dev/null
@@ -1,527 +0,0 @@
-From a843ffb026e18e8912167692119ffe1298e81f7e Mon Sep 17 00:00:00 2001
-From: Dmitry Artamonow <mad_soft@inbox.ru>
-Date: Sat, 21 Mar 2009 16:06:56 +0300
-Subject: [PATCH 1/7] MFD: driver for Atmel Microcontroller on iPaq h3xxx
-
-This adds a driver for the Atmel Microcontroller found on the
-iPAQ h3xxx series. This device handles some keys, the
-touchscreen, and the battery monitoring.
-
-This is a port of a driver from handhelds.org 2.6.21 kernel,
-written by Alessandro GARDICH. It has been heavily cleaned and
-converted to mfd-core by Dmitry Artamonow and rewritten
-again for the v3.x series kernels by Linus Walleij.
-
-Signed-off-by: Alessandro GARDICH <gremlin@gremlin.it>
-Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/mfd/Kconfig | 10 ++
- drivers/mfd/Makefile | 1 +
- drivers/mfd/ipaq-micro.c | 383 +++++++++++++++++++++++++++++++++++++++++
- include/linux/mfd/ipaq-micro.h | 73 ++++++++
- 4 files changed, 467 insertions(+)
- create mode 100644 drivers/mfd/ipaq-micro.c
- create mode 100644 include/linux/mfd/ipaq-micro.h
-
-diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
-index d54e985748b7..38db97060c4a 100644
---- a/drivers/mfd/Kconfig
-+++ b/drivers/mfd/Kconfig
-@@ -223,6 +223,16 @@ config MFD_INTEL_MSIC
- Passage) chip. This chip embeds audio, battery, GPIO, etc.
- devices used in Intel Medfield platforms.
-
-+config MFD_IPAQ_MICRO
-+ bool "Atmel Micro ASIC (iPAQ h3100/h3600/h3700) Support"
-+ depends on SA1100_H3100 || SA1100_H3600
-+ select MFD_CORE
-+ help
-+ Select this to get support for the Microcontroller found in
-+ the Compaq iPAQ handheld computers. This is an Atmel
-+ AT90LS8535 microcontroller flashed with a special iPAQ
-+ firmware using the custom protocol implemented in this driver.
-+
- config MFD_JANZ_CMODIO
- tristate "Janz CMOD-IO PCI MODULbus Carrier Board"
- select MFD_CORE
-diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
-index 718e94a2a9a7..4fddef75bdad 100644
---- a/drivers/mfd/Makefile
-+++ b/drivers/mfd/Makefile
-@@ -155,3 +155,4 @@ obj-$(CONFIG_MFD_LM3533) += lm3533-core.o lm3533-ctrlbank.o
- obj-$(CONFIG_VEXPRESS_CONFIG) += vexpress-config.o vexpress-sysreg.o
- obj-$(CONFIG_MFD_RETU) += retu-mfd.o
- obj-$(CONFIG_MFD_AS3711) += as3711.o
-+obj-$(CONFIG_MFD_IPAQ_MICRO) += ipaq-micro.o
-diff --git a/drivers/mfd/ipaq-micro.c b/drivers/mfd/ipaq-micro.c
-new file mode 100644
-index 000000000000..92deae2114e1
---- /dev/null
-+++ b/drivers/mfd/ipaq-micro.c
-@@ -0,0 +1,383 @@
-+/*
-+ * 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.
-+ *
-+ * h3xxx Atmel microcontroller companion support
-+ *
-+ * This is an Atmel AT90LS8535 with a special flashed-in firmware that
-+ * implements the special protocol used by this driver.
-+ *
-+ * based on previous kernel 2.4 version by Andrew Christian
-+ * Author : Alessandro Gardich <gremlin@gremlin.it>
-+ * Author : Dmitry Artamonow <mad_soft@inbox.ru>
-+ * Author : Linus Walleij <linus.walleij@linaro.org>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/pm.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/platform_device.h>
-+#include <linux/io.h>
-+#include <linux/mfd/core.h>
-+#include <linux/mfd/ipaq-micro.h>
-+
-+#include <mach/hardware.h>
-+
-+static void micro_rx_msg(struct ipaq_micro *micro, int id, int len, u8 *data)
-+{
-+ int i;
-+
-+ spin_lock(&micro->lock);
-+ switch (id) {
-+ case MSG_VERSION:
-+ if (len == 4) {
-+ memcpy(micro->version, data, 4);
-+ micro->version[4] = '\0';
-+ } else if (len == 9) {
-+ memcpy(micro->version, data, 4);
-+ micro->version[4] = '\0';
-+ /* Bytes 4-7 are "pack", byte 8 is "boot type" */
-+ } else {
-+ dev_err(micro->dev,
-+ "illegal version message %d bytes\n", len);
-+ }
-+ break;
-+ case MSG_BACKLIGHT:
-+ /* empty ack, just ignore */
-+ break;
-+ case MSG_KEYBOARD:
-+ if (micro->h_key != NULL)
-+ micro->h_key(len, data);
-+ else
-+ dev_err(micro->dev, "ipaq micro : key message ignored, "
-+ "no handle \n");
-+ break;
-+ case MSG_TOUCHSCREEN:
-+ if (micro->h_ts != NULL)
-+ micro->h_ts(len, data);
-+ else
-+ dev_err(micro->dev, "ipaq micro : touchscreen message"
-+ " ignored, no handle \n");
-+ break;
-+ case MSG_THERMAL_SENSOR:
-+ if (micro->h_temp != NULL)
-+ micro->h_temp(len, data);
-+ else
-+ dev_err(micro->dev, "ipaq micro : temperature message"
-+ " ignored, no handle \n");
-+ break;
-+ case MSG_NOTIFY_LED:
-+ /* Empty ack, just ignore */
-+ break;
-+ case MSG_BATTERY:
-+ if (micro->h_batt != NULL)
-+ micro->h_batt(len, data);
-+ else
-+ dev_err(micro->dev, "ipaq micro : battery message"
-+ " ignored, no handle \n");
-+ break;
-+ default:
-+ dev_err(micro->dev,
-+ "ipaq micro : unknown msg %d [%d] ", id, len);
-+ for (i = 0; i < len; ++i)
-+ pr_cont("0x%02x ", data[i]);
-+ pr_cont("\n");
-+ }
-+ complete(&micro->msg_ack);
-+ spin_unlock(&micro->lock);
-+}
-+
-+static void micro_process_char(struct ipaq_micro *micro, u8 ch)
-+{
-+ struct ipaq_micro_rxdev *rx = &micro->rx;
-+
-+ switch (rx->state) {
-+ case STATE_SOF: /* Looking for SOF */
-+ if (ch == CHAR_SOF)
-+ rx->state = STATE_ID; /* Next byte is the id and len */
-+ break;
-+ case STATE_ID: /* Looking for id and len byte */
-+ rx->id = (ch & 0xf0) >> 4 ;
-+ rx->len = (ch & 0x0f);
-+ rx->index = 0;
-+ rx->chksum = ch;
-+ rx->state = (rx->len > 0) ? STATE_DATA : STATE_CHKSUM;
-+ break;
-+ case STATE_DATA: /* Looking for 'len' data bytes */
-+ rx->chksum += ch;
-+ rx->buf[rx->index] = ch;
-+ if (++rx->index == rx->len)
-+ rx->state = STATE_CHKSUM;
-+ break;
-+ case STATE_CHKSUM: /* Looking for the checksum */
-+ if (ch == rx->chksum)
-+ micro_rx_msg(micro, rx->id, rx->len, rx->buf);
-+ rx->state = STATE_SOF;
-+ break;
-+ }
-+}
-+
-+static void micro_rx_chars(struct ipaq_micro *micro)
-+{
-+ unsigned int status, ch;
-+
-+ while ((status = Ser1UTSR1) & UTSR1_RNE) {
-+ ch = Ser1UTDR;
-+ if (status & UTSR1_PRE)
-+ dev_err(micro->dev, "ipaq micro_rx : parity error\n");
-+ else if (status & UTSR1_FRE)
-+ dev_err(micro->dev, "ipaq micro_rx : framing error\n");
-+ else if (status & UTSR1_ROR)
-+ dev_err(micro->dev, "ipaq micro_rx : overrun error\n");
-+ micro_process_char(micro, ch);
-+ }
-+}
-+
-+int ipaq_micro_tx_msg(struct ipaq_micro *micro, unsigned char id,
-+ unsigned char len, unsigned char *data)
-+{
-+ struct ipaq_micro_txdev *tx = &micro->tx;
-+ int free_space;
-+ int i;
-+ u8 checksum;
-+ int head, tail;
-+
-+ /* After TX, an interrupt will be triggered that completes */
-+ init_completion(&micro->msg_ack);
-+
-+ tail = atomic_read(&tx->tail);
-+ head = atomic_read(&tx->head);
-+
-+ free_space = (head >= tail) ? (TX_BUF_SIZE - head + tail - 1) \
-+ : (tail - head - 1);
-+
-+ if (free_space < len + 2) {
-+ dev_err(micro->dev, "%s : no avaiable space on tx buffer.",
-+ __func__);
-+ return -EIO;
-+ }
-+
-+ tx->buf[head] = (u8) CHAR_SOF;
-+ head = ((head+1) % TX_BUF_SIZE);
-+
-+ checksum = ((id & 0x0f) << 4) | (len & 0x0f);
-+ tx->buf[head] = checksum;
-+ head = ((head+1) % TX_BUF_SIZE);
-+
-+ for (i = 0; i < len; ++i) {
-+ tx->buf[head] = data[i];
-+ head = ((head + 1) % TX_BUF_SIZE);
-+ checksum += data[i];
-+ }
-+
-+ tx->buf[head] = checksum;
-+ head = ((head + 1) % TX_BUF_SIZE);
-+
-+ atomic_set(&tx->head, head);
-+
-+ Ser1UTCR3 |= UTCR3_TIE; /* enable interrupt */
-+
-+ return 0;
-+}
-+EXPORT_SYMBOL(ipaq_micro_tx_msg);
-+
-+static void ipaq_micro_get_version(struct ipaq_micro *micro)
-+{
-+ ipaq_micro_tx_msg(micro, MSG_VERSION, 0, NULL);
-+ wait_for_completion(&micro->msg_ack);
-+}
-+
-+static void ipaq_micro_eeprom_read(struct ipaq_micro *micro,
-+ u16 address, u8 *data, u16 len)
-+{
-+ int i;
-+
-+ for (i = 0; i < len; i++) {
-+ u8 data[2];
-+ u16 read_sz = len - i;
-+
-+ data[0] = 0;
-+
-+ ipaq_micro_tx_msg(micro, MSG_EEPROM_READ, 2, NULL);
-+ }
-+}
-+
-+static void micro_tx_chars(struct ipaq_micro *micro)
-+{
-+ struct ipaq_micro_txdev *tx = &micro->tx;
-+ int head, tail;
-+
-+ head = atomic_read(&tx->head);
-+ tail = atomic_read(&tx->tail);
-+
-+ while ((head != tail) && (Ser1UTSR1 & UTSR1_TNF)) {
-+ Ser1UTDR = tx->buf[tail];
-+ tail = ((tail+1) % TX_BUF_SIZE);
-+ }
-+ atomic_set(&tx->tail, tail);
-+
-+ if (tail == head) /* Stop interrupts */
-+ Ser1UTCR3 &= ~UTCR3_TIE;
-+}
-+
-+static void micro_reset_comm(struct ipaq_micro *micro)
-+{
-+ struct ipaq_micro_rxdev *rx = &micro->rx;
-+ struct ipaq_micro_txdev *tx = &micro->tx;
-+
-+ /* Initialize Serial channel protocol frame */
-+ rx->state = STATE_SOF; /* Reset the state machine */
-+
-+ atomic_set(&tx->head, 0);
-+ atomic_set(&tx->tail, 0);
-+
-+ /* Set up interrupts */
-+ Ser1SDCR0 = 0x1; /* Select UART mode */
-+
-+ Ser1UTCR3 = 0; /* Clean up CR3 */
-+ Ser1UTCR0 = UTCR0_8BitData | UTCR0_1StpBit; /* Format: 8N1 */
-+ Ser1UTCR1 = 0; /* Baud rate: 115200 */
-+ Ser1UTCR2 = 0x1;
-+
-+ Ser1UTSR0 = 0xff; /* Clear SR0 */
-+ Ser1UTCR3 = UTCR3_TXE | UTCR3_RXE | UTCR3_RIE; /* Enable RX int */
-+ Ser1UTCR3 &= ~UTCR3_TIE; /* Disable TX int */
-+}
-+
-+static irqreturn_t micro_serial_isr(int irq, void *dev_id)
-+{
-+ struct ipaq_micro *micro = dev_id;
-+ struct ipaq_micro_txdev *tx = &micro->tx;
-+ unsigned int status; /* UTSR0 */
-+ int head, tail;
-+
-+ status = Ser1UTSR0;
-+ do {
-+ if (status & (UTSR0_RID | UTSR0_RFS)) {
-+ if (status & UTSR0_RID)
-+ /* Clear the Receiver IDLE bit */
-+ Ser1UTSR0 = UTSR0_RID;
-+ micro_rx_chars(micro);
-+ }
-+
-+ /* Clear break bits */
-+ if (status & (UTSR0_RBB | UTSR0_REB))
-+ Ser1UTSR0 = status & (UTSR0_RBB | UTSR0_REB);
-+
-+ if (status & UTSR0_TFS)
-+ micro_tx_chars(micro);
-+
-+ status = Ser1UTSR0;
-+
-+ head = atomic_read(&tx->head);
-+ tail = atomic_read(&tx->tail);
-+ } while (((head != tail) && (status & UTSR0_TFS)) ||
-+ status & (UTSR0_RFS | UTSR0_RID));
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static struct mfd_cell micro_cells[] = {
-+ {
-+ .name = "ipaq-micro-backlight",
-+ },
-+ {
-+ .name = "ipaq-micro-battery",
-+ },
-+ {
-+ .name = "ipaq-micro-keys",
-+ },
-+ {
-+ .name = "ipaq-micro-ts",
-+ },
-+ {
-+ .name = "ipaq-micro-leds",
-+ },
-+};
-+
-+static int micro_suspend(struct device *dev)
-+{
-+ /* __micro_backlight_set_power(FB_BLANK_POWERDOWN); // FIXME */
-+ return 0;
-+}
-+
-+static int micro_resume(struct device *dev)
-+{
-+ struct ipaq_micro *micro = dev_get_drvdata(dev);
-+
-+ micro_reset_comm(micro);
-+ mdelay(10);
-+
-+ return 0;
-+}
-+
-+static int micro_probe(struct platform_device *pdev)
-+{
-+ struct ipaq_micro *micro;
-+ int res = 0;
-+ int irq;
-+
-+ micro = devm_kzalloc(&pdev->dev, sizeof(*micro), GFP_KERNEL);
-+ if (!micro)
-+ return -ENOMEM;
-+ micro->dev = &pdev->dev;
-+ micro_reset_comm(micro);
-+ irq = platform_get_irq(pdev, 0);
-+ if (!irq)
-+ return -EINVAL;
-+ res = devm_request_irq(&pdev->dev, irq, micro_serial_isr,
-+ IRQF_SHARED, "ipaq-micro",
-+ micro);
-+ if (res) {
-+ dev_err(&pdev->dev, "%s: unable to grab serial port IRQ\n",
-+ __func__);
-+ return res;
-+ } else
-+ dev_info(&pdev->dev, "grabbed serial port IRQ\n");
-+
-+
-+ spin_lock_init(&micro->lock);
-+ platform_set_drvdata(pdev, micro);
-+
-+ res = mfd_add_devices(&pdev->dev, pdev->id, micro_cells,
-+ ARRAY_SIZE(micro_cells), NULL, 0, NULL);
-+ if (res) {
-+ dev_err(&pdev->dev, "error adding MFD cells");
-+ return res;
-+ }
-+ /* Check version */
-+ ipaq_micro_get_version(micro);
-+ dev_info(&pdev->dev, "Atmel micro ASIC version %s\n", micro->version);
-+
-+ return 0;
-+}
-+
-+static int micro_remove(struct platform_device *pdev)
-+{
-+ mfd_remove_devices(&pdev->dev);
-+ Ser1UTCR3 &= ~(UTCR3_RXE | UTCR3_RIE); /* disable receive interrupt */
-+ Ser1UTCR3 &= ~(UTCR3_TXE | UTCR3_TIE); /* disable transmit interrupt */
-+ return 0;
-+}
-+
-+static const struct dev_pm_ops micro_dev_pm_ops = {
-+ SET_SYSTEM_SLEEP_PM_OPS(micro_suspend, micro_resume)
-+};
-+
-+static struct platform_driver micro_device_driver = {
-+ .driver = {
-+ .name = "ipaq-h3xxx-micro",
-+ .pm = &micro_dev_pm_ops,
-+ },
-+ .probe = micro_probe,
-+ .remove = micro_remove,
-+ /* .shutdown = micro_suspend, // FIXME */
-+};
-+module_platform_driver(micro_device_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("driver for iPAQ Atmel micro core and backlight");
-diff --git a/include/linux/mfd/ipaq-micro.h b/include/linux/mfd/ipaq-micro.h
-new file mode 100644
-index 000000000000..74733ff8a5ff
---- /dev/null
-+++ b/include/linux/mfd/ipaq-micro.h
-@@ -0,0 +1,73 @@
-+/*
-+ * Header file for the compaq Micro MFD
-+ */
-+
-+#ifndef _MICRO_H_
-+#define _MICRO_H_
-+
-+#include <linux/spinlock.h>
-+#include <linux/completion.h>
-+struct device;
-+
-+#define TX_BUF_SIZE 32
-+#define RX_BUF_SIZE 16
-+#define CHAR_SOF 0x02
-+
-+/*
-+ * These are the different messages that can be sent to the microcontroller
-+ * to control various aspects.
-+ */
-+#define MSG_VERSION 0x00
-+#define MSG_KEYBOARD 0x02
-+#define MSG_TOUCHSCREEN 0x03
-+#define MSG_EEPROM_READ 0x04
-+#define MSG_EEPROM_WRITE 0x05
-+#define MSG_THERMAL_SENSOR 0x06
-+#define MSG_NOTIFY_LED 0x08
-+#define MSG_BATTERY 0x09
-+#define MSG_SPI_READ 0x0b
-+#define MSG_SPI_WRITE 0x0c
-+#define MSG_BACKLIGHT 0x0d /* H3600 only */
-+#define MSG_CODEC_CTRL 0x0e /* H3100 only */
-+#define MSG_DISPLAY_CTRL 0x0f /* H3100 only */
-+
-+/* state of receiver parser */
-+enum rx_state {
-+ STATE_SOF = 0, /* Next byte should be start of frame */
-+ STATE_ID, /* Next byte is ID & message length */
-+ STATE_DATA, /* Next byte is a data byte */
-+ STATE_CHKSUM /* Next byte should be checksum */
-+};
-+
-+struct ipaq_micro_txdev {
-+ unsigned char buf[TX_BUF_SIZE];
-+ atomic_t head;
-+ atomic_t tail;
-+};
-+
-+struct ipaq_micro_rxdev {
-+ enum rx_state state; /* context of rx state machine */
-+ unsigned char chksum; /* calculated checksum */
-+ int id; /* message ID from packet */
-+ unsigned int len; /* rx buffer length */
-+ unsigned int index; /* rx buffer index */
-+ unsigned char buf[RX_BUF_SIZE]; /* rx buffer size */
-+};
-+
-+struct ipaq_micro {
-+ struct device *dev;
-+ char version[5];
-+ struct ipaq_micro_txdev tx; /* transmit ISR state */
-+ struct ipaq_micro_rxdev rx; /* receive ISR state */
-+ spinlock_t lock;
-+ struct completion msg_ack;
-+ void (*h_key) (int len, unsigned char *data);
-+ void (*h_batt) (int len, unsigned char *data);
-+ void (*h_temp) (int len, unsigned char *data);
-+ void (*h_ts) (int len, unsigned char *data);
-+};
-+
-+int ipaq_micro_tx_msg(struct ipaq_micro *micro, unsigned char id,
-+ unsigned char len, unsigned char *data);
-+
-+#endif /* _MICRO_H_ */
---
-1.8.3.1
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/h3600/0002-ARM-sa1100-add-Micro-ASIC-platform-device.patch b/recipes-kernel/linux/linux-yocto-3.10/h3600/0002-ARM-sa1100-add-Micro-ASIC-platform-device.patch
deleted file mode 100644
index 5a05a2d..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/h3600/0002-ARM-sa1100-add-Micro-ASIC-platform-device.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 21e2ad8a5ec7bfd69e17a04fb717fca9635c15eb 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 | 13 +++++++++++++
- 2 files changed, 15 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..6391c485139e 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,21 @@ static struct platform_device h3xxx_keys = {
- },
- };
-
-+static struct resource h3xxx_micro_resources[] = {
-+ [0] = 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.8.3.1
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/h3600/0003-input-driver-for-microcontroller-keys-on-the-iPaq-h3.patch b/recipes-kernel/linux/linux-yocto-3.10/h3600/0003-input-driver-for-microcontroller-keys-on-the-iPaq-h3.patch
deleted file mode 100644
index 378eb61..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/h3600/0003-input-driver-for-microcontroller-keys-on-the-iPaq-h3.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From a2fe0abc50935e0c7be52f6eba3e4a993b865e83 Mon Sep 17 00:00:00 2001
-From: Dmitry Artamonow <mad_soft@inbox.ru>
-Date: Sat, 21 Mar 2009 16:22:16 +0300
-Subject: [PATCH 3/7] input: driver for microcontroller keys on the iPaq h3xxx
-
-This adds a key input driver for the keys found on the h3xxx
-iPAQ series.
-
-Based on a driver from handhelds.org 2.6.21 kernel, written
-by Alessandro GARDICH.
-
-Signed-off-by: Alessandro GARDICH <gremlin@gremlin.it>
-Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/input/keyboard/Kconfig | 7 ++
- drivers/input/keyboard/Makefile | 1 +
- drivers/input/keyboard/ipaq-micro-keys.c | 129 +++++++++++++++++++++++++++++++
- 3 files changed, 137 insertions(+)
- create mode 100644 drivers/input/keyboard/ipaq-micro-keys.c
-
-diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
-index 7ac9c9818d55..de6ee82f72a0 100644
---- a/drivers/input/keyboard/Kconfig
-+++ b/drivers/input/keyboard/Kconfig
-@@ -543,6 +543,13 @@ config KEYBOARD_DAVINCI
- To compile this driver as a module, choose M here: the
- module will be called davinci_keyscan.
-
-+config KEYBOARD_IPAQ_MICRO
-+ tristate "Buttons on Micro SoC (iPaq h3100,h3600,h3700)"
-+ depends on MFD_IPAQ_MICRO
-+ help
-+ This enables support for the buttons attached to
-+ Micro peripheral controller on iPAQ h3100/h3600/h3700
-+
- config KEYBOARD_OMAP
- tristate "TI OMAP keypad support"
- depends on ARCH_OMAP1
-diff --git a/drivers/input/keyboard/Makefile b/drivers/input/keyboard/Makefile
-index 0c43e8cf8d0e..a6b468200300 100644
---- a/drivers/input/keyboard/Makefile
-+++ b/drivers/input/keyboard/Makefile
-@@ -21,6 +21,7 @@ obj-$(CONFIG_KEYBOARD_TCA6416) += tca6416-keypad.o
- obj-$(CONFIG_KEYBOARD_TCA8418) += tca8418_keypad.o
- obj-$(CONFIG_KEYBOARD_HIL) += hil_kbd.o
- obj-$(CONFIG_KEYBOARD_HIL_OLD) += hilkbd.o
-+obj-$(CONFIG_KEYBOARD_IPAQ_MICRO) += ipaq-micro-keys.o
- obj-$(CONFIG_KEYBOARD_IMX) += imx_keypad.o
- obj-$(CONFIG_KEYBOARD_HP6XX) += jornada680_kbd.o
- obj-$(CONFIG_KEYBOARD_HP7XX) += jornada720_kbd.o
-diff --git a/drivers/input/keyboard/ipaq-micro-keys.c b/drivers/input/keyboard/ipaq-micro-keys.c
-new file mode 100644
-index 000000000000..d7da6f8b8e37
---- /dev/null
-+++ b/drivers/input/keyboard/ipaq-micro-keys.c
-@@ -0,0 +1,129 @@
-+/*
-+ * 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.
-+ *
-+ * h3600 atmel micro companion support, key subdevice
-+ * based on previous kernel 2.4 version
-+ * Author : Alessandro Gardich <gremlin@gremlin.it>
-+ * Author : Linus Walleij <linus.walleij@linaro.org>
-+ *
-+ */
-+
-+
-+#include <linux/module.h>
-+#include <linux/version.h>
-+
-+#include <linux/init.h>
-+#include <linux/fs.h>
-+#include <linux/interrupt.h>
-+#include <linux/sched.h>
-+#include <linux/pm.h>
-+#include <linux/sysctl.h>
-+#include <linux/proc_fs.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/input.h>
-+#include <linux/platform_device.h>
-+#include <linux/mfd/ipaq-micro.h>
-+
-+static struct ipaq_micro *p_micro;
-+static struct input_dev *micro_key_input;
-+
-+int keycodes[] = {
-+ KEY_RECORD, /* 1: Record button */
-+ KEY_CALENDAR, /* 2: Calendar */
-+ KEY_ADDRESSBOOK, /* 3: Contacts (looks like Outlook) */
-+ KEY_MAIL, /* 4: Envelope (Q on older iPAQs) */
-+ KEY_HOMEPAGE, /* 5: Start (looks like swoopy arrow) */
-+ KEY_UP, /* 6: Up */
-+ KEY_RIGHT, /* 7: Right */
-+ KEY_LEFT, /* 8: Left */
-+ KEY_DOWN, /* 9: Down */
-+};
-+
-+static void micro_key_receive(int len, unsigned char *data)
-+{
-+ int key, down;
-+
-+ down = (0x80 & data[0]) ? 1 : 0;
-+ key = 0x7f & data[0];
-+
-+ if (key < ARRAY_SIZE(keycodes)) {
-+ input_report_key(micro_key_input, keycodes[key], down);
-+ input_sync(micro_key_input);
-+ }
-+}
-+
-+static int micro_key_probe(struct platform_device *pdev)
-+{
-+ int ret;
-+ int i;
-+
-+ micro_key_input = input_allocate_device();
-+
-+ micro_key_input->evbit[0] = BIT(EV_KEY);
-+ set_bit(EV_KEY, micro_key_input->evbit);
-+ for (i = 0; i < ARRAY_SIZE(keycodes); i++)
-+ set_bit(keycodes[i], micro_key_input->keybit);
-+
-+ micro_key_input->name = "h3600 micro keys";
-+
-+ ret = input_register_device(micro_key_input);
-+ if (ret)
-+ return ret;
-+
-+ p_micro = dev_get_drvdata(pdev->dev.parent);
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_key = micro_key_receive;
-+ spin_unlock(&p_micro->lock);
-+
-+ return 0;
-+}
-+
-+static int micro_key_remove(struct platform_device *pdev)
-+{
-+ input_unregister_device(micro_key_input);
-+
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_key = NULL;
-+ spin_unlock(&p_micro->lock);
-+
-+ return 0;
-+}
-+
-+static int micro_key_suspend(struct device *dev)
-+{
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_key = NULL;
-+ spin_unlock(&p_micro->lock);
-+
-+ return 0;
-+}
-+
-+static int micro_key_resume(struct device *dev)
-+{
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_key = micro_key_receive;
-+ spin_unlock(&p_micro->lock);
-+
-+ return 0;
-+}
-+
-+static const struct dev_pm_ops micro_key_dev_pm_ops = {
-+ SET_SYSTEM_SLEEP_PM_OPS(micro_key_suspend, micro_key_resume)
-+};
-+
-+struct platform_driver micro_key_device_driver = {
-+ .driver = {
-+ .name = "ipaq-micro-keys",
-+ .pm = &micro_key_dev_pm_ops,
-+ },
-+ .probe = micro_key_probe,
-+ .remove = micro_key_remove,
-+};
-+module_platform_driver(micro_key_device_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("driver for iPAQ Atmel micro keys");
-+MODULE_ALIAS("platform:ipaq-micro-keys");
---
-1.8.3.1
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/h3600/0004-input-driver-for-touchscreen-on-iPaq-h3xxx.patch b/recipes-kernel/linux/linux-yocto-3.10/h3600/0004-input-driver-for-touchscreen-on-iPaq-h3xxx.patch
deleted file mode 100644
index b1f0e65..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/h3600/0004-input-driver-for-touchscreen-on-iPaq-h3xxx.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From 34645060d6786dbb6c97d3e5a32981afa3c9de37 Mon Sep 17 00:00:00 2001
-From: Dmitry Artamonow <mad_soft@inbox.ru>
-Date: Sat, 21 Mar 2009 16:27:19 +0300
-Subject: [PATCH 4/7] input: driver for touchscreen on iPaq h3xxx
-
-This adds a driver for the touchscreen connected to the
-Atmel microcontroller on the iPAQ h3xxx series.
-
-Based on a driver from handhelds.org 2.6.21 kernel, written
-by Alessandro GARDICH.
-
-Signed-off-by: Alessandro GARDICH <gremlin@gremlin.it>
-Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/input/touchscreen/Kconfig | 8 ++
- drivers/input/touchscreen/Makefile | 1 +
- drivers/input/touchscreen/ipaq-micro-ts.c | 138 ++++++++++++++++++++++++++++++
- 3 files changed, 147 insertions(+)
- create mode 100644 drivers/input/touchscreen/ipaq-micro-ts.c
-
-diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
-index f9a5fd89bc02..1f10c7c9f3df 100644
---- a/drivers/input/touchscreen/Kconfig
-+++ b/drivers/input/touchscreen/Kconfig
-@@ -436,6 +436,14 @@ config TOUCHSCREEN_HP7XX
- To compile this driver as a module, choose M here: the
- module will be called jornada720_ts.
-
-+config TOUCHSCREEN_IPAQ_MICRO
-+ tristate "HP iPAQ Atmel Micro ASIC touchscreen"
-+ depends on MFD_IPAQ_MICRO
-+ help
-+ This enables support for the touchscreen attached to
-+ the Atmel Micro peripheral controller on iPAQ h3100/h3600/h3700
-+
-+
- config TOUCHSCREEN_HTCPEN
- tristate "HTC Shift X9500 touchscreen"
- depends on ISA
-diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
-index 6bfbeab67c9f..3cb2dc18e8d4 100644
---- a/drivers/input/touchscreen/Makefile
-+++ b/drivers/input/touchscreen/Makefile
-@@ -43,6 +43,7 @@ obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o
- obj-$(CONFIG_TOUCHSCREEN_MK712) += mk712.o
- obj-$(CONFIG_TOUCHSCREEN_HP600) += hp680_ts_input.o
- obj-$(CONFIG_TOUCHSCREEN_HP7XX) += jornada720_ts.o
-+obj-$(CONFIG_TOUCHSCREEN_IPAQ_MICRO) += ipaq-micro-ts.o
- obj-$(CONFIG_TOUCHSCREEN_HTCPEN) += htcpen.o
- obj-$(CONFIG_TOUCHSCREEN_USB_COMPOSITE) += usbtouchscreen.o
- obj-$(CONFIG_TOUCHSCREEN_PCAP) += pcap_ts.o
-diff --git a/drivers/input/touchscreen/ipaq-micro-ts.c b/drivers/input/touchscreen/ipaq-micro-ts.c
-new file mode 100644
-index 000000000000..5ea012a51de5
---- /dev/null
-+++ b/drivers/input/touchscreen/ipaq-micro-ts.c
-@@ -0,0 +1,138 @@
-+/*
-+ * 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.
-+ *
-+ * h3600 atmel micro companion support, touchscreen subdevice
-+ * Author : Alessandro Gardich <gremlin@gremlin.it>
-+ * Author : Linus Walleij <linus.walleij@linaro.org>
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/interrupt.h>
-+#include <linux/pm.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/input.h>
-+#include <linux/platform_device.h>
-+#include <linux/slab.h>
-+#include <linux/mfd/ipaq-micro.h>
-+
-+struct ts_sample {
-+ unsigned short x;
-+ unsigned short y;
-+};
-+
-+struct touchscreen_data {
-+ struct input_dev *input;
-+};
-+
-+static struct ipaq_micro *p_micro;
-+struct touchscreen_data *ts;
-+
-+static void micro_ts_receive(int len, unsigned char *data)
-+{
-+ if (len == 4) {
-+ input_report_abs(ts->input, ABS_X, (data[2]<<8)+data[3]);
-+ input_report_abs(ts->input, ABS_Y, (data[0]<<8)+data[1]);
-+ input_report_abs(ts->input, ABS_PRESSURE, 1);
-+ input_report_key(ts->input, BTN_TOUCH, 0);
-+ }
-+ if (len == 0) {
-+ input_report_abs(ts->input, ABS_X, 0);
-+ input_report_abs(ts->input, ABS_Y, 0);
-+ input_report_abs(ts->input, ABS_PRESSURE, 0);
-+ input_report_key(ts->input, BTN_TOUCH, 1);
-+ }
-+ input_sync(ts->input);
-+}
-+
-+
-+static int micro_ts_probe(struct platform_device *pdev)
-+{
-+ int ret;
-+
-+ ts = devm_kzalloc(&pdev->dev, sizeof(*ts), GFP_KERNEL);
-+ if (!ts)
-+ return -ENOMEM;
-+
-+ p_micro = dev_get_drvdata(pdev->dev.parent);
-+
-+ platform_set_drvdata(pdev, ts);
-+ /* dev->driver_data = ts; */
-+
-+ ts->input = input_allocate_device();
-+
-+ ts->input->evbit[0] = BIT(EV_ABS);
-+ ts->input->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
-+ input_set_abs_params(ts->input, ABS_X, 0, 1023, 0, 0);
-+ input_set_abs_params(ts->input, ABS_Y, 0, 1023, 0, 0);
-+ input_set_abs_params(ts->input, ABS_PRESSURE, 0x0, 0x1, 0, 0);
-+
-+ ts->input->name = "ipaq micro ts";
-+ /* ts->input->private = ts; */
-+
-+ ret = input_register_device(ts->input);
-+ if (ret) {
-+ dev_err(&pdev->dev, "error registering touch input\n");
-+ return ret;
-+ }
-+
-+ /*--- callback ---*/
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_ts = micro_ts_receive;
-+ spin_unlock(&p_micro->lock);
-+
-+ dev_info(&pdev->dev, "iPAQ micro touchscreen\n");
-+ return 0;
-+}
-+
-+static int micro_ts_remove(struct platform_device *pdev)
-+{
-+ struct touchscreen_data *ts;
-+
-+ ts = platform_get_drvdata(pdev);
-+
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_ts = NULL;
-+ spin_unlock(&p_micro->lock);
-+ input_unregister_device(ts->input);
-+
-+ return 0;
-+}
-+
-+static int micro_ts_suspend(struct device *dev)
-+{
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_ts = NULL;
-+ spin_unlock(&p_micro->lock);
-+ return 0;
-+}
-+
-+static int micro_ts_resume(struct device *dev)
-+{
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_ts = micro_ts_receive;
-+ spin_unlock(&p_micro->lock);
-+ return 0;
-+}
-+
-+static const struct dev_pm_ops micro_ts_dev_pm_ops = {
-+ SET_SYSTEM_SLEEP_PM_OPS(micro_ts_suspend, micro_ts_resume)
-+};
-+
-+struct platform_driver micro_ts_device_driver = {
-+ .driver = {
-+ .name = "ipaq-micro-ts",
-+ .pm = &micro_ts_dev_pm_ops,
-+ },
-+ .probe = micro_ts_probe,
-+ .remove = micro_ts_remove,
-+};
-+module_platform_driver(micro_ts_device_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("driver for iPAQ Atmel micro touchscreen");
-+MODULE_ALIAS("platform:ipaq-micro-ts");
---
-1.8.3.1
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/h3600/0005-power-add-driver-for-battery-reading-on-iPaq-h3xxx.patch b/recipes-kernel/linux/linux-yocto-3.10/h3600/0005-power-add-driver-for-battery-reading-on-iPaq-h3xxx.patch
deleted file mode 100644
index c0be9b8..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/h3600/0005-power-add-driver-for-battery-reading-on-iPaq-h3xxx.patch
+++ /dev/null
@@ -1,295 +0,0 @@
-From 92a0ddf6c78180510b47dc3734ccc68e733aad3a Mon Sep 17 00:00:00 2001
-From: Dmitry Artamonow <mad_soft@inbox.ru>
-Date: Sat, 21 Mar 2009 16:28:50 +0300
-Subject: [PATCH 5/7] power: add driver for battery reading on iPaq h3xxx
-
-This adds a driver for reading the battery status of the
-battery connected to the Atmel microcontroller on the
-iPAQ h3xxx series.
-
-Based on a driver from handhelds.org 2.6.21 kernel, written
-by Alessandro GARDICH.
-
-Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/power/Kconfig | 7 ++
- drivers/power/Makefile | 1 +
- drivers/power/ipaq_micro_battery.c | 235 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 243 insertions(+)
- create mode 100644 drivers/power/ipaq_micro_battery.c
-
-diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
-index 7b8979c63f48..380e4846428f 100644
---- a/drivers/power/Kconfig
-+++ b/drivers/power/Kconfig
-@@ -137,6 +137,13 @@ config BATTERY_COLLIE
- Say Y to enable support for the battery on the Sharp Zaurus
- SL-5500 (collie) models.
-
-+config BATTERY_IPAQ_MICRO
-+ tristate "iPAQ Atmel Micro ASIC battery driver"
-+ depends on MFD_IPAQ_MICRO
-+ help
-+ Choose this option if you want to monitor battery status on
-+ Compaq/HP iPAQ h3100 and h3600.
-+
- config BATTERY_WM97XX
- bool "WM97xx generic battery driver"
- depends on TOUCHSCREEN_WM97XX=y
-diff --git a/drivers/power/Makefile b/drivers/power/Makefile
-index 653bf6ceff30..1451aa7b9fc2 100644
---- a/drivers/power/Makefile
-+++ b/drivers/power/Makefile
-@@ -25,6 +25,7 @@ obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o
- obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
- obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o
- obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o
-+obj-$(CONFIG_BATTERY_IPAQ_MICRO) += ipaq_micro_battery.o
- obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o
- obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o
- obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o
-diff --git a/drivers/power/ipaq_micro_battery.c b/drivers/power/ipaq_micro_battery.c
-new file mode 100644
-index 000000000000..413e91cc128e
---- /dev/null
-+++ b/drivers/power/ipaq_micro_battery.c
-@@ -0,0 +1,235 @@
-+/*
-+ * 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.
-+ *
-+ * h3xxx atmel micro companion support, battery subdevice
-+ * based on previous kernel 2.4 version
-+ * Author : Alessandro Gardich <gremlin@gremlin.it>
-+ * Author : Linus Walleij <linus.walleij@linaro.org>
-+ *
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/version.h>
-+
-+#include <linux/init.h>
-+#include <linux/fs.h>
-+#include <linux/interrupt.h>
-+#include <linux/sched.h>
-+#include <linux/pm.h>
-+#include <linux/sysctl.h>
-+#include <linux/proc_fs.h>
-+#include <linux/delay.h>
-+#include <linux/device.h>
-+#include <linux/power_supply.h>
-+#include <linux/platform_device.h>
-+#include <linux/timer.h>
-+#include <linux/mfd/ipaq-micro.h>
-+#include <linux/completion.h>
-+
-+#define BATT_PERIOD (10 * HZ)
-+
-+#define H3600_BATT_STATUS_HIGH 0x01
-+#define H3600_BATT_STATUS_LOW 0x02
-+#define H3600_BATT_STATUS_CRITICAL 0x04
-+#define H3600_BATT_STATUS_CHARGING 0x08
-+#define H3600_BATT_STATUS_CHARGEMAIN 0x10
-+#define H3600_BATT_STATUS_DEAD 0x20 /* Battery will not charge */
-+#define H3600_BATT_STATUS_NOTINSTALLED 0x20 /* For expansion pack batteries */
-+#define H3600_BATT_STATUS_FULL 0x40 /* Battery fully charged */
-+#define H3600_BATT_STATUS_NOBATTERY 0x80
-+#define H3600_BATT_STATUS_UNKNOWN 0xff
-+
-+
-+static struct ipaq_micro *p_micro;
-+
-+struct timer_list batt_timer;
-+
-+struct {
-+ int ac;
-+ int update_time;
-+ int chemistry;
-+ int voltage;
-+ int temperature;
-+ int flag;
-+} micro_battery;
-+
-+static void micro_battery_receive(int len, unsigned char *data)
-+{
-+ pr_debug("h3600_battery: AC = %02x\n", data[0]);
-+ pr_debug("h3600_battery: BAT1 chemistry = %02x\n", data[1]);
-+ pr_debug("h3600_battery: BAT1 voltage = %d %02x%02x\n",
-+ (data[3] << 8) + data[2], data[2], data[3]);
-+ pr_debug("h3600_battery: BAT1 status = %02x\n", data[4]);
-+
-+ micro_battery.chemistry = data[1];
-+ micro_battery.voltage = ((((unsigned short)data[3] << 8) + \
-+ data[2]) * 5000L) * 1000 / 1024;
-+ micro_battery.flag = data[4];
-+
-+ if (len == 9) {
-+ pr_debug("h3600_battery: BAT2 chemistry = %02x\n", data[5]);
-+ pr_debug("h3600_battery: BAT2 voltage = %d %02x%02x\n",
-+ (data[7] << 8) + data[6], data[6], data[7]);
-+ pr_debug("h3600_battery: BAT2 status = %02x\n", data[8]);
-+ }
-+}
-+
-+static void micro_temperature_receive(int len, unsigned char *data)
-+{
-+ micro_battery.temperature = ((unsigned short)data[1] << 8) + data[0];
-+}
-+
-+void h3600_battery_read_status(unsigned long data)
-+{
-+ if (++data % 2)
-+ ipaq_micro_tx_msg(p_micro, MSG_BATTERY, 0, NULL);
-+ else
-+ ipaq_micro_tx_msg(p_micro, MSG_THERMAL_SENSOR, 0, NULL);
-+
-+ batt_timer.expires += BATT_PERIOD;
-+ batt_timer.data = data;
-+
-+ add_timer(&batt_timer);
-+}
-+
-+int get_capacity(struct power_supply *b)
-+{
-+ switch (micro_battery.flag) {
-+ case H3600_BATT_STATUS_HIGH:
-+ return 100;
-+ break;
-+ case H3600_BATT_STATUS_LOW:
-+ return 50;
-+ break;
-+ case H3600_BATT_STATUS_CRITICAL:
-+ return 5;
-+ break;
-+ default:
-+ break;
-+ }
-+ return 0;
-+}
-+
-+int get_status(struct power_supply *b)
-+{
-+ if (micro_battery.flag == H3600_BATT_STATUS_UNKNOWN)
-+ return POWER_SUPPLY_STATUS_UNKNOWN;
-+
-+ if (micro_battery.flag & H3600_BATT_STATUS_FULL)
-+ return POWER_SUPPLY_STATUS_FULL;
-+
-+ if ((micro_battery.flag & H3600_BATT_STATUS_CHARGING) ||
-+ (micro_battery.flag & H3600_BATT_STATUS_CHARGEMAIN))
-+ return POWER_SUPPLY_STATUS_CHARGING;
-+
-+ return POWER_SUPPLY_STATUS_DISCHARGING;
-+}
-+
-+static int micro_batt_get_property(struct power_supply *b,
-+ enum power_supply_property psp,
-+ union power_supply_propval *val)
-+{
-+ switch (psp) {
-+ case POWER_SUPPLY_PROP_STATUS:
-+ val->intval = get_status(b);
-+ break;
-+ case POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN:
-+ val->intval = 4700000;
-+ break;
-+ case POWER_SUPPLY_PROP_CAPACITY:
-+ val->intval = get_capacity(b);
-+ break;
-+ case POWER_SUPPLY_PROP_TEMP:
-+ val->intval = micro_battery.temperature;
-+ break;
-+ case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-+ val->intval = micro_battery.voltage;
-+ break;
-+ default:
-+ return -EINVAL;
-+ };
-+
-+ return 0;
-+}
-+
-+static enum power_supply_property micro_batt_props[] = {
-+ POWER_SUPPLY_PROP_STATUS,
-+ POWER_SUPPLY_PROP_VOLTAGE_MAX_DESIGN,
-+ POWER_SUPPLY_PROP_CAPACITY,
-+ POWER_SUPPLY_PROP_TEMP,
-+ POWER_SUPPLY_PROP_VOLTAGE_NOW,
-+};
-+
-+static struct power_supply h3600_battery = {
-+ .name = "main-battery",
-+ .properties = micro_batt_props,
-+ .num_properties = ARRAY_SIZE(micro_batt_props),
-+ .get_property = micro_batt_get_property,
-+ .use_for_apm = 1,
-+};
-+
-+static int micro_batt_probe(struct platform_device *pdev)
-+{
-+ power_supply_register(&pdev->dev, &h3600_battery);
-+
-+ p_micro = dev_get_drvdata(pdev->dev.parent);
-+ spin_lock(&p_micro->lock);
-+ p_micro->h_batt = micro_battery_receive;
-+ p_micro->h_temp = micro_temperature_receive;
-+ spin_unlock(&p_micro->lock);
-+
-+ init_timer(&batt_timer);
-+ batt_timer.expires = jiffies + BATT_PERIOD;
-+ batt_timer.data = 0;
-+ batt_timer.function = h3600_battery_read_status;
-+
-+ add_timer(&batt_timer);
-+
-+ dev_info(&pdev->dev, "iPAQ micro battery driver\n");
-+ return 0;
-+}
-+
-+static int micro_batt_remove(struct platform_device *pdev)
-+{
-+ power_supply_unregister(&h3600_battery);
-+ init_timer(&batt_timer);
-+ p_micro->h_batt = NULL;
-+ p_micro->h_temp = NULL;
-+ del_timer_sync(&batt_timer);
-+
-+ return 0;
-+}
-+
-+static int micro_batt_suspend(struct device *dev)
-+{
-+ del_timer(&batt_timer);
-+
-+ return 0;
-+}
-+
-+static int micro_batt_resume(struct device *dev)
-+{
-+ add_timer(&batt_timer);
-+
-+ return 0;
-+}
-+
-+static const struct dev_pm_ops micro_batt_dev_pm_ops = {
-+ SET_SYSTEM_SLEEP_PM_OPS(micro_batt_suspend, micro_batt_resume)
-+};
-+
-+struct platform_driver micro_batt_device_driver = {
-+ .driver = {
-+ .name = "ipaq-micro-battery",
-+ .pm = &micro_batt_dev_pm_ops,
-+ },
-+ .probe = micro_batt_probe,
-+ .remove = micro_batt_remove,
-+};
-+module_platform_driver(micro_batt_device_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("driver for iPAQ Atmel micro battery");
-+MODULE_ALIAS("platform:battery-ipaq-micro");
---
-1.8.3.1
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/h3600/0006-leds-add-driver-for-the-iPAQ-micro.patch b/recipes-kernel/linux/linux-yocto-3.10/h3600/0006-leds-add-driver-for-the-iPAQ-micro.patch
deleted file mode 100644
index 326e071..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/h3600/0006-leds-add-driver-for-the-iPAQ-micro.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From 972419f09360ff582ccb6c459ad2977c01fe05c0 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Thu, 31 Oct 2013 10:53:06 -0700
-Subject: [PATCH 6/7] leds: add driver for the iPAQ micro
-
-This adds a driver for the iPAQ microcontroller LED.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/leds/Kconfig | 7 +++
- drivers/leds/Makefile | 1 +
- drivers/leds/leds-ipaq-micro.c | 135 +++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 143 insertions(+)
- create mode 100644 drivers/leds/leds-ipaq-micro.c
-
-diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
-index ef992293598a..62b66ec0fb37 100644
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -143,6 +143,13 @@ config LEDS_SUNFIRE
- This option enables support for the Left, Middle, and Right
- LEDs on the I/O and CPU boards of SunFire UltraSPARC servers.
-
-+config LEDS_IPAQ_MICRO
-+ tristate "LED Support for the Compaq iPAQ h3xxx"
-+ depends on MFD_IPAQ_MICRO
-+ help
-+ Choose this option if you want to use the notification LED on
-+ Compaq/HP iPAQ h3100 and h3600.
-+
- config LEDS_HP6XX
- tristate "LED Support for the HP Jornada 6xx"
- depends on LEDS_CLASS
-diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
-index ac2897732b02..ea001f62f4bf 100644
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -30,6 +30,7 @@ obj-$(CONFIG_LEDS_LP5562) += leds-lp5562.o
- obj-$(CONFIG_LEDS_LP8788) += leds-lp8788.o
- obj-$(CONFIG_LEDS_TCA6507) += leds-tca6507.o
- obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
-+obj-$(CONFIG_LEDS_IPAQ_MICRO) += leds-ipaq-micro.o
- obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o
- obj-$(CONFIG_LEDS_OT200) += leds-ot200.o
- obj-$(CONFIG_LEDS_FSG) += leds-fsg.o
-diff --git a/drivers/leds/leds-ipaq-micro.c b/drivers/leds/leds-ipaq-micro.c
-new file mode 100644
-index 000000000000..899dae416ea3
---- /dev/null
-+++ b/drivers/leds/leds-ipaq-micro.c
-@@ -0,0 +1,135 @@
-+/*
-+ * 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.
-+ *
-+ * h3xxx atmel micro companion support, notification LED subdevice
-+ *
-+ * Author : Linus Walleij <linus.walleij@linaro.org>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/platform_device.h>
-+#include <linux/mfd/ipaq-micro.h>
-+#include <linux/leds.h>
-+
-+#define LED_YELLOW 0x00
-+#define LED_GREEN 0x01
-+
-+#define LED_EN (1 << 4) /* LED ON/OFF 0:off, 1:on */
-+#define LED_AUTOSTOP (1 << 5) /* LED ON/OFF auto stop set 0:disable, 1:enable */
-+#define LED_ALWAYS (1 << 6) /* LED Interrupt Mask 0:No mask, 1:mask */
-+
-+static void micro_leds_brightness_set(struct led_classdev *led_cdev,
-+ enum led_brightness value)
-+{
-+ struct ipaq_micro *micro = dev_get_drvdata(led_cdev->dev->parent->parent);
-+ /*
-+ * In this message:
-+ * Byte 0 = LED color: 0 = yellow, 1 = green
-+ * yellow LED is always ~30 blinks per minute
-+ * Byte 1 = duration (flags?) appears to be ignored
-+ * Byte 2 = green ontime in 1/10 sec (deciseconds)
-+ * 1 = 1/10 second
-+ * 0 = 256/10 second
-+ * Byte 3 = green offtime in 1/10 sec (deciseconds)
-+ * 1 = 1/10 second
-+ * 0 = 256/10 seconds
-+ */
-+ u8 data[4];
-+
-+ data[0] = LED_GREEN;
-+ data[1] = 0;
-+ if (value) {
-+ dev_info(micro->dev, "enable LED\n");
-+ data[2] = 0; /* Duty cycle 256 */
-+ data[3] = 1;
-+ } else {
-+ dev_info(micro->dev, "disable LED\n");
-+ data[2] = 1;
-+ data[3] = 0; /* Duty cycle 256 */
-+ }
-+ ipaq_micro_tx_msg(micro, MSG_NOTIFY_LED, 4, data);
-+}
-+
-+/* Maximum duty cycle in ms 256/10 sec = 25600 ms */
-+#define IPAQ_LED_MAX_DUTY 25600
-+
-+static int micro_leds_blink_set(struct led_classdev *led_cdev,
-+ unsigned long *delay_on,
-+ unsigned long *delay_off)
-+{
-+ struct ipaq_micro *micro = dev_get_drvdata(led_cdev->dev->parent->parent);
-+ /*
-+ * In this message:
-+ * Byte 0 = LED color: 0 = yellow, 1 = green
-+ * yellow LED is always ~30 blinks per minute
-+ * Byte 1 = duration (flags?) appears to be ignored
-+ * Byte 2 = green ontime in 1/10 sec (deciseconds)
-+ * 1 = 1/10 second
-+ * 0 = 256/10 second
-+ * Byte 3 = green offtime in 1/10 sec (deciseconds)
-+ * 1 = 1/10 second
-+ * 0 = 256/10 seconds
-+ */
-+ u8 data[4];
-+
-+ data[0] = LED_GREEN;
-+ if (*delay_on > IPAQ_LED_MAX_DUTY ||
-+ *delay_off > IPAQ_LED_MAX_DUTY)
-+ return -EINVAL;
-+
-+ if (*delay_on == 0 && *delay_off == 0) {
-+ *delay_on = 100;
-+ *delay_off = 100;
-+ }
-+
-+ data[1] = 0;
-+ if (*delay_on >= IPAQ_LED_MAX_DUTY)
-+ data[2] = 0;
-+ else
-+ data[2] = (u8) DIV_ROUND_CLOSEST(*delay_on, 100);
-+ if (*delay_off >= IPAQ_LED_MAX_DUTY)
-+ data[3] = 0;
-+ else
-+ data[3] = (u8) DIV_ROUND_CLOSEST(*delay_off, 100);
-+ ipaq_micro_tx_msg(micro, MSG_NOTIFY_LED, 4, data);
-+ return 0;
-+}
-+
-+static struct led_classdev micro_led = {
-+ .name = "notify",
-+ .brightness_set = micro_leds_brightness_set,
-+ .blink_set = micro_leds_blink_set,
-+ .flags = LED_CORE_SUSPENDRESUME,
-+};
-+
-+static int micro_leds_probe(struct platform_device *pdev)
-+{
-+ int ret;
-+
-+ ret = led_classdev_register(&pdev->dev, &micro_led);
-+ if (ret)
-+ dev_err(&pdev->dev, "registering led failed: %d\n", ret);
-+ dev_info(&pdev->dev, "iPAQ micro notification LED driver\n");
-+
-+ return 0;
-+}
-+
-+static int micro_leds_remove(struct platform_device *pdev)
-+{
-+ return 0;
-+}
-+
-+struct platform_driver micro_leds_device_driver = {
-+ .driver = {
-+ .name = "ipaq-micro-leds",
-+ },
-+ .probe = micro_leds_probe,
-+ .remove = micro_leds_remove,
-+};
-+module_platform_driver(micro_leds_device_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("driver for iPAQ Atmel micro leds");
-+MODULE_ALIAS("platform:ipaq-micro-leds");
---
-1.8.3.1
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/h3600/0007-fb-backlight-add-driver-for-iPAQ-micro-backlight.patch b/recipes-kernel/linux/linux-yocto-3.10/h3600/0007-fb-backlight-add-driver-for-iPAQ-micro-backlight.patch
deleted file mode 100644
index e958fff..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/h3600/0007-fb-backlight-add-driver-for-iPAQ-micro-backlight.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 7b9fdd2573c3e20e0981ce6a5b62f295109b2510 Mon Sep 17 00:00:00 2001
-From: Linus Walleij <linus.walleij@linaro.org>
-Date: Fri, 8 Nov 2013 10:09:13 +0100
-Subject: [PATCH 7/7] fb: backlight: add driver for iPAQ micro backlight
-
-This adds a driver for the backlight controlled by the microcontroller
-on the Compaq iPAQ series of handheld computers: h3100, h3600
-and h3700.
-
-Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
----
- drivers/video/backlight/Kconfig | 9 ++++
- drivers/video/backlight/Makefile | 1 +
- drivers/video/backlight/ipaq_micro_bl.c | 84 +++++++++++++++++++++++++++++++++
- 3 files changed, 94 insertions(+)
- create mode 100644 drivers/video/backlight/ipaq_micro_bl.c
-
-diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
-index d5ab6583f440..caae5c946b66 100644
---- a/drivers/video/backlight/Kconfig
-+++ b/drivers/video/backlight/Kconfig
-@@ -207,6 +207,15 @@ config BACKLIGHT_GENERIC
- known as the Corgi backlight driver. If you have a Sharp Zaurus
- SL-C7xx, SL-Cxx00 or SL-6000x say y.
-
-+config BACKLIGHT_IPAQ_MICRO
-+ tristate "iPAQ microcontroller backlight driver"
-+ depends on MFD_IPAQ_MICRO
-+ default y
-+ help
-+ Say y to enable the backlight driver for Compaq iPAQ handheld
-+ computers. Say yes if you have one of the h3100/h3600/h3700
-+ machines.
-+
- config BACKLIGHT_LM3533
- tristate "Backlight Driver for LM3533"
- depends on BACKLIGHT_CLASS_DEVICE
-diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
-index 92711fe60464..494e381c9694 100644
---- a/drivers/video/backlight/Makefile
-+++ b/drivers/video/backlight/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_BACKLIGHT_EP93XX) += ep93xx_bl.o
- obj-$(CONFIG_BACKLIGHT_GENERIC) += generic_bl.o
- obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o
- obj-$(CONFIG_BACKLIGHT_HP700) += jornada720_bl.o
-+obj-$(CONFIG_BACKLIGHT_IPAQ_MICRO) += ipaq_micro_bl.o
- obj-$(CONFIG_BACKLIGHT_LM3533) += lm3533_bl.o
- obj-$(CONFIG_BACKLIGHT_LM3630) += lm3630_bl.o
- obj-$(CONFIG_BACKLIGHT_LM3639) += lm3639_bl.o
-diff --git a/drivers/video/backlight/ipaq_micro_bl.c b/drivers/video/backlight/ipaq_micro_bl.c
-new file mode 100644
-index 000000000000..ae284fc9a22d
---- /dev/null
-+++ b/drivers/video/backlight/ipaq_micro_bl.c
-@@ -0,0 +1,84 @@
-+/*
-+ * 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.
-+ *
-+ * iPAQ microcontroller backlight support
-+ * Author : Linus Walleij <linus.walleij@linaro.org>
-+ */
-+
-+#include <linux/module.h>
-+#include <linux/init.h>
-+#include <linux/platform_device.h>
-+#include <linux/backlight.h>
-+#include <linux/mfd/ipaq-micro.h>
-+#include <linux/fb.h>
-+#include <linux/err.h>
-+
-+static int micro_bl_update_status(struct backlight_device *bd)
-+{
-+ struct ipaq_micro *micro = dev_get_drvdata(&bd->dev);
-+ int intensity = bd->props.brightness;
-+ u8 data[3];
-+
-+ if (bd->props.power != FB_BLANK_UNBLANK)
-+ intensity = 0;
-+ if (bd->props.state & BL_CORE_FBBLANK)
-+ intensity = 0;
-+ if (bd->props.state & BL_CORE_SUSPENDED)
-+ intensity = 0;
-+
-+ data[0] = 0x01;
-+ data[1] = intensity > 0 ? 1 : 0;
-+ data[2] = intensity;
-+ ipaq_micro_tx_msg(micro, MSG_BACKLIGHT, 3, data);
-+ return 0;
-+}
-+
-+static const struct backlight_ops micro_bl_ops = {
-+ .options = BL_CORE_SUSPENDRESUME,
-+ .update_status = micro_bl_update_status,
-+};
-+
-+static struct backlight_properties micro_bl_props = {
-+ .type = BACKLIGHT_RAW,
-+ .max_brightness = 255,
-+ .power = FB_BLANK_UNBLANK,
-+ .brightness = 64,
-+};
-+
-+static int micro_backlight_probe(struct platform_device *pdev)
-+{
-+ struct backlight_device *bd;
-+ struct ipaq_micro *micro = dev_get_drvdata(pdev->dev.parent);
-+
-+ bd = backlight_device_register("ipaq-micro-backlight", &pdev->dev,
-+ micro,
-+ &micro_bl_ops,
-+ &micro_bl_props);
-+ if (IS_ERR(bd))
-+ return PTR_ERR(bd);
-+ platform_set_drvdata(pdev, bd);
-+ backlight_update_status(bd);
-+ dev_info(&pdev->dev, "iPAQ micro backlight driver\n");
-+
-+ return 0;
-+}
-+
-+static int micro_backlight_remove(struct platform_device *pdev)
-+{
-+ return 0;
-+}
-+
-+struct platform_driver micro_backlight_device_driver = {
-+ .driver = {
-+ .name = "ipaq-micro-backlight",
-+ },
-+ .probe = micro_backlight_probe,
-+ .remove = micro_backlight_remove,
-+};
-+module_platform_driver(micro_backlight_device_driver);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_DESCRIPTION("driver for iPAQ Atmel micro backlight");
-+MODULE_ALIAS("platform:ipaq-micro-backlight");
---
-1.8.3.1
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/h3600/defconfig b/recipes-kernel/linux/linux-yocto-3.10/h3600/defconfig
deleted file mode 100644
index 612502a..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/h3600/defconfig
+++ /dev/null
@@ -1,91 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ_IDLE=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_MODULES=y
-# CONFIG_LBDAF is not set
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SA1100=y
-CONFIG_SA1100_H3600=y
-CONFIG_PCCARD=y
-CONFIG_PCMCIA_SA1100=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-# CONFIG_CPU_FREQ_STAT is not set
-CONFIG_FPE_NWFPE=y
-CONFIG_NET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_IPV6 is not set
-CONFIG_IRDA=y
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_DEVTMPFS=y
-CONFIG_MTD=y
-CONFIG_MTD_REDBOOT_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_CFI_I1 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_SA1100=y
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_IDE=y
-CONFIG_BLK_DEV_IDECS=y
-CONFIG_NETDEVICES=y
-CONFIG_PCMCIA_PCNET=y
-CONFIG_PPP=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_ASYNC=m
-# CONFIG_WLAN is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_IPAQ_MICRO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_IPAQ_MICRO=y
-# CONFIG_SERIO is not set
-CONFIG_SERIAL_SA1100=y
-CONFIG_SERIAL_SA1100_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_POWER_SUPPLY=y
-CONFIG_BATTERY_IPAQ_MICRO=y
-# CONFIG_HWMON is not set
-CONFIG_FB=y
-CONFIG_FB_SA1100=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_LOGO=y
-# CONFIG_USB_SUPPORT is not set
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_IPAQ_MICRO=y
-CONFIG_DMADEVICES=y
-CONFIG_DMA_SA11X0=y
-CONFIG_DMATEST=y
-CONFIG_EXT2_FS=y
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_CRAMFS=m
-CONFIG_NFS_FS=y
-CONFIG_NFSD=m
-CONFIG_NLS=y
-CONFIG_DEBUG_FS=y
diff --git a/recipes-kernel/linux/linux-yocto-3.10/hx4700/defconfig b/recipes-kernel/linux/linux-yocto-3.10/hx4700/defconfig
deleted file mode 100644
index ef3669f..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/hx4700/defconfig
+++ /dev/null
@@ -1,182 +0,0 @@
-CONFIG_CROSS_COMPILE="arm-softfloat-linux-gnueabi-"
-CONFIG_LOCALVERSION="-yocto-standard"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_DEFAULT_HOSTNAME="hx4700"
-CONFIG_SYSVIPC=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_FHANDLE=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_CGROUP_DEBUG=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_BLK_CGROUP=y
-CONFIG_NAMESPACES=y
-CONFIG_SCHED_AUTOGROUP=y
-# CONFIG_UID16 is not set
-CONFIG_EMBEDDED=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_LBDAF is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_PXA=y
-CONFIG_MACH_H4700=y
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-CONFIG_PCMCIA_PXA2XX=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE=" loglevel=3"
-CONFIG_KEXEC=y
-CONFIG_CPU_IDLE=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_APM_EMULATION=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-CONFIG_CFG80211=m
-# CONFIG_CFG80211_DEFAULT_PS is not set
-CONFIG_MAC80211=m
-CONFIG_RFKILL=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_GEOMETRY=y
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-# CONFIG_SCSI_PROC_FS is not set
-CONFIG_BLK_DEV_SD=y
-# CONFIG_SCSI_LOWLEVEL is not set
-CONFIG_ATA=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_SATA_PMP is not set
-# CONFIG_ATA_BMDMA is not set
-CONFIG_PATA_PCMCIA=y
-CONFIG_NETDEVICES=y
-CONFIG_PCMCIA_PCNET=m
-# CONFIG_INPUT_MOUSEDEV is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_SERIO is not set
-CONFIG_VT_HW_CONSOLE_BINDING=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-CONFIG_LEGACY_PTY_COUNT=2
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-# CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_PXA=y
-CONFIG_SPI=y
-CONFIG_SPI_PXA2XX=y
-CONFIG_W1=y
-CONFIG_W1_MASTER_DS1WM=y
-CONFIG_W1_SLAVE_DS2760=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_BATTERY_DS2760=y
-# CONFIG_HWMON is not set
-CONFIG_MFD_ASIC3=y
-CONFIG_HTC_EGPIO=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_DUMMY=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_REGULATOR_MAX1586=y
-CONFIG_FB=y
-CONFIG_FB_W100=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_LCD_PLATFORM=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_BACKLIGHT_PWM=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_LOGO=y
-CONFIG_SOUND=y
-CONFIG_SND=y
-CONFIG_SND_SOC=y
-CONFIG_SND_PXA2XX_SOC=y
-CONFIG_SND_PXA2XX_SOC_HX4700=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_PXA27X=y
-CONFIG_USB_ETH=y
-CONFIG_MMC=y
-CONFIG_MMC_UNSAFE_RESUME=y
-CONFIG_MMC_TMIO=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_BACKLIGHT=y
-CONFIG_LEDS_TRIGGER_GPIO=y
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_PXA=y
-CONFIG_PWM=y
-CONFIG_PWM_PXA=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-CONFIG_EXT3_FS=y
-CONFIG_FANOTIFY=y
-CONFIG_AUTOFS4_FS=y
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-# CONFIG_NETWORK_FILESYSTEMS is not set
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_UTF8=y
-CONFIG_PRINTK_TIME=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-# CONFIG_ARM_UNWIND is not set
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_SHA1=m
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
-CONFIG_CRC_CCITT=y
diff --git a/recipes-kernel/linux/linux-yocto-3.10/hx4700/hx4700-change-led-trigger-assignments.patch b/recipes-kernel/linux/linux-yocto-3.10/hx4700/hx4700-change-led-trigger-assignments.patch
deleted file mode 100644
index 75975d9..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/hx4700/hx4700-change-led-trigger-assignments.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c0cb3e77aadddc46e6e41b3dd1e10c56bc699df2 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Tue, 26 Jul 2011 11:44:47 +0200
-Subject: [PATCH] hx4700: change led trigger assignments
-
-Updated for 3.10
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- arch/arm/mach-pxa/hx4700.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c
-index cae9dbb..e7bda03 100644
---- a/arch/arm/mach-pxa/hx4700.c
-+++ b/arch/arm/mach-pxa/hx4700.c
-@@ -283,11 +283,11 @@ static struct asic3_led asic3_leds[ASIC3_NUM_LEDS] = {
- },
- [1] = {
- .name = "hx4700:green",
-- .default_trigger = "unused",
-+ .default_trigger = "heartbeat",
- },
- [2] = {
- .name = "hx4700:blue",
-- .default_trigger = "hx4700-radio",
-+ .default_trigger = "mmc0",
- },
- };
-
---
-1.7.4.4
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomo/locomo-fix-SCL-SDA.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomo/locomo-fix-SCL-SDA.patch
deleted file mode 100644
index fbf3edd..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomo/locomo-fix-SCL-SDA.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From acc2f94781ab11bead994bb3faaad149f9187bd4 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Tue, 12 Nov 2013 22:21:20 +0100
-Subject: [PATCH] linux-yocto: collie: locomo.c: fix SCL line instead
- of SDA
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- arch/arm/common/locomo.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
-index b55c362..d827bcb 100644
---- a/arch/arm/common/locomo.c
-+++ b/arch/arm/common/locomo.c
-@@ -629,7 +629,7 @@ static void locomo_m62332_sendbit(void *mapbase, int bit)
- unsigned int r;
-
- r = locomo_readl(mapbase + LOCOMO_DAC);
-- r &= ~(LOCOMO_DAC_SCLOEB);
-+ r &= ~(LOCOMO_DAC_SDAOEB);
- locomo_writel(r, mapbase + LOCOMO_DAC);
- udelay(DAC_LOW_SETUP_TIME); /* 300 nsec */
- udelay(DAC_DATA_HOLD_TIME); /* 300 nsec */
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomo/locomolcd-suspend-resume.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomo/locomolcd-suspend-resume.patch
deleted file mode 100644
index a3d63e0..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomo/locomolcd-suspend-resume.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From ec4ff55857d5f48d2bf08e46f12eb4670ec6aa1a Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Thu, 14 Nov 2013 17:18:26 +0400
-Subject: [PATCH] backlight: locomolcd: fix suspend/resume
-
-Replace cooked suspend/resume with support from core backlight layer.
-This allows us to remove suspend/resume callbacks from locomolcd
-completely. They were not working anyway, as locomo does not support
-pm_ops handling.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
----
- drivers/video/backlight/locomolcd.c | 26 +++-----------------------
- 1 file changed, 3 insertions(+), 23 deletions(-)
-
-diff --git a/drivers/video/backlight/locomolcd.c b/drivers/video/backlight/locomolcd.c
-index 6c3ec42..54d2da9 100644
---- a/drivers/video/backlight/locomolcd.c
-+++ b/drivers/video/backlight/locomolcd.c
-@@ -28,8 +28,6 @@
-
- static struct backlight_device *locomolcd_bl_device;
- static struct locomo_dev *locomolcd_dev;
--static unsigned long locomolcd_flags;
--#define LOCOMOLCD_SUSPENDED 0x01
-
- static void locomolcd_on(int comadj)
- {
-@@ -117,7 +115,7 @@ static int locomolcd_set_intensity(struct backlight_device *bd)
- intensity = 0;
- if (bd->props.fb_blank != FB_BLANK_UNBLANK)
- intensity = 0;
-- if (locomolcd_flags & LOCOMOLCD_SUSPENDED)
-+ if (bd->props.state & BL_CORE_SUSPENDED)
- intensity = 0;
-
- switch (intensity) {
-@@ -155,26 +153,9 @@ static int locomolcd_get_intensity(struct backlight_device *bd)
- static const struct backlight_ops locomobl_data = {
- .get_brightness = locomolcd_get_intensity,
- .update_status = locomolcd_set_intensity,
-+ .options = BL_CORE_SUSPENDRESUME,
- };
-
--#ifdef CONFIG_PM_SLEEP
--static int locomolcd_suspend(struct device *dev)
--{
-- locomolcd_flags |= LOCOMOLCD_SUSPENDED;
-- locomolcd_set_intensity(locomolcd_bl_device);
-- return 0;
--}
--
--static int locomolcd_resume(struct device *dev)
--{
-- locomolcd_flags &= ~LOCOMOLCD_SUSPENDED;
-- locomolcd_set_intensity(locomolcd_bl_device);
-- return 0;
--}
--#endif
--
--static SIMPLE_DEV_PM_OPS(locomolcd_pm_ops, locomolcd_suspend, locomolcd_resume);
--
- static int locomolcd_probe(struct locomo_dev *ldev)
- {
- struct backlight_properties props;
-@@ -198,6 +179,7 @@ static int locomolcd_probe(struct locomo_dev *ldev)
- memset(&props, 0, sizeof(struct backlight_properties));
- props.type = BACKLIGHT_RAW;
- props.max_brightness = 4;
-+ props.brightness = 2;
- locomolcd_bl_device = backlight_device_register("locomo-bl",
- &ldev->dev, NULL,
- &locomobl_data, &props);
-@@ -206,7 +188,6 @@ static int locomolcd_probe(struct locomo_dev *ldev)
- return PTR_ERR(locomolcd_bl_device);
-
- /* Set up frontlight so that screen is readable */
-- locomolcd_bl_device->props.brightness = 2;
- locomolcd_set_intensity(locomolcd_bl_device);
-
- return 0;
-@@ -230,7 +211,6 @@ static int locomolcd_remove(struct locomo_dev *dev)
- static struct locomo_driver poodle_lcd_driver = {
- .drv = {
- .name = "locomo-backlight",
-- .pm = &locomolcd_pm_ops,
- },
- .devid = LOCOMO_DEVID_BACKLIGHT,
- .probe = locomolcd_probe,
---
-1.8.4.2
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch
deleted file mode 100644
index 441e3dc..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-locomokbd/locomo_kbd_tweak-r2.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From c9a909cedb442a1a3d020f0c10683298dcc2246c Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Sat, 21 Apr 2012 23:48:57 +0200
-Subject: [PATCH] locomokbd: apply tweaks for Zaurus
-
-from http://www.rpsys.net/openzaurus/patches/
-
-Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-
-Upstream-Status: Inappropriate [embedded specific]
-[Patch needed for initramfs w/out keymaps like kexecboot]
----
- drivers/input/keyboard/locomokbd.c | 44 ++++++++++++++++++++++----------------
- 1 file changed, 25 insertions(+), 19 deletions(-)
-
-diff --git a/drivers/input/keyboard/locomokbd.c b/drivers/input/keyboard/locomokbd.c
-index c94d610..2b978c8 100644
---- a/drivers/input/keyboard/locomokbd.c
-+++ b/drivers/input/keyboard/locomokbd.c
-@@ -39,27 +39,33 @@ MODULE_AUTHOR("John Lenz <lenz@cs.wisc.edu>");
- MODULE_DESCRIPTION("LoCoMo keyboard driver");
- MODULE_LICENSE("GPL");
-
--#define LOCOMOKBD_NUMKEYS 128
--
--#define KEY_ACTIVITY KEY_F16
--#define KEY_CONTACT KEY_F18
--#define KEY_CENTER KEY_F15
-+#define LOCOMOKBD_NUMKEYS 128
-+
-+#define LOCOMO_KEY_CALENDER KEY_LEFTCTRL
-+#define LOCOMO_KEY_ADDRESS KEY_LEFTALT /* Needed for SysRQ */
-+#define LOCOMO_KEY_HOME KEY_SYSRQ /* Needed for SysRQ */
-+#define LOCOMO_KEY_MENU KEY_F12
-+#define LOCOMO_KEY_MAIL KEY_F10
-+#define LOCOMO_KEY_OK KEY_F11 /* Don't hardwire to KEY_RETURN */
-+#define LOCOMO_KEY_CANCEL KEY_POWER
-+#define LOCOMO_KEY_CENTER KEY_F5 /* Don't hardwire to KEY_RETURN */
-+#define LOCOMO_KEY_FN KEY_F9
-
- static const unsigned char
- locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
-- 0, KEY_ESC, KEY_ACTIVITY, 0, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
-- 0, 0, 0, 0, 0, 0, 0, KEY_MENU, KEY_HOME, KEY_CONTACT, /* 10 - 19 */
-- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 20 - 29 */
-- 0, 0, 0, KEY_CENTER, 0, KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */
-- 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */
-- KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */
-- KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, KEY_ENTER, 0, 0, /* 60 - 69 */
-- KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */
-- 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */
-- KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */
-- 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */
-- KEY_LEFTSHIFT, KEY_TAB, KEY_LEFTCTRL, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
-- KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */
-+ 0, LOCOMO_KEY_CANCEL, LOCOMO_KEY_CALENDER, LOCOMO_KEY_HOME, 0, 0, 0, 0, 0, 0, /* 0 - 9 */
-+ 0, 0, 0, 0, 0, 0, 0, LOCOMO_KEY_MENU, 0, LOCOMO_KEY_ADDRESS, /* 10 - 19 */
-+ 0, 0, 0, 0, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 20 - 29 */
-+ 0, 0, 0, LOCOMO_KEY_CENTER, 0, LOCOMO_KEY_MAIL, 0, 0, 0, 0, /* 30 - 39 */
-+ 0, 0, 0, 0, 0, 0, 0, 0, 0, KEY_RIGHT, /* 40 - 49 */
-+ KEY_UP, KEY_LEFT, 0, 0, KEY_P, 0, KEY_O, KEY_I, KEY_Y, KEY_T, /* 50 - 59 */
-+ KEY_E, KEY_W, 0, 0, 0, 0, KEY_DOWN, LOCOMO_KEY_OK, 0, 0, /* 60 - 69 */
-+ KEY_BACKSPACE, 0, KEY_L, KEY_U, KEY_H, KEY_R, KEY_D, KEY_Q, 0, 0, /* 70 - 79 */
-+ 0, 0, 0, 0, 0, 0, KEY_ENTER, KEY_RIGHTSHIFT, KEY_K, KEY_J, /* 80 - 89 */
-+ KEY_G, KEY_F, KEY_X, KEY_S, 0, 0, 0, 0, 0, 0, /* 90 - 99 */
-+ 0, 0, KEY_DOT, 0, KEY_COMMA, KEY_N, KEY_B, KEY_C, KEY_Z, KEY_A, /* 100 - 109 */
-+ KEY_LEFTSHIFT, KEY_TAB, LOCOMO_KEY_FN, 0, 0, 0, 0, 0, 0, 0, /* 110 - 119 */
-+ KEY_M, KEY_SPACE, KEY_V, KEY_APOSTROPHE, KEY_SLASH, 0, 0, 0 /* 120 - 128 */
- };
-
- #define KB_ROWS 16
-@@ -68,7 +74,7 @@ locomokbd_keycode[LOCOMOKBD_NUMKEYS] = {
- #define SCANCODE(c,r) ( ((c)<<4) + (r) + 1 )
-
- #define KB_DELAY 8
--#define SCAN_INTERVAL (HZ/10)
-+#define SCAN_INTERVAL (HZ/20)
-
- struct locomokbd {
- unsigned char keycode[LOCOMOKBD_NUMKEYS];
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mfd/mcp-device.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mfd/mcp-device.patch
deleted file mode 100644
index a3523b0..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mfd/mcp-device.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From c297f9bcdf58ed5bc69095ac6ff7fc1088c377dc Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Mon, 15 Jul 2013 18:15:19 +0200
-Subject: [PATCH] mcp.h: add missing header
-
-Fix
-linux/include/linux/mfd/mcp.h:22:16: error: field 'attached_device' has incomplete type
-linux/include/linux/mfd/mcp.h:48:23: error: field 'drv' has incomplete type
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- include/linux/mfd/mcp.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/linux/mfd/mcp.h b/include/linux/mfd/mcp.h
-index a9e8bd1..f682953 100644
---- a/include/linux/mfd/mcp.h
-+++ b/include/linux/mfd/mcp.h
-@@ -10,6 +10,8 @@
- #ifndef MCP_H
- #define MCP_H
-
-+#include <linux/device.h>
-+
- struct mcp_ops;
-
- struct mcp {
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mfd/ucb1x00-device.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mfd/ucb1x00-device.patch
deleted file mode 100644
index 76c4d97..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mfd/ucb1x00-device.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f669a459cac00894ce4503c011103dbea5baabee Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Mon, 15 Jul 2013 18:16:57 +0200
-Subject: [PATCH] ucb1x00: explicitely include linux/device.h
-
-Fix
-linux/include/linux/mfd/ucb1x00.h:137:17: error: field 'dev' has incomplete type
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- include/linux/mfd/ucb1x00.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/linux/mfd/ucb1x00.h b/include/linux/mfd/ucb1x00.h
-index 28af417..88f90cb 100644
---- a/include/linux/mfd/ucb1x00.h
-+++ b/include/linux/mfd/ucb1x00.h
-@@ -10,6 +10,7 @@
- #ifndef UCB1200_H
- #define UCB1200_H
-
-+#include <linux/device.h>
- #include <linux/mfd/mcp.h>
- #include <linux/gpio.h>
- #include <linux/mutex.h>
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-LH28F640BF.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-LH28F640BF.patch
deleted file mode 100644
index ce3e1b9..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-LH28F640BF.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 4a141aadc97f6493d3af58238acb681c41ef496d Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Sat, 31 May 2014 00:23:51 +0200
-Subject: [PATCH] mtd: cfi_cmdset_0001.c: add support for Sharp LH28F640BF NOR
-
-This family of chips was long ago supported by the pre-cfi driver.
-CFI code tested on several Zaurus SL-5500 (Collie) 2x16 on 32 bit bus.
-
-Function is_LH28F640BF() mimics is_m29ew() from cmdset_0002.c
-
-Buffer write fixes as seen in 2007 patch c/o
-Anti Sullin <anti.sullin <at> artecdesign.ee>
-http://comments.gmane.org/gmane.linux.ports.arm.kernel/36733
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- drivers/mtd/chips/cfi_cmdset_0001.c | 43 +++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
-diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c
-index e4ec355..a7543ba 100644
---- a/drivers/mtd/chips/cfi_cmdset_0001.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
-@@ -52,6 +52,11 @@
- /* Atmel chips */
- #define AT49BV640D 0x02de
- #define AT49BV640DT 0x02db
-+/* Sharp chips */
-+#define LH28F640BFHE_PTTL90 0x00b0
-+#define LH28F640BFHE_PBTL90 0x00b1
-+#define LH28F640BFHE_PTTL70A 0x00b2
-+#define LH28F640BFHE_PBTL70A 0x00b3
-
- static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
- static int cfi_intelext_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-@@ -258,6 +263,36 @@ static void fixup_st_m28w320cb(struct mtd_info *mtd)
- (cfi->cfiq->EraseRegionInfo[1] & 0xffff0000) | 0x3e;
- };
-
-+static int is_LH28F640BF(struct cfi_private *cfi)
-+{
-+ /* Sharp LH28F640BF Family */
-+ if (cfi->mfr == CFI_MFR_SHARP && (
-+ cfi->id == LH28F640BFHE_PTTL90 || cfi->id == LH28F640BFHE_PBTL90 ||
-+ cfi->id == LH28F640BFHE_PTTL70A || cfi->id == LH28F640BFHE_PBTL70A))
-+ return 1;
-+ return 0;
-+}
-+
-+static void fixup_LH28F640BF(struct mtd_info *mtd)
-+{
-+ struct map_info *map = mtd->priv;
-+ struct cfi_private *cfi = map->fldrv_priv;
-+ struct cfi_pri_intelext *extp = cfi->cmdset_priv;
-+
-+ /* Reset the Partition Configuration Register on LH28F640BF
-+ * to a single partition (PCR = 0x000): PCR is embedded into A0-A15. */
-+ if (is_LH28F640BF(cfi)) {
-+ printk(KERN_INFO "Reset Partition Config. Register: 1 Partition of 4 planes\n");
-+ map_write(map, CMD(0x60), 0);
-+ map_write(map, CMD(0x04), 0);
-+
-+ /* We have set one single partition thus
-+ * Simultaneous Operations are not allowed */
-+ printk(KERN_INFO "cfi_cmdset_0001: Simultaneous Operations disabled\n");
-+ extp->FeatureSupport &= ~512;
-+ }
-+}
-+
- static void fixup_use_point(struct mtd_info *mtd)
- {
- struct map_info *map = mtd->priv;
-@@ -309,6 +344,8 @@ static struct cfi_fixup cfi_fixup_table[] = {
- { CFI_MFR_ST, 0x00ba, /* M28W320CT */ fixup_st_m28w320ct },
- { CFI_MFR_ST, 0x00bb, /* M28W320CB */ fixup_st_m28w320cb },
- { CFI_MFR_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock },
-+ { CFI_MFR_SHARP, CFI_ID_ANY, fixup_unlock_powerup_lock },
-+ { CFI_MFR_SHARP, CFI_ID_ANY, fixup_LH28F640BF },
- { 0, 0, NULL }
- };
-
-@@ -1649,6 +1686,12 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
- initial_adr = adr;
- cmd_adr = adr & ~(wbufsize-1);
-
-+ /* Sharp LH28F640BF chips need the first address for the
-+ * Page Buffer Program command. See Table 5 of
-+ * LH28F320BF, LH28F640BF, LH28F128BF Series (Appendix FUM00701) */
-+ if (is_LH28F640BF(cfi))
-+ cmd_adr = adr;
-+
- /* Let's determine this according to the interleave only once */
- write_cmd = (cfi->cfiq->P_ID != P_ID_INTEL_PERFORMANCE) ? CMD(0xe8) : CMD(0xe9);
-
---
-1.9.1
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-cfi-probe-again.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-cfi-probe-again.patch
deleted file mode 100644
index 3054106..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-cfi-probe-again.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 35957eda21bdd2f22c84fa269c1b856f5039c308 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Tue, 12 Nov 2013 22:32:26 +0100
-Subject: [PATCH] sa1100: collie: detect NOR again with cfi_probe
-
-Ehile the detection is still forced we switch away from jedec:
-the CFI code allows us to set the necessary fixups.
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- arch/arm/mach-sa1100/collie.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
-index 799902d..8c088cc 100644
---- a/arch/arm/mach-sa1100/collie.c
-+++ b/arch/arm/mach-sa1100/collie.c
-@@ -326,7 +326,7 @@ static void collie_flash_exit(void)
- }
-
- static struct flash_platform_data collie_flash_data = {
-- .map_name = "jedec_probe",
-+ .map_name = "cfi_probe",
- .init = collie_flash_init,
- .set_vpp = collie_set_vpp,
- .exit = collie_flash_exit,
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-eraseinfo.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-eraseinfo.patch
deleted file mode 100644
index 0a8ebac..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-eraseinfo.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1fc59077a0f5a1f338c94e9dc2ef356f821d2614 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Mon, 15 Jul 2013 01:18:19 +0200
-Subject: [PATCH] jedec_probe.c: fix LH28F640BF definition
-
-Zaurus 5500 contains 2 LH28F640BFHE-PTTL90 (64M 4Mx16) and
-the LH28F640BFHE-PTTL90.pdf datasheet available on the net shows
-the exact erasesize and the OTP support.
-At the moment only jedec_probe can discover the chip and
-the NOR is mounted read only probably because of wrong vpp.
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-
-Upstream-Status: Submitted
-http://lists.infradead.org/pipermail/linux-mtd/2013-February/045781.html
----
- drivers/mtd/chips/jedec_probe.c | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
-index c443f52..7c0b27d 100644
---- a/drivers/mtd/chips/jedec_probe.c
-+++ b/drivers/mtd/chips/jedec_probe.c
-@@ -120,7 +120,7 @@
- #define PM49FL008 0x006A
-
- /* Sharp */
--#define LH28F640BF 0x00b0
-+#define LH28F640BF 0x00B0
-
- /* ST - www.st.com */
- #define M29F800AB 0x0058
-@@ -1299,13 +1299,14 @@ static const struct amd_flash_info jedec_table[] = {
- .mfr_id = CFI_MFR_SHARP,
- .dev_id = LH28F640BF,
- .name = "LH28F640BF",
-- .devtypes = CFI_DEVICETYPE_X8,
-+ .devtypes = CFI_DEVICETYPE_X16,
- .uaddr = MTD_UADDR_UNNECESSARY,
-- .dev_size = SIZE_4MiB,
-- .cmd_set = P_ID_INTEL_STD,
-- .nr_regions = 1,
-+ .dev_size = SIZE_8MiB,
-+ .cmd_set = P_ID_INTEL_EXT,
-+ .nr_regions = 2,
- .regions = {
-- ERASEINFO(0x40000,16),
-+ ERASEINFO(0x10000, 127),
-+ ERASEINFO(0x02000, 8),
- }
- }, {
- .mfr_id = CFI_MFR_SST,
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-jedec-probe.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-jedec-probe.patch
deleted file mode 100644
index bae540a..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-jedec-probe.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3d3ca843f0c1e6c9cac64744343774e2f7718034 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Mon, 15 Jul 2013 01:18:25 +0200
-Subject: [PATCH] collie.c: fall back to jedec_probe flash detection
-
-Zaurus 5500 contains 2 LH28F640BFHE-PTTL90 (64M 4Mx16) and
-the LH28F640BFHE-PTTL90.pdf datasheet available on the net shows
-the exact erasesize and the OTP support.
-At the moment only jedec_probe can discover the chip and
-the NOR is mounted read only probably because of wrong vpp
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
-
-Upstream-Status: Submitted
-http://lists.infradead.org/pipermail/linux-mtd/2013-February/045781.html
----
- arch/arm/mach-sa1100/collie.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
-index 612a456..7fb96eb 100644
---- a/arch/arm/mach-sa1100/collie.c
-+++ b/arch/arm/mach-sa1100/collie.c
-@@ -289,7 +289,7 @@ static void collie_flash_exit(void)
- }
-
- static struct flash_platform_data collie_flash_data = {
-- .map_name = "cfi_probe",
-+ .map_name = "jedec_probe",
- .init = collie_flash_init,
- .set_vpp = collie_set_vpp,
- .exit = collie_flash_exit,
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch
deleted file mode 100644
index ba52d2f..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-mtd-resize.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 85f5a57b9bdd94fa7a20280c31f4f8b148368215 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Thu, 7 Nov 2013 23:00:31 +0100
-Subject: ARM: SA1100: resize collie mtd to SZ_16M
-
-The end-user models have all 2x8 = 16 Megabytes of NOR.
-It seems that only some dev models/prototype had 32M.
-With current code, giving size of 32M can confuse the detection.
-
-JEDEC:
-sa1100-0: Found 2 x16 devices at 0x0 in 32-bit bank
-sa1100-0: Found different chip or no chip at all (mfr 0x4, id 0x3001) at 0x1000000
-SA1100 flash: CFI device at 0x00000000, 16MiB, 32-bit
-
-CFI:
-sa1100-0: Found 2 x16 devices at 0x0 in 32-bit bank. Manufacturer ID 0x0000b0 Chip ID 0x0000b0
-sa1100-0: Found 2 x16 devices at 0x1000000 in 32-bit bank
-Intel/Sharp Extended Query Table at 0x0039
-...
-sa1100-0: 2 set(s) of 2 interleaved chips --> 2 partitions of 16384 KiB
-SA1100 flash: CFI device at 0x00000000, 32MiB, 32-bit
-
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- arch/arm/mach-sa1100/collie.c | 2 +-
- 2 files changed, 230404 insertions(+), 1604 deletions(-)
-
-diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
-index 7fb96eb..c1005ef 100644
---- a/arch/arm/mach-sa1100/collie.c
-+++ b/arch/arm/mach-sa1100/collie.c
-@@ -298,7 +298,7 @@ static struct flash_platform_data collie_flash_data = {
- };
-
- static struct resource collie_flash_resources[] = {
-- DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),
-+ DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_16M),
- };
-
- static struct sa1100fb_mach_info collie_lcd_info = {
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-power/collie_battery-dev-pm.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-power/collie_battery-dev-pm.patch
deleted file mode 100644
index 4792c32..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-power/collie_battery-dev-pm.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 94010e3700b65986c65960e2b7a0966773928347 Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Tue, 16 Jul 2013 17:33:39 +0200
-Subject: [PATCH] collie_battery.c: convert to use dev_pm_ops
-
-Fix
-linux/drivers/power/collie_battery.c:372:2: warning: initialization from
-incompatible pointer type [enabled by default]
-linux/drivers/power/collie_battery.c:372:2: warning: (near initialization
-for 'collie_bat_driver.suspend') [enabled by default]
-
-Referencess:
-MFD: ucb1x00-core: convert to use dev_pm_ops
-https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/mfd?id=5a09b7120a965a7d7e8494d0ed509135bbce0118
-
-MFD: mcp-core: remove legacy driver suspend/resume methods
-https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/commit/include/linux/mfd?id=cf4abfcc0df2985ff6061f74e63b8353f2a1d0bc
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- drivers/power/collie_battery.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/power/collie_battery.c b/drivers/power/collie_battery.c
-index c58d0e3..d02ae02 100644
---- a/drivers/power/collie_battery.c
-+++ b/drivers/power/collie_battery.c
-@@ -287,7 +287,7 @@ static struct gpio collie_batt_gpios[] = {
- };
-
- #ifdef CONFIG_PM
--static int collie_bat_suspend(struct ucb1x00_dev *dev, pm_message_t state)
-+static int collie_bat_suspend(struct ucb1x00_dev *dev)
- {
- /* flush all pending status updates */
- flush_work(&bat_work);
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-power/tosa_battery_irq_to_gpio.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-power/tosa_battery_irq_to_gpio.patch
deleted file mode 100644
index 9951d3a..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-power/tosa_battery_irq_to_gpio.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 59031299cbfba766f9197c46f5271b4cb4afb89d Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Wed, 17 Jul 2013 00:27:23 +0200
-Subject: [PATCH] tosa_battery.c: get rid of irq_to_gpio usage
-
-Fix
-linux/drivers/power/tosa_battery.c:153:2: error: implicit declaration of
-function 'irq_to_gpio' [-Werror=implicit-function-declaration]
-| pr_info("tosa_bat_gpio irq: %d\n",
-gpio_get_value(irq_to_gpio(irq)));
-
-as done for collie_battery.c with
-commit 629bcb4b72d49b3631ae3dd0fe1d345820fadfcc
-
-Since 9d08d5d77a355510c2f5657c86b0a4b25acfe72c, irq_to_gpio() is no
-longer available but still in use by collie_battery.c. As it's just
-for a debug message, just get rid of this call.
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- drivers/power/tosa_battery.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/power/tosa_battery.c b/drivers/power/tosa_battery.c
-index 0224de5..f4d80df 100644
---- a/drivers/power/tosa_battery.c
-+++ b/drivers/power/tosa_battery.c
-@@ -150,7 +150,7 @@ static void tosa_bat_external_power_changed(struct power_supply *psy)
-
- static irqreturn_t tosa_bat_gpio_isr(int irq, void *data)
- {
-- pr_info("tosa_bat_gpio irq: %d\n", gpio_get_value(irq_to_gpio(irq)));
-+ pr_info("tosa_bat_gpio irq\n");
- schedule_work(&bat_work);
- return IRQ_HANDLED;
- }
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-pxa/sharpsl_param.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-pxa/sharpsl_param.patch
deleted file mode 100644
index 934cdca..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-pxa/sharpsl_param.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a8ca187342e1db8bf2f770b0d95935d2cbf1cc3c Mon Sep 17 00:00:00 2001
-From: Marko Katic <dromede@gmail.com>
-Date: Mon, 15 Jul 2013 00:57:22 +0200
-Subject: [PATCH] sharpsl_param: fix invalid memory access in
- sharpsl_save_param()
-
-Unbreak kernel boot (tested with kexecboot)
-
-Patch was sent twice upstrream:
-http://lists.infradead.org/pipermail/linux-arm-kernel/2012-December/137284.html
-Devices that call sharpsl_save_param() will hang on boot due to
-a memcpy call that uses a physical address that is no longer * accessible. Fix
-his by converting the physical address into a virtual one.
-
-Signed-off-by: Marko Katic <dromede@gmail.com>
-
-Upstream-Status: Submitted
-https://patchwork.kernel.org/patch/1818681/
----
- arch/arm/common/sharpsl_param.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c
-index d56c932..b70b13a 100644
---- a/arch/arm/common/sharpsl_param.c
-+++ b/arch/arm/common/sharpsl_param.c
-@@ -14,6 +14,7 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/string.h>
-+#include <asm/memory.h>
- #include <asm/mach/sharpsl_param.h>
-
- /*
-@@ -41,7 +42,8 @@ EXPORT_SYMBOL(sharpsl_param);
-
- void sharpsl_save_param(void)
- {
-- memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info));
-+ void *param_start = phys_to_virt(PARAM_BASE);
-+ memcpy(&sharpsl_param, param_start, sizeof(struct sharpsl_param_info));
-
- if (sharpsl_param.comadj_keyword != COMADJ_MAGIC)
- sharpsl_param.comadj=-1;
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-pxa/tosa-keys-mapping.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-pxa/tosa-keys-mapping.patch
deleted file mode 100644
index b63754a..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-pxa/tosa-keys-mapping.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-From patchwork Sat Nov 16 12:47:50 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [RESEND] arm: pxa: tosa: fix keys mapping
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-X-Patchwork-Id: 3192431
-Message-Id: <20131116124750.GA26318@anuminas.rup.mentorg.com>
-To: linux-arm-kernel@lists.infradead.org
-Cc: Russell King <linux@arm.linux.org.uk>, Eric Miao <eric.y.miao@gmail.com>,
- Haojian Zhuang <haojian.zhuang@gmail.com>
-Date: Sat, 16 Nov 2013 16:47:50 +0400
-
-When converting from tosa-keyboard driver to matrix keyboard, tosa keys
-received extra 1 column shift. Replace that with correct values to make
-keyboard work again.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-
----
-arch/arm/mach-pxa/tosa.c | 102 +++++++++++++++++++++++------------------------
- 1 file changed, 51 insertions(+), 51 deletions(-)
-
-diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
-index 0206b91..ef5557b 100644
---- a/arch/arm/mach-pxa/tosa.c
-+++ b/arch/arm/mach-pxa/tosa.c
-@@ -425,57 +425,57 @@ static struct platform_device tosa_power_device = {
- * Tosa Keyboard
- */
- static const uint32_t tosakbd_keymap[] = {
-- KEY(0, 2, KEY_W),
-- KEY(0, 6, KEY_K),
-- KEY(0, 7, KEY_BACKSPACE),
-- KEY(0, 8, KEY_P),
-- KEY(1, 1, KEY_Q),
-- KEY(1, 2, KEY_E),
-- KEY(1, 3, KEY_T),
-- KEY(1, 4, KEY_Y),
-- KEY(1, 6, KEY_O),
-- KEY(1, 7, KEY_I),
-- KEY(1, 8, KEY_COMMA),
-- KEY(2, 1, KEY_A),
-- KEY(2, 2, KEY_D),
-- KEY(2, 3, KEY_G),
-- KEY(2, 4, KEY_U),
-- KEY(2, 6, KEY_L),
-- KEY(2, 7, KEY_ENTER),
-- KEY(2, 8, KEY_DOT),
-- KEY(3, 1, KEY_Z),
-- KEY(3, 2, KEY_C),
-- KEY(3, 3, KEY_V),
-- KEY(3, 4, KEY_J),
-- KEY(3, 5, TOSA_KEY_ADDRESSBOOK),
-- KEY(3, 6, TOSA_KEY_CANCEL),
-- KEY(3, 7, TOSA_KEY_CENTER),
-- KEY(3, 8, TOSA_KEY_OK),
-- KEY(3, 9, KEY_LEFTSHIFT),
-- KEY(4, 1, KEY_S),
-- KEY(4, 2, KEY_R),
-- KEY(4, 3, KEY_B),
-- KEY(4, 4, KEY_N),
-- KEY(4, 5, TOSA_KEY_CALENDAR),
-- KEY(4, 6, TOSA_KEY_HOMEPAGE),
-- KEY(4, 7, KEY_LEFTCTRL),
-- KEY(4, 8, TOSA_KEY_LIGHT),
-- KEY(4, 10, KEY_RIGHTSHIFT),
-- KEY(5, 1, KEY_TAB),
-- KEY(5, 2, KEY_SLASH),
-- KEY(5, 3, KEY_H),
-- KEY(5, 4, KEY_M),
-- KEY(5, 5, TOSA_KEY_MENU),
-- KEY(5, 7, KEY_UP),
-- KEY(5, 11, TOSA_KEY_FN),
-- KEY(6, 1, KEY_X),
-- KEY(6, 2, KEY_F),
-- KEY(6, 3, KEY_SPACE),
-- KEY(6, 4, KEY_APOSTROPHE),
-- KEY(6, 5, TOSA_KEY_MAIL),
-- KEY(6, 6, KEY_LEFT),
-- KEY(6, 7, KEY_DOWN),
-- KEY(6, 8, KEY_RIGHT),
-+ KEY(0, 1, KEY_W),
-+ KEY(0, 5, KEY_K),
-+ KEY(0, 6, KEY_BACKSPACE),
-+ KEY(0, 7, KEY_P),
-+ KEY(1, 0, KEY_Q),
-+ KEY(1, 1, KEY_E),
-+ KEY(1, 2, KEY_T),
-+ KEY(1, 3, KEY_Y),
-+ KEY(1, 5, KEY_O),
-+ KEY(1, 6, KEY_I),
-+ KEY(1, 7, KEY_COMMA),
-+ KEY(2, 0, KEY_A),
-+ KEY(2, 1, KEY_D),
-+ KEY(2, 2, KEY_G),
-+ KEY(2, 3, KEY_U),
-+ KEY(2, 5, KEY_L),
-+ KEY(2, 6, KEY_ENTER),
-+ KEY(2, 7, KEY_DOT),
-+ KEY(3, 0, KEY_Z),
-+ KEY(3, 1, KEY_C),
-+ KEY(3, 2, KEY_V),
-+ KEY(3, 3, KEY_J),
-+ KEY(3, 4, TOSA_KEY_ADDRESSBOOK),
-+ KEY(3, 5, TOSA_KEY_CANCEL),
-+ KEY(3, 6, TOSA_KEY_CENTER),
-+ KEY(3, 7, TOSA_KEY_OK),
-+ KEY(3, 8, KEY_LEFTSHIFT),
-+ KEY(4, 0, KEY_S),
-+ KEY(4, 1, KEY_R),
-+ KEY(4, 2, KEY_B),
-+ KEY(4, 3, KEY_N),
-+ KEY(4, 4, TOSA_KEY_CALENDAR),
-+ KEY(4, 5, TOSA_KEY_HOMEPAGE),
-+ KEY(4, 6, KEY_LEFTCTRL),
-+ KEY(4, 7, TOSA_KEY_LIGHT),
-+ KEY(4, 9, KEY_RIGHTSHIFT),
-+ KEY(5, 0, KEY_TAB),
-+ KEY(5, 1, KEY_SLASH),
-+ KEY(5, 2, KEY_H),
-+ KEY(5, 3, KEY_M),
-+ KEY(5, 4, TOSA_KEY_MENU),
-+ KEY(5, 6, KEY_UP),
-+ KEY(5, 10, TOSA_KEY_FN),
-+ KEY(6, 0, KEY_X),
-+ KEY(6, 1, KEY_F),
-+ KEY(6, 2, KEY_SPACE),
-+ KEY(6, 3, KEY_APOSTROPHE),
-+ KEY(6, 4, TOSA_KEY_MAIL),
-+ KEY(6, 5, KEY_LEFT),
-+ KEY(6, 6, KEY_DOWN),
-+ KEY(6, 7, KEY_RIGHT),
- };
-
- static struct matrix_keymap_data tosakbd_keymap_data = {
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch
deleted file mode 100644
index cf3e23b..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 6abd8c6c642b7f5da4a8065fa6b29c4c90df308d Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Mon, 11 Nov 2013 22:53:36 +0400
-Subject: [PATCH 1/2] arm: sa1100: add cpu clock
-
-Both SA1100 framebuffer and PCMCIA drivers require knowledge of cpu
-frequency to correctly program timings. Currently they receive timing
-information by calling cpufreq_get(0). However if cpu frequency driver
-is not enabled (e.g. due to unsupported DRAM chip/board on sa1110)
-cpufreq_get(0) returns 0, causing incorrect timings to be programmed.
-
-Add cpu clock returning cpu frequency, to be used by sa11x0 fb and
-pcmcia drivers.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- arch/arm/mach-sa1100/clock.c | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
-
-diff --git a/arch/arm/mach-sa1100/clock.c b/arch/arm/mach-sa1100/clock.c
-index 172ebd0..abf1dc1 100644
---- a/arch/arm/mach-sa1100/clock.c
-+++ b/arch/arm/mach-sa1100/clock.c
-@@ -15,10 +15,12 @@
- #include <linux/clkdev.h>
-
- #include <mach/hardware.h>
-+#include <mach/generic.h>
-
- struct clkops {
- void (*enable)(struct clk *);
- void (*disable)(struct clk *);
-+ unsigned long (*get_rate)(struct clk *);
- };
-
- struct clk {
-@@ -51,6 +53,19 @@ static void clk_gpio27_disable(struct clk *clk)
- GAFR &= ~GPIO_32_768kHz;
- }
-
-+static void clk_cpu_enable(struct clk *clk)
-+{
-+}
-+
-+static void clk_cpu_disable(struct clk *clk)
-+{
-+}
-+
-+static unsigned long clk_cpu_get_rate(struct clk *clk)
-+{
-+ return sa11x0_getspeed(0) * 1000;
-+}
-+
- int clk_enable(struct clk *clk)
- {
- unsigned long flags;
-@@ -80,16 +95,35 @@ void clk_disable(struct clk *clk)
- }
- EXPORT_SYMBOL(clk_disable);
-
-+unsigned long clk_get_rate(struct clk *clk)
-+{
-+ if (clk && clk->ops && clk->ops->get_rate)
-+ return clk->ops->get_rate(clk);
-+ else
-+ return 0;
-+}
-+EXPORT_SYMBOL(clk_get_rate);
-+
- const struct clkops clk_gpio27_ops = {
- .enable = clk_gpio27_enable,
- .disable = clk_gpio27_disable,
- };
-
-+const struct clkops clk_cpu_ops = {
-+ .enable = clk_cpu_enable,
-+ .disable = clk_cpu_disable,
-+ .get_rate = clk_cpu_get_rate,
-+};
-+
- static DEFINE_CLK(gpio27, &clk_gpio27_ops);
-
-+static DEFINE_CLK(cpu, &clk_cpu_ops);
-+
- static struct clk_lookup sa11xx_clkregs[] = {
- CLKDEV_INIT("sa1111.0", NULL, &clk_gpio27),
- CLKDEV_INIT("sa1100-rtc", NULL, NULL),
-+ CLKDEV_INIT("sa11x0-fb", NULL, &clk_cpu),
-+ CLKDEV_INIT("sa11x0-pcmcia", NULL, &clk_cpu),
- };
-
- static int __init sa11xx_clk_init(void)
---
-1.8.4.2
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/collie-add-bootblock.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/collie-add-bootblock.patch
deleted file mode 100644
index 9f5aaa7..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/collie-add-bootblock.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0b6559d7a3e28c89c3093fd193076a5d7d7c699b Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Sat, 9 Nov 2013 16:30:01 +0100
-Subject: [PATCH] linux-yocto: collie: add top boot partition
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- arch/arm/mach-sa1100/collie.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
-index 946fa71..2785e6e 100644
---- a/arch/arm/mach-sa1100/collie.c
-+++ b/arch/arm/mach-sa1100/collie.c
-@@ -294,6 +294,11 @@ static struct mtd_partition collie_partitions[] = {
- .name = "rootfs",
- .offset = MTDPART_OFS_APPEND,
- .size = 0x00e20000,
-+ }, {
-+ .name = "bootblock",
-+ .offset = MTDPART_OFS_APPEND,
-+ .size = 0x00020000,
-+ .mask_flags = MTD_WRITEABLE
- }
- };
-
---
-1.8.1.5
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/collie-irda.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/collie-irda.patch
deleted file mode 100644
index 46ad808..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/collie-irda.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From c6fb61edf283f255c3763a57366bb89bb36ad79c Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Fri, 8 Nov 2013 17:57:32 +0400
-Subject: [PATCH] collie: add support for IrDA transceiver
-
-Collie has onboard IrDA transceiver controlled via active-low gpio. Add
-corresponding platform data.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- arch/arm/mach-sa1100/collie.c | 33 ++++++++++++++++++++++++++++++
- arch/arm/mach-sa1100/include/mach/collie.h | 2 +-
- 2 files changed, 34 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
-index 2349dee..1b9473d 100644
---- a/arch/arm/mach-sa1100/collie.c
-+++ b/arch/arm/mach-sa1100/collie.c
-@@ -41,6 +41,7 @@
- #include <asm/mach/arch.h>
- #include <asm/mach/flash.h>
- #include <asm/mach/map.h>
-+#include <asm/mach/irda.h>
-
- #include <asm/hardware/scoop.h>
- #include <asm/mach/sharpsl_param.h>
-@@ -94,6 +95,37 @@ static struct mcp_plat_data collie_mcp_data = {
- .codec_pdata = &collie_ucb1x00_data,
- };
-
-+int collie_ir_startup(struct device *dev)
-+{
-+ int rc = gpio_request(COLLIE_GPIO_IR_ON, "IrDA");
-+ if (rc)
-+ return rc;
-+ rc = gpio_direction_output(COLLIE_GPIO_IR_ON, 1);
-+
-+ if (!rc)
-+ return 0;
-+
-+ gpio_free(COLLIE_GPIO_IR_ON);
-+ return rc;
-+}
-+
-+void collie_ir_shutdown(struct device *dev)
-+{
-+ gpio_free(COLLIE_GPIO_IR_ON);
-+}
-+
-+static int collie_ir_set_power(struct device *dev, unsigned int state)
-+{
-+ gpio_set_value(COLLIE_GPIO_IR_ON, !state);
-+ return 0;
-+}
-+
-+static struct irda_platform_data collie_ir_data = {
-+ .startup = collie_ir_startup,
-+ .shutdown = collie_ir_shutdown,
-+ .set_power = collie_ir_set_power,
-+};
-+
- /*
- * Collie AC IN
- */
-@@ -323,6 +355,7 @@ static void __init collie_init(void)
- sa11x0_register_mtd(&collie_flash_data, collie_flash_resources,
- ARRAY_SIZE(collie_flash_resources));
- sa11x0_register_mcp(&collie_mcp_data);
-+ sa11x0_register_irda(&collie_ir_data);
-
- sharpsl_save_param();
- }
-diff --git a/arch/arm/mach-sa1100/include/mach/collie.h b/arch/arm/mach-sa1100/include/mach/collie.h
-index f33679d..0ef22f9 100644
---- a/arch/arm/mach-sa1100/include/mach/collie.h
-+++ b/arch/arm/mach-sa1100/include/mach/collie.h
-@@ -78,7 +78,7 @@ extern void locomolcd_power(int on);
- #define COLLIE_TC35143_GPIO_VERSION0 UCB_IO_0
- #define COLLIE_TC35143_GPIO_TBL_CHK UCB_IO_1
- #define COLLIE_TC35143_GPIO_VPEN_ON UCB_IO_2
--#define COLLIE_TC35143_GPIO_IR_ON UCB_IO_3
-+#define COLLIE_GPIO_IR_ON (COLLIE_TC35143_GPIO_BASE + 3)
- #define COLLIE_TC35143_GPIO_AMP_ON UCB_IO_4
- #define COLLIE_TC35143_GPIO_VERSION1 UCB_IO_5
- #define COLLIE_TC35143_GPIO_FS8KLPF UCB_IO_5
---
-1.8.4.rc3
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch
deleted file mode 100644
index 7460692..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 14edf9123f62bbfbfbffe38e2837b51b3a6065b5 Mon Sep 17 00:00:00 2001
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-Date: Mon, 11 Nov 2013 22:58:02 +0400
-Subject: [PATCH 2/2] fbdev: sa1100fb: make use of device clock
-
-Use per-device clock (instead of calling cpufreq_get(0), which can
-return 0 if no cpu frequency driver is selected) to program timings.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
----
- drivers/video/sa1100fb.c | 24 +++++++++++++++++-------
- drivers/video/sa1100fb.h | 1 +
- 2 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
-index de76da0..13d2c99 100644
---- a/drivers/video/sa1100fb.c
-+++ b/drivers/video/sa1100fb.c
-@@ -178,6 +178,7 @@
- #include <linux/dma-mapping.h>
- #include <linux/mutex.h>
- #include <linux/io.h>
-+#include <linux/clk.h>
-
- #include <video/sa1100fb.h>
-
-@@ -413,9 +414,9 @@ sa1100fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
- var->transp.offset);
-
- #ifdef CONFIG_CPU_FREQ
-- dev_dbg(fbi->dev, "dma period = %d ps, clock = %d kHz\n",
-+ dev_dbg(fbi->dev, "dma period = %d ps, clock = %ld kHz\n",
- sa1100fb_display_dma_period(var),
-- cpufreq_get(smp_processor_id()));
-+ clk_get_rate(fbi->clk)/1000);
- #endif
-
- return 0;
-@@ -586,9 +587,10 @@ static struct fb_ops sa1100fb_ops = {
- * Calculate the PCD value from the clock rate (in picoseconds).
- * We take account of the PPCR clock setting.
- */
--static inline unsigned int get_pcd(unsigned int pixclock, unsigned int cpuclock)
-+static inline unsigned int get_pcd(struct sa1100fb_info *fbi,
-+ unsigned int pixclock)
- {
-- unsigned int pcd = cpuclock / 100;
-+ unsigned int pcd = clk_get_rate(fbi->clk)/ 100 / 1000;
-
- pcd *= pixclock;
- pcd /= 10000000;
-@@ -667,7 +669,7 @@ static int sa1100fb_activate_var(struct fb_var_screeninfo *var, struct sa1100fb_
- LCCR2_BegFrmDel(var->upper_margin) +
- LCCR2_EndFrmDel(var->lower_margin);
-
-- pcd = get_pcd(var->pixclock, cpufreq_get(0));
-+ pcd = get_pcd(fbi, var->pixclock);
- new_regs.lccr3 = LCCR3_PixClkDiv(pcd) | fbi->inf->lccr3 |
- (var->sync & FB_SYNC_HOR_HIGH_ACT ? LCCR3_HorSnchH : LCCR3_HorSnchL) |
- (var->sync & FB_SYNC_VERT_HIGH_ACT ? LCCR3_VrtSnchH : LCCR3_VrtSnchL);
-@@ -1003,7 +1005,6 @@ sa1100fb_freq_transition(struct notifier_block *nb, unsigned long val,
- void *data)
- {
- struct sa1100fb_info *fbi = TO_INF(nb, freq_transition);
-- struct cpufreq_freqs *f = data;
- u_int pcd;
-
- switch (val) {
-@@ -1012,7 +1013,7 @@ sa1100fb_freq_transition(struct notifier_block *nb, unsigned long val,
- break;
-
- case CPUFREQ_POSTCHANGE:
-- pcd = get_pcd(fbi->fb.var.pixclock, f->new);
-+ pcd = get_pcd(fbi, fbi->fb.var.pixclock);
- fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd);
- set_ctrlr_state(fbi, C_ENABLE_CLKCHANGE);
- break;
-@@ -1219,6 +1220,13 @@ static int sa1100fb_probe(struct platform_device *pdev)
- if (!fbi)
- goto failed;
-
-+ fbi->clk = clk_get(&pdev->dev, NULL);
-+ if (IS_ERR(fbi->clk)) {
-+ ret = PTR_ERR(fbi->clk);
-+ fbi->clk = NULL;
-+ goto failed;
-+ }
-+
- fbi->base = ioremap(res->start, resource_size(res));
- if (!fbi->base)
- goto failed;
-@@ -1271,6 +1279,8 @@ static int sa1100fb_probe(struct platform_device *pdev)
- failed:
- if (fbi)
- iounmap(fbi->base);
-+ if (fbi->clk)
-+ clk_put(fbi->clk);
- platform_set_drvdata(pdev, NULL);
- kfree(fbi);
- release_mem_region(res->start, resource_size(res));
-diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h
-index fc5d429..0139d13 100644
---- a/drivers/video/sa1100fb.h
-+++ b/drivers/video/sa1100fb.h
-@@ -68,6 +68,7 @@ struct sa1100fb_info {
- #endif
-
- const struct sa1100fb_mach_info *inf;
-+ struct clk *clk;
- };
-
- #define TO_INF(ptr,member) container_of(ptr,struct sa1100fb_info,member)
---
-1.8.4.2
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/pcmcia-sa1100-device-clock.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/pcmcia-sa1100-device-clock.patch
deleted file mode 100644
index 1d12fc8..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-sa1100/pcmcia-sa1100-device-clock.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From patchwork Tue Nov 12 03:32:10 2013
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [3/5] pcmcia: sa1100: make use of device clock
-From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-X-Patchwork-Id: 3170611
-Message-Id: <1384227132-10501-3-git-send-email-dbaryshkov@gmail.com>
-To: linux-arm-kernel@lists.infradead.org
-Cc: linux-fbdev@vger.kernel.org, linux-pcmcia@lists.infradead.org,
- Russell King <linux@arm.linux.org.uk>
-Date: Tue, 12 Nov 2013 07:32:10 +0400
-
-Use per-device clock (instead of calling cpufreq_get(0), which can
-return 0 if no cpu frequency driver is selected) to program timings.
-
-Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-
----
-drivers/pcmcia/sa1100_generic.c | 1 +
- drivers/pcmcia/sa11xx_base.c | 14 ++++++++++++--
- 2 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c
-index ff8a027..d2ab060 100644
---- a/drivers/pcmcia/sa1100_generic.c
-+++ b/drivers/pcmcia/sa1100_generic.c
-@@ -93,6 +93,7 @@ static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
- for (i = 0; i < sinfo->nskt; i++)
- soc_pcmcia_remove_one(&sinfo->skt[i]);
-
-+ clk_put(sinfo->clk);
- kfree(sinfo);
- return 0;
- }
-diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
-index 6eecd7c..aef0e69 100644
---- a/drivers/pcmcia/sa11xx_base.c
-+++ b/drivers/pcmcia/sa11xx_base.c
-@@ -38,6 +38,7 @@
- #include <linux/spinlock.h>
- #include <linux/io.h>
- #include <linux/slab.h>
-+#include <linux/clk.h>
-
- #include <mach/hardware.h>
- #include <asm/irq.h>
-@@ -138,14 +139,15 @@ sa1100_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
- static int
- sa1100_pcmcia_set_timing(struct soc_pcmcia_socket *skt)
- {
-- return sa1100_pcmcia_set_mecr(skt, cpufreq_get(0));
-+ unsigned long clk = clk_get_rate(skt->clk);
-+ return sa1100_pcmcia_set_mecr(skt, clk / 1000);
- }
-
- static int
- sa1100_pcmcia_show_timing(struct soc_pcmcia_socket *skt, char *buf)
- {
- struct soc_pcmcia_timing timing;
-- unsigned int clock = cpufreq_get(0);
-+ unsigned int clock = clk_get_rate(skt->clk);
- unsigned long mecr = MECR;
- char *p = buf;
-
-@@ -221,6 +223,11 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
- struct skt_dev_info *sinfo;
- struct soc_pcmcia_socket *skt;
- int i, ret = 0;
-+ struct clk *clk;
-+
-+ clk = clk_get(dev, NULL);
-+ if (IS_ERR(clk))
-+ return -ENODEV;
-
- sa11xx_drv_pcmcia_ops(ops);
-
-@@ -229,12 +236,14 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
- return -ENOMEM;
-
- sinfo->nskt = nr;
-+ sinfo->clk = clk;
-
- /* Initialize processor specific parameters */
- for (i = 0; i < nr; i++) {
- skt = &sinfo->skt[i];
-
- skt->nr = first + i;
-+ skt->clk = clk;
- soc_pcmcia_init_one(skt, ops, dev);
-
- ret = sa11xx_drv_pcmcia_add_one(skt);
-@@ -245,6 +254,7 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
- if (ret) {
- while (--i >= 0)
- soc_pcmcia_remove_one(&sinfo->skt[i]);
-+ clk_put(clk);
- kfree(sinfo);
- } else {
- dev_set_drvdata(dev, sinfo);
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/revert-check-on-console-device.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/revert-check-on-console-device.patch
deleted file mode 100644
index b8b699d..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/revert-check-on-console-device.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2f55386ae2eccfa8628dd2ca26d8f33acc72cd7c Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Fri, 20 Apr 2012 00:28:21 +0200
-Subject: [PATCH 41/41] main.c: revert check on console device
-
-* we can have empty /dev,
-* in case of initramfs devtmpfs must be mounted by hand
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- init/main.c | 7 -------
- 1 files changed, 0 insertions(+), 7 deletions(-)
-
-diff --git a/init/main.c b/init/main.c
-index cb9d3dc..217ed23 100644
---- a/init/main.c
-+++ b/init/main.c
-@@ -794,7 +794,6 @@ static noinline int init_post(void)
-
- static int __init kernel_init(void * unused)
- {
-- struct stat console_stat;
- /*
- * Wait until kthreadd is all set-up.
- */
-@@ -820,12 +819,6 @@ static int __init kernel_init(void * unused)
-
- do_basic_setup();
-
-- /* Use /dev/console to infer if the rootfs is setup properly */
-- if (sys_newlstat((char __user *) "/dev/console", (struct stat __user *) &console_stat)
-- || !S_ISCHR(console_stat.st_mode)) {
-- panic("/dev/console is missing or not a character device!\nPlease ensure your rootfs is properly configured\n");
-- }
--
- /* Open the /dev/console on the rootfs, this should never fail */
- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
- printk(KERN_WARNING "Warning: unable to open an initial console.\n");
---
-1.7.3.4
-
diff --git a/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle-standard.scc b/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle-standard.scc
deleted file mode 100644
index 31ad9df..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle-standard.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE poodle
-define KTYPE standard
-define KARCH arm
-
-include ktypes/standard/standard.scc
-
-include poodle.scc
diff --git a/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle.cfg b/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle.cfg
deleted file mode 100644
index 8ae5c8e..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle.cfg
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Processor Features
-#
-CONFIG_SHARP_LOCOMO=y
-
-#
-# End-user Products (sorted by vendor name)
-#
-CONFIG_MACH_POODLE=y
-CONFIG_PXA25x=y
-
-#
-# Boot options
-#
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_NAND_SHARPSL=y
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_LOCOMO=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_PXA=y
-CONFIG_BACKLIGHT_LOCOMO=y
-
-#
-# Console display driver support
-#
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONT_8x8=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_LOCOMO=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_PXA25X=m
-CONFIG_SND_PXA2XX_SOC_I2S=m
-CONFIG_SND_PXA2XX_SOC_POODLE=m
-CONFIG_SND_SOC_WM8731=m
diff --git a/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle.scc b/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle.scc
deleted file mode 100644
index 39015f2..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/poodle/poodle.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-kconf hardware poodle.cfg
-
-include ../zaurus-pxa-only.scc
-include ../zaurus-common.scc
-
-patch ../patches/patches-locomokbd/locomo_kbd_tweak-r2.patch
-patch ../patches/patches-pxa/sharpsl_param.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/shrink_kernel.cfg b/recipes-kernel/linux/linux-yocto-3.10/shrink_kernel.cfg
deleted file mode 100644
index e784c03..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/shrink_kernel.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-# CONFIG_MD is not set
-
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_FUJITSU is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MICROCHIP is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_XIRCOM is not set
-
-# CONFIG_FTRACE is not set
-# CONFIG_BRANCH_PROFILE_NONE is not set
-# CONFIG_BINARY_PRINTF is not set
-
-# CONFIG_KPROBES is not set
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_KGDB is not set
diff --git a/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz-standard.scc b/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz-standard.scc
deleted file mode 100644
index 5b8e2c3..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz-standard.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE spitz
-define KTYPE standard
-define KARCH arm
-
-include ktypes/standard/standard.scc
-
-include spitz.scc
diff --git a/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz.cfg b/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz.cfg
deleted file mode 100644
index 85d5f0f..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz.cfg
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Processor Features
-#
-CONFIG_IWMMXT=y
-
-#
-# End-user Products (sorted by vendor name)
-#
-CONFIG_MACH_AKITA=y
-CONFIG_MACH_SPITZ=y
-CONFIG_MACH_BORZOI=y
-CONFIG_PXA27x=y
-CONFIG_PXA_SHARP_Cxx00=y
-CONFIG_SHARPSL_PM=y
-CONFIG_SHARPSL_PM_MAX1111=y
-
-#
-# Boot options
-#
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 fbcon=rotate:1 loglevel=3"
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_NAND_SHARPSL=y
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_MATRIX=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_PXA=y
-CONFIG_FB_PXA_OVERLAY=y
-CONFIG_FB_PXA_SMARTPANEL=y
-CONFIG_FB_PXA_PARAMETERS=y
-CONFIG_LCD_CORGI=y
-CONFIG_BACKLIGHT_GENERIC=y
-
-#
-# Console display driver support
-#
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONT_8x16=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_PXA27X=m
-CONFIG_SND_PXA2XX_SOC_I2S=m
-CONFIG_SND_PXA2XX_SOC_SPITZ=m
-CONFIG_SND_SOC_WM8750=m
diff --git a/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz.scc b/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz.scc
deleted file mode 100644
index ba4c7b5..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/spitz/spitz.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-kconf hardware spitz.cfg
-
-include ../zaurus-pxa-only.scc
-include ../zaurus-common.scc
-include ../zaurus-usb-host.scc
-
-patch ../patches/patches-pxa/sharpsl_param.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa-standard.scc b/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa-standard.scc
deleted file mode 100644
index b2e1324..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa-standard.scc
+++ /dev/null
@@ -1,7 +0,0 @@
-define KMACHINE tosa
-define KTYPE standard
-define KARCH arm
-
-include ktypes/standard/standard.scc
-
-include tosa.scc
diff --git a/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa.cfg b/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa.cfg
deleted file mode 100644
index 77aedfe..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa.cfg
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-# End-user Products (sorted by vendor name)
-#
-CONFIG_MACH_TOSA=y
-CONFIG_TOSA_BT=m
-CONFIG_PXA25x=y
-
-#
-# Boot options
-#
-CONFIG_CMDLINE="console=ttyS0,115200n8 console=tty1 loglevel=3"
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=y
-CONFIG_MFD_TMIO=y
-CONFIG_MFD_TC6393XB=y
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_NAND_TMIO=y
-
-#
-# Input Device Drivers
-#
-CONFIG_KEYBOARD_MATRIX=y
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_TMIO=y
-CONFIG_FB_TMIO_ACCELL=y
-CONFIG_LCD_TOSA=y
-CONFIG_BACKLIGHT_GENERIC=y
-CONFIG_BACKLIGHT_TOSA=y
-
-#
-# Console display driver support
-#
-CONFIG_FONT_8x16=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_PXA25X=m
-CONFIG_SND_PXA2XX_SOC_AC97=m
-CONFIG_SND_PXA2XX_SOC_TOSA=m
-CONFIG_SND_SOC_WM9712=m
-CONFIG_SND_SOC_AC97_BUS=y
-
-# USB GPIO expanders:
-#
-CONFIG_BATTERY_TOSA=m
diff --git a/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa.scc b/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa.scc
deleted file mode 100644
index a184b0f..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/tosa/tosa.scc
+++ /dev/null
@@ -1,9 +0,0 @@
-kconf hardware tosa.cfg
-
-include ../zaurus-pxa-only.scc
-include ../zaurus-common.scc
-include ../zaurus-usb-host.scc
-
-patch ../patches/patches-pxa/sharpsl_param.patch
-patch ../patches/patches-power/tosa_battery_irq_to_gpio.patch
-patch ../patches/patches-pxa/tosa-keys-mapping.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-common.scc b/recipes-kernel/linux/linux-yocto-3.10/zaurus-common.scc
deleted file mode 100644
index 975446d..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-common.scc
+++ /dev/null
@@ -1,14 +0,0 @@
-kconf hardware zaurus-hardware.cfg
-kconf non-hardware zaurus-non-hardware.cfg
-
-include cfg/fs/flash_fs.scc
-include cfg/fs/vfat.scc
-include cfg/8250.scc
-include cfg/sound.scc
-
-include features/vfat/vfat.scc
-include features/scsi/disk.scc
-include features/hostapd/hostapd.scc
-include features/mac80211/mac80211.scc
-
-kconf hardware shrink_kernel.cfg
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg b/recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg
deleted file mode 100644
index 903b810..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-hardware.cfg
+++ /dev/null
@@ -1,276 +0,0 @@
-CONFIG_ARM=y
-CONFIG_SYS_SUPPORTS_APM_EMULATION=y
-CONFIG_HAVE_PROC_CPU=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_ARCH_HAS_CPUFREQ=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_ARCH_MTD_XIP=y
-CONFIG_VECTORS_BASE=0xffff0000
-CONFIG_ARM_PATCH_PHYS_VIRT=y
-CONFIG_GENERIC_BUG=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_HAVE_OPROFILE=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-
-#
-# System Type
-#
-CONFIG_MMU=y
-
-
-#
-# Processor Features
-#
-CONFIG_ARM_L1_CACHE_SHIFT=5
-CONFIG_ARM_NR_BANKS=8
-CONFIG_SHARP_PARAM=y
-CONFIG_SHARP_SCOOP=y
-
-#
-# Power management options
-#
-CONFIG_SUSPEND=y
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_PM_SLEEP=y
-CONFIG_PM_RUNTIME=y
-CONFIG_PM=y
-CONFIG_APM_EMULATION=y
-CONFIG_PM_CLK=y
-CONFIG_CPU_PM=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARM_CPU_SUSPEND=y
-
-#
-# Generic Driver Options
-#
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_BLKDEVS=y
-CONFIG_MTD_BLOCK=y
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_ROM=y
-
-#
-# Mapping drivers for chip access
-#
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-
-#
-# Disk-On-Chip Device Drivers
-#
-CONFIG_MTD_NAND_ECC=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_IDS=y
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_APMPOWER=y
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_DEVKMEM=y
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=m
-CONFIG_SERIAL_8250_CS=m
-
-#
-# Non-8250 serial port support
-#
-CONFIG_HW_RANDOM=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_HELPER_AUTO=y
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_SPI=y
-CONFIG_SPI_MASTER=y
-
-#
-# Enable Device Drivers -> PPS to see the PTP clock options.
-#
-CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
-
-#
-# MODULbus GPIO expanders:
-#
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-CONFIG_HWMON=y
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_MAX1111=y
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Graphics support
-#
-CONFIG_FB=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-
-#
-# Console display driver support
-#
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-CONFIG_SND_DRIVERS=y
-CONFIG_SND_ARM=y
-CONFIG_SND_SPI=y
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-CONFIG_HID=m
-
-#
-# Special HID drivers
-#
-CONFIG_USB_ARCH_HAS_HCD=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_OTG_WHITELIST=y
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_GADGET_DEBUG_FS=y
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-CONFIG_USB_ZERO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_ETH_EEM=y
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_MASS_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_RNDIS=y
-CONFIG_USB_G_MULTI_CDC=y
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-
-#
-# LED drivers
-#
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-
-#
-# on-CPU RTC drivers
-#
-CONFIG_RTC_DRV_SA1100=y
-
-#
-# Kernel hacking
-#
-CONFIG_ARM_UNWIND=y
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-non-hardware.cfg b/recipes-kernel/linux/linux-yocto-3.10/zaurus-non-hardware.cfg
deleted file mode 100644
index 0dd4da9..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-non-hardware.cfg
+++ /dev/null
@@ -1,396 +0,0 @@
-#CONFIG_NETFILTER is not set
-
-CONFIG_HARDIRQS_SW_RESEND=y
-CONFIG_GENERIC_IRQ_PROBE=y
-#
-# General setup
-#
-CONFIG_KTIME_SCALAR=y
-
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_IRQ_WORK=y
-
-#
-# General setup
-#
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_CROSS_COMPILE=""
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_LZMA=y
-CONFIG_HAVE_KERNEL_LZO=y
-CONFIG_KERNEL_LZMA=y
-CONFIG_DEFAULT_HOSTNAME="(none)"
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_HAVE_GENERIC_HARDIRQS=y
-
-#
-# IRQ subsystem
-#
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_IRQ_SHOW=y
-CONFIG_SPARSE_IRQ=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TINY_RCU=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-CONFIG_RD_XZ=y
-CONFIG_RD_LZO=y
-CONFIG_ANON_INODES=y
-CONFIG_EXPERT=y
-CONFIG_UID16=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_AIO=y
-CONFIG_HAVE_PERF_EVENTS=y
-CONFIG_PERF_USE_VMALLOC=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_COMPAT_BRK=y
-CONFIG_SLAB=y
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_BLK_DEV_BSG=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-
-#
-# IO Schedulers
-#
-CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
-CONFIG_INLINE_READ_UNLOCK=y
-CONFIG_INLINE_READ_UNLOCK_IRQ=y
-CONFIG_INLINE_WRITE_UNLOCK=y
-CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
-
-#
-# Bus support
-#
-CONFIG_PCCARD=y
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-
-#
-# PC-card bridges
-#
-CONFIG_PCMCIA_SOC_COMMON=y
-
-#
-# Kernel Features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_VMSPLIT_3G=y
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HZ=100
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_HAVE_MEMBLOCK=y
-CONFIG_SPLIT_PTLOCK_CPUS=999999
-CONFIG_ZONE_DMA_FLAG=0
-CONFIG_VIRT_TO_BUS=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_NEED_PER_CPU_KM=y
-CONFIG_FORCE_MAX_ZONEORDER=11
-CONFIG_ALIGNMENT_TRAP=y
-
-#
-# Boot options
-#
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE_FROM_BOOTLOADER=y
-CONFIG_KEXEC=y
-CONFIG_ATAGS_PROC=y
-
-#
-# Network testing
-#
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-
-#
-# FIR device drivers
-#
-CONFIG_BT=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_WIRELESS=y
-CONFIG_WEXT_CORE=y
-CONFIG_WEXT_PROC=y
-CONFIG_WEXT_SPY=y
-CONFIG_WEXT_PRIV=y
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-CONFIG_REGMAP=y
-CONFIG_REGMAP_I2C=m
-CONFIG_REGMAP_SPI=m
-
-#
-# LPDDR flash memory drivers
-#
-CONFIG_BLK_DEV=y
-
-#
-# Altera FPGA firmware download module
-#
-CONFIG_HAVE_IDE=y
-
-#
-# SCSI device support
-#
-CONFIG_SCSI_MOD=y
-CONFIG_SCSI_DMA=y
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ATA=y
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
-
-#
-# Controllers with non-SFF native interface
-#
-CONFIG_ATA_SFF=y
-
-#
-# SFF controllers with custom DMA interface
-#
-CONFIG_ATA_BMDMA=y
-
-#
-# PIO-only SFF controllers
-#
-CONFIG_PATA_PCMCIA=y
-
-#
-# CAIF transport drivers
-#
-CONFIG_ETHERNET=y
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_NET_VENDOR_AMD=y
-CONFIG_NET_VENDOR_BROADCOM=y
-CONFIG_NET_VENDOR_CHELSIO=y
-CONFIG_NET_VENDOR_CIRRUS=y
-CONFIG_NET_VENDOR_FARADAY=y
-CONFIG_NET_VENDOR_FUJITSU=y
-CONFIG_NET_VENDOR_INTEL=y
-CONFIG_NET_VENDOR_I825XX=y
-CONFIG_NET_VENDOR_MARVELL=y
-CONFIG_NET_VENDOR_MICREL=y
-CONFIG_NET_VENDOR_MICROCHIP=y
-CONFIG_NET_VENDOR_NATSEMI=y
-CONFIG_NET_VENDOR_8390=y
-CONFIG_PCMCIA_PCNET=m
-CONFIG_NET_VENDOR_SEEQ=y
-CONFIG_NET_VENDOR_SMSC=y
-CONFIG_NET_VENDOR_STMICRO=y
-CONFIG_NET_VENDOR_XIRCOM=y
-CONFIG_SLHC=m
-
-#
-# USB Network Adapters
-#
-CONFIG_AIRO_CS=m
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_CS=m
-
-#
-# Character devices
-#
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE_SLEEP=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_BCMA_POSSIBLE=y
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_USB_ULPI=y
-CONFIG_NOP_USB_XCEIV=m
-#
-CONFIG_MMC=y
-CONFIG_MMC_UNSAFE_RESUME=y
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=y
-CONFIG_MMC_BLOCK_MINORS=8
-CONFIG_MMC_BLOCK_BOUNCE=y
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SPI=y
-
-#
-# Hardware Spinlock drivers
-#
-CONFIG_CLKSRC_MMIO=y
-CONFIG_IOMMU_SUPPORT=y
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_EXT4_FS=y
-CONFIG_JBD=y
-CONFIG_JBD2=y
-CONFIG_EXPORTFS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_GENERIC_ACL=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
-CONFIG_MISC_FILESYSTEMS=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-CONFIG_JFFS2_CMODE_PRIORITY=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_UBIFS_FS_LZO=y
-CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_DEF_FILE_IO_SIZE=4096
-CONFIG_NFS_USE_KERNEL_DNS=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V4=y
-CONFIG_NFS_COMMON=y
-CONFIG_NLS=y
-
-#
-# Kernel hacking
-#
-CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
-CONFIG_ENABLE_WARN_DEPRECATED=y
-CONFIG_ENABLE_MUST_CHECK=y
-CONFIG_FRAME_WARN=1024
-
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_C_RECORDMCOUNT=y
-CONFIG_RING_BUFFER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_BRANCH_PROFILE_NONE=y
-CONFIG_HAVE_ARCH_KGDB=y
-
-#
-# Security options
-#
-CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_CRC_CCITT=y
-CONFIG_CRC16=y
-CONFIG_CRC_ITU_T=y
-CONFIG_CRC32=y
-CONFIG_CRC7=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_LZO_COMPRESS=y
-CONFIG_LZO_DECOMPRESS=y
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_DECOMPRESS_LZO=y
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_NLATTR=y
-CONFIG_GENERIC_ATOMIC64=y
-CONFIG_AVERAGE=y
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-common-non-hw.cfg b/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-common-non-hw.cfg
deleted file mode 100644
index 75c3626..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-common-non-hw.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# Microsoft Hyper-V guest support
-#
-CONFIG_CLKDEV_LOOKUP=y
-
-#
-# End-user Products (sorted by vendor name)
-#
-CONFIG_PXA_SSP=y
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-common.cfg b/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-common.cfg
deleted file mode 100644
index 538e19c..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-common.cfg
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# System Type
-#
-CONFIG_ARCH_PXA=y
-
-#
-# End-user Products (sorted by vendor name)
-#
-CONFIG_PXA_SHARPSL=y
-
-#
-# System MMU
-#
-CONFIG_PLAT_PXA=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_XSCALE=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_PABRT_LEGACY=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WBI=y
-CONFIG_CPU_CP15=y
-CONFIG_CPU_CP15_MMU=y
-CONFIG_CPU_USE_DOMAINS=y
-
-#
-# Processor Features
-#
-CONFIG_XSCALE_PMU=y
-CONFIG_MULTI_IRQ_HANDLER=y
-
-#
-# PC-card bridges
-#
-CONFIG_PCMCIA_PXA2XX=y
-
-#
-# Kernel Features
-#
-CONFIG_HAVE_ARCH_PFN_VALID=y
-CONFIG_HW_PERF_EVENTS=y
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-
-#
-# Boot options
-#
-CONFIG_AUTO_ZRELADDR=y
-
-#
-# FIR device drivers
-#
-CONFIG_PXA_FICP=m
-
-#
-# RAM/ROM/Flash chip drivers
-#
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-
-#
-# PATA SFF controllers with BMDMA
-#
-CONFIG_PATA_PXA=y
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_PXA=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_PXA2XX=y
-
-
-#
-# Console display driver support
-#
-CONFIG_SND_VMASTER=y
-CONFIG_SND_PXA2XX_PCM=m
-CONFIG_SND_PXA2XX_LIB=m
-CONFIG_SND_PXA2XX_LIB_AC97=y
-CONFIG_SND_PXA2XX_AC97=m
-CONFIG_SND_PXA2XX_SOC=m
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_PXA=y
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-only.scc b/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-only.scc
deleted file mode 100644
index 037a2e4..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-pxa-only.scc
+++ /dev/null
@@ -1,2 +0,0 @@
-kconf hardware zaurus-pxa-common.cfg
-kconf non-hardware zaurus-pxa-common-non-hw.cfg
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-host.scc b/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-host.scc
deleted file mode 100644
index 19f7523..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-host.scc
+++ /dev/null
@@ -1,6 +0,0 @@
-kconf hardware zaurus-usb-ohci.cfg
-kconf non-hardware zaurus-usb-ohci-non-hw.cfg
-
-include features/usb/ohci-hcd.scc
-include features/usb-net/usb-net.scc
-#include cfg/usb-mass-storage.scc
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-ohci-non-hw.cfg b/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-ohci-non-hw.cfg
deleted file mode 100644
index f20d7e6..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-ohci-non-hw.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Console display driver support
-#
-CONFIG_SND_RAWMIDI_SEQ=m
diff --git a/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-ohci.cfg b/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-ohci.cfg
deleted file mode 100644
index 5cf2099..0000000
--- a/recipes-kernel/linux/linux-yocto-3.10/zaurus-usb-ohci.cfg
+++ /dev/null
@@ -1,105 +0,0 @@
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_ATH3K=m
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_SIERRA_NET=m
-
-#
-# Console display driver support
-#
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-
-#
-# USB HID Boot Protocol drivers
-#
-CONFIG_USB_KBD=m
-CONFIG_USB_MOUSE=m
-
-#
-# Special HID drivers
-#
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_DEBUG=y
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_MON=m
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_SERIAL=m
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_SAFE=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_WWAN=m
-CONFIG_USB_SERIAL_OMNINET=m
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/defconfig b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/defconfig
deleted file mode 100644
index a8e3069..0000000
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/akita/defconfig
+++ /dev/null
@@ -1,138 +0,0 @@
-CONFIG_LOCALVERSION="-yocto-tiny"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_SWAP is not set
-CONFIG_NO_HZ=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
-CONFIG_RD_LZMA=y
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_UID16 is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PRINTK is not set
-# CONFIG_BUG is not set
-# CONFIG_BASE_FULL is not set
-# CONFIG_AIO is not set
-CONFIG_EMBEDDED=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLOB=y
-# CONFIG_LBDAF is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_PXA=y
-CONFIG_GPIO_PCA953X=y
-CONFIG_PXA_SHARPSL=y
-CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
-CONFIG_MACH_AKITA=y
-CONFIG_MACH_BORZOI=y
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-CONFIG_PCMCIA_PXA2XX=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 loglevel=3"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_KEXEC=y
-# CONFIG_BINFMT_SCRIPT is not set
-# CONFIG_COREDUMP is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FW_LOADER_USER_HELPER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_ROM=y
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_SHARPSL=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_PXA=y
-CONFIG_PATA_PCMCIA=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_APMPOWER=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_MATRIX=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_SERIO is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_I2C_COMPAT is not set
-CONFIG_SPI_PXA2XX=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-CONFIG_FB=y
-CONFIG_FB_PXA=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CORGI=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_PXA=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_SYSTOHC is not set
-CONFIG_RTC_DRV_PXA=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_FILE_LOCKING is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_CRAMFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/defconfig b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/defconfig
deleted file mode 100644
index 039fa8b..0000000
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/c7x0/defconfig
+++ /dev/null
@@ -1,139 +0,0 @@
-CONFIG_LOCALVERSION="-yocto-tiny"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_SWAP is not set
-CONFIG_NO_HZ=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
-CONFIG_RD_LZMA=y
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_UID16 is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PRINTK is not set
-# CONFIG_BUG is not set
-# CONFIG_BASE_FULL is not set
-# CONFIG_AIO is not set
-CONFIG_EMBEDDED=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLOB=y
-# CONFIG_LBDAF is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_PXA=y
-CONFIG_PXA_SHARPSL=y
-CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
-CONFIG_MACH_CORGI=y
-CONFIG_MACH_SHEPHERD=y
-CONFIG_MACH_HUSKY=y
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-CONFIG_PCMCIA_PXA2XX=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_KEXEC=y
-# CONFIG_BINFMT_SCRIPT is not set
-# CONFIG_COREDUMP is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FW_LOADER_USER_HELPER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_ROM=y
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_SHARPSL=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_PXA=y
-CONFIG_PATA_PCMCIA=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_APMPOWER=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_MATRIX=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_SERIO is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_PXA=y
-CONFIG_SPI_PXA2XX=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-CONFIG_FB=y
-CONFIG_FB_W100=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CORGI=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_PXA=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_SYSTOHC is not set
-CONFIG_RTC_DRV_SA1100=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_FILE_LOCKING is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_CRAMFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig
deleted file mode 100644
index 2903270..0000000
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/collie/defconfig
+++ /dev/null
@@ -1,145 +0,0 @@
-CONFIG_LOCALVERSION="-yocto-tiny"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_SWAP is not set
-CONFIG_NO_HZ=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
-CONFIG_RD_LZMA=y
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_UID16 is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PRINTK is not set
-# CONFIG_BUG is not set
-# CONFIG_BASE_FULL is not set
-# CONFIG_AIO is not set
-CONFIG_EMBEDDED=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLOB=y
-# CONFIG_LBDAF is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SA1100=y
-CONFIG_SA1100_COLLIE=y
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-CONFIG_PCMCIA_SA1100=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 console=ttySA0,115200n8 fbcon=rotate:1 mem=64M loglevel=3"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_KEXEC=y
-# CONFIG_BINFMT_SCRIPT is not set
-# CONFIG_COREDUMP is not set
-CONFIG_APM_EMULATION=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FW_LOADER_USER_HELPER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_CFI=y
-CONFIG_MTD_CFI_ADV_OPTIONS=y
-CONFIG_MTD_CFI_GEOMETRY=y
-# CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_2 is not set
-# CONFIG_MTD_CFI_I1 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_SA1100=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_PCMCIA=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_APMPOWER=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_LOCOMO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_SERIO is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_SA1100=y
-CONFIG_SERIAL_SA1100_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_SPI=y
-CONFIG_SPI_GPIO=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-CONFIG_BATTERY_COLLIE=y
-# CONFIG_HWMON is not set
-CONFIG_MCP_SA11X0=y
-CONFIG_MCP_UCB1200=y
-CONFIG_MCP_UCB1200_TS=y
-CONFIG_FB=y
-CONFIG_FB_SA1100=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_SPI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_LOCOMO=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_SYSTOHC is not set
-CONFIG_RTC_DRV_SA1100=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_FILE_LOCKING is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_CRAMFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/defconfig b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/defconfig
deleted file mode 100644
index d789c80..0000000
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/poodle/defconfig
+++ /dev/null
@@ -1,143 +0,0 @@
-CONFIG_LOCALVERSION="-yocto-tiny"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_SWAP is not set
-CONFIG_NO_HZ=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
-CONFIG_RD_LZMA=y
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_UID16 is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PRINTK is not set
-# CONFIG_BUG is not set
-# CONFIG_BASE_FULL is not set
-# CONFIG_AIO is not set
-CONFIG_EMBEDDED=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLOB=y
-# CONFIG_LBDAF is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_PXA=y
-CONFIG_PXA_SHARPSL=y
-CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
-CONFIG_MACH_POODLE=y
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-CONFIG_PCMCIA_PXA2XX=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 loglevel=3"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_KEXEC=y
-# CONFIG_BINFMT_SCRIPT is not set
-# CONFIG_COREDUMP is not set
-CONFIG_APM_EMULATION=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FW_LOADER_USER_HELPER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_ROM=y
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_SHARPSL=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_PXA=y
-CONFIG_PATA_PCMCIA=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=240
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_APMPOWER=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_LOCOMO=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_SERIO is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_PXA=y
-CONFIG_SPI=y
-CONFIG_SPI_PXA2XX=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-# CONFIG_HWMON is not set
-CONFIG_FB=y
-CONFIG_FB_PXA=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_BACKLIGHT_GENERIC is not set
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_PXA=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_LOCOMO=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_SYSTOHC is not set
-CONFIG_RTC_DRV_SA1100=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_FILE_LOCKING is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_CRAMFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/3200-mtd.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/3200-mtd.patch
deleted file mode 100644
index 4b2a968..0000000
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/3200-mtd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
-index 953a919..14e7736 100644
---- a/arch/arm/mach-pxa/spitz.c
-+++ b/arch/arm/mach-pxa/spitz.c
-@@ -802,7 +802,7 @@ static void __init spitz_nand_init(void)
- spitz_nand_bbt.len = 1;
- spitz_nand_pdata.ecc_layout = &akita_oobinfo;
- } else if (machine_is_borzoi()) {
-- spitz_nand_partitions[1].size = 32 * 1024 * 1024;
-+ spitz_nand_partitions[1].size = 43 * 1024 * 1024;
- spitz_nand_bbt.len = 1;
- spitz_nand_pdata.ecc_layout = &akita_oobinfo;
- }
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/defconfig b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/defconfig
deleted file mode 100644
index b22cec3..0000000
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/spitz/defconfig
+++ /dev/null
@@ -1,137 +0,0 @@
-CONFIG_LOCALVERSION="-yocto-tiny"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_SWAP is not set
-CONFIG_NO_HZ=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
-CONFIG_RD_LZMA=y
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_UID16 is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PRINTK is not set
-# CONFIG_BUG is not set
-# CONFIG_BASE_FULL is not set
-# CONFIG_AIO is not set
-CONFIG_EMBEDDED=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLOB=y
-# CONFIG_LBDAF is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_PXA=y
-CONFIG_PXA_SHARPSL=y
-CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
-CONFIG_MACH_AKITA=y
-CONFIG_MACH_BORZOI=y
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-CONFIG_PCMCIA_PXA2XX=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 fbcon=rotate:1 loglevel=3"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_KEXEC=y
-# CONFIG_BINFMT_SCRIPT is not set
-# CONFIG_COREDUMP is not set
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FW_LOADER_USER_HELPER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_ROM=y
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_SHARPSL=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_PXA=y
-CONFIG_PATA_PCMCIA=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=640
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_APMPOWER=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_MATRIX=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=y
-# CONFIG_SERIO is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-# CONFIG_I2C_COMPAT is not set
-CONFIG_SPI_PXA2XX=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-CONFIG_FB=y
-CONFIG_FB_PXA=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CORGI=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_PXA=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_SYSTOHC is not set
-CONFIG_RTC_DRV_PXA=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_FILE_LOCKING is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_CRAMFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/defconfig b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/defconfig
deleted file mode 100644
index aad4369..0000000
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/tosa/defconfig
+++ /dev/null
@@ -1,141 +0,0 @@
-CONFIG_LOCALVERSION="-yocto-tiny"
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_KERNEL_LZMA=y
-# CONFIG_SWAP is not set
-CONFIG_NO_HZ=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE="initramfs.cpio.lzma"
-CONFIG_RD_LZMA=y
-CONFIG_INITRAMFS_COMPRESSION_LZMA=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_UID16 is not set
-# CONFIG_KALLSYMS is not set
-# CONFIG_PRINTK is not set
-# CONFIG_BUG is not set
-# CONFIG_BASE_FULL is not set
-# CONFIG_AIO is not set
-CONFIG_EMBEDDED=y
-# CONFIG_VM_EVENT_COUNTERS is not set
-# CONFIG_COMPAT_BRK is not set
-CONFIG_SLOB=y
-# CONFIG_LBDAF is not set
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_EFI_PARTITION is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_PXA=y
-CONFIG_PXA_SHARPSL=y
-CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y
-CONFIG_MACH_TOSA=y
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_LOAD_CIS is not set
-CONFIG_PCMCIA_PXA2XX=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_CROSS_MEMORY_ATTACH is not set
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty1 console=ttyS0,115200n8 loglevel=3"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_KEXEC=y
-# CONFIG_BINFMT_SCRIPT is not set
-# CONFIG_COREDUMP is not set
-CONFIG_APM_EMULATION=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-# CONFIG_FW_LOADER_USER_HELPER is not set
-CONFIG_MTD=y
-CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_ROM=y
-CONFIG_MTD_COMPLEX_MAPPINGS=y
-CONFIG_MTD_PHYSMAP=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_TMIO=y
-CONFIG_MTD_UBI=y
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-# CONFIG_ATA_VERBOSE_ERROR is not set
-# CONFIG_SATA_PMP is not set
-CONFIG_PATA_PXA=y
-CONFIG_PATA_PCMCIA=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=480
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640
-CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_APMPOWER=y
-# CONFIG_KEYBOARD_ATKBD is not set
-CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_MATRIX=y
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_SERIO is not set
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_PXA=y
-CONFIG_SERIAL_PXA_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-# CONFIG_I2C_COMPAT is not set
-CONFIG_I2C_PXA=y
-CONFIG_SPI=y
-CONFIG_SPI_PXA2XX=y
-CONFIG_POWER_SUPPLY=y
-CONFIG_PDA_POWER=y
-CONFIG_APM_POWER=y
-# CONFIG_HWMON is not set
-CONFIG_MFD_TC6393XB=y
-CONFIG_FB=y
-CONFIG_FB_TMIO=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_TOSA=y
-CONFIG_BACKLIGHT_TOSA=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_PXA=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_RTC_CLASS=y
-# CONFIG_RTC_SYSTOHC is not set
-CONFIG_RTC_DRV_SA1100=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
-# CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-# CONFIG_FILE_LOCKING is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-# CONFIG_PROC_PAGE_MONITOR is not set
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_SUMMARY=y
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RUBIN=y
-CONFIG_UBIFS_FS=y
-CONFIG_UBIFS_FS_ADVANCED_COMPR=y
-CONFIG_CRAMFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
-# CONFIG_FTRACE is not set
-# CONFIG_ARM_UNWIND is not set
-# CONFIG_CRYPTO_ANSI_CPRNG is not set
-# CONFIG_CRYPTO_HW is not set
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend b/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend
deleted file mode 100644
index 53c2924..0000000
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot_3.10.bbappend
+++ /dev/null
@@ -1,94 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.10:${THISDIR}/linux-yocto-3.10:${THISDIR}/files:"
-
-COMPATIBLE_MACHINE .= "|akita|c7x0|collie|poodle|spitz|tosa"
-
-# Zaurus machines need kernel size-check.
-KERNEL_IMAGE_MAXSIZE_akita = "1264"
-KERNEL_IMAGE_MAXSIZE_c7x0 = "1264"
-KERNEL_IMAGE_MAXSIZE_collie = "1024"
-KERNEL_IMAGE_MAXSIZE_poodle = "1264"
-KERNEL_IMAGE_MAXSIZE_spitz = "1264"
-KERNEL_IMAGE_MAXSIZE_tosa = "1264"
-
-KMACHINE_akita = "akita"
-KMACHINE_c7x0 = "c7x0"
-KMACHINE_collie = "collie"
-KMACHINE_poodle = "poodle"
-KMACHINE_spitz = "spitz"
-KMACHINE_tosa = "tosa"
-
-# Note: Providing "defconfig" we bypass the linux-yocto processing
-# re-expand the defconfig produced by "make_savedefconfig"
-KCONFIG_MODE_akita = "--alldefconfig"
-KCONFIG_MODE_c7x0 = "--alldefconfig"
-KCONFIG_MODE_collie = "--alldefconfig"
-KCONFIG_MODE_poodle = "--alldefconfig"
-KCONFIG_MODE_spitz = "--alldefconfig"
-KCONFIG_MODE_tosa = "--alldefconfig"
-
-SRC_URI_append_akita = " \
- file://defconfig \
- file://patches/patches-pxa/sharpsl_param.patch \
- file://patches/revert-check-on-console-device.patch \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_c7x0 = " \
- file://defconfig \
- file://patches/patches-pxa/sharpsl_param.patch \
- file://patches/revert-check-on-console-device.patch \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_collie = " \
- file://defconfig \
- file://patches/patches-locomokbd/locomo_kbd_tweak-r2.patch \
- file://patches/patches-power/collie_battery-dev-pm.patch \
- file://patches/patches-mfd/mcp-device.patch \
- file://patches/patches-mfd/ucb1x00-device.patch \
- file://patches/patches-mtd/collie-jedec-probe.patch \
- file://patches/patches-mtd/collie-eraseinfo.patch \
- file://patches/patches-mtd/collie-cfi-probe-again.patch \
- file://patches/patches-mtd/collie-mtd-resize.patch \
- file://patches/patches-mtd/collie-LH28F640BF.patch \
- file://patches/patches-sa1100/collie-irda.patch \
- file://patches/patches-sa1100/collie-add-bootblock.patch \
- file://patches/patches-sa1100/arm-sa1100-add-cpu-clock.patch \
- file://patches/patches-sa1100/fbdev-sa1100fb-make-use-of-device-clock.patch \
- file://patches/patches-sa1100/pcmcia-sa1100-device-clock.patch \
- file://patches/patches-locomo/locomo-fix-SCL-SDA.patch \
- file://patches/patches-locomo/locomolcd-suspend-resume.patch \
- file://patches/revert-check-on-console-device.patch \
- file://qvga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_poodle = " \
- file://defconfig \
- file://patches/patches-locomokbd/locomo_kbd_tweak-r2.patch \
- file://patches/patches-pxa/sharpsl_param.patch \
- file://patches/revert-check-on-console-device.patch \
- file://qvga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_spitz = " \
- file://defconfig \
- file://patches/patches-pxa/sharpsl_param.patch \
- file://patches/revert-check-on-console-device.patch \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_tosa = " \
- file://defconfig \
- file://patches/patches-pxa/sharpsl_param.patch \
- file://patches/patches-power/tosa_battery_irq_to_gpio.patch \
- file://patches/patches-pxa/tosa-keys-mapping.patch \
- file://patches/revert-check-on-console-device.patch \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-do_configure_prepend() {
-
- if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
- install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm ${WORKDIR}/linux/drivers/video/logo/logo_linux_clut224.ppm
- fi
-}
diff --git a/recipes-kernel/linux/linux-yocto_3.10.bbappend b/recipes-kernel/linux/linux-yocto_3.10.bbappend
deleted file mode 100644
index d4ad6b3..0000000
--- a/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ /dev/null
@@ -1,90 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-3.10:${THISDIR}/${PN}:${THISDIR}/files:"
-
-COMPATIBLE_MACHINE .= "|akita|c7x0|collie|h3600|hx4700|poodle|spitz|tosa"
-
-# Override kernel features
-#KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
-
-KERNEL_EXTRA_FEATURES_akita ?= ""
-KERNEL_EXTRA_FEATURES_c7x0 ?= ""
-KERNEL_EXTRA_FEATURES_collie ?= ""
-KERNEL_EXTRA_FEATURES_h3600 ?= ""
-KERNEL_EXTRA_FEATURES_hx4700 ?= ""
-KERNEL_EXTRA_FEATURES_poodle ?= ""
-KERNEL_EXTRA_FEATURES_spitz ?= ""
-KERNEL_EXTRA_FEATURES_tosa ?= ""
-
-KMACHINE_akita = "akita"
-KMACHINE_c7x0 = "c7x0"
-KMACHINE_collie = "collie"
-KMACHINE_h3600 = "h3600"
-KMACHINE_hx4700 = "hx4700"
-KMACHINE_poodle = "poodle"
-KMACHINE_spitz = "spitz"
-KMACHINE_tosa = "tosa"
-
-# Note: Providing "defconfig" we bypass the linux-yocto processing
-# re-expand the defconfig produced by "make_savedefconfig"
-KCONFIG_MODE_akita = "--alldefconfig"
-KCONFIG_MODE_c7x0 = "--alldefconfig"
-KCONFIG_MODE_collie = "--alldefconfig"
-KCONFIG_MODE_h3600 = "--alldefconfig"
-KCONFIG_MODE_hx4700 = "--alldefconfig"
-KCONFIG_MODE_poodle = "--alldefconfig"
-KCONFIG_MODE_spitz = "--alldefconfig"
-KCONFIG_MODE_tosa = "--alldefconfig"
-
-SRC_URI_append_akita = " \
- file://feature-top.scc \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_c7x0 = " \
- file://feature-top.scc \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_collie = " \
- file://feature-top.scc \
- file://qvga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_h3600 = " \
- file://defconfig \
- file://0001-MFD-driver-for-Atmel-Microcontroller-on-iPaq-h3xxx.patch \
- file://0002-ARM-sa1100-add-Micro-ASIC-platform-device.patch \
- file://0003-input-driver-for-microcontroller-keys-on-the-iPaq-h3.patch \
- file://0004-input-driver-for-touchscreen-on-iPaq-h3xxx.patch \
- file://0005-power-add-driver-for-battery-reading-on-iPaq-h3xxx.patch \
- file://0006-leds-add-driver-for-the-iPAQ-micro.patch \
- file://0007-fb-backlight-add-driver-for-iPAQ-micro-backlight.patch \
- file://qvga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_hx4700 = " \
- file://defconfig \
- file://hx4700-change-led-trigger-assignments.patch \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_poodle = " \
- file://feature-top.scc \
- file://qvga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_spitz = " \
- file://feature-top.scc \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-SRC_URI_append_tosa = " \
- file://feature-top.scc \
- file://vga/logo_linux_clut224.ppm.bz2 \
- "
-
-do_configure_prepend() {
-
- if [ -e ${WORKDIR}/logo_linux_clut224.ppm ]; then
- install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm ${WORKDIR}/linux/drivers/video/logo/logo_linux_clut224.ppm
- fi
-}