Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linux-compulab: update from 3.14.28 to 3.14.52. #3

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ index 144cd69..65f8e6f 100644
snd-soc-imx-cs42888-objs := imx-cs42888.o
snd-soc-imx-sgtl5000-objs := imx-sgtl5000.o
+snd-soc-imx-wm8731-objs := imx-wm8731.o
snd-soc-imx-wm8958-objs := imx-wm8958.o
snd-soc-imx-wm8960-objs := imx-wm8960.o
snd-soc-imx-wm8962-objs := imx-wm8962.o
snd-soc-imx-spdif-objs := imx-spdif.o
snd-soc-imx-mc13783-objs := imx-mc13783.o
@@ -69,6 +70,7 @@ obj-$(CONFIG_SND_MXC_SOC_WM1133_EV1) += snd-soc-wm1133-ev1.o
obj-$(CONFIG_SND_SOC_IMX_CS42888) += snd-soc-imx-cs42888.o
obj-$(CONFIG_SND_SOC_IMX_SGTL5000) += snd-soc-imx-sgtl5000.o
obj-${CONFIG_SND_SOC_IMX_WM8958} += snd-soc-imx-wm8958.o
obj-${CONFIG_SND_SOC_IMX_WM8960} += snd-soc-imx-wm8960.o
obj-$(CONFIG_SND_SOC_IMX_WM8962) += snd-soc-imx-wm8962.o
+obj-$(CONFIG_SND_SOC_IMX_WM8731) += snd-soc-imx-wm8731.o
obj-$(CONFIG_SND_SOC_IMX_SII902X) += snd-soc-imx-sii902x.o
obj-$(CONFIG_SND_SOC_IMX_SPDIF) += snd-soc-imx-spdif.o
obj-$(CONFIG_SND_SOC_IMX_MC13783) += snd-soc-imx-mc13783.o
obj-$(CONFIG_SND_SOC_IMX_HDMI) += snd-soc-imx-hdmi.o
diff --git a/sound/soc/fsl/imx-wm8731.c b/sound/soc/fsl/imx-wm8731.c
new file mode 100644
index 0000000..ba1363f
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ index 699bf8f..0d6813e 100644
imx6q-phytec-pbab01.dtb \
imx6q-sabreauto.dtb \
@@ -179,6 +183,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
imx6q-sabresd-uart.dtb \
imx6q-sabresd-hdcp.dtb \
imx6q-sabresd-enetirq.dtb \
imx6q-sabresd-ldo.dtb \
imx6q-sabresd-hdcp.dtb \
+ imx6q-sbc-fx6.dtb \
+ imx6q-sbc-fx6m.dtb \
imx6q-sbc6x.dtb \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
require recipes-kernel/linux/linux-imx.inc
require recipes-kernel/linux/linux-dtb.inc

SUMMARY = "CompuLab 3.14.28 kernel"
SUMMARY = "CompuLab 3.14.52 kernel"
DESCRIPTION = "Linux kernel for CompuLab cm-fx6 boards."

DEPENDS += "lzop-native bc-native"

SRCBRANCH = "imx_3.14.28_1.0.0_ga"
SRCREV = "91cf351a2afc17ac4a260e4d2ad1e32d00925a1b"
SRCBRANCH = "imx_3.14.52_1.1.0_ga"
SRCREV = "5f6f0a50e6039370078369ddf380179d59024789"
LOCALVERSION = "-cm-fx6"

SRC_URI += "file://defconfig \
Expand Down