michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: npcx: Fixed the name of nodes in vw, miwu-wui, and miwu-int files.

Browse source 
Fixed the name of nodes in in espi-vw, miwu-wui, and miwu-int
device-tree node. This CL fixed missing nodes in CL d3a94fa8ab.

Signed-off-by: Mulin Chao <mlchao@nuvoton.com>
This commit is contained in:
Mulin Chao 2021-04-12 19:38:20 -07:00 • committed by Anas Nashif
commit c22df17be3
6 changed files with 80 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

58
dts/arm/nuvoton/npcx/npcx7-espi-vws-map.dtsi
View file

@ -34,94 +34,106 @@
/* eSPI Virtual Vire (VW) input configuration */ /* eSPI Virtual Vire (VW) input configuration */
/* index 02h (In) */ /* index 02h (In) */
vw-slp-s3 { vw-slp-s3 {
vw_reg = <NPCX_VWEVMS0 0x01>; wui_map = <&wui_vw_slp_s3>; vw-reg = <NPCX_VWEVMS0 0x01>;
vw-wui = <&wui_vw_slp_s3>;
}; };
vw-slp-s4 { vw-slp-s4 {
vw_reg = <NPCX_VWEVMS0 0x02>; wui_map = <&wui_vw_slp_s4>; vw-reg = <NPCX_VWEVMS0 0x02>;
vw-wui = <&wui_vw_slp_s4>;
}; };
vw-slp-s5 { vw-slp-s5 {
vw_reg = <NPCX_VWEVMS0 0x04>; wui_map = <&wui_vw_slp_s5>; vw-reg = <NPCX_VWEVMS0 0x04>;
vw-wui = <&wui_vw_slp_s5>;
}; };
/* index 03h (In) */ /* index 03h (In) */
vw-sus-stat { vw-sus-stat {
vw_reg = <NPCX_VWEVMS1 0x01>; wui_map = <&wui_vw_sus_stat>; vw-reg = <NPCX_VWEVMS1 0x01>;
vw-wui = <&wui_vw_sus_stat>;
}; };
vw-plt-rst { vw-plt-rst {
vw_reg = <NPCX_VWEVMS1 0x02>; wui_map = <&wui_vw_plt_rst>; vw-reg = <NPCX_VWEVMS1 0x02>;
vw-wui = <&wui_vw_plt_rst>;
}; };
vw-oob-rst-warn { vw-oob-rst-warn {
vw_reg = <NPCX_VWEVMS1 0x04>; wui_map = <&wui_vw_oob_rst_warn>; vw-reg = <NPCX_VWEVMS1 0x04>;
vw-wui = <&wui_vw_oob_rst_warn>;
}; };
/* index 07h (In) */ /* index 07h (In) */
vw-host-rst-warn { vw-host-rst-warn {
vw_reg = <NPCX_VWEVMS2 0x01>; wui_map =<&wui_vw_host_rst_warn>; vw-reg = <NPCX_VWEVMS2 0x01>;
vw-wui = <&wui_vw_host_rst_warn>;
}; };
/* index 41h (In) */ /* index 41h (In) */
vw-sus-warn { vw-sus-warn {
vw_reg = <NPCX_VWEVMS3 0x01>; wui_map = <&wui_vw_sus_warn>; vw-reg = <NPCX_VWEVMS3 0x01>;
vw-wui = <&wui_vw_sus_warn>;
}; };
vw-sus-pwrdn-ack { vw-sus-pwrdn-ack {
vw_reg = <NPCX_VWEVMS3 0x02>; wui_map =<&wui_vw_sus_pwrdn_ack>; vw-reg = <NPCX_VWEVMS3 0x02>;
vw-wui = <&wui_vw_sus_pwrdn_ack>;
}; };
vw-slp-a { vw-slp-a {
vw_reg = <NPCX_VWEVMS3 0x08>; wui_map = <&wui_vw_slp_a>; vw-reg = <NPCX_VWEVMS3 0x08>;
vw-wui = <&wui_vw_slp_a>;
}; };
/* index 42h (In) */ /* index 42h (In) */
vw-slp-lan { vw-slp-lan {
vw_reg = <NPCX_VWEVMS4 0x01>; wui_map = <&wui_vw_slp_lan>; vw-reg = <NPCX_VWEVMS4 0x01>;
vw-wui = <&wui_vw_slp_lan>;
}; };
vw-slp-wlan { vw-slp-wlan {
vw_reg = <NPCX_VWEVMS4 0x02>; wui_map = <&wui_vw_slp_wlan>; vw-reg = <NPCX_VWEVMS4 0x02>;
vw-wui = <&wui_vw_slp_wlan>;
}; };
/* eSPI Virtual Vire (VW) output configuration */ /* eSPI Virtual Vire (VW) output configuration */
/* index 04h (Out) */ /* index 04h (Out) */
vw-oob-rst-ack { vw-oob-rst-ack {
vw_reg = <NPCX_VWEVSM0 0x01>; vw-reg = <NPCX_VWEVSM0 0x01>;
}; };
vw-wake { vw-wake {
vw_reg = <NPCX_VWEVSM0 0x04>; vw-reg = <NPCX_VWEVSM0 0x04>;
}; };
vw-pme { vw-pme {
vw_reg = <NPCX_VWEVSM0 0x08>; vw-reg = <NPCX_VWEVSM0 0x08>;
}; };
/* index 05h (Out) */ /* index 05h (Out) */
vw-slv-boot-done { vw-slv-boot-done {
vw_reg = <NPCX_VWEVSM1 0x01>; vw-reg = <NPCX_VWEVSM1 0x01>;
}; };
vw-err-fatal { vw-err-fatal {
vw_reg = <NPCX_VWEVSM1 0x02>; vw-reg = <NPCX_VWEVSM1 0x02>;
}; };
vw-err-non-fatal { vw-err-non-fatal {
vw_reg = <NPCX_VWEVSM1 0x04>; vw-reg = <NPCX_VWEVSM1 0x04>;
}; };
vw-slv-boot-sts-with-done { vw-slv-boot-sts-with-done {
/* /*
* SLAVE_BOOT_DONE & SLAVE_LOAD_STS bits (bit 0 & bit 3) * SLAVE_BOOT_DONE & SLAVE_LOAD_STS bits (bit 0 & bit 3)
* have to be sent together. Hence its bitmask is 0x09. * have to be sent together. Hence its bitmask is 0x09.
*/ */
vw_reg = <NPCX_VWEVSM1 0x09>; vw-reg = <NPCX_VWEVSM1 0x09>;
}; };
/* index 06h (Out) */ /* index 06h (Out) */
vw-sci { vw-sci {
vw_reg = <NPCX_VWEVSM2 0x01>; vw-reg = <NPCX_VWEVSM2 0x01>;
}; };
vw-smi { vw-smi {
vw_reg = <NPCX_VWEVSM2 0x02>; vw-reg = <NPCX_VWEVSM2 0x02>;
}; };
vw-host-rst-ack { vw-host-rst-ack {
vw_reg = <NPCX_VWEVSM2 0x08>; vw-reg = <NPCX_VWEVSM2 0x08>;
}; };
/* index 40h (Out) */ /* index 40h (Out) */
vw-sus-ack { vw-sus-ack {
vw_reg = <NPCX_VWEVSM3 0x01>; vw-reg = <NPCX_VWEVSM3 0x01>;
}; };
}; };
}; };

