michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: npcx: replace series-prefix 'npcx7-' with famliy-prefix 'npcx-'

Browse source 
This CL replaces series-prefix "npcx7-" with family-"npcx-" for npcx dts
nodes such as 'espi-vws-map' and 'miwus-int-map'. Since we plan to
introduce the npcx9 and later series, adding a new node such as
npcx9-espi-vws-map for each series is more complicated and not
necessary.

Signed-off-by: Mulin Chao <mlchao@nuvoton.com>
This commit is contained in:
Mulin Chao 2021-04-26 01:28:21 -07:00 • committed by Kumar Gala
commit a8a217f22d
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/espi/espi_npcx.c
View file

@ -109,7 +109,7 @@ struct npcx_vw_out_config {
/* /*
* eSPI VW input/Output signal configuration tables. Please refer * eSPI VW input/Output signal configuration tables. Please refer
* npcx7-espi-vws-map.dtsi device tree file for more detail. * npcxn-espi-vws-map.dtsi device tree file for more detail.
*/ */
static const struct npcx_vw_in_config vw_in_tbl[] = { static const struct npcx_vw_in_config vw_in_tbl[] = {
/* index 02h (In) */ /* index 02h (In) */

4
drivers/interrupt_controller/intc_miwu.c
View file

@ -23,8 +23,8 @@
* it include: * it include:
* 1. npcxn-miwus-wui-map.dtsi: it presents relationship between wake-up inputs * 1. npcxn-miwus-wui-map.dtsi: it presents relationship between wake-up inputs
* (WUI) and its source device such as gpio, timer, eSPI VWs and so on. * (WUI) and its source device such as gpio, timer, eSPI VWs and so on.
* 2. npcx7-miwus-int-map.dtsi: it presents relationship between MIWU group * 2. npcxn-miwus-int-map.dtsi: it presents relationship between MIWU group
* and NVIC interrupt in npcx7. Please notice it isn't 1-to-1 mapping. * and NVIC interrupt in npcx series. Please notice it isn't 1-to-1 mapping.
* For example, here is the mapping between miwu0's group a & d and IRQ7: * For example, here is the mapping between miwu0's group a & d and IRQ7:
* *
* map_miwu0_groups: { * map_miwu0_groups: {

2
dts/arm/nuvoton/npcx/npcx7-alts-map.dtsi
View file

@ -5,7 +5,7 @@
*/ */
/ { / {
npcx7_alts_map { npcx-alts-map {
compatible = "nuvoton,npcx-pinctrl-conf"; compatible = "nuvoton,npcx-pinctrl-conf";
/* SCFG device alternative table */ /* SCFG device alternative table */

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

@ -28,7 +28,7 @@
*/ */
/ { / {
npcx7-espi-vws-map { npcx-espi-vws-map {
compatible = "nuvoton,npcx-espi-vw-conf"; compatible = "nuvoton,npcx-espi-vw-conf";
/* eSPI Virtual Vire (VW) input configuration */ /* eSPI Virtual Vire (VW) input configuration */

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

@ -6,7 +6,7 @@
/ { / {
/* Mapping between MIWU group and interrupts */ /* Mapping between MIWU group and interrupts */
npcx7-miwus-int-map { npcx-miwus-int-map {
map_miwu0_groups: map-miwu0-groups { map_miwu0_groups: map-miwu0-groups {
compatible = "nuvoton,npcx-miwu-int-map"; compatible = "nuvoton,npcx-miwu-int-map";
parent = <&miwu0>; parent = <&miwu0>;

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

@ -6,7 +6,7 @@
/ { / {
/* Mapping between MIWU wui bits and source device */ /* Mapping between MIWU wui bits and source device */
npcx7_miwus_wui { npcx-miwus-wui-map {
compatible = "nuvoton,npcx-miwu-wui-map"; compatible = "nuvoton,npcx-miwu-wui-map";
/* MIWU table 0 */ /* MIWU table 0 */

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

@ -402,7 +402,7 @@
* @param i index of npcx miwu devices * @param i index of npcx miwu devices
* @return node identifier with that path. * @return node identifier with that path.
*/ */
#define NPCX_DT_NODE_FROM_MIWU_MAP(i) DT_PATH(npcx7_miwus_int_map, \ #define NPCX_DT_NODE_FROM_MIWU_MAP(i) DT_PATH(npcx_miwus_int_map, \
map_miwu##i##_groups) map_miwu##i##_groups)
/** /**
* @brief Get the index prop from parent MIWU device node. * @brief Get the index prop from parent MIWU device node.
@ -436,18 +436,18 @@
} while (0) } while (0)
/** /**
* @brief Get a child node from path '/npcx7-espi-vws-map/name'. * @brief Get a child node from path '/npcx-espi-vws-map/name'.
* *
* @param name a path which name is /npcx7-espi-vws-map/'name'. * @param name a path which name is /npcx-espi-vws-map/'name'.
* @return child node identifier with that path. * @return child node identifier with that path.
*/ */
#define NPCX_DT_NODE_FROM_VWTABLE(name) DT_CHILD(DT_PATH(npcx7_espi_vws_map), \ #define NPCX_DT_NODE_FROM_VWTABLE(name) DT_CHILD(DT_PATH(npcx_espi_vws_map), \
name) name)
/** /**
* @brief Get phandle from vw-wui 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 /npcx-espi-vws-map/'name'.
* @return phandle from "vw-wui" 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( \
@ -457,7 +457,7 @@
* @brief Construct a npcx_wui structure from vw-wui 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 /npcx-espi-vws-map/'name'.
* @return npcx_wui item with that path. * @return npcx_wui item with that path.
*/ */
#define NPCX_DT_VW_WUI_ITEM(name) \ #define NPCX_DT_VW_WUI_ITEM(name) \
@ -473,7 +473,7 @@
* a child node with that path. * a child node with that path.
* *
* @signal vw input signal name. * @signal vw input signal name.
* @param name a path which name is /npcx7-espi-vws-map/'name'. * @param name a path which name is /npcx-espi-vws-map/'name'.
* @return npcx_vw_in_config item with that path. * @return npcx_vw_in_config item with that path.
*/ */
#define NPCX_DT_VW_IN_CONF(signal, name) \ #define NPCX_DT_VW_IN_CONF(signal, name) \
@ -491,7 +491,7 @@
* a child node with that path. * a child node with that path.
* *
* @signal vw output signal name. * @signal vw output signal name.
* @param name a path which name is /npcx7-espi-vws-map/'name'. * @param name a path which name is /npcx-espi-vws-map/'name'.
* @return npcx_vw_in_config item with that path. * @return npcx_vw_in_config item with that path.
*/ */
#define NPCX_DT_VW_OUT_CONF(signal, name) \ #define NPCX_DT_VW_OUT_CONF(signal, name) \