All of lore.kernel.org
 help / color / mirror / Atom feed
From: Guodong Xu <guodong.xu@linaro.org>
To: xuwei5@hisilicon.com, mark.rutland@arm.com, robh@kernel.org,
	grant.likely@secretlab.ca, linus.walleij@linaro.org,
	arnd.bergmann@linaro.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	kong.kongxinwei@hisilicon.com,
	Zhong Kaihua <zhongkaihua@huawei.com>
Subject: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes
Date: Sat,  2 Apr 2016 17:29:33 +0800	[thread overview]
Message-ID: <1459589383-16914-7-git-send-email-guodong.xu@linaro.org> (raw)
In-Reply-To: <1459589383-16914-1-git-send-email-guodong.xu@linaro.org>

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;
 	};
 
 	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@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";
+		};
 	};
 };
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

WARNING: multiple messages have this Message-ID (diff)
From: guodong.xu@linaro.org (Guodong Xu)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes
Date: Sat,  2 Apr 2016 17:29:33 +0800	[thread overview]
Message-ID: <1459589383-16914-7-git-send-email-guodong.xu@linaro.org> (raw)
In-Reply-To: <1459589383-16914-1-git-send-email-guodong.xu@linaro.org>

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;
 	};
 
 	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";
+		};
 	};
 };
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 at 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 at f8001800 {
-- 
1.9.1

  parent reply	other threads:[~2016-04-02  9:31 UTC|newest]

Thread overview: 85+ 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 ` 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   ` Guodong Xu
2016-04-02  9:29 ` [PATCH v2 02/16] arm64: dts: add sp804 timer node for Hi6220 Guodong Xu
2016-04-02  9:29   ` Guodong Xu
2016-04-03 19:23   ` Linus Walleij
2016-04-03 19:23     ` Linus Walleij
2016-04-03 19:23     ` Linus Walleij
2016-04-04  1:43     ` Leo Yan
2016-04-04  1:43       ` Leo Yan
2016-04-04  1:43       ` Leo Yan
2016-04-04 11:21       ` Linus Walleij
2016-04-04 11:21         ` Linus Walleij
2016-04-04 11:21         ` Linus Walleij
2016-04-04 13:42         ` Leo Yan
2016-04-04 13:42           ` Leo Yan
2016-04-04 13:42           ` Leo Yan
2016-04-04 13:53           ` Linus Walleij
2016-04-04 13:53             ` Linus Walleij
2016-04-04 13:53             ` Linus Walleij
2016-04-04 14:03             ` Leo Yan
2016-04-04 14:03               ` Leo Yan
2016-04-04 14:03               ` Leo Yan
2016-04-04  5:16     ` Rob Herring
2016-04-04  5:16       ` Rob Herring
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   ` Guodong Xu
2016-04-02  9:29   ` Guodong Xu
2016-04-02  9:29 ` [PATCH v2 04/16] arm64: dts: Add Hi6220 gpio configuration nodes Guodong Xu
2016-04-02  9:29   ` Guodong Xu
2016-04-03 19:28   ` Linus Walleij
2016-04-03 19:28     ` Linus Walleij
2016-04-03 19:28     ` Linus Walleij
2016-04-12  9:18     ` Guodong Xu
2016-04-12  9:18       ` Guodong Xu
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-02  9:29   ` Guodong Xu
2016-04-03 19:31   ` Linus Walleij
2016-04-03 19:31     ` Linus Walleij
2016-04-03 19:31     ` Linus Walleij
2016-04-04 22:54     ` Tony Lindgren
2016-04-04 22:54       ` Tony Lindgren
2016-04-04 22:54       ` Tony Lindgren
2016-04-12  8:28       ` Guodong Xu
2016-04-02  9:29 ` Guodong Xu [this message]
2016-04-02  9:29   ` [PATCH v2 06/16] arm64: dts: add Hi6220 spi " Guodong Xu
2016-04-04  5:16   ` Rob Herring
2016-04-04  5:16     ` Rob Herring
2016-04-12  9:40     ` Guodong Xu
2016-04-12  9:40       ` Guodong Xu
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   ` 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-02  9:29   ` Guodong Xu
2016-04-04  5:16   ` Rob Herring
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   ` Guodong Xu
2016-04-02  9:29   ` 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   ` 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   ` 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   ` Guodong Xu
2016-04-02  9:29   ` Guodong Xu
2016-04-02  9:29 ` [PATCH v2 13/16] arm64: dts: add LED nodes for hi6220-hikey Guodong Xu
2016-04-02  9:29   ` Guodong Xu
2016-04-04  5:16   ` Rob Herring
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-02  9:29   ` Guodong Xu
2016-04-04  5:16   ` Rob Herring
2016-04-04  5:16     ` Rob Herring
2016-04-12 13:14     ` Guodong Xu
2016-04-12 13:14       ` Guodong Xu
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   ` Guodong Xu
2016-04-02  9:29 ` [PATCH v2 16/16] arm64: dts: add wifi nodes support for hi6220-hikey Guodong Xu
2016-04-02  9:29   ` 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=1459589383-16914-7-git-send-email-guodong.xu@linaro.org \
    --to=guodong.xu@linaro.org \
    --cc=arnd.bergmann@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=grant.likely@secretlab.ca \
    --cc=kong.kongxinwei@hisilicon.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=robh@kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.