Skip to content

Rebase 14 oct20 up2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Rebase 14 oct20 up2 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0b241d
Revert "soc/xtensa/intel_adsp: Remove GPIO metadata"
lyakh Oct 19, 2020
db42ff5
sof: add two Kconfig options to prj.conf
lyakh Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions samples/audio/sof/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
CONFIG_SOF=y
CONFIG_SMP=n
CONFIG_LOG=y
CONFIG_SYS_HEAP_ALIGNED_ALLOC=y
CONFIG_MP_NUM_CPUS=1
108 changes: 108 additions & 0 deletions soc/xtensa/intel_adsp/common/adsp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,112 @@ LOG_MODULE_REGISTER(sof);

#include <cavs/mailbox.h>

/* TODO: Cleanup further */

#if CONFIG_DW_GPIO

#include <sof/drivers/gpio.h>

const struct gpio_pin_config gpio_data[] = {
{ /* GPIO0 */
.mux_id = 1,
.mux_config = {.bit = 0, .mask = 3, .fn = 1},
}, { /* GPIO1 */
.mux_id = 1,
.mux_config = {.bit = 2, .mask = 3, .fn = 1},
}, { /* GPIO2 */
.mux_id = 1,
.mux_config = {.bit = 4, .mask = 3, .fn = 1},
}, { /* GPIO3 */
.mux_id = 1,
.mux_config = {.bit = 6, .mask = 3, .fn = 1},
}, { /* GPIO4 */
.mux_id = 1,
.mux_config = {.bit = 8, .mask = 3, .fn = 1},
}, { /* GPIO5 */
.mux_id = 1,
.mux_config = {.bit = 10, .mask = 3, .fn = 1},
}, { /* GPIO6 */
.mux_id = 1,
.mux_config = {.bit = 12, .mask = 3, .fn = 1},
}, { /* GPIO7 */
.mux_id = 1,
.mux_config = {.bit = 14, .mask = 3, .fn = 1},
}, { /* GPIO8 */
.mux_id = 1,
.mux_config = {.bit = 16, .mask = 1, .fn = 1},
}, { /* GPIO9 */
.mux_id = 0,
.mux_config = {.bit = 11, .mask = 1, .fn = 1},
}, { /* GPIO10 */
.mux_id = 0,
.mux_config = {.bit = 11, .mask = 1, .fn = 1},
}, { /* GPIO11 */
.mux_id = 0,
.mux_config = {.bit = 11, .mask = 1, .fn = 1},
}, { /* GPIO12 */
.mux_id = 0,
.mux_config = {.bit = 11, .mask = 1, .fn = 1},
}, { /* GPIO13 */
.mux_id = 0,
.mux_config = {.bit = 0, .mask = 1, .fn = 1},
}, { /* GPIO14 */
.mux_id = 0,
.mux_config = {.bit = 1, .mask = 1, .fn = 1},
}, { /* GPIO15 */
.mux_id = 0,
.mux_config = {.bit = 9, .mask = 1, .fn = 1},
}, { /* GPIO16 */
.mux_id = 0,
.mux_config = {.bit = 9, .mask = 1, .fn = 1},
}, { /* GPIO17 */
.mux_id = 0,
.mux_config = {.bit = 9, .mask = 1, .fn = 1},
}, { /* GPIO18 */
.mux_id = 0,
.mux_config = {.bit = 9, .mask = 1, .fn = 1},
}, { /* GPIO19 */
.mux_id = 0,
.mux_config = {.bit = 10, .mask = 1, .fn = 1},
}, { /* GPIO20 */
.mux_id = 0,
.mux_config = {.bit = 10, .mask = 1, .fn = 1},
}, { /* GPIO21 */
.mux_id = 0,
.mux_config = {.bit = 10, .mask = 1, .fn = 1},
}, { /* GPIO22 */
.mux_id = 0,
.mux_config = {.bit = 10, .mask = 1, .fn = 1},
}, { /* GPIO23 */
.mux_id = 0,
.mux_config = {.bit = 16, .mask = 1, .fn = 1},
}, { /* GPIO24 */
.mux_id = 0,
.mux_config = {.bit = 16, .mask = 1, .fn = 1},
}, { /* GPIO25 */
.mux_id = 0,
.mux_config = {.bit = 26, .mask = 1, .fn = 1},
},
};

const int n_gpios = ARRAY_SIZE(gpio_data);

#if CONFIG_INTEL_IOMUX

#include <sof/drivers/iomux.h>

struct iomux iomux_data[] = {
{.base = EXT_CTRL_BASE + 0x30,},
{.base = EXT_CTRL_BASE + 0x34,},
{.base = EXT_CTRL_BASE + 0x38,},
};

const int n_iomux = ARRAY_SIZE(iomux_data);

#endif

#endif

#define SRAM_WINDOW_HOST_OFFSET(x) (0x80000 + x * 0x20000)

static const struct adsp_ipc_fw_ready fw_ready_apl
Expand All @@ -43,6 +149,7 @@ static const struct adsp_ipc_fw_ready fw_ready_apl
.flags = 0,
};

#if !defined(CONFIG_SOF)
#define NUM_WINDOWS 2

static const struct adsp_ipc_window sram_window = {
Expand Down Expand Up @@ -134,3 +241,4 @@ static int adsp_init(const struct device *dev)

/* Init after IPM initialization and before logging (uses memory windows) */
SYS_INIT(adsp_init, PRE_KERNEL_2, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
#endif /* ! CONFIG_SOF */