public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: robh@kernel.org (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes
Date: Mon, 4 Apr 2016 00:16:38 -0500	[thread overview]
Message-ID: <20160404051638.GR17806@rob-hp-laptop> (raw)
In-Reply-To: <1459589383-16914-7-git-send-email-guodong.xu@linaro.org>

On Sat, Apr 02, 2016 at 05:29:33PM +0800, Guodong Xu wrote:
> From: Zhong Kaihua <zhongkaihua@huawei.com>
> 
> Add Hi6220 spi configuration nodes
> 
> Signed-off-by: Zhong Kaihua <zhongkaihua@huawei.com>
> Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
> ---
>  arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts   |  1 +
>  arch/arm64/boot/dts/hisilicon/hi6220.dtsi        | 15 +++++++++++++++
>  arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi | 21 +++++++++++++++++++++
>  3 files changed, 37 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index 985a2ad..5c9ee31 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -20,6 +20,7 @@
>  		serial1 = &uart1; /* BT UART */
>  		serial2 = &uart2; /* LS Expansion UART0 */
>  		serial3 = &uart3; /* LS Expansion UART1 */
> +		spi0 = &spi_0;

You shouldn't really need an alias for SPI.

>  	};
>  
>  	chosen {
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> index e96cc3c..dcca83b 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
> @@ -585,5 +585,20 @@
>  			clock-names = "apb_pclk";
>  			status = "ok";
>  		};
> +
> +		spi_0: spi at f7106000 {
> +			compatible = "arm,pl022", "arm,primecell";
> +			reg = <0x0 0xf7106000 0x0 0x1000>;
> +			interrupts = <0 50 4>;
> +			bus-id = <0>;
> +			enable-dma = <0>;
> +			clocks = <&sys_ctrl HI6220_SPI_CLK>;
> +			clock-names = "apb_pclk";
> +			pinctrl-names = "default";
> +			pinctrl-0 = <&spi0_pmx_func &spi0_cfg_func>;
> +			num-cs = <1>;
> +			cs-gpios = <&gpio6 2 0>;
> +			status = "ok";

You only need an ok to override a disabled status, so I think you can 
drop this. Or disable by default and let boards override it if that 
makes sense.

Rob

  reply	other threads:[~2016-04-04  5:16 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-02  9:29 [PATCH v2 00/16] DTS for hi6220 and HiKey Guodong Xu
2016-04-02  9:29 ` [PATCH v2 01/16] arm64: dts: Reserve memory regions for hi6220 Guodong Xu
2016-04-02  9:29 ` [PATCH v2 02/16] arm64: dts: add sp804 timer node for Hi6220 Guodong Xu
2016-04-03 19:23   ` Linus Walleij
2016-04-04  1:43     ` Leo Yan
2016-04-04 11:21       ` Linus Walleij
2016-04-04 13:42         ` Leo Yan
2016-04-04 13:53           ` Linus Walleij
2016-04-04 14:03             ` Leo Yan
2016-04-04  5:16     ` Rob Herring
2016-04-02  9:29 ` [PATCH v2 03/16] arm64: dts: enable idle states " Guodong Xu
2016-04-02  9:29 ` [PATCH v2 04/16] arm64: dts: Add Hi6220 gpio configuration nodes Guodong Xu
2016-04-03 19:28   ` Linus Walleij
2016-04-12  9:18     ` Guodong Xu
2016-04-02  9:29 ` [PATCH v2 05/16] arm64: dts: add Hi6220 pinctrl " Guodong Xu
2016-04-03 19:31   ` Linus Walleij
2016-04-04 22:54     ` Tony Lindgren
2016-04-02  9:29 ` [PATCH v2 06/16] arm64: dts: add Hi6220 spi " Guodong Xu
2016-04-04  5:16   ` Rob Herring [this message]
2016-04-12  9:40     ` Guodong Xu
2016-04-02  9:29 ` [PATCH v2 07/16] arm64: dts: add all hi6220 i2c nodes Guodong Xu
2016-04-02  9:29 ` [PATCH v2 08/16] arm64: dts: hikey: enable i2c0 and i2c1 for working with mezzanine boards Guodong Xu
2016-04-04  5:16   ` Rob Herring
2016-04-02  9:29 ` [PATCH v2 09/16] arm64: dts: add hi6220 usb node Guodong Xu
2016-04-02  9:29 ` [PATCH v2 10/16] arm64: dts: add mailbox node for Hi6220 Guodong Xu
2016-04-02  9:29 ` [PATCH v2 11/16] arm64: dts: add Hi6220's stub clock node Guodong Xu
2016-04-02  9:29 ` [PATCH v2 12/16] arm64: dts: hi6220: add pinctrl for uarts and enable them Guodong Xu
2016-04-02  9:29 ` [PATCH v2 13/16] arm64: dts: add LED nodes for hi6220-hikey Guodong Xu
2016-04-04  5:16   ` Rob Herring
2016-04-02  9:29 ` [PATCH v2 14/16] arm64: dts: hikey: Add hi655x pmic dts node Guodong Xu
2016-04-04  5:16   ` Rob Herring
2016-04-12 13:14     ` Guodong Xu
2016-04-02  9:29 ` [PATCH v2 15/16] arm64: dts: add dwmmc nodes for hi6220 Guodong Xu
2016-04-02  9:29 ` [PATCH v2 16/16] arm64: dts: add wifi nodes support for hi6220-hikey Guodong Xu

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=20160404051638.GR17806@rob-hp-laptop \
    --to=robh@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.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