diff --git a/arch/arm/boot/dts/imx6ul-oas.dts b/arch/arm/boot/dts/imx6ul-oas.dts
index cb5791f40e86b..ac179c7f30055 100644
--- a/arch/arm/boot/dts/imx6ul-oas.dts
+++ b/arch/arm/boot/dts/imx6ul-oas.dts
@@ -140,6 +140,7 @@
 			  <&clks IMX6UL_CLK_SAI3>;
 	assigned-clock-rates = <0>, <786432000>, <12288000>;
 	assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
+	fsl,sai-mclk-direction-output;
 	status = "okay";
 };
 
diff --git a/arch/arm/configs/oas_defconfig b/arch/arm/configs/oas_defconfig
index 1f7de682d2d6b..03c1aca4f895f 100644
--- a/arch/arm/configs/oas_defconfig
+++ b/arch/arm/configs/oas_defconfig
@@ -109,7 +109,6 @@ CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_GPMI_NAND=y
 CONFIG_MTD_UBI=y
-# CONFIG_MTD_UBI_FASTMAP is not set
 CONFIG_MTD_UBI_BLOCK=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
@@ -176,8 +175,8 @@ CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_SERIAL_MCA_CC6UL=y
 CONFIG_FSL_OTP=y
-# CONFIG_I2C_COMPAT is not set
 CONFIG_I2C=y
+# CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
 CONFIG_I2C_ALGOBIT=y
@@ -209,19 +208,12 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_ANATOP=y
 CONFIG_REGULATOR_GPIO=y
 CONFIG_REGULATOR_PFUZE100=y
-# CONFIG_MEDIA_SUPPORT is not set
-# CONFIG_V4L_PLATFORM_DRIVERS is not set
-CONFIG_MXC_IPU_DEVICE_QUEUE_SDC=y
-# CONFIG_MXC_IPU_PRP_ENC is not set
-# CONFIG_SOC_CAMERA is not set
-# CONFIG_VIDEO_CODA is not set
 CONFIG_FB=y
 # CONFIG_FB_MX3 is not set
 CONFIG_FB_MXS=y
 CONFIG_FB_MXC_SYNC_PANEL=y
 CONFIG_FB_MXC_LDB=y
 # CONFIG_FB_MXC_EDID is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_LOGO=y
@@ -234,14 +226,15 @@ CONFIG_SND=y
 # CONFIG_SND_SUPPORT_OLD_API is not set
 # CONFIG_SND_VERBOSE_PROCFS is not set
 # CONFIG_SND_DRIVERS is not set
-# CONFIG_SND_PCI is not set
 # CONFIG_SND_ARM is not set
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_USB is not set
 CONFIG_SND_SOC=y
+CONFIG_SND_SOC_FSL_ASRC=y
 CONFIG_SND_IMX_SOC=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
-CONFIG_SND_SOC_IMX_HDMI=y
+CONFIG_SND_SOC_IMX_MAX98088=y
+CONFIG_SND_SOC_IMX_SPDIF=y
+CONFIG_SND_SOC_FSL_ASOC_CARD=y
 CONFIG_USB=y
 CONFIG_USB_OTG=y
 CONFIG_USB_EHCI_HCD=y
@@ -267,7 +260,6 @@ CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_G_SERIAL=m
 CONFIG_USB_CDC_COMPOSITE=m
 CONFIG_MMC=y
-CONFIG_MMC_BLOCK=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_ESDHC_IMX=y