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

Commit facdb3dd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'davinci-for-v3.18/dt' of... 

Merge tag 'davinci-for-v3.18/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

 into next/dt

Pull "DT additions for DA850" from Sekhar Nori:

Adds EDMA and audio support

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>

* tag 'davinci-for-v3.18/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: DTS: da850-evm: Enable audio via simple-card
  ARM: DTS: da850-evm: Add node for tlv320aic3106 codec
  ARM: DTS: da850-evm: Enable McASP via DT boot
  ARM: DTS: da850: Add node for McASP
  ARM: DTS: da850: Add node for edma0
  ARM: davinci: da8xx-dt: add OF_DEV_AUXDATA entry for mcasp0
parents d62584f3 3f526696

arch/arm/boot/dts/da850-evm.dts

+72 −0
Original line number Diff line number Diff line
@@ -17,6 +17,18 @@ 
	soc {

		pmx_core: pinmux@1c14120 {

			status = "okay";



			mcasp0_pins: pinmux_mcasp0_pins {

				pinctrl-single,bits = <

					/*

					 * AHCLKX, ACLKX, AFSX, AHCLKR, ACLKR,

					 * AFSR, AMUTE

					 */

					0x00 0x11111111 0xffffffff

					/* AXR11, AXR12 */

					0x04 0x00011000 0x000ff000

				>;

			};

		};

		serial0: serial@1c42000 {

			status = "okay";
@@ -39,6 +51,20 @@ 
			tps: tps@48 {

				reg = <0x48>;

			};

			tlv320aic3106: tlv320aic3106@18 {

				#sound-dai-cells = <0>;

				compatible = "ti,tlv320aic3106";

				reg = <0x18>;

				status = "okay";



				/* Regulators */

				IOVDD-supply = <&vdcdc2_reg>;

				/* Derived from VBAT: Baseboard 3.3V / 1.8V */

				AVDD-supply = <&vbat>;

				DRVDD-supply = <&vbat>;

				DVDD-supply = <&vbat>;

			};



		};

		wdt: wdt@1c21000 {

			status = "okay";
@@ -117,6 +143,33 @@ 
		regulator-max-microvolt = <5000000>;

		regulator-boot-on;

	};



	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "DA850/OMAP-L138 EVM";

		simple-audio-card,widgets =

			"Line", "Line In",

			"Line", "Line Out";

		simple-audio-card,routing =

			"LINE1L", "Line In",

			"LINE1R", "Line In",

			"Line Out", "LLOUT",

			"Line Out", "RLOUT";

		simple-audio-card,format = "dsp_b";

		simple-audio-card,bitclock-master = <&link0_codec>;

		simple-audio-card,frame-master = <&link0_codec>;

		simple-audio-card,bitclock-inversion;



		simple-audio-card,cpu {

			sound-dai = <&mcasp0>;

			system-clock-frequency = <24576000>;

		};



		link0_codec: simple-audio-card,codec {

			sound-dai = <&tlv320aic3106>;

			system-clock-frequency = <24576000>;

		};

	};

};



/include/ "tps6507x.dtsi"
@@ -170,3 +223,22 @@ 
		};

	};

};



&mcasp0 {

	#sound-dai-cells = <0>;

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&mcasp0_pins>;



	op-mode = <0>;          /* MCASP_IIS_MODE */

	tdm-slots = <2>;

	/* 4 serializer */

	serial-dir = <  /* 0: INACTIVE, 1: TX, 2: RX */

		0 0 0 0

		0 0 0 0

		0 0 0 1

		2 0 0 0

	>;

	tx-num-evt = <32>;

	rx-num-evt = <32>;

};

arch/arm/boot/dts/da850.dtsi

+19 −0
Original line number Diff line number Diff line
@@ -150,6 +150,12 @@ 
			};



		};

		edma0: edma@01c00000 {

			compatible = "ti,edma3";

			reg =	<0x0 0x10000>;

			interrupts = <11 13 12>;

			#dma-cells = <1>;

		};

		serial0: serial@1c42000 {

			compatible = "ns16550a";

			reg = <0x42000 0x100>;
@@ -270,6 +276,19 @@ 
			ti,davinci-gpio-unbanked = <0>;

			status = "disabled";

		};



		mcasp0: mcasp@01d00000 {

			compatible = "ti,da830-mcasp-audio";

			reg = <0x100000 0x2000>,

			      <0x102000 0x400000>;

			reg-names = "mpu", "dat";

			interrupts = <54>;

			interrupt-names = "common";

			status = "disabled";

			dmas = <&edma0 1>,

				<&edma0 0>;

			dma-names = "tx", "rx";

		};

	};

	nand_cs3@62000000 {

		compatible = "ti,davinci-nand";

arch/arm/mach-davinci/da8xx-dt.c

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = { 
	OF_DEV_AUXDATA("ti,davinci_mdio", 0x01e24000, "davinci_mdio.0", NULL),

	OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",

		       NULL),

	OF_DEV_AUXDATA("ti,da830-mcasp-audio", 0x01d00000, "davinci-mcasp.0", NULL),

	{}

};