diff --git a/drivers/espi/espi_npcx.c b/drivers/espi/espi_npcx.c index d045c752012..80890bf5f19 100644 --- a/drivers/espi/espi_npcx.c +++ b/drivers/espi/espi_npcx.c @@ -109,7 +109,7 @@ struct npcx_vw_out_config { /* * 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[] = { /* index 02h (In) */ diff --git a/drivers/interrupt_controller/intc_miwu.c b/drivers/interrupt_controller/intc_miwu.c index 7ae5b65262b..c80a0d9382c 100644 --- a/drivers/interrupt_controller/intc_miwu.c +++ b/drivers/interrupt_controller/intc_miwu.c @@ -23,8 +23,8 @@ * it include: * 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. - * 2. npcx7-miwus-int-map.dtsi: it presents relationship between MIWU group - * and NVIC interrupt in npcx7. Please notice it isn't 1-to-1 mapping. + * 2. npcxn-miwus-int-map.dtsi: it presents relationship between MIWU group + * 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: * * map_miwu0_groups: { diff --git a/dts/arm/nuvoton/npcx/npcx7-alts-map.dtsi b/dts/arm/nuvoton/npcx/npcx7-alts-map.dtsi index c78cd82dec1..071db727830 100644 --- a/dts/arm/nuvoton/npcx/npcx7-alts-map.dtsi +++ b/dts/arm/nuvoton/npcx/npcx7-alts-map.dtsi @@ -5,7 +5,7 @@ */ / { - npcx7_alts_map { + npcx-alts-map { compatible = "nuvoton,npcx-pinctrl-conf"; /* SCFG device alternative table */ diff --git a/dts/arm/nuvoton/npcx/npcx7-espi-vws-map.dtsi b/dts/arm/nuvoton/npcx/npcx7-espi-vws-map.dtsi index cf24c20ed91..ae63de6fa32 100644 --- a/dts/arm/nuvoton/npcx/npcx7-espi-vws-map.dtsi +++ b/dts/arm/nuvoton/npcx/npcx7-espi-vws-map.dtsi @@ -28,7 +28,7 @@ */ / { - npcx7-espi-vws-map { + npcx-espi-vws-map { compatible = "nuvoton,npcx-espi-vw-conf"; /* eSPI Virtual Vire (VW) input configuration */ diff --git a/dts/arm/nuvoton/npcx/npcx7-miwus-int-map.dtsi b/dts/arm/nuvoton/npcx/npcx7-miwus-int-map.dtsi index 26ad450c174..2108d6186b1 100644 --- a/dts/arm/nuvoton/npcx/npcx7-miwus-int-map.dtsi +++ b/dts/arm/nuvoton/npcx/npcx7-miwus-int-map.dtsi @@ -6,7 +6,7 @@ / { /* Mapping between MIWU group and interrupts */ - npcx7-miwus-int-map { + npcx-miwus-int-map { map_miwu0_groups: map-miwu0-groups { compatible = "nuvoton,npcx-miwu-int-map"; parent = <&miwu0>; diff --git a/dts/arm/nuvoton/npcx/npcx7-miwus-wui-map.dtsi b/dts/arm/nuvoton/npcx/npcx7-miwus-wui-map.dtsi index 1b7a9465a99..26b1f968c92 100644 --- a/dts/arm/nuvoton/npcx/npcx7-miwus-wui-map.dtsi +++ b/dts/arm/nuvoton/npcx/npcx7-miwus-wui-map.dtsi @@ -6,7 +6,7 @@ / { /* Mapping between MIWU wui bits and source device */ - npcx7_miwus_wui { + npcx-miwus-wui-map { compatible = "nuvoton,npcx-miwu-wui-map"; /* MIWU table 0 */ diff --git a/soc/arm/nuvoton_npcx/common/soc_dt.h b/soc/arm/nuvoton_npcx/common/soc_dt.h index 3cba565371a..16b1656ef43 100644 --- a/soc/arm/nuvoton_npcx/common/soc_dt.h +++ b/soc/arm/nuvoton_npcx/common/soc_dt.h @@ -402,7 +402,7 @@ * @param i index of npcx miwu devices * @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) /** * @brief Get the index prop from parent MIWU device node. @@ -436,18 +436,18 @@ } 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. */ -#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) /** * @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. */ #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 * 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. */ #define NPCX_DT_VW_WUI_ITEM(name) \ @@ -473,7 +473,7 @@ * a child node with that path. * * @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. */ #define NPCX_DT_VW_IN_CONF(signal, name) \ @@ -491,7 +491,7 @@ * a child node with that path. * * @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. */ #define NPCX_DT_VW_OUT_CONF(signal, name) \