Merge remote-tracking branches 'asoc/topic/wm8996', 'asoc/topic/xtensa' and 'asoc...

diff --combined sound/soc/codecs/wm8996.c
index a1905433b1253d2dfcf5d1aeeb8ee0eccdf50993,370459fcf21cb85f3fed9b782fd34d5a28dc89e2,3dd063f682b29f6fa4e1bb1dbdda1a3305c750bc,3dd063f682b29f6fa4e1bb1dbdda1a3305c750bc..f7ccd9fc5808e56950225d2ccccd7a8ad8d2de62
--- 1/sound/soc/codecs/wm8996.c
--- 2/sound/soc/codecs/wm8996.c
--- 3/sound/soc/codecs/wm8996.c
--- 4/sound/soc/codecs/wm8996.c
+++ b/sound/soc/codecs/wm8996.c
@@@@@ -117,7 -117,7 -117,7 -117,7 +117,7 @@@@@ WM8996_REGULATOR_EVENT(0
    WM8996_REGULATOR_EVENT(1)
    WM8996_REGULATOR_EVENT(2)
    
 ---static struct reg_default wm8996_reg[] = {
 +++static const struct reg_default wm8996_reg[] = {
        { WM8996_POWER_MANAGEMENT_1, 0x0 },
        { WM8996_POWER_MANAGEMENT_2, 0x0 },
        { WM8996_POWER_MANAGEMENT_3, 0x0 },
@@@@@ -1780,7 -1780,7 -1780,7 -1780,7 +1780,7 @@@@@ static int wm8996_hw_params(struct snd_
        wm8996->rx_rate[dai->id] = params_rate(params);
    
        /* Needs looking at for TDM */
 ---    bits = snd_pcm_format_width(params_format(params));
 +++    bits = params_width(params);
        if (bits < 0)
                return bits;
        aifdata |= (bits << WM8996_AIF1TX_WL_SHIFT) | bits;
@@@@@ -2647,12 -2647,10 -2647,12 -2647,12 +2647,10 @@@@@ static int wm8996_probe(struct snd_soc_
                if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))
                        ret = request_threaded_irq(i2c->irq, NULL,
                                                   wm8996_edge_irq,
- --                                               irq_flags | IRQF_ONESHOT,
- --                                               "wm8996", codec);
+ ++                                               irq_flags, "wm8996", codec);
                else
                        ret = request_threaded_irq(i2c->irq, NULL, wm8996_irq,
- --                                               irq_flags | IRQF_ONESHOT,
- --                                               "wm8996", codec);
+ ++                                               irq_flags, "wm8996", codec);
    
                if (ret == 0) {
                        /* Unmask the interrupt */
@@@@@ -3100,6 -3098,7 -3100,7 -3100,7 +3098,6 @@@@@ MODULE_DEVICE_TABLE(i2c, wm8996_i2c_id)
    static struct i2c_driver wm8996_i2c_driver = {
        .driver = {
                .name = "wm8996",
 ---            .owner = THIS_MODULE,
        },
        .probe =    wm8996_i2c_probe,
        .remove =   wm8996_i2c_remove,

diff --combined sound/soc/zte/zx296702-i2s.c
index 1930c42e1f557ae62c30003b379088f242b0dbfe,98d96e1b17e05847aaa2b48740f3f9f0cc2c6e2a,98d96e1b17e05847aaa2b48740f3f9f0cc2c6e2a,f4b681d7769a78b4c784f6a9608d0315e97eaca5..1cad93dc1fcfdb669a876b1cfa6c2afbc625fe16
--- 1/sound/soc/zte/zx296702-i2s.c
--- 2/sound/soc/zte/zx296702-i2s.c
--- 3/sound/soc/zte/zx296702-i2s.c
--- 4/sound/soc/zte/zx296702-i2s.c
+++ b/sound/soc/zte/zx296702-i2s.c
@@@@@ -380,7 -380,7 -380,7 -380,7 +380,7 @@@@@ static int zx_i2s_probe(struct platform
        struct zx_i2s_info *zx_i2s;
        int ret;
    
---     zx_i2s =  kzalloc(sizeof(*zx_i2s), GFP_KERNEL);
+++     zx_i2s = devm_kzalloc(&pdev->dev, sizeof(*zx_i2s), GFP_KERNEL);
        if (!zx_i2s)
                return -ENOMEM;
    
@@@@@ -393,16 -393,16 -393,16 -393,16 +393,16 @@@@@
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        zx_i2s->mapbase = res->start;
        zx_i2s->reg_base = devm_ioremap_resource(&pdev->dev, res);
 ---    if (!zx_i2s->reg_base) {
 +++    if (IS_ERR(zx_i2s->reg_base)) {
                dev_err(&pdev->dev, "ioremap failed!\n");
 ---            return -EIO;
 +++            return PTR_ERR(zx_i2s->reg_base);
        }
    
        writel_relaxed(0, zx_i2s->reg_base + ZX_I2S_FIFO_CTRL);
        platform_set_drvdata(pdev, zx_i2s);
    
---     ret = snd_soc_register_component(&pdev->dev, &zx_i2s_component,
---                                      &zx_i2s_dai, 1);
+++     ret = devm_snd_soc_register_component(&pdev->dev, &zx_i2s_component,
+++                                           &zx_i2s_dai, 1);
        if (ret) {
                dev_err(&pdev->dev, "Register DAI failed: %d\n", ret);
                return ret;