armadillo800 patches added

3 files changed, 80 insertions, 0 deletions

diff --git a/patches.armadillo800/armadillo800eva-defconfig-enable-drivers-used-with-multimedia.patch b/patches.armadillo800/armadillo800eva-defconfig-enable-drivers-used-with-multimedia.patch
new file mode 100644
index 00000000000000..53536350e33503
--- /dev/null
+++ b/patches.armadillo800/armadillo800eva-defconfig-enable-drivers-used-with-multimedia.patch
@@ -0,0 +1,48 @@
+From dhobsong@igel.co.jp Mon Jan 14 21:42:16 2013
+From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
+Date: Tue, 15 Jan 2013 14:41:36 +0900
+Subject: armadillo800eva: defconfig: Enable drivers used with multimedia
+To: gregkh@linuxfoundation.org
+Cc: ltsi-dev@lists.linuxfoundation.org, Damian Hobson-Garcia <dhobsong@igel.co.jp>
+Message-ID: <1358228496-29613-3-git-send-email-dhobsong@igel.co.jp>
+
+
+Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
+---
+ arch/arm/configs/armadillo800eva_defconfig |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/arch/arm/configs/armadillo800eva_defconfig
++++ b/arch/arm/configs/armadillo800eva_defconfig
+@@ -37,6 +37,7 @@ CONFIG_CMDLINE="console=tty0 console=tty
+ CONFIG_CMDLINE_FORCE=y
+ CONFIG_KEXEC=y
+ CONFIG_VFP=y
++CONFIG_CMA=y
+ # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+ # CONFIG_SUSPEND is not set
+ CONFIG_NET=y
+@@ -45,6 +46,7 @@ CONFIG_UNIX=y
+ CONFIG_INET=y
+ CONFIG_IP_PNP=y
+ CONFIG_IP_PNP_DHCP=y
++CONFIG_SHMOBILE_PMB=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
+@@ -99,6 +101,7 @@ CONFIG_VIDEO_SH_MOBILE_CEU=y
+ # CONFIG_RADIO_ADAPTERS is not set
+ CONFIG_FB=y
+ CONFIG_FB_SH_MOBILE_LCDC=y
++CONFIG_FB_SH_MOBILE_MERAM=y
+ CONFIG_FB_SH_MOBILE_HDMI=y
+ CONFIG_LCD_CLASS_DEVICE=y
+ CONFIG_FRAMEBUFFER_CONSOLE=y
+@@ -124,6 +127,7 @@ CONFIG_DMADEVICES=y
+ CONFIG_SH_DMAE=y
+ CONFIG_UIO=y
+ CONFIG_UIO_PDRV_GENIRQ=y
++CONFIG_UIO_DMEM_GENIRQ=y
+ # CONFIG_DNOTIFY is not set
+ CONFIG_MSDOS_FS=y
+ CONFIG_VFAT_FS=y
diff --git a/patches.armadillo800/shmobile-iommu-only-enable-driver-on-arm-based-shmobile-configuration.patch b/patches.armadillo800/shmobile-iommu-only-enable-driver-on-arm-based-shmobile-configuration.patch
new file mode 100644
index 00000000000000..b1daa196871285
--- /dev/null
+++ b/patches.armadillo800/shmobile-iommu-only-enable-driver-on-arm-based-shmobile-configuration.patch
@@ -0,0 +1,30 @@
+From dhobsong@igel.co.jp Mon Jan 14 21:42:10 2013
+From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
+Date: Tue, 15 Jan 2013 14:41:35 +0900
+Subject: shmobile/iommu: Only enable driver on ARM based shmobile configuration
+To: gregkh@linuxfoundation.org
+Cc: ltsi-dev@lists.linuxfoundation.org, Damian Hobson-Garcia <dhobsong@igel.co.jp>
+Message-ID: <1358228496-29613-2-git-send-email-dhobsong@igel.co.jp>
+Status: RO
+Content-Length: 622
+Lines: 23
+
+
+Make sure that the shmobile IOMMU driver cannot be inadvertently enabled
+on other platforms.
+
+Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
+---
+ drivers/iommu/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/iommu/Kconfig
++++ b/drivers/iommu/Kconfig
+@@ -165,6 +165,7 @@ config TEGRA_IOMMU_SMMU
+ config SHMOBILE_IOMMU
+ 	bool "IOMMU for Renesas IPMMU/IPMMUI"
+ 	default n
++	depends on (ARM && ARCH_SHMOBILE)
+ 	select IOMMU_API
+ 	select ARM_DMA_USE_IOMMU
+ 	select SHMOBILE_IPMMU
diff --git a/series b/series
index c837f204e0195b..b4298a3f690bb7 100644
--- a/series
+++ b/series
@@ -423,6 +423,8 @@ patches.armadillo800/shmobile-armadillo800eva-enable-iommu-support.patch
 patches.armadillo800/shmobile-ipmmu-add-basic-pmb-support.patch
 patches.armadillo800/shmobile-r8a7740-set-up-meram-address-range.patch
 patches.armadillo800/shmobile-r8a7740-add-meram-uio-device.patch
+patches.armadillo800/shmobile-iommu-only-enable-driver-on-arm-based-shmobile-configuration.patch
+patches.armadillo800/armadillo800eva-defconfig-enable-drivers-used-with-multimedia.patch
 
 
 #############################################################################