linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes
@ 2017-08-14  9:50 Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 01/10] arm64: dts: hi3660: enable idle states Guodong Xu
                   ` (10 more replies)
  0 siblings, 11 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Guodong Xu

This patchset adds more device nodes for hi3660 and hikey960, including:
 - cpu idle states
 - L2 cache
 - PMU
 - OP-TEE
 - reboot
 - pstore
 - DMA
 - watchdog

Patch 7 fixes an issue in mmc nodes, by adding 'reset'
Patch 8 change bluetooth uart max-speed to 3Mbps

HiKey960 is one of 96boards. For details information about it, please
refer to [1].

===
Major changes in v3:
 - update commit message of patch 1, as suggested by Daniel Lezcano
 - add patch 10 for watchdog bindings

Major changes in v2:
 - add patch 8 to change bluetooth uart max-speed to 3Mbps
 - add patch 9 for DMA node.

[1] https://github.com/96boards/documentation/tree/master/ConsumerEdition/HiKey960

Guodong Xu (4):
  arm64: dts: hikey960: Add support for syscon-reboot-mode
  arm64: dts: hikey960: Add pstore support
  arm64: dts: hi3660: Reset the mmc hosts
  arm64: dts: hikey960: change bluetooth uart max-speed to 3mbps

Leo Yan (3):
  arm64: dts: hi3660: enable idle states
  arm64: dts: hi3660: add L2 cache topology
  arm64: dts: hi3660: enable watchdog

Victor Chong (1):
  arm64: dts: hikey960: Add optee node

Wang Ruyi (1):
  arm64: dts: hi3660: add bindings for DMA

YiPing Xu (1):
  arm64: dts: hi3660: add pmu dt node for hi3660

 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts |  37 +++++-
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi         | 130 ++++++++++++++++++++++
 2 files changed, 166 insertions(+), 1 deletion(-)

-- 
2.10.2

^ permalink raw reply	[flat|nested] 12+ messages in thread

* [PATCH v3 01/10] arm64: dts: hi3660: enable idle states
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 02/10] arm64: dts: hi3660: add L2 cache topology Guodong Xu
                   ` (9 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Leo Yan, Kevin Wang

From: Leo Yan <leo.yan@linaro.org>

There are two clusters on the Hi3660, the first one is Cortex-A53 based
and the other one is Cortex-A73 based. These two clusters have different
idle states.

Thanks to Daniel Lezcano's recent changes, the generic ARM cpuidle
driver can now support several clusters with different idle states, thus
supporting the big.Little architecture.

In addition to the WFI idle state which is the default shallowest state
for all ARM cpus, the Hi3660 supports the following states:

 - CA53 CPUs:
        - CPU_SLEEP:       CPU power off state
        - CLUSTER_SLEEP_0: Cluster power off state

 - CA73 CPUs:
        - CPU_NAP:         CPU retention state
        - CPU_SLEEP:       CPU power off state
        - CLUSTER_SLEEP_1: Cluster power off state

This patch adds the idle states description for the Hi3660 to the device
tree.

Cc: Kevin Wang <jean.wangtao@linaro.org>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 63 +++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index c6a1961..8921310 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -58,6 +58,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x0>;
 			enable-method = "psci";
+			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
 		};
 
 		cpu1: cpu@1 {
@@ -65,6 +66,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x1>;
 			enable-method = "psci";
+			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
 		};
 
 		cpu2: cpu@2 {
@@ -72,6 +74,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x2>;
 			enable-method = "psci";
+			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
 		};
 
 		cpu3: cpu@3 {
@@ -79,6 +82,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x3>;
 			enable-method = "psci";
+			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
 		};
 
 		cpu4: cpu@100 {
@@ -86,6 +90,11 @@
 			device_type = "cpu";
 			reg = <0x0 0x100>;
 			enable-method = "psci";
+			cpu-idle-states = <
+					&CPU_NAP
+					&CPU_SLEEP
+					&CLUSTER_SLEEP_1
+			>;
 		};
 
 		cpu5: cpu@101 {
@@ -93,6 +102,11 @@
 			device_type = "cpu";
 			reg = <0x0 0x101>;
 			enable-method = "psci";
+			cpu-idle-states = <
+					&CPU_NAP
+					&CPU_SLEEP
+					&CLUSTER_SLEEP_1
+			>;
 		};
 
 		cpu6: cpu@102 {
@@ -100,6 +114,11 @@
 			device_type = "cpu";
 			reg = <0x0 0x102>;
 			enable-method = "psci";
+			cpu-idle-states = <
+					&CPU_NAP
+					&CPU_SLEEP
+					&CLUSTER_SLEEP_1
+			>;
 		};
 
 		cpu7: cpu@103 {
@@ -107,6 +126,50 @@
 			device_type = "cpu";
 			reg = <0x0 0x103>;
 			enable-method = "psci";
+			cpu-idle-states = <
+					&CPU_NAP
+					&CPU_SLEEP
+					&CLUSTER_SLEEP_1
+			>;
+		};
+
+		idle-states {
+			entry-method = "psci";
+
+			CPU_NAP: cpu-nap {
+				compatible = "arm,idle-state";
+				arm,psci-suspend-param = <0x0000001>;
+				entry-latency-us = <7>;
+				exit-latency-us = <2>;
+				min-residency-us = <15>;
+			};
+
+			CPU_SLEEP: cpu-sleep {
+				compatible = "arm,idle-state";
+				local-timer-stop;
+				arm,psci-suspend-param = <0x0010000>;
+				entry-latency-us = <40>;
+				exit-latency-us = <70>;
+				min-residency-us = <3000>;
+			};
+
+			CLUSTER_SLEEP_0: cluster-sleep-0 {
+				compatible = "arm,idle-state";
+				local-timer-stop;
+				arm,psci-suspend-param = <0x1010000>;
+				entry-latency-us = <500>;
+				exit-latency-us = <5000>;
+				min-residency-us = <20000>;
+			};
+
+			CLUSTER_SLEEP_1: cluster-sleep-1 {
+				compatible = "arm,idle-state";
+				local-timer-stop;
+				arm,psci-suspend-param = <0x1010000>;
+				entry-latency-us = <1000>;
+				exit-latency-us = <5000>;
+				min-residency-us = <20000>;
+			};
 		};
 	};
 
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 02/10] arm64: dts: hi3660: add L2 cache topology
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 01/10] arm64: dts: hi3660: enable idle states Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 03/10] arm64: dts: hi3660: add pmu dt node for hi3660 Guodong Xu
                   ` (8 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Leo Yan

From: Leo Yan <leo.yan@linaro.org>

This patch adds the L2 cache topology on 96boards Hikey960.

Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 8921310..1cdd03b 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -58,6 +58,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x0>;
 			enable-method = "psci";
+			next-level-cache = <&A53_L2>;
 			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
 		};
 
@@ -66,6 +67,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x1>;
 			enable-method = "psci";
+			next-level-cache = <&A53_L2>;
 			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
 		};
 
@@ -74,6 +76,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x2>;
 			enable-method = "psci";
+			next-level-cache = <&A53_L2>;
 			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
 		};
 
@@ -82,6 +85,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x3>;
 			enable-method = "psci";
+			next-level-cache = <&A53_L2>;
 			cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP_0>;
 		};
 
@@ -90,6 +94,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x100>;
 			enable-method = "psci";
+			next-level-cache = <&A73_L2>;
 			cpu-idle-states = <
 					&CPU_NAP
 					&CPU_SLEEP
@@ -102,6 +107,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x101>;
 			enable-method = "psci";
+			next-level-cache = <&A73_L2>;
 			cpu-idle-states = <
 					&CPU_NAP
 					&CPU_SLEEP
@@ -114,6 +120,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x102>;
 			enable-method = "psci";
+			next-level-cache = <&A73_L2>;
 			cpu-idle-states = <
 					&CPU_NAP
 					&CPU_SLEEP
@@ -126,6 +133,7 @@
 			device_type = "cpu";
 			reg = <0x0 0x103>;
 			enable-method = "psci";
+			next-level-cache = <&A73_L2>;
 			cpu-idle-states = <
 					&CPU_NAP
 					&CPU_SLEEP
@@ -171,6 +179,14 @@
 				min-residency-us = <20000>;
 			};
 		};
+
+		A53_L2: l2-cache0 {
+			compatible = "cache";
+		};
+
+		A73_L2: l2-cache1 {
+			compatible = "cache";
+		};
 	};
 
 	gic: interrupt-controller@e82b0000 {
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 03/10] arm64: dts: hi3660: add pmu dt node for hi3660
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 01/10] arm64: dts: hi3660: enable idle states Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 02/10] arm64: dts: hi3660: add L2 cache topology Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 04/10] arm64: dts: hikey960: Add optee node Guodong Xu
                   ` (7 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, YiPing Xu,
	Zhong Kaihua, Leo Yan

From: YiPing Xu <xuyiping@hisilicon.com>

Add pmu dt node for hi3660

Signed-off-by: YiPing Xu <xuyiping@hisilicon.com>
Signed-off-by: Zhong Kaihua <zhongkaihua@huawei.com>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
Tested-by: Jumana Mundichipparakkal <jumana.mp@arm.com>
---
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 1cdd03b..5fd5686 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -202,6 +202,26 @@
 					 IRQ_TYPE_LEVEL_HIGH)>;
 	};
 
+	pmu {
+		compatible = "arm,armv8-pmuv3";
+		interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-affinity = <&cpu0>,
+				     <&cpu1>,
+				     <&cpu2>,
+				     <&cpu3>,
+				     <&cpu4>,
+				     <&cpu5>,
+				     <&cpu6>,
+				     <&cpu7>;
+	};
+
 	timer {
 		compatible = "arm,armv8-timer";
 		interrupt-parent = <&gic>;
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 04/10] arm64: dts: hikey960: Add optee node
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
                   ` (2 preceding siblings ...)
  2017-08-14  9:50 ` [PATCH v3 03/10] arm64: dts: hi3660: add pmu dt node for hi3660 Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 05/10] arm64: dts: hikey960: Add support for syscon-reboot-mode Guodong Xu
                   ` (6 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Victor Chong

From: Victor Chong <victor.chong@linaro.org>

This patch adds op-tee node for hikey960

Signed-off-by: Victor Chong <victor.chong@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index 6609b0f..b96d865 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -159,6 +159,13 @@
 		startup-delay-us = <70000>;
 		enable-active-high;
 	};
+
+	firmware {
+		optee {
+			compatible = "linaro,optee-tz";
+			method = "smc";
+		};
+	};
 };
 
 &i2c0 {
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 05/10] arm64: dts: hikey960: Add support for syscon-reboot-mode
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
                   ` (3 preceding siblings ...)
  2017-08-14  9:50 ` [PATCH v3 04/10] arm64: dts: hikey960: Add optee node Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 06/10] arm64: dts: hikey960: Add pstore support Guodong Xu
                   ` (5 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Guodong Xu, John Stultz

Add support to hikey960 dts for the syscon-reboot-mode driver.

Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index b96d865..ce5e874 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -39,6 +39,20 @@
 		reg = <0x0 0x0 0x0 0x0>;
 	};
 
+	reboot-mode-syscon@32100000 {
+		compatible = "syscon", "simple-mfd";
+		reg = <0x0 0x32100000 0x0 0x00001000>;
+
+		reboot-mode {
+			compatible = "syscon-reboot-mode";
+			offset = <0x0>;
+
+			mode-normal	= <0x77665501>;
+			mode-bootloader	= <0x77665500>;
+			mode-recovery	= <0x77665502>;
+		};
+	};
+
 	keys {
 		compatible = "gpio-keys";
 		pinctrl-names = "default";
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 06/10] arm64: dts: hikey960: Add pstore support
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
                   ` (4 preceding siblings ...)
  2017-08-14  9:50 ` [PATCH v3 05/10] arm64: dts: hikey960: Add support for syscon-reboot-mode Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 07/10] arm64: dts: hi3660: Reset the mmc hosts Guodong Xu
                   ` (4 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Guodong Xu, John Stultz

This patch reserves some memory in the DTS and sets up a
pstore device tree node to enable pstore support on HiKey960.

Cc: John Stultz <john.stultz@linaro.org>
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index ce5e874..7770ec7 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -39,6 +39,20 @@
 		reg = <0x0 0x0 0x0 0x0>;
 	};
 
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		ramoops@32000000 {
+			compatible = "ramoops";
+			reg = <0x0 0x32000000 0x0 0x00100000>;
+			record-size	= <0x00020000>;
+			console-size	= <0x00020000>;
+			ftrace-size	= <0x00020000>;
+		};
+	};
+
 	reboot-mode-syscon@32100000 {
 		compatible = "syscon", "simple-mfd";
 		reg = <0x0 0x32100000 0x0 0x00001000>;
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 07/10] arm64: dts: hi3660: Reset the mmc hosts
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
                   ` (5 preceding siblings ...)
  2017-08-14  9:50 ` [PATCH v3 06/10] arm64: dts: hikey960: Add pstore support Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 08/10] arm64: dts: hikey960: change bluetooth uart max-speed to 3mbps Guodong Xu
                   ` (3 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Guodong Xu

Add reset-names = "reset" into mmc nodes.

Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 5fd5686..41841f7 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -909,6 +909,7 @@
 			clock-names = "ciu", "biu";
 			clock-frequency = <3200000>;
 			resets = <&crg_rst 0x94 18>;
+			reset-names = "reset";
 			cd-gpios = <&gpio25 3 0>;
 			hisilicon,peripheral-syscon = <&sctrl>;
 			pinctrl-names = "default";
@@ -938,6 +939,7 @@
 				 <&crg_ctrl HI3660_HCLK_GATE_SDIO0>;
 			clock-names = "ciu", "biu";
 			resets = <&crg_rst 0x94 20>;
+			reset-names = "reset";
 			card-detect-delay = <200>;
 			supports-highspeed;
 			keep-power-in-suspend;
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 08/10] arm64: dts: hikey960: change bluetooth uart max-speed to 3mbps
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
                   ` (6 preceding siblings ...)
  2017-08-14  9:50 ` [PATCH v3 07/10] arm64: dts: hi3660: Reset the mmc hosts Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 09/10] arm64: dts: hi3660: add bindings for DMA Guodong Xu
                   ` (2 subsequent siblings)
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Guodong Xu

Update bluetooth UART max-speed to 3Mbps

Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
index 7770ec7..fd4705c 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
@@ -230,7 +230,7 @@
 	bluetooth {
 		compatible = "ti,wl1837-st";
 		enable-gpios = <&gpio15 6 GPIO_ACTIVE_HIGH>;
-		max-speed = <921600>;
+		max-speed = <3000000>;
 	};
 };
 
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 09/10] arm64: dts: hi3660: add bindings for DMA
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
                   ` (7 preceding siblings ...)
  2017-08-14  9:50 ` [PATCH v3 08/10] arm64: dts: hikey960: change bluetooth uart max-speed to 3mbps Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-14  9:50 ` [PATCH v3 10/10] arm64: dts: hi3660: enable watchdog Guodong Xu
  2017-08-15 13:36 ` [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Wei Xu
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Wang Ruyi, Guodong Xu

From: Wang Ruyi <wangruyi@huawei.com>

Add bindings for DMA.

Signed-off-by: Wang Ruyi <wangruyi@huawei.com>
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 41841f7..545d435 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -436,6 +436,19 @@
 			status = "disabled";
 		};
 
+		dma0: dma@fdf30000 {
+			compatible = "hisilicon,k3-dma-1.0";
+			reg = <0x0 0xfdf30000 0x0 0x1000>;
+			#dma-cells = <1>;
+			dma-channels = <16>;
+			dma-requests = <32>;
+			dma-min-chan = <1>;
+			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&crg_ctrl HI3660_CLK_GATE_DMAC>;
+			dma-no-cci;
+			dma-type = "hi3660_dma";
+		};
+
 		rtc0: rtc@fff04000 {
 			compatible = "arm,pl031", "arm,primecell";
 			reg = <0x0 0Xfff04000 0x0 0x1000>;
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* [PATCH v3 10/10] arm64: dts: hi3660: enable watchdog
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
                   ` (8 preceding siblings ...)
  2017-08-14  9:50 ` [PATCH v3 09/10] arm64: dts: hi3660: add bindings for DMA Guodong Xu
@ 2017-08-14  9:50 ` Guodong Xu
  2017-08-15 13:36 ` [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Wei Xu
  10 siblings, 0 replies; 12+ messages in thread
From: Guodong Xu @ 2017-08-14  9:50 UTC (permalink / raw)
  To: xuwei5, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel, Leo Yan, Guodong Xu,
	Zhong Kaihua

From: Leo Yan <leo.yan@linaro.org>

This patch is to add watchdog binding for Hi3660 on Hikey960 board.

Cc: Guodong Xu <guodong.xu@linaro.org>
Cc: Zhong Kaihua <zhongkaihua@huawei.com>
Signed-off-by: Leo Yan <leo.yan@linaro.org>
---
 arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
index 545d435..b7a90d6 100644
--- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi
@@ -962,5 +962,21 @@
 				     &sdio_cfg_func>;
 			status = "disabled";
 		};
+
+		watchdog0: watchdog@e8a06000 {
+			compatible = "arm,sp805-wdt", "arm,primecell";
+			reg = <0x0 0xe8a06000 0x0 0x1000>;
+			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&crg_ctrl HI3660_OSC32K>;
+			clock-names = "apb_pclk";
+		};
+
+		watchdog1: watchdog@e8a07000 {
+			compatible = "arm,sp805-wdt", "arm,primecell";
+			reg = <0x0 0xe8a07000 0x0 0x1000>;
+			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&crg_ctrl HI3660_OSC32K>;
+			clock-names = "apb_pclk";
+		};
 	};
 };
-- 
2.10.2

^ permalink raw reply related	[flat|nested] 12+ messages in thread

* Re: [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes
  2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
                   ` (9 preceding siblings ...)
  2017-08-14  9:50 ` [PATCH v3 10/10] arm64: dts: hi3660: enable watchdog Guodong Xu
@ 2017-08-15 13:36 ` Wei Xu
  10 siblings, 0 replies; 12+ messages in thread
From: Wei Xu @ 2017-08-15 13:36 UTC (permalink / raw)
  To: Guodong Xu, robh+dt, mark.rutland, catalin.marinas, will.deacon,
	keescook, anton, ccross, tony.luck
  Cc: devicetree, linux-kernel, linux-arm-kernel

Hi Guodong,

On 2017/8/14 10:50, Guodong Xu wrote:
> This patchset adds more device nodes for hi3660 and hikey960, including:
>  - cpu idle states
>  - L2 cache
>  - PMU
>  - OP-TEE
>  - reboot
>  - pstore
>  - DMA
>  - watchdog
> 
> Patch 7 fixes an issue in mmc nodes, by adding 'reset'
> Patch 8 change bluetooth uart max-speed to 3Mbps
> 
> HiKey960 is one of 96boards. For details information about it, please
> refer to [1].
> 
> ===
> Major changes in v3:
>  - update commit message of patch 1, as suggested by Daniel Lezcano
>  - add patch 10 for watchdog bindings
> 
> Major changes in v2:
>  - add patch 8 to change bluetooth uart max-speed to 3Mbps
>  - add patch 9 for DMA node.
> 
> [1] https://github.com/96boards/documentation/tree/master/ConsumerEdition/HiKey960
> 
> Guodong Xu (4):
>   arm64: dts: hikey960: Add support for syscon-reboot-mode
>   arm64: dts: hikey960: Add pstore support
>   arm64: dts: hi3660: Reset the mmc hosts
>   arm64: dts: hikey960: change bluetooth uart max-speed to 3mbps
> 
> Leo Yan (3):
>   arm64: dts: hi3660: enable idle states
>   arm64: dts: hi3660: add L2 cache topology
>   arm64: dts: hi3660: enable watchdog
> 
> Victor Chong (1):
>   arm64: dts: hikey960: Add optee node
> 
> Wang Ruyi (1):
>   arm64: dts: hi3660: add bindings for DMA
> 
> YiPing Xu (1):
>   arm64: dts: hi3660: add pmu dt node for hi3660
> 
>  arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts |  37 +++++-
>  arch/arm64/boot/dts/hisilicon/hi3660.dtsi         | 130 ++++++++++++++++++++++
>  2 files changed, 166 insertions(+), 1 deletion(-)
> 

Thanks!
Series applied to the hisilicon dt tree.

Best Regards,
Wei

^ permalink raw reply	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2017-08-15 13:36 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-14  9:50 [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Guodong Xu
2017-08-14  9:50 ` [PATCH v3 01/10] arm64: dts: hi3660: enable idle states Guodong Xu
2017-08-14  9:50 ` [PATCH v3 02/10] arm64: dts: hi3660: add L2 cache topology Guodong Xu
2017-08-14  9:50 ` [PATCH v3 03/10] arm64: dts: hi3660: add pmu dt node for hi3660 Guodong Xu
2017-08-14  9:50 ` [PATCH v3 04/10] arm64: dts: hikey960: Add optee node Guodong Xu
2017-08-14  9:50 ` [PATCH v3 05/10] arm64: dts: hikey960: Add support for syscon-reboot-mode Guodong Xu
2017-08-14  9:50 ` [PATCH v3 06/10] arm64: dts: hikey960: Add pstore support Guodong Xu
2017-08-14  9:50 ` [PATCH v3 07/10] arm64: dts: hi3660: Reset the mmc hosts Guodong Xu
2017-08-14  9:50 ` [PATCH v3 08/10] arm64: dts: hikey960: change bluetooth uart max-speed to 3mbps Guodong Xu
2017-08-14  9:50 ` [PATCH v3 09/10] arm64: dts: hi3660: add bindings for DMA Guodong Xu
2017-08-14  9:50 ` [PATCH v3 10/10] arm64: dts: hi3660: enable watchdog Guodong Xu
2017-08-15 13:36 ` [PATCH v3 00/10] arm64: dts: hi3660: add more device nodes Wei Xu

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).