* [PATCH 1/5] arm64: dts: hi6220: add pinctrl for uarts and enable them
2016-02-19 5:19 [PATCH 0/5] add DTS for hi6220 and HiKey Guodong Xu
@ 2016-02-19 5:19 ` Guodong Xu
2016-02-19 5:19 ` [PATCH 2/5] arm64: dts: add LED nodes for hi6220-hikey Guodong Xu
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Guodong Xu @ 2016-02-19 5:19 UTC (permalink / raw)
To: xuwei5, mark.rutland, robh, grant.likely
Cc: devicetree, linux-kernel, linux-arm-kernel, kong.kongxinwei,
Guodong Xu
Add pinctrl for uart2 uart3 and uart4. Enable uart1 uart2 and uart3.
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 12 ++++++++++++
arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 9 +++++++++
2 files changed, 21 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index e00e9ec..c4f560a 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -50,6 +50,18 @@
i2c1: i2c@f7101000 {
status = "ok";
};
+
+ uart1: uart@f7111000 {
+ status = "ok";
+ };
+
+ uart2: uart@f7112000 {
+ status = "ok";
+ };
+
+ uart3: uart@f7113000 {
+ status = "ok";
+ };
};
};
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index a7ca40b..6afd327 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -266,6 +266,8 @@
clocks = <&sys_ctrl HI6220_UART1_PCLK>,
<&sys_ctrl HI6220_UART1_PCLK>;
clock-names = "uartclk", "apb_pclk";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart1_pmx_func &uart1_cfg_func1 &uart1_cfg_func2>;
status = "disabled";
};
@@ -276,6 +278,8 @@
clocks = <&sys_ctrl HI6220_UART2_PCLK>,
<&sys_ctrl HI6220_UART2_PCLK>;
clock-names = "uartclk", "apb_pclk";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart2_pmx_func &uart2_cfg_func>;
status = "disabled";
};
@@ -286,6 +290,9 @@
clocks = <&sys_ctrl HI6220_UART3_PCLK>,
<&sys_ctrl HI6220_UART3_PCLK>;
clock-names = "uartclk", "apb_pclk";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart3_pmx_func &uart3_cfg_func>;
+ status = "disabled";
};
uart4: uart@f7114000 {
@@ -295,6 +302,8 @@
clocks = <&sys_ctrl HI6220_UART4_PCLK>,
<&sys_ctrl HI6220_UART4_PCLK>;
clock-names = "uartclk", "apb_pclk";
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart4_pmx_func &uart4_cfg_func>;
status = "disabled";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/5] arm64: dts: add LED nodes for hi6220-hikey
2016-02-19 5:19 [PATCH 0/5] add DTS for hi6220 and HiKey Guodong Xu
2016-02-19 5:19 ` [PATCH 1/5] arm64: dts: hi6220: add pinctrl for uarts and enable them Guodong Xu
@ 2016-02-19 5:19 ` Guodong Xu
2016-02-19 5:19 ` [PATCH 3/5] arm64: dts: add dwmmc nodes for hi6220 Guodong Xu
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Guodong Xu @ 2016-02-19 5:19 UTC (permalink / raw)
To: xuwei5, mark.rutland, robh, grant.likely
Cc: devicetree, linux-kernel, linux-arm-kernel, kong.kongxinwei,
Guodong Xu
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..5a004b4 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_led1 {
+ label = "user_led4";
+ gpios = <&gpio4 0 0>; /* <&gpio_user_led_1>; */
+ linux,default-trigger = "heartbeat";
+ };
+
+ user_led2 {
+ label = "user_led3";
+ gpios = <&gpio4 1 0>; /* <&gpio_user_led_2>; */
+ linux,default-trigger = "mmc0";
+ };
+
+ user_led3 {
+ label = "user_led2";
+ gpios = <&gpio4 2 0>; /* <&gpio_user_led_3>; */
+ linux,default-trigger = "mmc1";
+ };
+
+ user_led4 {
+ 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
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/5] arm64: dts: add dwmmc nodes for hi6220
2016-02-19 5:19 [PATCH 0/5] add DTS for hi6220 and HiKey Guodong Xu
2016-02-19 5:19 ` [PATCH 1/5] arm64: dts: hi6220: add pinctrl for uarts and enable them Guodong Xu
2016-02-19 5:19 ` [PATCH 2/5] arm64: dts: add LED nodes for hi6220-hikey Guodong Xu
@ 2016-02-19 5:19 ` Guodong Xu
2016-02-19 5:19 ` [PATCH 4/5] arm64: dts: hi6220: add resets property into dwmmc nodes Guodong Xu
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Guodong Xu @ 2016-02-19 5:19 UTC (permalink / raw)
To: xuwei5, mark.rutland, robh, grant.likely
Cc: devicetree, linux-kernel, linux-arm-kernel, kong.kongxinwei,
Guodong Xu
From: Xinwei Kong <kong.kongxinwei@hisilicon.com>
Add all three dwmmc nodes description for hi6220
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
Signed-off-by: Xinwei Kong <kong.kongxinwei@hisilicon.com>
---
arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 53 +++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 6afd327..28bd441 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -738,5 +738,58 @@
interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
#mbox-cells = <3>;
};
+
+ dwmmc_0: dwmmc0@f723d000 {
+ compatible = "hisilicon,hi6220-dw-mshc";
+ num-slots = <0x1>;
+ cap-mmc-highspeed;
+ non-removable;
+ reg = <0x0 0xf723d000 0x0 0x1000>;
+ interrupts = <0x0 0x48 0x4>;
+ clocks = <&sys_ctrl 2>, <&sys_ctrl 1>;
+ clock-names = "ciu", "biu";
+ bus-width = <0x8>;
+ vmmc-supply = <&ldo19>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&emmc_pmx_func &emmc_clk_cfg_func
+ &emmc_cfg_func &emmc_rst_cfg_func>;
+ };
+
+ dwmmc_1: dwmmc1@f723e000 {
+ compatible = "hisilicon,hi6220-dw-mshc";
+ num-slots = <0x1>;
+ card-detect-delay = <200>;
+ hisilicon,peripheral-syscon = <&ao_ctrl>;
+ cap-sd-highspeed;
+ reg = <0x0 0xf723e000 0x0 0x1000>;
+ interrupts = <0x0 0x49 0x4>;
+ #address-cells = <0x1>;
+ #size-cells = <0x0>;
+ clocks = <&sys_ctrl 4>, <&sys_ctrl 3>;
+ clock-names = "ciu", "biu";
+ vqmmc-supply = <&ldo7>;
+ vmmc-supply = <&ldo10>;
+ bus-width = <0x4>;
+ disable-wp;
+ cd-gpios = <&gpio1 0 1>;
+ pinctrl-names = "default", "idle";
+ pinctrl-0 = <&sd_pmx_func &sd_clk_cfg_func &sd_cfg_func>;
+ pinctrl-1 = <&sd_pmx_idle &sd_clk_cfg_idle &sd_cfg_idle>;
+ };
+
+ dwmmc_2: dwmmc2@f723f000 {
+ compatible = "hisilicon,hi6220-dw-mshc";
+ status = "okay";
+ num-slots = <0x1>;
+ reg = <0x0 0xf723f000 0x0 0x1000>;
+ interrupts = <0x0 0x4a 0x4>;
+ clocks = <&sys_ctrl HI6220_MMC2_CIUCLK>, <&sys_ctrl HI6220_MMC2_CLK>;
+ clock-names = "ciu", "biu";
+ bus-width = <0x4>;
+ broken-cd;
+ pinctrl-names = "default", "idle";
+ pinctrl-0 = <&sdio_pmx_func &sdio_clk_cfg_func &sdio_cfg_func>;
+ pinctrl-1 = <&sdio_pmx_idle &sdio_clk_cfg_idle &sdio_cfg_idle>;
+ };
};
};
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] arm64: dts: hi6220: add resets property into dwmmc nodes
2016-02-19 5:19 [PATCH 0/5] add DTS for hi6220 and HiKey Guodong Xu
` (2 preceding siblings ...)
2016-02-19 5:19 ` [PATCH 3/5] arm64: dts: add dwmmc nodes for hi6220 Guodong Xu
@ 2016-02-19 5:19 ` Guodong Xu
2016-02-19 5:19 ` [PATCH 5/5] arm64: dts: add wifi nodes support for hi6220-hikey Guodong Xu
2016-02-27 10:13 ` [PATCH 0/5] add DTS for hi6220 and HiKey Wei Xu
5 siblings, 0 replies; 7+ messages in thread
From: Guodong Xu @ 2016-02-19 5:19 UTC (permalink / raw)
To: xuwei5, mark.rutland, robh, grant.likely
Cc: devicetree, linux-kernel, linux-arm-kernel, kong.kongxinwei,
Guodong Xu
Add resets property into dwmmc_0, dwmmc_1 and dwmmc_2 for hi6220
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
index 28bd441..7452359 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hi6220.dtsi
@@ -7,6 +7,7 @@
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/hi6220-clock.h>
#include <dt-bindings/pinctrl/hisi.h>
+#include <dt-bindings/reset/hisi,hi6220-resets.h>
/ {
compatible = "hisilicon,hi6220";
@@ -748,6 +749,7 @@
interrupts = <0x0 0x48 0x4>;
clocks = <&sys_ctrl 2>, <&sys_ctrl 1>;
clock-names = "ciu", "biu";
+ resets = <&sys_ctrl PERIPH_RSTDIS0_MMC0>;
bus-width = <0x8>;
vmmc-supply = <&ldo19>;
pinctrl-names = "default";
@@ -767,6 +769,7 @@
#size-cells = <0x0>;
clocks = <&sys_ctrl 4>, <&sys_ctrl 3>;
clock-names = "ciu", "biu";
+ resets = <&sys_ctrl PERIPH_RSTDIS0_MMC1>;
vqmmc-supply = <&ldo7>;
vmmc-supply = <&ldo10>;
bus-width = <0x4>;
@@ -785,6 +788,7 @@
interrupts = <0x0 0x4a 0x4>;
clocks = <&sys_ctrl HI6220_MMC2_CIUCLK>, <&sys_ctrl HI6220_MMC2_CLK>;
clock-names = "ciu", "biu";
+ resets = <&sys_ctrl PERIPH_RSTDIS0_MMC2>;
bus-width = <0x4>;
broken-cd;
pinctrl-names = "default", "idle";
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] arm64: dts: add wifi nodes support for hi6220-hikey
2016-02-19 5:19 [PATCH 0/5] add DTS for hi6220 and HiKey Guodong Xu
` (3 preceding siblings ...)
2016-02-19 5:19 ` [PATCH 4/5] arm64: dts: hi6220: add resets property into dwmmc nodes Guodong Xu
@ 2016-02-19 5:19 ` Guodong Xu
2016-02-27 10:13 ` [PATCH 0/5] add DTS for hi6220 and HiKey Wei Xu
5 siblings, 0 replies; 7+ messages in thread
From: Guodong Xu @ 2016-02-19 5:19 UTC (permalink / raw)
To: xuwei5, mark.rutland, robh, grant.likely
Cc: devicetree, linux-kernel, linux-arm-kernel, kong.kongxinwei,
Guodong Xu
Add wifi nodes support for hi6220-hikey
Signed-off-by: Guodong Xu <guodong.xu@linaro.org>
---
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 28 ++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
index 5a004b4..eba6ec7 100644
--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
+++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
@@ -47,6 +47,7 @@
i2c0: i2c@f7100000 {
status = "ok";
};
+
i2c1: i2c@f7101000 {
status = "ok";
};
@@ -62,6 +63,33 @@
uart3: uart@f7113000 {
status = "ok";
};
+
+ dwmmc_2: dwmmc2@f723f000 {
+ /* WL_EN */
+ vmmc-supply = <&wlan_en_reg>;
+
+ #address-cells = <0x1>;
+ #size-cells = <0x0>;
+ wlcore: wlcore@2 {
+ compatible = "ti,wl1835";
+ reg = <2>; /* sdio func num */
+ /* WL_IRQ, WL_HOST_WAKE_GPIO1_3 */
+ interrupt-parent = <&gpio1>;
+ interrupts = <3 IRQ_TYPE_EDGE_RISING>;
+ };
+ };
+
+ wlan_en_reg: fixedregulator@1 {
+ compatible = "regulator-fixed";
+ regulator-name = "wlan-en-regulator";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ /* WLAN_EN GPIO */
+ gpio = <&gpio0 5 0>;
+ /* WLAN card specific delay */
+ startup-delay-us = <70000>;
+ enable-active-high;
+ };
};
leds {
--
1.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 0/5] add DTS for hi6220 and HiKey
2016-02-19 5:19 [PATCH 0/5] add DTS for hi6220 and HiKey Guodong Xu
` (4 preceding siblings ...)
2016-02-19 5:19 ` [PATCH 5/5] arm64: dts: add wifi nodes support for hi6220-hikey Guodong Xu
@ 2016-02-27 10:13 ` Wei Xu
5 siblings, 0 replies; 7+ messages in thread
From: Wei Xu @ 2016-02-27 10:13 UTC (permalink / raw)
To: Guodong Xu, mark.rutland, robh, grant.likely
Cc: devicetree, linux-kernel, linux-arm-kernel, kong.kongxinwei
Hi Guodong,
On 19/02/2016 13:19, Guodong Xu wrote:
> This patchset include more dts changes for hi6220 SoC and HiKey board.
>
> Patch 1 adds pinctrl to uart ports in SoC and enables them for HiKey board.
> Patch 2 adds gpio LEDs device nodes.
> Patch 3 adds dwmmc nodes description for hi6220. It refers to two LDO's
> which are defined in regulator patchsets which pending on review:
> [PATCH v8 5/5] arm64: dts: hisilicon: Add hi655x pmic dts node
> http://thread.gmane.org/gmane.linux.kernel/2151688
>
> Patch 4 adds resets property into dwmmc nodes.
> Patch 5 adds wifi device nodes (TI's wl1835) for HiKey board.
>
> Guodong Xu (4):
> arm64: dts: hi6220: add pinctrl for uarts and enable them
> arm64: dts: add LED nodes for hi6220-hikey
> arm64: dts: hi6220: add resets property into dwmmc nodes
> arm64: dts: add wifi nodes support for hi6220-hikey
>
> Xinwei Kong (1):
> arm64: dts: add dwmmc nodes for hi6220
>
> arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 81 ++++++++++++++++++++++++++
> arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 66 +++++++++++++++++++++
> 2 files changed, 147 insertions(+)
>
Applied all the patches into the hisilicon soc tree.
Thanks!
Best Regards,
Wei
^ permalink raw reply [flat|nested] 7+ messages in thread