From: Liviu Dudau <Liviu.Dudau@arm.com>
Date: Tue, 23 Sep 2014 17:32:06 +0000 (+0100)
Subject: Juno: defconfig: Enable PL330 DMA and Designware I2S support
X-Git-Tag: submit/tizen/20141203.153721~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c1929e6949be72b4f7cdb8da5ecc6195854316ed;p=platform%2Fkernel%2Flinux-arm64.git

Juno: defconfig: Enable PL330 DMA and Designware I2S support

Enable PL330 DMA engine and Designware I2S support in the defconfig.
However, DMA and PL011 UART doesn't work, so comment out the DMA
channels in PL011 to work around hang in the boot.

Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
---

diff --git a/arch/arm64/boot/dts/juno.dts b/arch/arm64/boot/dts/juno.dts
index 364f80e1aec..f8ee9d359be 100644
--- a/arch/arm64/boot/dts/juno.dts
+++ b/arch/arm64/boot/dts/juno.dts
@@ -364,9 +364,9 @@
 		interrupts = <0 83 4>;
 		clocks = <&soc_uartclk>, <&soc_refclk100mhz>;
 		clock-names = "uartclk", "apb_pclk";
-		dmas = <&dma0 1
+		/* dmas = <&dma0 1
 			&dma0 2>;
-		dma-names = "rx", "tx";
+		dma-names = "rx", "tx"; */
 	};
 
 	/* this UART is reserved for secure software.
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index b5a1d40213a..b5d7b9fc07f 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -189,6 +189,19 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SEQUENCER=y
+CONFIG_SND_SEQ_DUMMY=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_SEQUENCER_OSS=y
+# CONFIG_SND_USB is not set
+CONFIG_SND_SOC=y
+CONFIG_SND_DESIGNWARE_I2S=y
+CONFIG_SND_SOC_HDMI_CODEC=y
+CONFIG_SND_SOC_SPDIF=y
+CONFIG_SND_SIMPLE_CARD=y
 CONFIG_HID_CHERRY=m
 CONFIG_HID_MULTITOUCH=y
 CONFIG_USB=y
@@ -222,6 +235,8 @@ CONFIG_MMC=y
 CONFIG_MMC_ARMMMCI=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_PL031=y
+CONFIG_DMADEVICES=y
+CONFIG_PL330_DMA=y
 CONFIG_VIRT_DRIVERS=y
 CONFIG_VIRTIO_BALLOON=y
 CONFIG_VIRTIO_MMIO=y