From: Guodong Xu <guodong.xu@linaro.org>
To: xuwei5@hisilicon.com, robh+dt@kernel.org, pawel.moll@arm.com,
mark.rutland@arm.com, ijc+devicetree@hellion.org.uk,
galak@codeaurora.org, catalin.marinas@arm.com,
will.deacon@arm.com, haojian.zhuang@linaro.org,
linus.walleij@linaro.org, tony@atomide.com
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Zhong Kaihua <zhongkaihua@huawei.com>,
Guodong Xu <guodong.xu@linaro.com>
Subject: [PATCH v4 06/16] arm64: dts: add Hi6220 spi configuration nodes
Date: Wed, 13 Apr 2016 07:55:42 +0800 [thread overview]
Message-ID: <1460505352-13157-7-git-send-email-guodong.xu@linaro.org> (raw)
In-Reply-To: <1460505352-13157-1-git-send-email-guodong.xu@linaro.org>
From: Zhong Kaihua <zhongkaihua@huawei.com>
Add Hi6220 spi configuration nodes. Disable by default in hi6220.dtsi
and enable it in board dts for usage of 96boards LS mezzanine board.
Signed-off-by: Zhong Kaihua <zhongkaihua@huawei.com>
Signed-off-by: Guodong Xu <guodong.xu@linaro.com>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Reviewed-by: Rob Herring <robh@kernel.org>
---
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 6 ++++++
arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 15 +++++++++++++++
arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi | 21 +++++++++++++++++++++
3 files changed, 42 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 3d9e8b2..7545e36 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -40,6 +40,12 @@
<0x00000000 0x06e00000 0x00000000 0x0060f000>,
<0x00000000 0x07410000 0x00000000 0x36bf0000>;
};
+
+ soc {
+ spi0: spi@f7106000 {
+ status = "ok";
+ };
+ };
};
&uart2 {
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index df56571..7bcfffe 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -567,5 +567,20 @@
clocks = <&ao_ctrl 2>;
clock-names = "apb_pclk";
};
+
+ spi0: spi@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 = "disabled";
+ };
};
};
diff --git a/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi b/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi
index 28806df..0916e84 100644
--- a/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi
@@ -221,6 +221,15 @@
0xfc MUX_M0 /* I2C2_SDA (IOMG063) */
>;
};
+
+ spi0_pmx_func: spi0_pmx_func {
+ pinctrl-single,pins = <
+ 0x1a0 MUX_M1 /* SPI0_DI (IOMG104) */
+ 0x1a4 MUX_M1 /* SPI0_DO (IOMG105) */
+ 0x1a8 MUX_M1 /* SPI0_CS_N (IOMG106) */
+ 0x1ac MUX_M1 /* SPI0_CLK (IOMG107) */
+ >;
+ };
};
pmx1: pinmux@f7010800 {
@@ -625,6 +634,18 @@
pinctrl-single,bias-pullup = <PULL_DIS PULL_UP PULL_DIS PULL_UP>;
pinctrl-single,drive-strength = <DRIVE1_02MA DRIVE_MASK>;
};
+
+ spi0_cfg_func: spi0_cfg_func {
+ pinctrl-single,pins = <
+ 0x1b0 0x0 /* SPI0_DI (IOCFG108) */
+ 0x1b4 0x0 /* SPI0_DO (IOCFG109) */
+ 0x1b8 0x0 /* SPI0_CS_N (IOCFG110) */
+ 0x1bc 0x0 /* SPI0_CLK (IOCFG111) */
+ >;
+ pinctrl-single,bias-pulldown = <PULL_DIS PULL_DOWN PULL_DIS PULL_DOWN>;
+ pinctrl-single,bias-pullup = <PULL_DIS PULL_UP PULL_DIS PULL_UP>;
+ pinctrl-single,drive-strength = <DRIVE1_02MA DRIVE_MASK>;
+ };
};
pmx2: pinmux@f8001800 {
--
1.9.1
next prev parent reply other threads:[~2016-04-12 23:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-12 23:55 [PATCH v4 00/16] DTS for hi6220 and HiKey Guodong Xu
2016-04-12 23:55 ` [PATCH v4 03/16] arm64: dts: enable idle states for Hi6220 Guodong Xu
2016-04-12 23:55 ` [PATCH v4 04/16] arm64: dts: Add Hi6220 gpio configuration nodes Guodong Xu
2016-04-12 23:55 ` [PATCH v4 05/16] arm64: dts: add Hi6220 pinctrl " Guodong Xu
2016-04-12 23:55 ` Guodong Xu [this message]
[not found] ` <1460505352-13157-1-git-send-email-guodong.xu-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-12 23:55 ` [PATCH v4 01/16] arm64: dts: Reserve memory regions for hi6220 Guodong Xu
2016-04-12 23:55 ` [PATCH v4 02/16] arm64: dts: add sp804 timer node for Hi6220 Guodong Xu
2016-04-12 23:55 ` [PATCH v4 07/16] arm64: dts: add all hi6220 i2c nodes Guodong Xu
2016-04-12 23:55 ` [PATCH v4 13/16] arm64: dts: add LED nodes for hi6220-hikey Guodong Xu
2016-04-12 23:55 ` [PATCH v4 14/16] arm64: dts: hikey: Add hi655x pmic dts node Guodong Xu
[not found] ` <1460505352-13157-15-git-send-email-guodong.xu-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2016-04-13 0:11 ` Rob Herring
[not found] ` <CAL_Jsq+4kHUBvSLheV-hfmPFic_D+3Xz7oXOKnUSqnWOt71Peg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-04-13 0:14 ` Guodong Xu
2016-04-16 16:56 ` [PATCH v4 00/16] DTS for hi6220 and HiKey Wei Xu
2016-04-12 23:55 ` [PATCH v4 08/16] arm64: dts: hikey: enable i2c0 and i2c1 for working with mezzanine boards Guodong Xu
2016-04-12 23:55 ` [PATCH v4 09/16] arm64: dts: Add hi6220 usb node Guodong Xu
2016-04-12 23:55 ` [PATCH v4 10/16] arm64: dts: add mailbox node for Hi6220 Guodong Xu
2016-04-12 23:55 ` [PATCH v4 11/16] arm64: dts: add Hi6220's stub clock node Guodong Xu
2016-04-12 23:55 ` [PATCH v4 12/16] arm64: dts: hi6220: add pinctrl for uarts and enable them Guodong Xu
2016-04-12 23:55 ` [PATCH v4 15/16] arm64: dts: add dwmmc nodes for hi6220 Guodong Xu
2016-04-12 23:55 ` [PATCH v4 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=1460505352-13157-7-git-send-email-guodong.xu@linaro.org \
--to=guodong.xu@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=guodong.xu@linaro.com \
--cc=haojian.zhuang@linaro.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--cc=will.deacon@arm.com \
--cc=xuwei5@hisilicon.com \
--cc=zhongkaihua@huawei.com \
/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).