aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/imx23/patches
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/imx23/patches')
-rw-r--r--target/linux/imx23/patches/100-soc-audio-support.patch30
-rw-r--r--target/linux/imx23/patches/101-soc-audio-dts.patch5
-rw-r--r--target/linux/imx23/patches/105-imx23-dcp.patch21
-rw-r--r--target/linux/imx23/patches/106-add-dcp-dts.patch12
-rw-r--r--target/linux/imx23/patches/110-lradc-dts.patch11
5 files changed, 20 insertions, 59 deletions
diff --git a/target/linux/imx23/patches/100-soc-audio-support.patch b/target/linux/imx23/patches/100-soc-audio-support.patch
index 33a1ea43ff..ef07f92c78 100644
--- a/target/linux/imx23/patches/100-soc-audio-support.patch
+++ b/target/linux/imx23/patches/100-soc-audio-support.patch
@@ -1,5 +1,3 @@
-diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index 2f45f00..8226a88 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -125,6 +125,7 @@ config SND_SOC_ALL_CODECS
@@ -20,8 +18,6 @@ index 2f45f00..8226a88 100644
# Amp
config SND_SOC_LM4857
tristate
-diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index b9e41c9..e3b6654 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -118,6 +118,7 @@ snd-soc-wm9705-objs := wm9705.o
@@ -32,7 +28,7 @@ index b9e41c9..e3b6654 100644
# Amp
snd-soc-max9877-objs := max9877.o
-@@ -242,6 +243,7 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o
+@@ -242,6 +243,7 @@ obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-
obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
obj-$(CONFIG_SND_SOC_WM_ADSP) += snd-soc-wm-adsp.o
obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o
@@ -40,9 +36,6 @@ index b9e41c9..e3b6654 100644
# Amp
obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o
-diff --git a/sound/soc/codecs/mxs-builtin-codec.c b/sound/soc/codecs/mxs-builtin-codec.c
-new file mode 100644
-index 0000000..144b225
--- /dev/null
+++ b/sound/soc/codecs/mxs-builtin-codec.c
@@ -0,0 +1,1128 @@
@@ -1174,9 +1167,6 @@ index 0000000..144b225
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec Driver");
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
+MODULE_LICENSE("GPL");
-diff --git a/sound/soc/codecs/mxs-builtin-codec.h b/sound/soc/codecs/mxs-builtin-codec.h
-new file mode 100644
-index 0000000..75dee0b
--- /dev/null
+++ b/sound/soc/codecs/mxs-builtin-codec.h
@@ -0,0 +1,825 @@
@@ -2005,8 +1995,6 @@ index 0000000..75dee0b
+#define BV_AUDIOIN_ADCVOL_SELECT__MIC 0x00
+
+#endif /* __MXS_ADC_CODEC_H */
-diff --git a/sound/soc/mxs/Kconfig b/sound/soc/mxs/Kconfig
-index 78d321c..9b8dd7d 100644
--- a/sound/soc/mxs/Kconfig
+++ b/sound/soc/mxs/Kconfig
@@ -18,3 +18,13 @@ config SND_SOC_MXS_SGTL5000
@@ -2023,11 +2011,9 @@ index 78d321c..9b8dd7d 100644
+ help
+ Say Y or M if you want to add support for codecs attached to
+ the MXS SAIF interface.
-diff --git a/sound/soc/mxs/Makefile b/sound/soc/mxs/Makefile
-index 565b5b5..cd0cf16 100644
--- a/sound/soc/mxs/Makefile
+++ b/sound/soc/mxs/Makefile
-@@ -8,3 +8,12 @@ obj-$(CONFIG_SND_MXS_SOC) += snd-soc-mxs.o snd-soc-mxs-pcm.o
+@@ -8,3 +8,12 @@ obj-$(CONFIG_SND_MXS_SOC) += snd-soc-mxs
snd-soc-mxs-sgtl5000-objs := mxs-sgtl5000.o
obj-$(CONFIG_SND_SOC_MXS_SGTL5000) += snd-soc-mxs-sgtl5000.o
@@ -2040,9 +2026,6 @@ index 565b5b5..cd0cf16 100644
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-pcm.o
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-dai.o
+obj-$(CONFIG_SND_MXS_SOC_BUILTIN) += snd-soc-mxs-builtin-audio.o
-diff --git a/sound/soc/mxs/mxs-builtin-audio.c b/sound/soc/mxs/mxs-builtin-audio.c
-new file mode 100644
-index 0000000..088863e
--- /dev/null
+++ b/sound/soc/mxs/mxs-builtin-audio.c
@@ -0,0 +1,120 @@
@@ -2166,9 +2149,6 @@ index 0000000..088863e
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Machine Driver");
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
+MODULE_LICENSE("GPL");
-diff --git a/sound/soc/mxs/mxs-builtin-dai.c b/sound/soc/mxs/mxs-builtin-dai.c
-new file mode 100644
-index 0000000..d12bde7
--- /dev/null
+++ b/sound/soc/mxs/mxs-builtin-dai.c
@@ -0,0 +1,588 @@
@@ -2760,9 +2740,6 @@ index 0000000..d12bde7
+MODULE_DESCRIPTION("Freescale MXS ADC/DAC SoC Codec DAI Driver");
+MODULE_AUTHOR("Michal Ulianko <michal.ulianko@gmail.com>");
+MODULE_LICENSE("GPL");
-diff --git a/sound/soc/mxs/mxs-builtin-pcm.c b/sound/soc/mxs/mxs-builtin-pcm.c
-new file mode 100644
-index 0000000..9f155df
--- /dev/null
+++ b/sound/soc/mxs/mxs-builtin-pcm.c
@@ -0,0 +1,69 @@
@@ -2835,9 +2812,6 @@ index 0000000..9f155df
+EXPORT_SYMBOL_GPL(mxs_adc_pcm_platform_unregister);
+
+MODULE_LICENSE("GPL");
-diff --git a/sound/soc/mxs/mxs-builtin-pcm.h b/sound/soc/mxs/mxs-builtin-pcm.h
-new file mode 100644
-index 0000000..2fba109
--- /dev/null
+++ b/sound/soc/mxs/mxs-builtin-pcm.h
@@ -0,0 +1,25 @@
diff --git a/target/linux/imx23/patches/101-soc-audio-dts.patch b/target/linux/imx23/patches/101-soc-audio-dts.patch
index a93c937dc2..924cbebb08 100644
--- a/target/linux/imx23/patches/101-soc-audio-dts.patch
+++ b/target/linux/imx23/patches/101-soc-audio-dts.patch
@@ -1,6 +1,5 @@
-diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.snd/arch/arm/boot/dts/imx23-olinuxino.dts
---- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-01 00:13:29.000000000 +0200
-+++ linux-3.10.snd/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-30 14:43:31.000000000 +0200
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -84,6 +84,25 @@
usbphy0: usbphy@8007c000 {
status = "okay";
diff --git a/target/linux/imx23/patches/105-imx23-dcp.patch b/target/linux/imx23/patches/105-imx23-dcp.patch
index cbc25a06b3..ae74209775 100644
--- a/target/linux/imx23/patches/105-imx23-dcp.patch
+++ b/target/linux/imx23/patches/105-imx23-dcp.patch
@@ -1,10 +1,8 @@
-diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
-index dffb855..3e11215 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
-@@ -286,6 +286,16 @@ config CRYPTO_DEV_SAHARA
- This option enables support for the SAHARA HW crypto accelerator
- found in some Freescale i.MX chips.
+@@ -287,6 +287,16 @@ config CRYPTO_DEV_SAHARA
+ This option enables support for the SAHARA HW crypto accelerator
+ found in some Freescale i.MX chips.
+config CRYPTO_DEV_DCP
+ tristate "Support for the DCP engine"
@@ -17,13 +15,11 @@ index dffb855..3e11215 100644
+ capabilities of the DCP co-processor
+
config CRYPTO_DEV_S5P
- tristate "Support for Samsung S5PV210 crypto accelerator"
- depends on ARCH_S5PV210
-diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
-index 38ce13d..b4946dd 100644
+ tristate "Support for Samsung S5PV210 crypto accelerator"
+ depends on ARCH_S5PV210
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
-@@ -13,6 +13,7 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += omap-sham.o
+@@ -13,6 +13,7 @@ obj-$(CONFIG_CRYPTO_DEV_OMAP_SHAM) += om
obj-$(CONFIG_CRYPTO_DEV_OMAP_AES) += omap-aes.o
obj-$(CONFIG_CRYPTO_DEV_PICOXCELL) += picoxcell_crypto.o
obj-$(CONFIG_CRYPTO_DEV_SAHARA) += sahara.o
@@ -31,9 +27,6 @@ index 38ce13d..b4946dd 100644
obj-$(CONFIG_CRYPTO_DEV_S5P) += s5p-sss.o
obj-$(CONFIG_CRYPTO_DEV_TEGRA_AES) += tegra-aes.o
obj-$(CONFIG_CRYPTO_DEV_UX500) += ux500/
-diff --git a/drivers/crypto/dcp.c b/drivers/crypto/dcp.c
-new file mode 100644
-index 0000000..eea194c
--- /dev/null
+++ b/drivers/crypto/dcp.c
@@ -0,0 +1,925 @@
@@ -962,5 +955,3 @@ index 0000000..eea194c
+MODULE_AUTHOR("Tobias Rauter <tobias.rau...@gmail.com>");
+MODULE_DESCRIPTION("Freescale DCP Crypto Driver");
+MODULE_LICENSE("GPL");
-
-
diff --git a/target/linux/imx23/patches/106-add-dcp-dts.patch b/target/linux/imx23/patches/106-add-dcp-dts.patch
index 6d50df6005..ddb223c38c 100644
--- a/target/linux/imx23/patches/106-add-dcp-dts.patch
+++ b/target/linux/imx23/patches/106-add-dcp-dts.patch
@@ -1,7 +1,6 @@
-diff -ruN linux-3.10/arch/arm/boot/dts/imx23.dtsi linux-3.10.dcp/arch/arm/boot/dts/imx23.dtsi
---- linux-3.10/arch/arm/boot/dts/imx23.dtsi 2013-07-01 00:13:29.000000000 +0200
-+++ linux-3.10.dcp/arch/arm/boot/dts/imx23.dtsi 2013-08-03 11:15:59.000000000 +0200
-@@ -333,6 +333,7 @@
+--- a/arch/arm/boot/dts/imx23.dtsi
++++ b/arch/arm/boot/dts/imx23.dtsi
+@@ -337,6 +337,7 @@
dcp@80028000 {
reg = <0x80028000 0x2000>;
@@ -9,9 +8,8 @@ diff -ruN linux-3.10/arch/arm/boot/dts/imx23.dtsi linux-3.10.dcp/arch/arm/boot/d
status = "disabled";
};
-diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.dcp/arch/arm/boot/dts/imx23-olinuxino.dts
---- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-01 00:13:29.000000000 +0200
-+++ linux-3.10.dcp/arch/arm/boot/dts/imx23-olinuxino.dts 2013-08-02 12:30:07.000000000 +0200
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -66,6 +66,12 @@
pinctrl-0 = <&spi2_pins_a>;
status = "okay";
diff --git a/target/linux/imx23/patches/110-lradc-dts.patch b/target/linux/imx23/patches/110-lradc-dts.patch
index 936fac65b3..a2b9886959 100644
--- a/target/linux/imx23/patches/110-lradc-dts.patch
+++ b/target/linux/imx23/patches/110-lradc-dts.patch
@@ -1,9 +1,8 @@
-diff -ruN linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts linux-3.10.new/arch/arm/boot/dts/imx23-olinuxino.dts
---- linux-3.10/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-08 23:35:34.000000000 +0200
-+++ linux-3.10.new/arch/arm/boot/dts/imx23-olinuxino.dts 2013-07-08 23:35:44.000000000 +0200
-@@ -90,6 +90,11 @@
- usbphy0: usbphy@8007c000 {
- status = "okay";
+--- a/arch/arm/boot/dts/imx23-olinuxino.dts
++++ b/arch/arm/boot/dts/imx23-olinuxino.dts
+@@ -109,6 +109,11 @@
+ dmas = <&dma_apbx 0>, <&dma_apbx 1>;
+ dma-names = "rx", "tx";
};
+
+ lradc@80050000 {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 03:32:32 +0000