Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1369906 > unrolled thread

[PATCH v2 00/16] DTS for hi6220 and HiKey

Started byGuodong Xu <guodong.xu@linaro.org>
First post2016-04-02 11:40 +0200
Last post2016-04-12 11:50 +0200
Articles 8 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH v2 00/16] DTS for hi6220 and HiKey Guodong Xu <guodong.xu@linaro.org> - 2016-04-02 11:40 +0200
    [PATCH v2 09/16] arm64: dts: add hi6220 usb node Guodong Xu <guodong.xu@linaro.org> - 2016-04-02 11:40 +0200
    [PATCH v2 01/16] arm64: dts: Reserve memory regions for hi6220 Guodong Xu <guodong.xu@linaro.org> - 2016-04-02 11:40 +0200
    [PATCH v2 13/16] arm64: dts: add LED nodes for hi6220-hikey Guodong Xu <guodong.xu@linaro.org> - 2016-04-02 11:40 +0200
      Re: [PATCH v2 13/16] arm64: dts: add LED nodes for hi6220-hikey Rob Herring <robh@kernel.org> - 2016-04-04 07:20 +0200
    [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes Guodong Xu <guodong.xu@linaro.org> - 2016-04-02 11:40 +0200
      Re: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes Rob Herring <robh@kernel.org> - 2016-04-04 07:20 +0200
        Re: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes Guodong Xu <guodong.xu@linaro.org> - 2016-04-12 11:50 +0200

#1369906 — [PATCH v2 00/16] DTS for hi6220 and HiKey

FromGuodong Xu <guodong.xu@linaro.org>
Date2016-04-02 11:40 +0200
Subject[PATCH v2 00/16] DTS for hi6220 and HiKey
Message-ID<rjqc9-1I3-3@gated-at.bofh.it>
This patchset include dts changes for hi6220 SoC and HiKey board. These
patches apply well one by one on top of next-20160401.

To avoid merge conflicts with patches already ack'ed by maintainers,
I picked all hi6220/hikey dts related patches into this single patchset.
And they passed the tests on HiKey.

Patch 1~3 are from hi6220 cpuidle support. It has been reviewed and
ack'ed in maillist.
[PATCH v2 RESEND 0/4] arm64: Hi6220: enable CPU idle states:
http://archive.arm.linux.org.uk/lurker/message/20160121.105346.7d3b0470.en.html

Patch 4~6 are for hi6220 gpio, pinctl and spi configurations respectively.

Patch 7 adds hi6220 i2c nodes, and
patch 8 enables them for hikey board usage.

Patch 9 adds add hi6220 usb node. It has been sent to maillist.
[PATCH] arm64: dts: add hi6220 usb node
http://thread.gmane.org/gmane.linux.drivers.devicetree/146062
http://thread.gmane.org/gmane.linux.drivers.devicetree/144335/focus=134022

Patch 10 and 11 are from hi6220 mailbox support. It has been reviewed and
ack'ed in maillist.
[PATCH v7 RESEND 0/4] mailbox: hisilicon: add Hi6220 mailbox driver
http://thread.gmane.org/gmane.linux.kernel/2152759/focus=2152768

Patch 12 adds pinctrl to uart ports in SoC and enables them for HiKey board.
Patch 13 adds gpio LEDs device nodes.

Patch 14 adds hi655x pmic dts node and regulator support.
[PATCH v8 5/5] arm64: dts: hisilicon: Add hi655x pmic dts node
http://thread.gmane.org/gmane.linux.kernel/2151688

Patch 15 adds dwmmc nodes description for hi6220. It refers to two LDO's
which are defined above.
Patch 16 adds wifi device node (TI's wl1835) for HiKey board.


v2:
- picked hi655x pmic dts node.
- removed dw_mmc resets property, as it is still under review.
- add 'non-removable' into dw_mmc2 for wifi

Chen Feng (1):
  arm64: dts: hikey: Add hi655x pmic dts node

Guodong Xu (4):
  arm64: dts: hikey: enable i2c0 and i2c1 for working with mezzanine
    boards
  arm64: dts: hi6220: add pinctrl for uarts and enable them
  arm64: dts: add LED nodes for hi6220-hikey
  arm64: dts: add wifi nodes support for hi6220-hikey

Leo Yan (5):
  arm64: dts: Reserve memory regions for hi6220
  arm64: dts: add sp804 timer node for Hi6220
  arm64: dts: enable idle states for Hi6220
  arm64: dts: add mailbox node for Hi6220
  arm64: dts: add Hi6220's stub clock node

Xinwei Kong (2):
  arm64: dts: add all hi6220 i2c nodes
  arm64: dts: add dwmmc nodes for hi6220

Zhangfei Gao (1):
  arm64: dts: add hi6220 usb node

Zhong Kaihua (3):
  arm64: dts: Add Hi6220 gpio configuration nodes
  arm64: dts: add Hi6220 pinctrl configuration nodes
  arm64: dts: add Hi6220 spi configuration nodes

 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts   | 198 ++++++-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi        | 582 +++++++++++++++++++
 arch/arm64/boot/dts/hisilicon/hikey-gpio.dtsi    | 607 +++++++++++++++++++
 arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi | 705 +++++++++++++++++++++++
 include/dt-bindings/pinctrl/hisi.h               |  59 ++
 5 files changed, 2147 insertions(+), 4 deletions(-)
 create mode 100644 arch/arm64/boot/dts/hisilicon/hikey-gpio.dtsi
 create mode 100644 arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi
 create mode 100644 include/dt-bindings/pinctrl/hisi.h

-- 
1.9.1

[toc] | [next] | [standalone]

#1369907 — [PATCH v2 09/16] arm64: dts: add hi6220 usb node

FromGuodong Xu <guodong.xu@linaro.org>
Date2016-04-02 11:40 +0200
Subject[PATCH v2 09/16] arm64: dts: add hi6220 usb node
Message-ID<rjqca-1I3-35@gated-at.bofh.it>
In reply to#1369906
From: Zhangfei Gao <zhangfei.gao@linaro.org>

Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
---
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 32 +++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 664cc7a..2608b68 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -633,5 +633,37 @@
 			pinctrl-0 = <&i2c2_pmx_func &i2c2_cfg_func>;
 			status = "disabled";
 		};
+
+		fixed_5v_hub: regulator@0 {
+			compatible = "regulator-fixed";
+			regulator-name = "fixed_5v_hub";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			regulator-boot-on;
+			gpio = <&gpio0 7 0>;
+			regulator-always-on;
+		};
+
+		usb_phy: usbphy {
+			compatible = "hisilicon,hi6220-usb-phy";
+			#phy-cells = <0>;
+			phy-supply = <&fixed_5v_hub>;
+			hisilicon,peripheral-syscon = <&sys_ctrl>;
+		};
+
+		usb: usb@f72c0000 {
+			compatible = "hisilicon,hi6220-usb";
+			reg = <0x0 0xf72c0000 0x0 0x40000>;
+			phys = <&usb_phy>;
+			phy-names = "usb2-phy";
+			clocks = <&sys_ctrl HI6220_USBOTG_HCLK>;
+			clock-names = "otg";
+			dr_mode = "otg";
+			g-use-dma;
+			g-rx-fifo-size = <512>;
+			g-np-tx-fifo-size = <128>;
+			g-tx-fifo-size = <128 128 128 128 128 128>;
+			interrupts = <0 77 0x4>;
+		};
 	};
 };
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1369908 — [PATCH v2 01/16] arm64: dts: Reserve memory regions for hi6220

