Skip to content

Commit 1983a4c

Browse files
laurenmurphyx64nashif
authored andcommitted
boards, dts: fix namespace for intel adsp cavs, ace
Fixes namespace for Intel ADSP CAVS and ACE boards. Signed-off-by: Lauren Murphy <[email protected]>
1 parent ca5d698 commit 1983a4c

File tree

23 files changed

+86
-86
lines changed

23 files changed

+86
-86
lines changed

boards/xtensa/intel_adsp_cavs15/intel_adsp_cavs15.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/dts-v1/;
88

9-
#include <intel/intel_cavs15.dtsi>
9+
#include <intel/intel_adsp_cavs15.dtsi>
1010

1111
/ {
1212
model = "intel_adsp_cavs15";

boards/xtensa/intel_adsp_cavs18/intel_adsp_cavs18.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/dts-v1/;
88

9-
#include <intel/intel_cavs18.dtsi>
9+
#include <intel/intel_adsp_cavs18.dtsi>
1010

1111
/ {
1212
model = "intel_adsp_cavs18";

boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/dts-v1/;
88

9-
#include <intel/intel_cavs20.dtsi>
9+
#include <intel/intel_adsp_cavs20.dtsi>
1010

1111
/ {
1212
model = "intel_adsp_cavs20";

boards/xtensa/intel_adsp_cavs20/intel_adsp_cavs20_jsl.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/dts-v1/;
88

9-
#include <intel/intel_cavs20_jsl.dtsi>
9+
#include <intel/intel_adsp_cavs20_jsl.dtsi>
1010

1111
/ {
1212
model = "intel_adsp_cavs20_jsl";

boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/dts-v1/;
88

9-
#include <intel/intel_cavs25.dtsi>
9+
#include <intel/intel_adsp_cavs25.dtsi>
1010

1111
/ {
1212
model = "intel_adsp_cavs25";

boards/xtensa/intel_adsp_cavs25/intel_adsp_cavs25_tgph.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/dts-v1/;
88

9-
#include <intel/intel_cavs25_tgph.dtsi>
9+
#include <intel/intel_adsp_cavs25_tgph.dtsi>
1010

1111
/ {
1212
model = "intel_adsp_cavs25_tgph";

drivers/clock_control/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
zephyr_library()
44

55
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_BEETLE beetle_clock_control.c)
6-
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_CAVS clock_control_cavs.c)
6+
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_ADSP clock_control_cavs.c)
77
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_ESP32 clock_control_esp32.c)
88
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_GD32 clock_control_gd32.c)
99
zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_LITEX clock_control_litex.c)

drivers/clock_control/Kconfig.cavs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# Copyright (c) 2022 Intel Corporation
44
# SPDX-License-Idertifier: Apache-2.0
55

6-
config CLOCK_CONTROL_CAVS
6+
config CLOCK_CONTROL_ADSP
77
bool "Intel CAVS clock control"
88
default y
9-
depends on DT_HAS_INTEL_CAVS_SHIM_CLKCTL_ENABLED
10-
select CAVS_CLOCK
9+
depends on DT_HAS_INTEL_ADSP_SHIM_CLKCTL_ENABLED
10+
select ADSP_CLOCK
1111
help
1212
Driver for the CAVS clocks. Allow type of clock (and
1313
thus frequency) to be chosen.

drivers/ipm/ipm_cavs_idc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ static int cavs_idc_set_enabled(const struct device *dev, int enable)
188188
idc_write(IPC_IDCCTL, i, mask);
189189

190190
/* FIXME: when we have API to enable IRQ on specific core. */
191-
sys_set_bit(DT_REG_ADDR(DT_NODELABEL(cavs0)) + 0x04 +
191+
sys_set_bit(DT_REG_ADDR(DT_NODELABEL(cavs_intc0)) + 0x04 +
192192
CAVS_ICTL_INT_CPU_OFFSET(i),
193193
CAVS_IRQ_NUMBER(DT_INST_IRQN(0)));
194194
}

dts/bindings/clock/intel,cavs-shim-clkctl.yaml renamed to dts/bindings/clock/intel,adsp-shim-clkctl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
description: Intel cAVS clock controlling related constants.
55

6-
compatible: "intel,cavs-shim-clkctl"
6+
compatible: "intel,adsp-shim-clkctl"
77

88
properties:
99
cavs-clkctl-clk-wovcro:

0 commit comments

Comments
 (0)