diff --git a/config/linux-udoo-default.config b/config/linux-udoo-default.config index 4de5cead78..7edf0474d7 100644 --- a/config/linux-udoo-default.config +++ b/config/linux-udoo-default.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 3.14.57 Kernel Configuration +# Linux/arm 3.14.58 Kernel Configuration # CONFIG_ARM=y CONFIG_MIGHT_HAVE_PCI=y @@ -329,11 +329,6 @@ CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SX=y # CONFIG_SOC_VF610 is not set - -# -# UDOO Boards -# -CONFIG_UDOO_QDL_HALT=y # CONFIG_ARCH_OMAP3 is not set # CONFIG_ARCH_OMAP4 is not set # CONFIG_SOC_OMAP5 is not set @@ -2471,12 +2466,14 @@ CONFIG_SND_SOC_IMX_HDMI=y # CONFIG_SND_SOC_IMX_SI476X is not set # CONFIG_SND_SOC_IMX_TDA19988 is not set # CONFIG_SND_SOC_IMX_TDA1997X is not set +CONFIG_SND_SOC_IMX_ES9023=m CONFIG_SND_SOC_I2C_AND_SPI=y CONFIG_SND_SOC_CS42XX8=m CONFIG_SND_SOC_CS42XX8_I2C=m CONFIG_SND_SOC_FSL_MQS=y CONFIG_SND_SOC_HDMI_CODEC=y CONFIG_SND_SOC_VT1613=y +CONFIG_SND_SOC_ES9023=m # CONFIG_SND_SIMPLE_CARD is not set # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=y @@ -2933,9 +2930,9 @@ CONFIG_LEDS_TRIGGER_GPIO=y # CONFIG_EDAC is not set CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=y -CONFIG_RTC_HCTOSYS=n +# CONFIG_RTC_HCTOSYS is not set CONFIG_RTC_SYSTOHC=y -# CONFIG_RTC_HCTOSYS_DEVICE is not set +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" # CONFIG_RTC_DEBUG is not set # diff --git a/patch/kernel/udoo-default/disable_csi_camera.patch b/patch/kernel/udoo-default/disable_csi_camera.patch new file mode 100644 index 0000000000..d72736dd1b --- /dev/null +++ b/patch/kernel/udoo-default/disable_csi_camera.patch @@ -0,0 +1,33 @@ +diff --git a/arch/arm/boot/dts/imx6qdl-udoo.dtsi b/arch/arm/boot/dts/imx6qdl-udoo.dtsi +old mode 100644 +new mode 100755 +index e7cd2e9..cb3fff8 +--- a/arch/arm/boot/dts/imx6qdl-udoo.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-udoo.dtsi +@@ -125,7 +125,7 @@ + ipu_id = <0>; + csi_id = <0>; + mclk_source = <0>; +- status = "okay"; ++ status = "disabled"; + }; + + v4l2_cap_1 { +@@ -133,7 +133,7 @@ + ipu_id = <0>; + csi_id = <1>; + mclk_source = <0>; +- status = "okay"; ++ status = "disabled"; + }; + + v4l2_out { +@@ -214,7 +214,7 @@ + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c3>; +- status = "okay"; ++ status = "disabled"; + ov5640_mipi: ov5640_mipi@3c { + compatible = "ovti,ov5640_mipi"; + reg = <0x3c>;