FromGuodong Xu <guodong.xu@linaro.org>
Date2016-04-02 11:40 +0200
Subject[PATCH v2 01/16] arm64: dts: Reserve memory regions for hi6220
Message-ID<rjqca-1I3-31@gated-at.bofh.it>
In reply to#1369906
From: Leo Yan <leo.yan@linaro.org>

On Hi6220, below memory regions in DDR have specific purpose:

  0x05e0,0000 - 0x05ef,ffff: For MCU firmware using at runtime;
  0x06df,f000 - 0x06df,ffff: For mailbox message data;
  0x0740,f000 - 0x0740,ffff: For MCU firmware's section;
  0x3e00,0000 - 0x3fff,ffff: For OP-TEE.

This patch reserves these memory regions in DT.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 8185251..17bd793 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -7,9 +7,6 @@
 
 /dts-v1/;
 
-/*Reserved 1MB memory for MCU*/
-/memreserve/ 0x05e00000 0x00100000;
-
 #include "hi6220.dtsi"
 
 / {
@@ -27,9 +24,20 @@
 		stdout-path = "serial3:115200n8";
 	};
 
+	/*
+	 * Reserve below regions from memory node:
+	 *
+	 *  0x05e0,0000 - 0x05ef,ffff: MCU firmware runtime using
+	 *  0x06df,f000 - 0x06df,ffff: Mailbox message data
+	 *  0x0740,f000 - 0x0740,ffff: MCU firmware section
+	 *  0x3e00,0000 - 0x3fff,ffff: OP-TEE
+	 */
 	memory@0 {
 		device_type = "memory";
-		reg = <0x0 0x0 0x0 0x40000000>;
+		reg = <0x00000000 0x00000000 0x00000000 0x05e00000>,
+		      <0x00000000 0x05f00000 0x00000000 0x00eff000>,
+		      <0x00000000 0x06e00000 0x00000000 0x0060f000>,
+		      <0x00000000 0x07410000 0x00000000 0x36bf0000>;
 	};
 };
 
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1369910 — [PATCH v2 13/16] arm64: dts: add LED nodes for hi6220-hikey

