Unverified Commit cab65577 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Merge up fixes 

Some refactoring opportunities for the rcard driver were noticed while
fixing a bug.
parents c6631cee 3692a4cc

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml

+9 −9
Original line number Diff line number Diff line
@@ -102,21 +102,21 @@ properties: 
    default: 2



  interrupts:

    oneOf:

      - minItems: 1

        items:

          - description: TX interrupt

          - description: RX interrupt

      - items:

          - description: common/combined interrupt

    minItems: 1

    maxItems: 2



  interrupt-names:

    oneOf:

      - minItems: 1

      - description: TX interrupt

        const: tx

      - description: RX interrupt

        const: rx

      - description: TX and RX interrupts

        items:

          - const: tx

          - const: rx

      - const: common

      - description: Common/combined interrupt

        const: common



  fck_parent:

    $ref: /schemas/types.yaml#/definitions/string

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -15089,6 +15089,7 @@ F: drivers/spi/spi-at91-usart.c 








MICROCHIP AUDIO ASOC DRIVERS









M:	Claudiu Beznea <claudiu.beznea@tuxon.dev>









M:	Andrei Simion <andrei.simion@microchip.com>









L:	linux-sound@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/sound/atmel*








@@ -15197,6 +15198,7 @@ F:	include/video/atmel_lcdc.h















MICROCHIP MCP16502 PMIC DRIVER









M:	Claudiu Beznea <claudiu.beznea@tuxon.dev>









M:	Andrei Simion <andrei.simion@microchip.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









F:	Documentation/devicetree/bindings/regulator/microchip,mcp16502.yaml








@@ -15328,6 +15330,7 @@ F:	drivers/spi/spi-atmel.*















MICROCHIP SSC DRIVER









M:	Claudiu Beznea <claudiu.beznea@tuxon.dev>









M:	Andrei Simion <andrei.simion@microchip.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Supported









F:	Documentation/devicetree/bindings/misc/atmel-ssc.txt
































include/uapi/sound/asoc.h



+1
−1






























Original line number
Diff line number
Diff line







@@ -88,7 +88,7 @@

















/* ABI version */









#define SND_SOC_TPLG_ABI_VERSION	0x5	/* current version */









#define SND_SOC_TPLG_ABI_VERSION_MIN	0x4	/* oldest version supported */









#define SND_SOC_TPLG_ABI_VERSION_MIN	0x5	/* oldest version supported */



















/* Max size of TLV data */









#define SND_SOC_TPLG_TLV_SIZE		32
































sound/soc/amd/yc/acp6x-mach.c



+7
−0






























Original line number
Diff line number
Diff line







@@ -339,6 +339,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = {







			DMI_MATCH(DMI_PRODUCT_NAME, "M7600RE"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {









			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),









			DMI_MATCH(DMI_PRODUCT_NAME, "M3502RA"),









		}









	},









	{









		.driver_data = &acp6x_card,









		.matches = {
































sound/soc/codecs/max98388.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -763,6 +763,7 @@ static int max98388_dai_tdm_slot(struct snd_soc_dai *dai,







			addr = MAX98388_R2044_PCM_TX_CTRL1 + (cnt / 8);









			bits = cnt % 8;









			regmap_update_bits(max98388->regmap, addr, bits, bits);









			slot_found++;









			if (slot_found >= MAX_NUM_CH)









				break;









		}