Skip to content

DMIC: Enable power for DMIC for ICL platform. #514

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

Merged
lgirdwood merged 1 commit into from
Nov 6, 2018
Merged

DMIC: Enable power for DMIC for ICL platform. #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions src/drivers/intel/cavs/dmic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,6 +1450,8 @@ static int dmic_probe(struct dai *dai)
if (dai_get_drvdata(dai))
return -EEXIST; /* already created */

/* Enable DMIC power */
pm_runtime_get_sync(DMIC_POW, dai->index);
/* Disable dynamic clock gating for dmic before touching any reg */
pm_runtime_get_sync(DMIC_CLK, dai->index);

Expand Down Expand Up @@ -1482,6 +1484,8 @@ static int dmic_remove(struct dai *dai)
interrupt_unregister(dmic_irq(dai));

pm_runtime_put_sync(DMIC_CLK, dai->index);
/* Disable DMIC power */
pm_runtime_put_sync(DMIC_POW, dai->index);

rfree(dma_get_drvdata(dai));
dai_set_drvdata(dai, NULL);
Expand Down
1 change: 1 addition & 0 deletions src/include/sof/pm_runtime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ enum pm_runtime_context {
PM_RUNTIME_HOST_DMA_L1 = 0, /**< Host DMA L1 Exit */
SSP_CLK, /**< SSP Clock */
DMIC_CLK, /**< DMIC Clock */
DMIC_POW, /**< DMIC Power */
DW_DMAC_CLK /**< DW DMAC Clock */
};

Expand Down
5 changes: 5 additions & 0 deletions src/platform/cannonlake/include/platform/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
#define SHIM_BASE 0x00071F00
#define SHIM_SIZE 0x00000100

/* Digital Mic Shim Registers */
#define DMIC_SHIM_BASE 0x00071E80
#define DMICLCTL_OFFSET 0x04
#define DMICLCTL (DMIC_SHIM_BASE + DMICLCTL_OFFSET)

/* cmd IO to audio codecs */
#define CMD_BASE 0x00001100
#define CMD_SIZE 0x00000010
Expand Down
3 changes: 3 additions & 0 deletions src/platform/cannonlake/include/platform/shim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@
#define DMWBA_ENABLE (1 << 0)
#define DMWBA_READONLY (1 << 1)

/* DMIC power ON bit */
#define DMICLCTL_SPA ((uint32_t) BIT(0))

#ifndef ASSEMBLY

static inline uint16_t shim_read16(uint16_t reg)
Expand Down
5 changes: 5 additions & 0 deletions src/platform/icelake/include/platform/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
#define SHIM_BASE 0x00071F00
#define SHIM_SIZE 0x00000100

/* Digital Mic Shim Registers */
#define DMIC_SHIM_BASE 0x00071E80
#define DMICLCTL_OFFSET 0x04
#define DMICLCTL (DMIC_SHIM_BASE + DMICLCTL_OFFSET)

/* cmd IO to audio codecs */
#define CMD_BASE 0x00001100
#define CMD_SIZE 0x00000010
Expand Down
3 changes: 3 additions & 0 deletions src/platform/icelake/include/platform/shim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@
#define DMWBA_ENABLE (1 << 0)
#define DMWBA_READONLY (1 << 1)

/* DMIC power ON bit */
#define DMICLCTL_SPA ((uint32_t) BIT(0))

#ifndef ASSEMBLY

static inline uint16_t shim_read16(uint16_t reg)
Expand Down
26 changes: 26 additions & 0 deletions src/platform/intel/cavs/pm_runtime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,27 @@ static inline void cavs_pm_runtime_en_dmic_clk_gating(uint32_t index)
index, shim_read(SHIM_CLKCTL));
#endif
}
static inline void cavs_pm_runtime_en_dmic_power(uint32_t index)
{
(void) index;
#if defined(CONFIG_CANNONLAKE) || defined(CONFIG_ICELAKE) \
|| defined(CONFIG_SUECREEK)
/* Enable DMIC power */
io_reg_write(DMICLCTL,
(io_reg_read(DMICLCTL) | DMICLCTL_SPA));
#endif
}
static inline void cavs_pm_runtime_dis_dmic_power(uint32_t index)
{
(void) index;
#if defined(CONFIG_CANNONLAKE) || defined(CONFIG_ICELAKE) \
|| defined(CONFIG_SUECREEK)
/* Disable DMIC power */
io_reg_write(DMICLCTL,
(io_reg_read(DMICLCTL) & (~DMICLCTL_SPA)));
#endif
}
#endif /* #if defined(CONFIG_DMIC) */

static inline void cavs_pm_runtime_dis_dwdma_clk_gating(uint32_t index)
{
Expand Down Expand Up @@ -171,6 +191,9 @@ void platform_pm_runtime_get(enum pm_runtime_context context, uint32_t index,
case DMIC_CLK:
cavs_pm_runtime_dis_dmic_clk_gating(index);
break;
case DMIC_POW:
cavs_pm_runtime_en_dmic_power(index);
break;
#endif
case DW_DMAC_CLK:
cavs_pm_runtime_dis_dwdma_clk_gating(index);
Expand All @@ -194,6 +217,9 @@ void platform_pm_runtime_put(enum pm_runtime_context context, uint32_t index,
case DMIC_CLK:
cavs_pm_runtime_en_dmic_clk_gating(index);
break;
case DMIC_POW:
cavs_pm_runtime_dis_dmic_power(index);
break;
#endif
case DW_DMAC_CLK:
cavs_pm_runtime_en_dwdma_clk_gating(index);
Expand Down
5 changes: 5 additions & 0 deletions src/platform/suecreek/include/platform/memory.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@
#define SHIM_BASE 0x00071F00
#define SHIM_SIZE 0x00000100

/* Digital Mic Shim Registers */
#define DMIC_SHIM_BASE 0x00071E80
#define DMICLCTL_OFFSET 0x04
#define DMICLCTL (DMIC_SHIM_BASE + DMICLCTL_OFFSET)

/* cmd IO to audio codecs */
#define CMD_BASE 0x00001100
#define CMD_SIZE 0x00000010
Expand Down
3 changes: 3 additions & 0 deletions src/platform/suecreek/include/platform/shim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@
#define DMWBA_ENABLE (1 << 0)
#define DMWBA_READONLY (1 << 1)

/* DMIC power ON bit */
#define DMICLCTL_SPA ((uint32_t) BIT(0))

#ifndef ASSEMBLY

static inline uint16_t shim_read16(uint16_t reg)
Expand Down