68
dts/arm/nuvoton/npcx/npcx7-miwus-int-map.dtsi
View file

@ -13,23 +13,23 @@
group_ad0: group-ad0-map { group_ad0: group-ad0-map {
irq = <7>; irq = <7>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x09>; group-mask = <0x09>;
}; };
group_b0: group-b0-map { group_b0: group-b0-map {
irq = <31>; irq = <31>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x02>; group-mask = <0x02>;
}; };
group_c0: group-c0-map { group_c0: group-c0-map {
irq = <15>; irq = <15>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x04>; group-mask = <0x04>;
}; };
group_efgh0: group-efgh0-map { group_efgh0: group-efgh0-map {
irq = <11>; irq = <11>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0xF0>; group-mask = <0xF0>;
}; };
}; };
@ -39,43 +39,43 @@
group_a1: group-a1-map { group_a1: group-a1-map {
irq = <47>; irq = <47>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x01>; group-mask = <0x01>;
}; };
group_b1: group-b1-map { group_b1: group-b1-map {
irq = <48>; irq = <48>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x02>; group-mask = <0x02>;
}; };
group_c1: group-c1-map { group_c1: group-c1-map {
irq = <49>; irq = <49>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x04>; group-mask = <0x04>;
}; };
group_d1: group-d1-map { group_d1: group-d1-map {
irq = <50>; irq = <50>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x08>; group-mask = <0x08>;
}; };
group_e1: group-e1-map { group_e1: group-e1-map {
irq = <51>; irq = <51>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x10>; group-mask = <0x10>;
}; };
group_f1: group-f1-map { group_f1: group-f1-map {
irq = <52>; irq = <52>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x20>; group-mask = <0x20>;
}; };
group_g1: group-g1-map { group_g1: group-g1-map {
irq = <53>; irq = <53>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x40>; group-mask = <0x40>;
}; };
group_h1: group-h1-map { group_h1: group-h1-map {
irq = <54>; irq = <54>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x80>; group-mask = <0x80>;
}; };
}; };
@ -85,28 +85,28 @@
group_a2: group-a2-map { group_a2: group-a2-map {
irq = <60>; irq = <60>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x01>; group-mask = <0x01>;
}; };
group_b2: group-b2-map { group_b2: group-b2-map {
irq = <61>; irq = <61>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x02>; group-mask = <0x02>;
}; };
group_c2: group-c2-map { group_c2: group-c2-map {
irq = <62>; irq = <62>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x04>; group-mask = <0x04>;
}; };
group_d2: group-d2-map { group_d2: group-d2-map {
irq = <63>; irq = <63>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x08>; group-mask = <0x08>;
}; };
group_fg2: group-fg2-map { group_fg2: group-fg2-map {
irq = <59>; irq = <59>;
irq_prio = <2>; irq-prio = <2>;
group_mask = <0x60>; group-mask = <0x60>;
}; };
}; };
}; };

