Re: [PATCH] ARM: dts: Add am335x mcasp with l3 data port ranges

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Tony,

On 06/12/2018 1.03, Tony Lindgren wrote:
> Earlier attempt to move am335x mcasp to probe with ti-sysc
> interconnect target module caused audio to stop working and and
> the dts changes were reverted by commit 5d2632a577ba ("ARM: dts:
> Revert am335x mcasp ti-sysc changes").
> 
> Turns out we were missing the l3 data port ranges for mcasp. This
> caused mcasp dma to attempt to use wrong port address. So let's
> try again essentially reverting the earlier revert and adding the
> missing l3 data port ranges.
> 
> Cc: Peter Ujfalusi <peter.ujfalusi@xxxxxx>
> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> 
> Peter, can you please test with your bbb + audio cape?

Works fine on bbb + audio cape.
For some reason my am335x-evm-sk is not booting up at all w/ linux-next,
but I believe it is not related to this (disabled audio and still not
booting).

Tested-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx>

> 
> ---
>  arch/arm/boot/dts/am33xx-l4.dtsi | 42 +++++++++++++++++++++++++++-----
>  arch/arm/boot/dts/am33xx.dtsi    | 29 ----------------------
>  2 files changed, 36 insertions(+), 35 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
> --- a/arch/arm/boot/dts/am33xx-l4.dtsi
> +++ b/arch/arm/boot/dts/am33xx-l4.dtsi
> @@ -824,7 +824,9 @@
>  	ranges = <0x00000000 0x48000000 0x100000>,	/* segment 0 */
>  		 <0x00100000 0x48100000 0x100000>,	/* segment 1 */
>  		 <0x00200000 0x48200000 0x100000>,	/* segment 2 */
> -		 <0x00300000 0x48300000 0x100000>;	/* segment 3 */
> +		 <0x00300000 0x48300000 0x100000>,	/* segment 3 */
> +		 <0x46000000 0x46000000 0x400000>,	/* l3 data port */
> +		 <0x46400000 0x46400000 0x400000>;	/* l3 data port */
>  
>  	segment@0 {					/* 0x48000000 */
>  		compatible = "simple-bus";
> @@ -881,7 +883,9 @@
>  			 <0x000cc000 0x000cc000 0x001000>,	/* ap 89 */
>  			 <0x000cd000 0x000cd000 0x001000>,	/* ap 90 */
>  			 <0x000ca000 0x000ca000 0x001000>,	/* ap 91 */
> -			 <0x000cb000 0x000cb000 0x001000>;	/* ap 92 */
> +			 <0x000cb000 0x000cb000 0x001000>,	/* ap 92 */
> +			 <0x46000000 0x46000000 0x400000>,	/* l3 data port */
> +			 <0x46400000 0x46400000 0x400000>;	/* l3 data port */
>  
>  		target-module@8000 {			/* 0x48008000, ap 6 10.0 */
>  			compatible = "ti,sysc";
> @@ -1055,8 +1059,21 @@
>  			clock-names = "fck";
>  			#address-cells = <1>;
>  			#size-cells = <1>;
> -			ranges = <0x0 0x38000 0x2000>;
> -			status = "disabled";
> +			ranges = <0x0 0x38000 0x2000>,
> +				 <0x46000000 0x46000000 0x400000>;
> +
> +			mcasp0: mcasp@0 {
> +				compatible = "ti,am33xx-mcasp-audio";
> +				reg = <0x0 0x2000>,
> +				      <0x46000000 0x400000>;
> +				reg-names = "mpu", "dat";
> +				interrupts = <80>, <81>;
> +				interrupt-names = "tx", "rx";
> +				status = "disabled";
> +				dmas = <&edma 8 2>,
> +					<&edma 9 2>;
> +				dma-names = "tx", "rx";
> +			};
>  		};
>  
>  		target-module@3c000 {			/* 0x4803c000, ap 20 32.0 */
> @@ -1073,8 +1090,21 @@
>  			clock-names = "fck";
>  			#address-cells = <1>;
>  			#size-cells = <1>;
> -			ranges = <0x0 0x3c000 0x2000>;
> -			status = "disabled";
> +			ranges = <0x0 0x3c000 0x2000>,
> +				 <0x46400000 0x46400000 0x400000>;
> +
> +			mcasp1: mcasp@0 {
> +				compatible = "ti,am33xx-mcasp-audio";
> +				reg = <0x0 0x2000>,
> +				      <0x46400000 0x400000>;
> +				reg-names = "mpu", "dat";
> +				interrupts = <82>, <83>;
> +				interrupt-names = "tx", "rx";
> +				status = "disabled";
> +				dmas = <&edma 10 2>,
> +					<&edma 11 2>;
> +				dma-names = "tx", "rx";
> +			};
>  		};
>  
>  		target-module@40000 {			/* 0x48040000, ap 22 1e.0 */
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -440,36 +440,7 @@
>  			       <&edma 5 0>;
>  			dma-names = "tx", "rx";
>  		};
> -
> -		mcasp0: mcasp@48038000 {
> -			compatible = "ti,am33xx-mcasp-audio";
> -			ti,hwmods = "mcasp0";
> -			reg = <0x48038000 0x2000>,
> -			      <0x46000000 0x400000>;
> -			reg-names = "mpu", "dat";
> -			interrupts = <80>, <81>;
> -			interrupt-names = "tx", "rx";
> -			status = "disabled";
> -			dmas = <&edma 8 2>,
> -				<&edma 9 2>;
> -			dma-names = "tx", "rx";
> -		};
> -
> -		mcasp1: mcasp@4803c000 {
> -			compatible = "ti,am33xx-mcasp-audio";
> -			ti,hwmods = "mcasp1";
> -			reg = <0x4803C000 0x2000>,
> -			      <0x46400000 0x400000>;
> -			reg-names = "mpu", "dat";
> -			interrupts = <82>, <83>;
> -			interrupt-names = "tx", "rx";
> -			status = "disabled";
> -			dmas = <&edma 10 2>,
> -				<&edma 11 2>;
> -			dma-names = "tx", "rx";
> -		};
>  	};
> -
>  };
>  
>  #include "am33xx-l4.dtsi"
> 

- Péter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki



[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux