defconfig patches added

3 files changed, 141 insertions, 2 deletions

diff --git a/patches.armadillo800/asoc-sh-fsi-select-simple-card-on-kconfig.patch b/patches.armadillo800/asoc-sh-fsi-select-simple-card-on-kconfig.patch
new file mode 100644
index 00000000000000..22ca5eb8b01637
--- /dev/null
+++ b/patches.armadillo800/asoc-sh-fsi-select-simple-card-on-kconfig.patch
@@ -0,0 +1,38 @@
+From horms@vergenet.net Mon Dec  3 20:53:02 2012
+From: Simon Horman <horms+renesas@verge.net.au>
+Date: Tue,  4 Dec 2012 13:52:51 +0900
+Subject: [PATCH 2/2] ASoC: sh: fsi: select simple-card on Kconfig
+To: ltsi-dev@lists.linuxfoundation.org
+Cc: Greg KH <gregkh@linuxfoundation.org>
+Message-ID: <1354596771-7290-3-git-send-email-horms+renesas@verge.net.au>
+
+
+From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+
+Current SuperH FSI require simple-card driver as sound card.
+This patch select it on Kconfig when FSI was selected.
+
+Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+(cherry picked from commit cd04461e2f491c81d30fb3b234cf43db3f098103)
+
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+---
+ sound/soc/sh/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
+index c9fdf63..6bcb116 100644
+--- a/sound/soc/sh/Kconfig
++++ b/sound/soc/sh/Kconfig
+@@ -22,6 +22,7 @@ config SND_SOC_SH4_SSI
+ 
+ config SND_SOC_SH4_FSI
+ 	tristate "SH4 FSI support"
++	select SND_SIMPLE_CARD
+ 	help
+ 	  This option enables FSI sound support
+ 
+-- 
+1.7.10.4
+
diff --git a/patches.marzen/arm-mach-shmobile-marzen-defconfig-update.patch b/patches.marzen/arm-mach-shmobile-marzen-defconfig-update.patch
new file mode 100644
index 00000000000000..200cae35200828
--- /dev/null
+++ b/patches.marzen/arm-mach-shmobile-marzen-defconfig-update.patch
@@ -0,0 +1,101 @@
+From horms@vergenet.net Mon Dec  3 20:53:03 2012
+From: Simon Horman <horms+renesas@verge.net.au>
+Date: Tue,  4 Dec 2012 13:52:50 +0900
+Subject: [PATCH 1/2] ARM: mach-shmobile: marzen: defconfig update
+To: ltsi-dev@lists.linuxfoundation.org
+Cc: Greg KH <gregkh@linuxfoundation.org>
+Message-ID: <1354596771-7290-2-git-send-email-horms+renesas@verge.net.au>
+
+
+From: Simon Horman <horms@verge.net.au>
+
+Update marzen defconfig
+* Enable MMC Block device as SDHI hw is now supported.
+* Default to NFS root, this is consistent with many other
+  shmobile boards
+* Enable UNIX which is required by udevd
+* Enable SDHI
+
+Other changes are noise due to using make savedefconfig
+to create the new defconfig.
+
+Signed-off-by: Simon Horman <horms@verge.net.au>
+Cc: Phil Edworthy <phil.edworthy@renesas.com>
+Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+(cherry picked from commit f0a1f1c226b64859448bfc247dbf8835c4c5cf06)
+
+Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
+---
+ arch/arm/configs/marzen_defconfig |   15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
+index 864f9a5..737e498 100644
+--- a/arch/arm/configs/marzen_defconfig
++++ b/arch/arm/configs/marzen_defconfig
+@@ -1,13 +1,14 @@
+ # CONFIG_ARM_PATCH_PHYS_VIRT is not set
+ CONFIG_EXPERIMENTAL=y
+ CONFIG_KERNEL_LZMA=y
++CONFIG_NO_HZ=y
+ CONFIG_IKCONFIG=y
+ CONFIG_IKCONFIG_PROC=y
+ CONFIG_LOG_BUF_SHIFT=16
+ CONFIG_SYSCTL_SYSCALL=y
+ CONFIG_EMBEDDED=y
+ CONFIG_SLAB=y
+-# CONFIG_BLOCK is not set
++# CONFIG_IOSCHED_CFQ is not set
+ CONFIG_ARCH_SHMOBILE=y
+ CONFIG_ARCH_R8A7779=y
+ CONFIG_MACH_MARZEN=y
+@@ -21,7 +22,6 @@ CONFIG_ARM_ERRATA_458693=y
+ CONFIG_ARM_ERRATA_460075=y
+ CONFIG_ARM_ERRATA_743622=y
+ CONFIG_ARM_ERRATA_754322=y
+-CONFIG_NO_HZ=y
+ CONFIG_SMP=y
+ # CONFIG_ARM_CPU_TOPOLOGY is not set
+ CONFIG_AEABI=y
+@@ -29,13 +29,16 @@ CONFIG_AEABI=y
+ CONFIG_HIGHMEM=y
+ CONFIG_ZBOOT_ROM_TEXT=0x0
+ CONFIG_ZBOOT_ROM_BSS=0x0
+-CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"
++CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on"
+ CONFIG_CMDLINE_FORCE=y
+ CONFIG_KEXEC=y
+ # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+ CONFIG_PM_RUNTIME=y
+ CONFIG_NET=y
++CONFIG_UNIX=y
+ CONFIG_INET=y
++CONFIG_IP_PNP=y
++CONFIG_IP_PNP_DHCP=y
+ # CONFIG_IPV6 is not set
+ # CONFIG_WIRELESS is not set
+ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+@@ -69,16 +72,18 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
+ CONFIG_GPIO_SYSFS=y
+ # CONFIG_HWMON is not set
+ CONFIG_SSB=y
+-# CONFIG_HID_SUPPORT is not set
+ # CONFIG_USB_SUPPORT is not set
++CONFIG_MMC=y
++CONFIG_MMC_SDHI=y
+ CONFIG_UIO=y
+ CONFIG_UIO_PDRV_GENIRQ=y
+ # CONFIG_IOMMU_SUPPORT is not set
+-# CONFIG_FILE_LOCKING is not set
+ # CONFIG_DNOTIFY is not set
+ # CONFIG_INOTIFY_USER is not set
+ CONFIG_TMPFS=y
+ # CONFIG_MISC_FILESYSTEMS is not set
++CONFIG_NFS_FS=y
++CONFIG_ROOT_NFS=y
+ CONFIG_MAGIC_SYSRQ=y
+ CONFIG_DEBUG_INFO=y
+ CONFIG_DEBUG_INFO_REDUCED=y
+-- 
+1.7.10.4
+
diff --git a/series b/series
index 01d0719b57540b..61664d011b8d47 100644
--- a/series
+++ b/series
@@ -213,7 +213,7 @@ patches.marzen/0096-mmc-sh_mmcif-remove-redundant-.down_pwr-callback.patch
 patches.marzen/0097-mmc-sh_mmcif-add-regulator-support.patch
 patches.marzen/0098-mmc-sh-mmcif-add-OF-support-make-platform-data-optio.patch
 patches.marzen/0099-mmc-sh_mmcif-support-generic-card-detection.patch
-
+patches.marzen/arm-mach-shmobile-marzen-defconfig-update.patch
 
 #############################################################################
 # Armadillo 800 board support
@@ -325,7 +325,7 @@ patches.armadillo800/0104-ARM-mach-shmobile-armadillo800eva-Fix-GPIO-buttons-d.p
 patches.armadillo800/0105-ARM-mach-shmobile-armadillo800eva-Enable-power-butto.patch
 patches.armadillo800/0106-ARM-shmobile-armadillo800eva-fixup-sound-card-detect.patch
 patches.armadillo800/0107-ARM-shmobile-armadillo800eva-enable-rw-rootfs-mount.patch
-
+patches.armadillo800/asoc-sh-fsi-select-simple-card-on-kconfig.patch
 
 #############################################################################
 # AT91 board support