4
dts/arm/nuvoton/npcx/npcx7-miwus-wui-map.dtsi
View file

@ -500,13 +500,13 @@
}; };
/* Pseudo wui item means no mapping between source and wui */ /* Pseudo wui item means no mapping between source and wui */
wui_none: wui_pseudo { wui_none: wui-pseudo {
miwus = <&miwu_none 7 7>; miwus = <&miwu_none 7 7>;
}; };
}; };
/* Pseudo MIWU device to present no mapping relationship */ /* Pseudo MIWU device to present no mapping relationship */
miwu_none: miwu_pseudo { miwu_none: miwu-pseudo {
compatible = "nuvoton,npcx-miwu"; compatible = "nuvoton,npcx-miwu";
index = <3>; index = <3>;
#miwu-cells = <2>; #miwu-cells = <2>;

6
dts/bindings/espi/nuvoton,npcx-espi-vw-conf.yaml
View file

@ -8,15 +8,15 @@ compatible: "nuvoton,npcx-espi-vw-conf"
child-binding: child-binding:
description: Child node to to present the mapping between VW signal, its core register and input source of MIWU description: Child node to to present the mapping between VW signal, its core register and input source of MIWU
properties: properties:
vw_reg: vw-reg:
type: array type: array
required: true required: true
description: vw signal's register index and vw bitmask. description: vw signal's register index and vw bitmask.
wui_map: vw-wui:
type: phandle type: phandle
description: | description: |
Mapping table between Wake-Up Input (WUI) and vw input signal. Mapping table between Wake-Up Input (WUI) and vw input signal.
For example the WUI mapping on NPCX7 for VW_SLP5 would be For example the WUI mapping on NPCX7 for VW_SLP5 would be
wui_map = <&wui_vw_slp_s5>; vw-wui = <&wui_vw_slp_s5>;

4
dts/bindings/interrupt-controller/nuvoton,npcx-miwu-int-map.yaml
View file

@ -18,11 +18,11 @@ child-binding:
type: int type: int
required: true required: true
description: irq for miwu group description: irq for miwu group
irq_prio: irq-prio:
type: int type: int
required: true required: true
description: irq's priority for miwu group. The valid number is from 0 to 7. description: irq's priority for miwu group. The valid number is from 0 to 7.
group_mask: group-mask:
type: int type: int
required: true required: true
description: group bit-mask for miwu interrupts description: group bit-mask for miwu interrupts

8
soc/arm/nuvoton_npcx/common/soc_dt.h
View file

@ -415,16 +415,16 @@
name) name)
/** /**
* @brief Get phandle from wui_map property of child node with that path. * @brief Get phandle from vw-wui property of child node with that path.
* *
* @param name path which name is /npcx7-espi-vws-map/'name'. * @param name path which name is /npcx7-espi-vws-map/'name'.
* @return phandle from "wui_map" prop of child node with that path. * @return phandle from "vw-wui" prop of child node with that path.
*/ */
#define NPCX_DT_PHANDLE_VW_WUI(name) DT_PHANDLE(NPCX_DT_NODE_FROM_VWTABLE( \ #define NPCX_DT_PHANDLE_VW_WUI(name) DT_PHANDLE(NPCX_DT_NODE_FROM_VWTABLE( \
name), wui_map) name), vw_wui)
/** /**
* @brief Construct a npcx_wui structure from wui_map property of a child node * @brief Construct a npcx_wui structure from vw-wui property of a child node
* with that path. * with that path.
* *
* @param name a path which name is /npcx7-espi-vws-map/'name'. * @param name a path which name is /npcx7-espi-vws-map/'name'.