devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shawn Guo <shawnguo@kernel.org>
To: Michael Walle <michael@walle.cc>
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, Li Yang <leoyang.li@nxp.com>,
	Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Subject: Re: [PATCH 2/4] arm64: dts: ls1028a: add missing sai nodes
Date: Mon, 9 Dec 2019 14:31:29 +0800	[thread overview]
Message-ID: <20191209063128.GC3365@dragon> (raw)
In-Reply-To: <20191123201317.25861-3-michael@walle.cc>

On Sat, Nov 23, 2019 at 09:13:15PM +0100, Michael Walle wrote:
> The LS1028A has six SAI cores.
> 
> Signed-off-by: Michael Walle <michael@walle.cc>
> ---
>  .../arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 42 +++++++++++++++++++
>  1 file changed, 42 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> index f2e71fd57b20..6730922c2d47 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
> @@ -534,6 +534,20 @@
>  			status = "disabled";
>  		};
>  
> +		sai3: audio-controller@f120000 {
> +			#sound-dai-cells = <0>;
> +			compatible = "fsl,vf610-sai";
> +			reg = <0x0 0xf120000 0x0 0x10000>;
> +			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clockgen 4 1>, <&clockgen 4 1>,
> +				 <&clockgen 4 1>, <&clockgen 4 1>;
> +			clock-names = "bus", "mclk1", "mclk2", "mclk3";
> +			dma-names = "tx", "rx";
> +			dmas = <&edma0 1 8>,
> +			       <&edma0 1 7>;
> +			status = "disabled";
> +		};
> +
>  		sai4: audio-controller@f130000 {
>  			#sound-dai-cells = <0>;
>  			compatible = "fsl,vf610-sai";
> @@ -548,6 +562,34 @@
>  			status = "disabled";
>  		};
>  
> +		sai5: audio-controller@f140000 {
> +			#sound-dai-cells = <0>;
> +			compatible = "fsl,vf610-sai";
> +			reg = <0x0 0xf140000 0x0 0x10000>;
> +			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clockgen 4 1>, <&clockgen 4 1>,
> +				 <&clockgen 4 1>, <&clockgen 4 1>;
> +			clock-names = "bus", "mclk1", "mclk2", "mclk3";
> +			dma-names = "tx", "rx";
> +			dmas = <&edma0 1 12>,
> +			       <&edma0 1 11>;
> +			status = "disabled";
> +		};
> +
> +		sai6: audio-controller@f150000 {
> +			#sound-dai-cells = <0>;
> +			compatible = "fsl,vf610-sai";
> +			reg = <0x0 0xf150000 0x0 0x10000>;
> +			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
> +			clocks = <&clockgen 4 1>, <&clockgen 4 1>,
> +				 <&clockgen 4 1>, <&clockgen 4 1>;
> +			clock-names = "bus", "mclk1", "mclk2", "mclk3";
> +			dma-names = "tx", "rx";
> +			dmas = <&edma0 1 14>,
> +			       <&edma0 1 13>;
> +			status = "disabled";
> +		};
> +
>  		tmu: tmu@1f00000 {

Not sure what your base is, but I have tmu@1f80000.  And that makes
the patch applying fail here.

Shawn

>  			compatible = "fsl,qoriq-tmu";
>  			reg = <0x0 0x1f80000 0x0 0x10000>;
> -- 
> 2.20.1
> 

  reply	other threads:[~2019-12-09  6:31 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-23 20:13 [PATCH 0/4] ls1028a: dts fixes and new board support Michael Walle
2019-11-23 20:13 ` [PATCH 1/4] arm64: dts: ls1028a: fix typo in TMU calibration data Michael Walle
2019-12-09  6:24   ` Shawn Guo
2019-12-09  6:39     ` [EXT] " Andy Tang
2019-12-09  8:41     ` Michael Walle
2019-11-23 20:13 ` [PATCH 2/4] arm64: dts: ls1028a: add missing sai nodes Michael Walle
2019-12-09  6:31   ` Shawn Guo [this message]
2019-11-23 20:13 ` [PATCH 3/4] arm64: dts: ls1028a: add FlexSPI node Michael Walle
2019-11-26  6:40   ` [EXT] " Kuldeep Singh
2019-11-26 10:08     ` Michael Walle
2019-12-02  5:43       ` Kuldeep Singh
2019-11-23 20:13 ` [PATCH 4/4] arm64: dts: freescale: add Kontron sl28 support Michael Walle
2019-12-09  6:43   ` Shawn Guo
2019-12-09  8:54     ` Michael Walle

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191209063128.GC3365@dragon \
    --to=shawnguo@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=leoyang.li@nxp.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=michael@walle.cc \
    --cc=robh+dt@kernel.org \
    --subject='Re: [PATCH 2/4] arm64: dts: ls1028a: add missing sai nodes' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).