Unverified Commit 55331b55 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: remove obsolete drivers" from Arnd Bergmann <arnd@kernel.org>

Arnd Bergmann <arnd@arndb.de>:

From: Arnd Bergmann <arnd@arndb.de>

A few Arm platforms are getting removed in v5.12, this removes
the corresponding sound drivers.

Link: https://lore.kernel.org/linux-arm-kernel/20210120124812.2800027-1-arnd@kernel.org/T/

Arnd Bergmann (2):
  ASoC: remove sirf prima/atlas drivers
  ASoC: remove zte zx drivers

 .../bindings/sound/sirf-audio-codec.txt       |  17 -
 .../devicetree/bindings/sound/sirf-usp.txt    |  27 -
 .../devicetree/bindings/sound/zte,tdm.txt     |  30 -
 .../bindings/sound/zte,zx-aud96p22.txt        |  24 -
 .../devicetree/bindings/sound/zte,zx-i2s.txt  |  45 --
 .../bindings/sound/zte,zx-spdif.txt           |  27 -
 sound/soc/Kconfig                             |   2 -
 sound/soc/Makefile                            |   2 -
 sound/soc/codecs/Makefile                     |   4 -
 sound/soc/codecs/sirf-audio-codec.c           | 575 ------------------
 sound/soc/codecs/zx_aud96p22.c                | 401 ------------
 sound/soc/sirf/Kconfig                        |  21 -
 sound/soc/sirf/Makefile                       |   8 -
 sound/soc/sirf/sirf-audio-port.c              |  86 ---
 sound/soc/sirf/sirf-audio.c                   | 160 -----
 sound/soc/sirf/sirf-usp.c                     | 435 -------------
 sound/soc/sirf/sirf-usp.h                     | 292 ---------
 sound/soc/zte/Kconfig                         |  26 -
 sound/soc/zte/Makefile                        |   4 -
 sound/soc/zte/zx-i2s.c                        | 452 --------------
 sound/soc/zte/zx-spdif.c                      | 363 -----------
 sound/soc/zte/zx-tdm.c                        | 458 --------------
 22 files changed, 3459 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/sound/sirf-audio-codec.txt
 delete mode 100644 Documentation/devicetree/bindings/sound/sirf-usp.txt
 delete mode 100644 Documentation/devicetree/bindings/sound/zte,tdm.txt
 delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-aud96p22.txt
 delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-i2s.txt
 delete mode 100644 Documentation/devicetree/bindings/sound/zte,zx-spdif.txt
 delete mode 100644 sound/soc/codecs/sirf-audio-codec.c
 delete mode 100644 sound/soc/codecs/zx_aud96p22.c
 delete mode 100644 sound/soc/sirf/Kconfig
 delete mode 100644 sound/soc/sirf/Makefile
 delete mode 100644 sound/soc/sirf/sirf-audio-port.c
 delete mode 100644 sound/soc/sirf/sirf-audio.c
 delete mode 100644 sound/soc/sirf/sirf-usp.c
 delete mode 100644 sound/soc/sirf/sirf-usp.h
 delete mode 100644 sound/soc/zte/Kconfig
 delete mode 100644 sound/soc/zte/Makefile
 delete mode 100644 sound/soc/zte/zx-i2s.c
 delete mode 100644 sound/soc/zte/zx-spdif.c
 delete mode 100644 sound/soc/zte/zx-tdm.c

--
2.29.2
parents 4e63b565 dc98f1d6
Loading
Loading
Loading
Loading
+0 −17
Original line number Diff line number Diff line
SiRF internal audio CODEC

Required properties:

  - compatible : "sirf,atlas6-audio-codec" or "sirf,prima2-audio-codec"

  - reg : the register address of the device.

  - clocks: the clock of SiRF internal audio codec

Example:

audiocodec: audiocodec@b0040000 {
	compatible = "sirf,atlas6-audio-codec";
	reg = <0xb0040000 0x10000>;
	clocks = <&clks 27>;
};
+0 −27
Original line number Diff line number Diff line
* SiRF SoC USP module

Required properties:
- compatible: "sirf,prima2-usp-pcm"
- reg: Base address and size entries:
- dmas: List of DMA controller phandle and DMA request line ordered pairs.
- dma-names: Identifier string for each DMA request line in the dmas property.
  These strings correspond 1:1 with the ordered pairs in dmas.

  One of the DMA channels will be responsible for transmission (should be
  named "tx") and one for reception (should be named "rx").

- clocks: USP controller clock source
- pinctrl-names: Must contain a "default" entry.
- pinctrl-NNN: One property must exist for each entry in pinctrl-names.

Example:
usp0: usp@b0080000 {
	compatible = "sirf,prima2-usp-pcm";
	reg = <0xb0080000 0x10000>;
	clocks = <&clks 28>;
	dmas = <&dmac1 1>, <&dmac1 2>;
	dma-names = "rx", "tx";
	pinctrl-names = "default";
	pinctrl-0 = <&usp0_only_utfs_pins_a>;
};
+0 −30
Original line number Diff line number Diff line
ZTE TDM DAI driver

Required properties:

- compatible : should be one of the following.
       * zte,zx296718-tdm
- reg : physical base address of the controller and length of memory mapped
    region.
- clocks : Pairs of phandle and specifier referencing the controller's clocks.
- clock-names: "wclk" for the wclk.
               "pclk" for the pclk.
-#clock-cells: should be 1.
- zte,tdm-dma-sysctrl : Reference to the sysctrl controller controlling
    the dma. includes:
	phandle of sysctrl.
	register offset in sysctrl for control dma.
	mask of the register that be written to sysctrl.

Example:

	tdm: tdm@1487000 {
		compatible = "zte,zx296718-tdm";
		reg = <0x01487000 0x1000>;
		clocks = <&audiocrm AUDIO_TDM_WCLK>, <&audiocrm AUDIO_TDM_PCLK>;
		clock-names = "wclk", "pclk";
		#clock-cells = <1>;
		pinctrl-names = "default";
		pinctrl-0 = <&tdm_global_pin>;
		zte,tdm-dma-sysctrl = <&sysctrl 0x10c 4>;
	};
+0 −24
Original line number Diff line number Diff line
ZTE ZX AUD96P22 Audio Codec

Required properties:
 - compatible: Must be "zte,zx-aud96p22"
 - #sound-dai-cells: Should be 0
 - reg: I2C bus slave address of AUD96P22

Example:

	i2c0: i2c@1486000 {
		compatible = "zte,zx296718-i2c";
		reg = <0x01486000 0x1000>;
		interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
		#address-cells = <1>;
		#size-cells = <0>;
		clocks = <&audiocrm AUDIO_I2C0_WCLK>;
		clock-frequency = <1600000>;

		aud96p22: codec@22 {
			compatible = "zte,zx-aud96p22";
			#sound-dai-cells = <0>;
			reg = <0x22>;
		};
	};
+0 −45
Original line number Diff line number Diff line
ZTE ZX296702 I2S controller

Required properties:
 - compatible : Must be one of:
	"zte,zx296718-i2s", "zte,zx296702-i2s"
	"zte,zx296702-i2s"
 - reg : Must contain I2S core's registers location and length
 - clocks : Pairs of phandle and specifier referencing the controller's clocks.
 - clock-names: "wclk" for the wclk, "pclk" for the pclk to the I2S interface.
 - dmas: Pairs of phandle and specifier for the DMA channel that is used by
   the core. The core expects two dma channels for transmit.
 - dma-names : Must be "tx" and "rx"

For more details on the 'dma', 'dma-names', 'clock' and 'clock-names' properties
please check:
	* resource-names.txt
	* clock/clock-bindings.txt
	* dma/dma.txt

Example:
	i2s0: i2s@b005000 {
		#sound-dai-cells = <0>;
		compatible = "zte,zx296718-i2s", "zte,zx296702-i2s";
		reg = <0x0b005000 0x1000>;
		clocks = <&audiocrm AUDIO_I2S0_WCLK>, <&audiocrm AUDIO_I2S0_PCLK>;
		clock-names = "wclk", "pclk";
		interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
		dmas = <&dma 5>, <&dma 6>;
		dma-names = "tx", "rx";
	};

	sound {
		compatible = "simple-audio-card";
		simple-audio-card,name = "zx296702_snd";
		simple-audio-card,format = "left_j";
		simple-audio-card,bitclock-master = <&sndcodec>;
		simple-audio-card,frame-master = <&sndcodec>;
		sndcpu: simple-audio-card,cpu {
			sound-dai = <&i2s0>;
		};

		sndcodec: simple-audio-card,codec {
			sound-dai = <&acodec>;
		};
	};
Loading