kernel: refresh patches

[openwrt/staging/yousong.git] / target / linux / brcm2708 / patches-3.14 / 0042-ASoC-BCM2708-Add-support-for-RPi-DAC.patch

diff --git a/target/linux/brcm2708/patches-3.14/0042-ASoC-BCM2708-Add-support-for-RPi-DAC.patch b/target/linux/brcm2708/patches-3.14/0042-ASoC-BCM2708-Add-support-for-RPi-DAC.patch
index 7f4075a34f18308dd515630a1ecd1b58160ecc39..3cbafe1f688cfb5dd585429d6f949f7e9c2e3ee9 100644 (file)
--- a/target/linux/brcm2708/patches-3.14/0042-ASoC-BCM2708-Add-support-for-RPi-DAC.patch
+++ b/target/linux/brcm2708/patches-3.14/0042-ASoC-BCM2708-Add-support-for-RPi-DAC.patch
@@ -19,8 +19,6 @@ Signed-off-by: Florian Meier <florian.meier@koalo.de>
  create mode 100644 sound/soc/bcm/rpi-dac.c
  create mode 100644 sound/soc/codecs/pcm1794a.c
 
-diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig
-index 36e7473..f877ab2 100644
 --- a/arch/arm/configs/bcmrpi_defconfig
 +++ b/arch/arm/configs/bcmrpi_defconfig
 @@ -744,8 +744,10 @@ CONFIG_SND_SOC_DMAENGINE_PCM=y
@@ -34,11 +32,9 @@ index 36e7473..f877ab2 100644
  CONFIG_SOUND_PRIME=m
  CONFIG_HIDRAW=y
  CONFIG_HID_A4TECH=m
-diff --git a/arch/arm/mach-bcm2708/bcm2708.c b/arch/arm/mach-bcm2708/bcm2708.c
-index 82b09a5..cf10f74 100644
 --- a/arch/arm/mach-bcm2708/bcm2708.c
 +++ b/arch/arm/mach-bcm2708/bcm2708.c
-@@ -651,6 +651,20 @@ static struct platform_device snd_pcm5102a_codec_device = {
+@@ -651,6 +651,20 @@ static struct platform_device snd_pcm510
  };
  #endif
  
@@ -71,8 +67,6 @@ index 82b09a5..cf10f74 100644
        for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                struct amba_device *d = amba_devs[i];
                amba_device_register(d, &iomem_resource);
-diff --git a/sound/soc/bcm/Kconfig b/sound/soc/bcm/Kconfig
-index b36a62f..714841d 100644
 --- a/sound/soc/bcm/Kconfig
 +++ b/sound/soc/bcm/Kconfig
 @@ -25,3 +25,10 @@ config SND_BCM2708_SOC_HIFIBERRY_DAC
@@ -86,11 +80,9 @@ index b36a62f..714841d 100644
 +        select SND_SOC_PCM1794A
 +        help
 +         Say Y or M if you want to add support for RPi-DAC.
-diff --git a/sound/soc/bcm/Makefile b/sound/soc/bcm/Makefile
-index be90a49cb..ccc9809 100644
 --- a/sound/soc/bcm/Makefile
 +++ b/sound/soc/bcm/Makefile
-@@ -10,5 +10,7 @@ obj-$(CONFIG_SND_BCM2708_SOC_I2S) += snd-soc-bcm2708-i2s.o
+@@ -10,5 +10,7 @@ obj-$(CONFIG_SND_BCM2708_SOC_I2S) += snd
  
  # BCM2708 Machine Support
  snd-soc-hifiberry-dac-objs := hifiberry_dac.o
@@ -98,9 +90,6 @@ index be90a49cb..ccc9809 100644
  
  obj-$(CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC) += snd-soc-hifiberry-dac.o
 +obj-$(CONFIG_SND_BCM2708_SOC_RPI_DAC) += snd-soc-rpi-dac.o
-diff --git a/sound/soc/bcm/rpi-dac.c b/sound/soc/bcm/rpi-dac.c
-new file mode 100644
-index 0000000..ef3cd93
 --- /dev/null
 +++ b/sound/soc/bcm/rpi-dac.c
 @@ -0,0 +1,97 @@
@@ -201,8 +190,6 @@ index 0000000..ef3cd93
 +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
 +MODULE_DESCRIPTION("ASoC Driver for RPi-DAC");
 +MODULE_LICENSE("GPL v2");
-diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
-index f0d76ec..4d2569e 100644
 --- a/sound/soc/codecs/Kconfig
 +++ b/sound/soc/codecs/Kconfig
 @@ -59,6 +59,7 @@ config SND_SOC_ALL_CODECS
@@ -223,8 +210,6 @@ index f0d76ec..4d2569e 100644
  config SND_SOC_PCM5102A
        tristate
  
-diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
-index 612f414..9b806a2 100644
 --- a/sound/soc/codecs/Makefile
 +++ b/sound/soc/codecs/Makefile
 @@ -46,6 +46,7 @@ snd-soc-hdmi-codec-objs := hdmi.o
@@ -235,7 +220,7 @@ index 612f414..9b806a2 100644
  snd-soc-pcm5102a-objs := pcm5102a.o
  snd-soc-rt5631-objs := rt5631.o
  snd-soc-rt5640-objs := rt5640.o
-@@ -180,6 +181,7 @@ obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-soc-hdmi-codec.o
+@@ -180,6 +181,7 @@ obj-$(CONFIG_SND_SOC_HDMI_CODEC) += snd-
  obj-$(CONFIG_SND_SOC_PCM1681) += snd-soc-pcm1681.o
  obj-$(CONFIG_SND_SOC_PCM1792A)        += snd-soc-pcm1792a-codec.o
  obj-$(CONFIG_SND_SOC_PCM3008) += snd-soc-pcm3008.o
@@ -243,9 +228,6 @@ index 612f414..9b806a2 100644
  obj-$(CONFIG_SND_SOC_PCM5102A)        += snd-soc-pcm5102a.o
  obj-$(CONFIG_SND_SOC_RT5631)  += snd-soc-rt5631.o
  obj-$(CONFIG_SND_SOC_RT5640)  += snd-soc-rt5640.o
-diff --git a/sound/soc/codecs/pcm1794a.c b/sound/soc/codecs/pcm1794a.c
-new file mode 100644
-index 0000000..b4eaa44
 --- /dev/null
 +++ b/sound/soc/codecs/pcm1794a.c
 @@ -0,0 +1,62 @@
@@ -311,6 +293,3 @@ index 0000000..b4eaa44
 +MODULE_DESCRIPTION("ASoC PCM1794A codec driver");
 +MODULE_AUTHOR("Florian Meier <florian.meier@koalo.de>");
 +MODULE_LICENSE("GPL v2");
--- 
-1.9.1
-