aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2013-11-27 12:34:41 +0000
committerImre Kaloz <kaloz@openwrt.org>2013-11-27 12:34:41 +0000
commit94cdb9986f60a1fbcd78385bf791b7d87b43e24d (patch)
tree6f9635835d1f20a2184101dd93d5024a8d693557 /target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch
parent60b5ba0f1db9e640fbaf1144e7abf0ff24b0146c (diff)
downloadupstream-94cdb9986f60a1fbcd78385bf791b7d87b43e24d.tar.gz
upstream-94cdb9986f60a1fbcd78385bf791b7d87b43e24d.tar.bz2
upstream-94cdb9986f60a1fbcd78385bf791b7d87b43e24d.zip
[omap]: refresh/rename patches
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38932 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch')
-rw-r--r--target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch11
1 files changed, 2 insertions, 9 deletions
diff --git a/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch b/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch
index e377cb264d..0421b9008a 100644
--- a/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch
+++ b/target/linux/omap/patches-3.12/415-ASoC-davinci-mcasp-Remove-redundant-num-serializer-D.patch
@@ -16,8 +16,6 @@ Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
sound/soc/davinci/davinci-mcasp.c | 22 +++++---------------
2 files changed, 8 insertions(+), 22 deletions(-)
-diff --git a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
-index 2fd0bf2..be6cf94 100644
--- a/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
+++ b/Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt
@@ -13,10 +13,9 @@ Required properties:
@@ -42,11 +40,9 @@ index 2fd0bf2..be6cf94 100644
serial-dir = <
0 0 0 0 /* 0: INACTIVE, 1: TX, 2: RX */
0 0 0 0
-diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/davinci/davinci-mcasp.c
-index acbf5f8..69e662e 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/davinci/davinci-mcasp.c
-@@ -1050,7 +1050,6 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
+@@ -1050,7 +1050,6 @@ static struct snd_platform_data *davinci
struct of_phandle_args dma_spec;
const u32 *of_serial_dir32;
@@ -54,7 +50,7 @@ index acbf5f8..69e662e 100644
u32 val;
int i, ret = 0;
-@@ -1081,32 +1080,21 @@ static struct snd_platform_data *davinci_mcasp_set_pdata_from_of(
+@@ -1081,32 +1080,21 @@ static struct snd_platform_data *davinci
pdata->tdm_slots = val;
}
@@ -92,6 +88,3 @@ index acbf5f8..69e662e 100644
pdata->serial_dir = of_serial_dir;
}
---
-1.7.10.4
-