Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93ac820d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

parents daa5ab9e 3951e4aa

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

0 → 100644
+15 −0
Original line number Diff line number Diff line 
* Atmel SSC driver.



Required properties:

- compatible: "atmel,at91rm9200-ssc" or "atmel,at91sam9g45-ssc"

	- atmel,at91rm9200-ssc: support pdc transfer

	- atmel,at91sam9g45-ssc: support dma transfer

- reg: Should contain SSC registers location and length

- interrupts: Should contain SSC interrupt



Example:

ssc0: ssc@fffbc000 {

	compatible = "atmel,at91rm9200-ssc";

	reg = <0xfffbc000 0x4000>;

	interrupts = <14 4 5>;

};

Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
* Atmel at91sam9g20ek wm8731 audio complex



Required properties:

  - compatible: "atmel,at91sam9g20ek-wm8731-audio"

  - atmel,model: The user-visible name of this sound complex.

  - atmel,audio-routing: A list of the connections between audio components.

  - atmel,ssc-controller: The phandle of the SSC controller

  - atmel,audio-codec: The phandle of the WM8731 audio codec

Optional properties:

  - pinctrl-names, pinctrl-0: Please refer to pinctrl-bindings.txt



Example:

sound {

	compatible = "atmel,at91sam9g20ek-wm8731-audio";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pck0_as_mck>;



	atmel,model = "wm8731 @ AT91SAMG20EK";



	atmel,audio-routing =

		"Ext Spk", "LHPOUT",

		"Int MIC", "MICIN";



	atmel,ssc-controller = <&ssc0>;

	atmel,audio-codec = <&wm8731>;

};

arch/arm/boot/dts/at91sam9260.dtsi

+8 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
		tcb0 = &tcb0;

		tcb1 = &tcb1;

		i2c0 = &i2c0;

		ssc0 = &ssc0;

	};

	cpus {

		cpu@0 {
@@ -212,6 +213,13 @@ 
				status = "disabled";

			};



			ssc0: ssc@fffbc000 {

				compatible = "atmel,at91rm9200-ssc";

				reg = <0xfffbc000 0x4000>;

				interrupts = <14 4 5>;

				status = "disable";

			};



			adc0: adc@fffe0000 {

				compatible = "atmel,at91sam9260-adc";

				reg = <0xfffe0000 0x100>;

arch/arm/boot/dts/at91sam9263.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
		gpio4 = &pioE;

		tcb0 = &tcb0;

		i2c0 = &i2c0;

		ssc0 = &ssc0;

		ssc1 = &ssc1;

	};

	cpus {

		cpu@0 {
@@ -173,6 +175,20 @@ 
				status = "disabled";

			};



			ssc0: ssc@fff98000 {

				compatible = "atmel,at91rm9200-ssc";

				reg = <0xfff98000 0x4000>;

				interrupts = <16 4 5>;

				status = "disable";

			};



			ssc1: ssc@fff9c000 {

				compatible = "atmel,at91rm9200-ssc";

				reg = <0xfff9c000 0x4000>;

				interrupts = <17 4 5>;

				status = "disable";

			};



			macb0: ethernet@fffbc000 {

				compatible = "cdns,at32ap7000-macb", "cdns,macb";

				reg = <0xfffbc000 0x100>;

arch/arm/boot/dts/at91sam9g20ek_common.dtsi

+31 −1
Original line number Diff line number Diff line
@@ -30,6 +30,16 @@ 


	ahb {

		apb {

			pinctrl@fffff400 {

				board {

					pinctrl_pck0_as_mck: pck0_as_mck {

						atmel,pins =

							<2 1 0x2 0x0>;	/* PC1 periph B */

					};



				};

			};



			dbgu: serial@fffff200 {

				status = "okay";

			};
@@ -51,6 +61,11 @@ 
				atmel,vbus-gpio = <&pioC 5 0>;

				status = "okay";

			};



			ssc0: ssc@fffbc000 {

				status = "okay";

				pinctrl-0 = <&pinctrl_ssc0_tx>;

			};

		};



		nand0: nand@40000000 {
@@ -114,7 +129,7 @@ 
			reg = <0x50>;

		};



		wm8731@1b {

		wm8731: wm8731@1b {

			compatible = "wm8731";

			reg = <0x1b>;

		};
@@ -139,4 +154,19 @@ 
			gpio-key,wakeup;

		};

	};



	sound {

		compatible = "atmel,at91sam9g20ek-wm8731-audio";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_pck0_as_mck>;



		atmel,model = "wm8731 @ AT91SAMG20EK";



		atmel,audio-routing =

			"Ext Spk", "LHPOUT",

			"Int Mic", "MICIN";



		atmel,ssc-controller = <&ssc0>;

		atmel,audio-codec = <&wm8731>;

	};

};