FromGuodong Xu <guodong.xu@linaro.org>
Date2016-04-02 11:40 +0200
Subject[PATCH v2 13/16] arm64: dts: add LED nodes for hi6220-hikey
Message-ID<rjqcb-1I3-41@gated-at.bofh.it>
In reply to#1369906
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index c4f560a..28bc646 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -63,6 +63,47 @@
 			status = "ok";
 		};
 	};
+
+	leds {
+		compatible = "gpio-leds";
+		user_led4 {
+			label = "user_led4";
+			gpios = <&gpio4 0 0>; /* <&gpio_user_led_1>; */
+			linux,default-trigger = "heartbeat";
+		};
+
+		user_led3 {
+			label = "user_led3";
+			gpios = <&gpio4 1 0>; /* <&gpio_user_led_2>; */
+			linux,default-trigger = "mmc0";
+		};
+
+		user_led2 {
+			label = "user_led2";
+			gpios = <&gpio4 2 0>; /* <&gpio_user_led_3>; */
+			linux,default-trigger = "mmc1";
+		};
+
+		user_led1 {
+			label = "user_led1";
+			gpios = <&gpio4 3 0>; /* <&gpio_user_led_4>; */
+			linux,default-trigger = "cpu0";
+		};
+
+		wlan_active_led {
+			label = "wifi_active";
+			gpios = <&gpio3 5 0>; /* <&gpio_wlan_active_led>; */
+			linux,default-trigger = "phy0tx";
+			default-state = "off";
+		};
+
+		bt_active_led {
+			label = "bt_active";
+			gpios = <&gpio4 7 0>; /* <&gpio_bt_active_led>; */
+			linux,default-trigger = "hci0rx";
+			default-state = "off";
+		};
+	};
 };
 
 &uart2 {
-- 
1.9.1

[toc] | [prev] | [next] | [standalone]

#1370364 — Re: [PATCH v2 13/16] arm64: dts: add LED nodes for hi6220-hikey

FromRob Herring <robh@kernel.org>
Date2016-04-04 07:20 +0200
SubjectRe: [PATCH v2 13/16] arm64: dts: add LED nodes for hi6220-hikey
Message-ID<rk55G-6H0-47@gated-at.bofh.it>
In reply to#1369910
On Sat, Apr 02, 2016 at 05:29:40PM +0800, Guodong Xu wrote:
> Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
> ---
>  arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 41 ++++++++++++++++++++++++++
>  1 file changed, 41 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> index c4f560a..28bc646 100644
> --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
> @@ -63,6 +63,47 @@
>  			status = "ok";
>  		};
>  	};
> +
> +	leds {
> +		compatible = "gpio-leds";
> +		user_led4 {

Don't use underscores in node names: user-led4

> +			label = "user_led4";

We need to make sure the node names and labels are aligned with other 
boards. There's some discussion about this for the new db600 board.

This looks closer to what we should have than what we have for 
db410c currently.

Rob

[toc] | [prev] | [next] | [standalone]

#1369911 — [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes

FromGuodong Xu <guodong.xu@linaro.org>
Date2016-04-02 11:40 +0200
Subject[PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes
Message-ID<rjqcb-1I3-43@gated-at.bofh.it>
In reply to#1369906
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

[toc] | [prev] | [next] | [standalone]

#1370352 — Re: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes

FromRob Herring <robh@kernel.org>
Date2016-04-04 07:20 +0200
SubjectRe: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes
Message-ID<rk55F-6H0-19@gated-at.bofh.it>
In reply to#1369911
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@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

[toc] | [prev] | [next] | [standalone]

#1376612 — Re: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes

FromGuodong Xu <guodong.xu@linaro.org>
Date2016-04-12 11:50 +0200
SubjectRe: [PATCH v2 06/16] arm64: dts: add Hi6220 spi configuration nodes
Message-ID<rn37j-547-9@gated-at.bofh.it>
In reply to#1370352
On 4 April 2016 at 13:16, Rob Herring <robh@kernel.org> wrote:
> 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.

Will remove it.

>
>>       };
>>
>>       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";
>
> 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.

Thanks. I will modify this to "disabled", and enable it in board dts:
hi6220-hikey.dts

-Guodong

>
> Rob

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web