devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wei Xu <xuwei5@hisilicon.com>
To: John Stultz <john.stultz@linaro.org>,
	lkml <linux-kernel@vger.kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>,
	devicetree@vger.kernel.org, Guodong Xu <guodong.xu@linaro.org>,
	Xinliang Liu <xinliang.liu@linaro.org>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Rob Herring <robh+dt@kernel.org>,
	linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey
Date: Wed, 24 Aug 2016 16:14:57 +0100	[thread overview]
Message-ID: <57BDB9F1.7020103@hisilicon.com> (raw)
In-Reply-To: <1471906085-16682-1-git-send-email-john.stultz@linaro.org>

Hi John,

On 22/08/2016 23:48, John Stultz wrote:
> From: Xinliang Liu <xinliang.liu@linaro.org>
> 
> Add ade and dsi DT nodes for hikey board.
> 
> Cc: Guodong Xu <guodong.xu@linaro.org>
> Cc: Wei Xu <xuwei5@hisilicon.com>
> Cc: Rob Herring <robh+dt@kernel.org>
> Cc: Mark Rutland <mark.rutland@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: devicetree@vger.kernel.org
> Signed-off-by: Xinliang Liu <xinliang.liu@linaro.org>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---

Series applied to the hisilicon soc tree.
Thanks!

Best Regards,
Wei

>  arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts |  8 ++++
>  arch/arm64/boot/dts/hisilicon/hi6220.dtsi      | 55 ++++++++++++++++++++++++++
>  2 files changed, 63 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index 593c7e4..c2f014e 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -372,3 +372,11 @@
>  &uart3 {
>  	label = "LS-UART1";
>  };
> +
> +&ade {
> +	status = "ok";
> +};
> +
> +&dsi {
> +	status = "ok";
> +};
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> index 4f27041..d0b887a 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> @@ -262,6 +262,11 @@
>  			#clock-cells = <1>;
>  		};
>  
> +		medianoc_ade: medianoc_ade@f4520000 {
> +			compatible = "syscon";
> +			reg = <0x0 0xf4520000 0x0 0x4000>;
> +		};
> +
>  		stub_clock: stub_clock {
>  			compatible = "hisilicon,hi6220-stub-clk";
>  			hisilicon,hi6220-clk-sram = <&sram>;
> @@ -850,5 +855,55 @@
>  				};
>  			};
>  		};
> +
> +		ade: ade@f4100000 {
> +			compatible = "hisilicon,hi6220-ade";
> +			reg = <0x0 0xf4100000 0x0 0x7800>;
> +			reg-names = "ade_base";
> +			hisilicon,noc-syscon = <&medianoc_ade>;
> +			resets = <&media_ctrl MEDIA_ADE>;
> +			interrupts = <0 115 4>; /* ldi interrupt */
> +
> +			clocks = <&media_ctrl HI6220_ADE_CORE>,
> +				 <&media_ctrl HI6220_CODEC_JPEG>,
> +				 <&media_ctrl HI6220_ADE_PIX_SRC>;
> +			/*clock name*/
> +			clock-names  = "clk_ade_core",
> +				       "clk_codec_jpeg",
> +				       "clk_ade_pix";
> +
> +			assigned-clocks = <&media_ctrl HI6220_ADE_CORE>,
> +				<&media_ctrl HI6220_CODEC_JPEG>;
> +			assigned-clock-rates = <360000000>, <288000000>;
> +			dma-coherent;
> +			status = "disabled";
> +
> +			port {
> +				ade_out: endpoint {
> +					remote-endpoint = <&dsi_in>;
> +				};
> +			};
> +		};
> +
> +		dsi: dsi@f4107800 {
> +			compatible = "hisilicon,hi6220-dsi";
> +			reg = <0x0 0xf4107800 0x0 0x100>;
> +			clocks = <&media_ctrl  HI6220_DSI_PCLK>;
> +			clock-names = "pclk";
> +			status = "disabled";
> +
> +			ports {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +
> +				/* 0 for input port */
> +				port@0 {
> +					reg = <0>;
> +					dsi_in: endpoint {
> +						remote-endpoint = <&ade_out>;
> +					};
> +				};
> +			};
> +		};
>  	};
>  };
> 

      parent reply	other threads:[~2016-08-24 15:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-22 22:48 [PATCH 1/4] arm64: dts: Add display subsystem DT nodes for hi6220-hikey John Stultz
2016-08-22 22:48 ` [PATCH 2/4] arm64: dts: Add HDMI node " John Stultz
2016-08-22 22:48 ` [PATCH 3/4] arm64: dts: hikey: Add hikey support for syscon-reboot-mode John Stultz
2016-08-22 22:48 ` [PATCH 4/4] arm64: dts: hikey: Add pstore support for HiKey John Stultz
2016-09-09  0:12   ` Kees Cook
2016-09-09  0:17     ` John Stultz
     [not found]       ` <CALAqxLVU5kusY=PyQrBX8mZRRcLN08Lzrs6XUKUUVd3fb3VBkw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-09-09  8:31         ` Wei Xu
2016-08-24 15:14 ` Wei Xu [this message]

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=57BDB9F1.7020103@hisilicon.com \
    --to=xuwei5@hisilicon.com \
    --cc=catalin.marinas@arm.com \
    --cc=devicetree@vger.kernel.org \
    --cc=guodong.xu@linaro.org \
    --cc=john.stultz@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=will.deacon@arm.com \
    --cc=xinliang.liu@linaro.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).