* [PATCH v9 0/4] ASoC: codecs: add rk817 support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
This series is to add support for the Rockchip rk817 audio codec which
is present in all Rockchip rk817 MFD chips.
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of
#sound-dai-cells, interrupt-parent, and wakeup-source for mfd
documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to
"rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in separate
series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
Chris Morgan (4):
mfd: Add Rockchip rk817 audio CODEC support
ASoC: Add Rockchip rk817 audio CODEC support
dt-bindings: Add Rockchip rk817 audio CODEC support
arm64: dts: rockchip: add rk817 codec to Odroid Go
.../devicetree/bindings/mfd/rk808.txt | 186 ++++++
.../boot/dts/rockchip/rk3326-odroid-go2.dts | 36 +-
drivers/mfd/rk808.c | 85 +++
include/linux/mfd/rk808.h | 81 +++
sound/soc/codecs/Kconfig | 6 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/rk817_codec.c | 558 ++++++++++++++++++
7 files changed, 952 insertions(+), 2 deletions(-)
create mode 100644 sound/soc/codecs/rk817_codec.c
--
2.25.1
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v9 0/4] ASoC: codecs: add rk817 support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: pierre-louis.bossart, heiko, devicetree, tiwai, robh+dt,
lgirdwood, linux-rockchip, broonie, Chris Morgan, jbx6244,
lee.jones, maccraft123mc
From: Chris Morgan <macromorgan@hotmail.com>
This series is to add support for the Rockchip rk817 audio codec which
is present in all Rockchip rk817 MFD chips.
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of
#sound-dai-cells, interrupt-parent, and wakeup-source for mfd
documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to
"rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in separate
series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
Chris Morgan (4):
mfd: Add Rockchip rk817 audio CODEC support
ASoC: Add Rockchip rk817 audio CODEC support
dt-bindings: Add Rockchip rk817 audio CODEC support
arm64: dts: rockchip: add rk817 codec to Odroid Go
.../devicetree/bindings/mfd/rk808.txt | 186 ++++++
.../boot/dts/rockchip/rk3326-odroid-go2.dts | 36 +-
drivers/mfd/rk808.c | 85 +++
include/linux/mfd/rk808.h | 81 +++
sound/soc/codecs/Kconfig | 6 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/rk817_codec.c | 558 ++++++++++++++++++
7 files changed, 952 insertions(+), 2 deletions(-)
create mode 100644 sound/soc/codecs/rk817_codec.c
--
2.25.1
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v9 0/4] ASoC: codecs: add rk817 support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
This series is to add support for the Rockchip rk817 audio codec which
is present in all Rockchip rk817 MFD chips.
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of
#sound-dai-cells, interrupt-parent, and wakeup-source for mfd
documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to
"rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in separate
series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
Chris Morgan (4):
mfd: Add Rockchip rk817 audio CODEC support
ASoC: Add Rockchip rk817 audio CODEC support
dt-bindings: Add Rockchip rk817 audio CODEC support
arm64: dts: rockchip: add rk817 codec to Odroid Go
.../devicetree/bindings/mfd/rk808.txt | 186 ++++++
.../boot/dts/rockchip/rk3326-odroid-go2.dts | 36 +-
drivers/mfd/rk808.c | 85 +++
include/linux/mfd/rk808.h | 81 +++
sound/soc/codecs/Kconfig | 6 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/rk817_codec.c | 558 ++++++++++++++++++
7 files changed, 952 insertions(+), 2 deletions(-)
create mode 100644 sound/soc/codecs/rk817_codec.c
--
2.25.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 33+ messages in thread
* [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
2021-05-05 14:08 ` Chris Morgan
(?)
@ 2021-05-05 14:08 ` Chris Morgan
-1 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
Add rk817 codec support cell to rk808 mfd driver.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
2 files changed, 166 insertions(+)
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index ad923dd4e007..9231209184e0 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
switch (reg) {
case RK817_SECONDS_REG ... RK817_WEEKS_REG:
case RK817_RTC_STATUS_REG:
+ case RK817_CODEC_DTOP_LPT_SRST:
case RK817_INT_STS_REG0:
case RK817_INT_STS_REG1:
case RK817_INT_STS_REG2:
@@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
.num_resources = ARRAY_SIZE(rk817_rtc_resources),
.resources = &rk817_rtc_resources[0],
},
+#ifdef CONFIG_SND_SOC_RK817
+ {
+ .name = "rk817-codec",
+ },
+#endif
};
static const struct mfd_cell rk818s[] = {
@@ -201,6 +207,85 @@ static const struct rk808_reg_data rk808_pre_init_reg[] = {
static const struct rk808_reg_data rk817_pre_init_reg[] = {
{RK817_RTC_CTRL_REG, RTC_STOP, RTC_STOP},
+ /* Codec specific registers */
+ { RK817_CODEC_DTOP_VUCTL, MASK_ALL, 0x03 },
+ { RK817_CODEC_DTOP_VUCTIME, MASK_ALL, 0x00 },
+ { RK817_CODEC_DTOP_LPT_SRST, MASK_ALL, 0x00 },
+ { RK817_CODEC_DTOP_DIGEN_CLKE, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_AREF_RTCFG0 not defined in data sheet */
+ { RK817_CODEC_AREF_RTCFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_AREF_RTCFG1, MASK_ALL, 0x06 },
+ { RK817_CODEC_AADC_CFG0, MASK_ALL, 0xc8 },
+ /* from vendor driver, CODEC_AADC_CFG1 not defined in data sheet */
+ { RK817_CODEC_AADC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_SR_ACL0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_ALC1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_ALC2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_NG, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_HPF, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
+ { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
+ { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
+ { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
+ { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
+ { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
+ { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
+ { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
+ { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
+ { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
+ { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
+ { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
+ { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DDAC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AHP_ANTI0, MASK_ALL, 0x00 },
+ { RK817_CODEC_AHP_ANTI1, MASK_ALL, 0x00 },
+ { RK817_CODEC_AHP_CFG0, MASK_ALL, 0xe0 },
+ { RK817_CODEC_AHP_CFG1, MASK_ALL, 0x1f },
+ { RK817_CODEC_AHP_CP, MASK_ALL, 0x09 },
+ { RK817_CODEC_ACLASSD_CFG1, MASK_ALL, 0x69 },
+ { RK817_CODEC_ACLASSD_CFG2, MASK_ALL, 0x44 },
+ { RK817_CODEC_APLL_CFG0, MASK_ALL, 0x04 },
+ { RK817_CODEC_APLL_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_APLL_CFG2, MASK_ALL, 0x30 },
+ { RK817_CODEC_APLL_CFG3, MASK_ALL, 0x19 },
+ { RK817_CODEC_APLL_CFG4, MASK_ALL, 0x65 },
+ { RK817_CODEC_APLL_CFG5, MASK_ALL, 0x01 },
+ { RK817_CODEC_DI2S_CKM, MASK_ALL, 0x01 },
+ { RK817_CODEC_DI2S_RSD, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_RXCR1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_RXCR2, MASK_ALL, 0x17 },
+ { RK817_CODEC_DI2S_RXCMD_TSD, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_TXCR1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_TXCR2, MASK_ALL, 0x17 },
+ { RK817_CODEC_DI2S_TXCR3_TXCMD, MASK_ALL, 0x00 },
{RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L},
{RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK,
RK817_HOTDIE_105 | RK817_TSD_140},
diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
index e07f6e61cd38..a96e6d43ca06 100644
--- a/include/linux/mfd/rk808.h
+++ b/include/linux/mfd/rk808.h
@@ -437,6 +437,87 @@ enum rk809_reg_id {
#define RK817_RTC_COMP_LSB_REG 0x10
#define RK817_RTC_COMP_MSB_REG 0x11
+/* RK817 Codec Registers */
+#define RK817_CODEC_DTOP_VUCTL 0x12
+#define RK817_CODEC_DTOP_VUCTIME 0x13
+#define RK817_CODEC_DTOP_LPT_SRST 0x14
+#define RK817_CODEC_DTOP_DIGEN_CLKE 0x15
+#define RK817_CODEC_AREF_RTCFG0 0x16
+#define RK817_CODEC_AREF_RTCFG1 0x17
+#define RK817_CODEC_AADC_CFG0 0x18
+#define RK817_CODEC_AADC_CFG1 0x19
+#define RK817_CODEC_DADC_VOLL 0x1a
+#define RK817_CODEC_DADC_VOLR 0x1b
+#define RK817_CODEC_DADC_SR_ACL0 0x1e
+#define RK817_CODEC_DADC_ALC1 0x1f
+#define RK817_CODEC_DADC_ALC2 0x20
+#define RK817_CODEC_DADC_NG 0x21
+#define RK817_CODEC_DADC_HPF 0x22
+#define RK817_CODEC_DADC_RVOLL 0x23
+#define RK817_CODEC_DADC_RVOLR 0x24
+#define RK817_CODEC_AMIC_CFG0 0x27
+#define RK817_CODEC_AMIC_CFG1 0x28
+#define RK817_CODEC_DMIC_PGA_GAIN 0x29
+#define RK817_CODEC_DMIC_LMT1 0x2a
+#define RK817_CODEC_DMIC_LMT2 0x2b
+#define RK817_CODEC_DMIC_NG1 0x2c
+#define RK817_CODEC_DMIC_NG2 0x2d
+#define RK817_CODEC_ADAC_CFG0 0x2e
+#define RK817_CODEC_ADAC_CFG1 0x2f
+#define RK817_CODEC_DDAC_POPD_DACST 0x30
+#define RK817_CODEC_DDAC_VOLL 0x31
+#define RK817_CODEC_DDAC_VOLR 0x32
+#define RK817_CODEC_DDAC_SR_LMT0 0x35
+#define RK817_CODEC_DDAC_LMT1 0x36
+#define RK817_CODEC_DDAC_LMT2 0x37
+#define RK817_CODEC_DDAC_MUTE_MIXCTL 0x38
+#define RK817_CODEC_DDAC_RVOLL 0x39
+#define RK817_CODEC_DDAC_RVOLR 0x3a
+#define RK817_CODEC_AHP_ANTI0 0x3b
+#define RK817_CODEC_AHP_ANTI1 0x3c
+#define RK817_CODEC_AHP_CFG0 0x3d
+#define RK817_CODEC_AHP_CFG1 0x3e
+#define RK817_CODEC_AHP_CP 0x3f
+#define RK817_CODEC_ACLASSD_CFG1 0x40
+#define RK817_CODEC_ACLASSD_CFG2 0x41
+#define RK817_CODEC_APLL_CFG0 0x42
+#define RK817_CODEC_APLL_CFG1 0x43
+#define RK817_CODEC_APLL_CFG2 0x44
+#define RK817_CODEC_APLL_CFG3 0x45
+#define RK817_CODEC_APLL_CFG4 0x46
+#define RK817_CODEC_APLL_CFG5 0x47
+#define RK817_CODEC_DI2S_CKM 0x48
+#define RK817_CODEC_DI2S_RSD 0x49
+#define RK817_CODEC_DI2S_RXCR1 0x4a
+#define RK817_CODEC_DI2S_RXCR2 0x4b
+#define RK817_CODEC_DI2S_RXCMD_TSD 0x4c
+#define RK817_CODEC_DI2S_TXCR1 0x4d
+#define RK817_CODEC_DI2S_TXCR2 0x4e
+#define RK817_CODEC_DI2S_TXCR3_TXCMD 0x4f
+
+/* RK817_CODEC_DI2S_CKM */
+#define RK817_I2S_MODE_MASK (0x1 << 0)
+#define RK817_I2S_MODE_MST (0x1 << 0)
+#define RK817_I2S_MODE_SLV (0x0 << 0)
+
+/* RK817_CODEC_DDAC_MUTE_MIXCTL */
+#define DACMT_MASK (0x1 << 0)
+#define DACMT_ENABLE (0x1 << 0)
+#define DACMT_DISABLE (0x0 << 0)
+
+/* RK817_CODEC_DI2S_RXCR2 */
+#define VDW_RX_24BITS (0x17)
+#define VDW_RX_16BITS (0x0f)
+
+/* RK817_CODEC_DI2S_TXCR2 */
+#define VDW_TX_24BITS (0x17)
+#define VDW_TX_16BITS (0x0f)
+
+/* RK817_CODEC_AMIC_CFG0 */
+#define MIC_DIFF_MASK (0x1 << 7)
+#define MIC_DIFF_DIS (0x0 << 7)
+#define MIC_DIFF_EN (0x1 << 7)
+
#define RK817_POWER_EN_REG(i) (0xb1 + (i))
#define RK817_POWER_SLP_EN_REG(i) (0xb5 + (i))
--
2.25.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: pierre-louis.bossart, heiko, devicetree, tiwai, robh+dt,
lgirdwood, linux-rockchip, broonie, Chris Morgan, jbx6244,
lee.jones, maccraft123mc
From: Chris Morgan <macromorgan@hotmail.com>
Add rk817 codec support cell to rk808 mfd driver.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
2 files changed, 166 insertions(+)
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index ad923dd4e007..9231209184e0 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
switch (reg) {
case RK817_SECONDS_REG ... RK817_WEEKS_REG:
case RK817_RTC_STATUS_REG:
+ case RK817_CODEC_DTOP_LPT_SRST:
case RK817_INT_STS_REG0:
case RK817_INT_STS_REG1:
case RK817_INT_STS_REG2:
@@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
.num_resources = ARRAY_SIZE(rk817_rtc_resources),
.resources = &rk817_rtc_resources[0],
},
+#ifdef CONFIG_SND_SOC_RK817
+ {
+ .name = "rk817-codec",
+ },
+#endif
};
static const struct mfd_cell rk818s[] = {
@@ -201,6 +207,85 @@ static const struct rk808_reg_data rk808_pre_init_reg[] = {
static const struct rk808_reg_data rk817_pre_init_reg[] = {
{RK817_RTC_CTRL_REG, RTC_STOP, RTC_STOP},
+ /* Codec specific registers */
+ { RK817_CODEC_DTOP_VUCTL, MASK_ALL, 0x03 },
+ { RK817_CODEC_DTOP_VUCTIME, MASK_ALL, 0x00 },
+ { RK817_CODEC_DTOP_LPT_SRST, MASK_ALL, 0x00 },
+ { RK817_CODEC_DTOP_DIGEN_CLKE, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_AREF_RTCFG0 not defined in data sheet */
+ { RK817_CODEC_AREF_RTCFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_AREF_RTCFG1, MASK_ALL, 0x06 },
+ { RK817_CODEC_AADC_CFG0, MASK_ALL, 0xc8 },
+ /* from vendor driver, CODEC_AADC_CFG1 not defined in data sheet */
+ { RK817_CODEC_AADC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_SR_ACL0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_ALC1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_ALC2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_NG, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_HPF, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
+ { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
+ { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
+ { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
+ { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
+ { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
+ { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
+ { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
+ { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
+ { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
+ { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
+ { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
+ { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DDAC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AHP_ANTI0, MASK_ALL, 0x00 },
+ { RK817_CODEC_AHP_ANTI1, MASK_ALL, 0x00 },
+ { RK817_CODEC_AHP_CFG0, MASK_ALL, 0xe0 },
+ { RK817_CODEC_AHP_CFG1, MASK_ALL, 0x1f },
+ { RK817_CODEC_AHP_CP, MASK_ALL, 0x09 },
+ { RK817_CODEC_ACLASSD_CFG1, MASK_ALL, 0x69 },
+ { RK817_CODEC_ACLASSD_CFG2, MASK_ALL, 0x44 },
+ { RK817_CODEC_APLL_CFG0, MASK_ALL, 0x04 },
+ { RK817_CODEC_APLL_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_APLL_CFG2, MASK_ALL, 0x30 },
+ { RK817_CODEC_APLL_CFG3, MASK_ALL, 0x19 },
+ { RK817_CODEC_APLL_CFG4, MASK_ALL, 0x65 },
+ { RK817_CODEC_APLL_CFG5, MASK_ALL, 0x01 },
+ { RK817_CODEC_DI2S_CKM, MASK_ALL, 0x01 },
+ { RK817_CODEC_DI2S_RSD, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_RXCR1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_RXCR2, MASK_ALL, 0x17 },
+ { RK817_CODEC_DI2S_RXCMD_TSD, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_TXCR1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_TXCR2, MASK_ALL, 0x17 },
+ { RK817_CODEC_DI2S_TXCR3_TXCMD, MASK_ALL, 0x00 },
{RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L},
{RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK,
RK817_HOTDIE_105 | RK817_TSD_140},
diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
index e07f6e61cd38..a96e6d43ca06 100644
--- a/include/linux/mfd/rk808.h
+++ b/include/linux/mfd/rk808.h
@@ -437,6 +437,87 @@ enum rk809_reg_id {
#define RK817_RTC_COMP_LSB_REG 0x10
#define RK817_RTC_COMP_MSB_REG 0x11
+/* RK817 Codec Registers */
+#define RK817_CODEC_DTOP_VUCTL 0x12
+#define RK817_CODEC_DTOP_VUCTIME 0x13
+#define RK817_CODEC_DTOP_LPT_SRST 0x14
+#define RK817_CODEC_DTOP_DIGEN_CLKE 0x15
+#define RK817_CODEC_AREF_RTCFG0 0x16
+#define RK817_CODEC_AREF_RTCFG1 0x17
+#define RK817_CODEC_AADC_CFG0 0x18
+#define RK817_CODEC_AADC_CFG1 0x19
+#define RK817_CODEC_DADC_VOLL 0x1a
+#define RK817_CODEC_DADC_VOLR 0x1b
+#define RK817_CODEC_DADC_SR_ACL0 0x1e
+#define RK817_CODEC_DADC_ALC1 0x1f
+#define RK817_CODEC_DADC_ALC2 0x20
+#define RK817_CODEC_DADC_NG 0x21
+#define RK817_CODEC_DADC_HPF 0x22
+#define RK817_CODEC_DADC_RVOLL 0x23
+#define RK817_CODEC_DADC_RVOLR 0x24
+#define RK817_CODEC_AMIC_CFG0 0x27
+#define RK817_CODEC_AMIC_CFG1 0x28
+#define RK817_CODEC_DMIC_PGA_GAIN 0x29
+#define RK817_CODEC_DMIC_LMT1 0x2a
+#define RK817_CODEC_DMIC_LMT2 0x2b
+#define RK817_CODEC_DMIC_NG1 0x2c
+#define RK817_CODEC_DMIC_NG2 0x2d
+#define RK817_CODEC_ADAC_CFG0 0x2e
+#define RK817_CODEC_ADAC_CFG1 0x2f
+#define RK817_CODEC_DDAC_POPD_DACST 0x30
+#define RK817_CODEC_DDAC_VOLL 0x31
+#define RK817_CODEC_DDAC_VOLR 0x32
+#define RK817_CODEC_DDAC_SR_LMT0 0x35
+#define RK817_CODEC_DDAC_LMT1 0x36
+#define RK817_CODEC_DDAC_LMT2 0x37
+#define RK817_CODEC_DDAC_MUTE_MIXCTL 0x38
+#define RK817_CODEC_DDAC_RVOLL 0x39
+#define RK817_CODEC_DDAC_RVOLR 0x3a
+#define RK817_CODEC_AHP_ANTI0 0x3b
+#define RK817_CODEC_AHP_ANTI1 0x3c
+#define RK817_CODEC_AHP_CFG0 0x3d
+#define RK817_CODEC_AHP_CFG1 0x3e
+#define RK817_CODEC_AHP_CP 0x3f
+#define RK817_CODEC_ACLASSD_CFG1 0x40
+#define RK817_CODEC_ACLASSD_CFG2 0x41
+#define RK817_CODEC_APLL_CFG0 0x42
+#define RK817_CODEC_APLL_CFG1 0x43
+#define RK817_CODEC_APLL_CFG2 0x44
+#define RK817_CODEC_APLL_CFG3 0x45
+#define RK817_CODEC_APLL_CFG4 0x46
+#define RK817_CODEC_APLL_CFG5 0x47
+#define RK817_CODEC_DI2S_CKM 0x48
+#define RK817_CODEC_DI2S_RSD 0x49
+#define RK817_CODEC_DI2S_RXCR1 0x4a
+#define RK817_CODEC_DI2S_RXCR2 0x4b
+#define RK817_CODEC_DI2S_RXCMD_TSD 0x4c
+#define RK817_CODEC_DI2S_TXCR1 0x4d
+#define RK817_CODEC_DI2S_TXCR2 0x4e
+#define RK817_CODEC_DI2S_TXCR3_TXCMD 0x4f
+
+/* RK817_CODEC_DI2S_CKM */
+#define RK817_I2S_MODE_MASK (0x1 << 0)
+#define RK817_I2S_MODE_MST (0x1 << 0)
+#define RK817_I2S_MODE_SLV (0x0 << 0)
+
+/* RK817_CODEC_DDAC_MUTE_MIXCTL */
+#define DACMT_MASK (0x1 << 0)
+#define DACMT_ENABLE (0x1 << 0)
+#define DACMT_DISABLE (0x0 << 0)
+
+/* RK817_CODEC_DI2S_RXCR2 */
+#define VDW_RX_24BITS (0x17)
+#define VDW_RX_16BITS (0x0f)
+
+/* RK817_CODEC_DI2S_TXCR2 */
+#define VDW_TX_24BITS (0x17)
+#define VDW_TX_16BITS (0x0f)
+
+/* RK817_CODEC_AMIC_CFG0 */
+#define MIC_DIFF_MASK (0x1 << 7)
+#define MIC_DIFF_DIS (0x0 << 7)
+#define MIC_DIFF_EN (0x1 << 7)
+
#define RK817_POWER_EN_REG(i) (0xb1 + (i))
#define RK817_POWER_SLP_EN_REG(i) (0xb5 + (i))
--
2.25.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
Add rk817 codec support cell to rk808 mfd driver.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
2 files changed, 166 insertions(+)
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index ad923dd4e007..9231209184e0 100644
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
switch (reg) {
case RK817_SECONDS_REG ... RK817_WEEKS_REG:
case RK817_RTC_STATUS_REG:
+ case RK817_CODEC_DTOP_LPT_SRST:
case RK817_INT_STS_REG0:
case RK817_INT_STS_REG1:
case RK817_INT_STS_REG2:
@@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
.num_resources = ARRAY_SIZE(rk817_rtc_resources),
.resources = &rk817_rtc_resources[0],
},
+#ifdef CONFIG_SND_SOC_RK817
+ {
+ .name = "rk817-codec",
+ },
+#endif
};
static const struct mfd_cell rk818s[] = {
@@ -201,6 +207,85 @@ static const struct rk808_reg_data rk808_pre_init_reg[] = {
static const struct rk808_reg_data rk817_pre_init_reg[] = {
{RK817_RTC_CTRL_REG, RTC_STOP, RTC_STOP},
+ /* Codec specific registers */
+ { RK817_CODEC_DTOP_VUCTL, MASK_ALL, 0x03 },
+ { RK817_CODEC_DTOP_VUCTIME, MASK_ALL, 0x00 },
+ { RK817_CODEC_DTOP_LPT_SRST, MASK_ALL, 0x00 },
+ { RK817_CODEC_DTOP_DIGEN_CLKE, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_AREF_RTCFG0 not defined in data sheet */
+ { RK817_CODEC_AREF_RTCFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_AREF_RTCFG1, MASK_ALL, 0x06 },
+ { RK817_CODEC_AADC_CFG0, MASK_ALL, 0xc8 },
+ /* from vendor driver, CODEC_AADC_CFG1 not defined in data sheet */
+ { RK817_CODEC_AADC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_SR_ACL0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_ALC1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_ALC2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_NG, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_HPF, MASK_ALL, 0x00 },
+ { RK817_CODEC_DADC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
+ { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
+ { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
+ { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
+ { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
+ { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
+ { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DADC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AMIC_CFG0, MASK_ALL, 0x70 },
+ { RK817_CODEC_AMIC_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_PGA_GAIN, MASK_ALL, 0x66 },
+ { RK817_CODEC_DMIC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DMIC_NG2, MASK_ALL, 0x00 },
+ /* from vendor driver, CODEC_ADAC_CFG0 not defined in data sheet */
+ { RK817_CODEC_ADAC_CFG0, MASK_ALL, 0x00 },
+ { RK817_CODEC_ADAC_CFG1, MASK_ALL, 0x07 },
+ { RK817_CODEC_DDAC_POPD_DACST, MASK_ALL, 0x82 },
+ { RK817_CODEC_DDAC_VOLL, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_VOLR, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_SR_LMT0, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_LMT2, MASK_ALL, 0x00 },
+ { RK817_CODEC_DDAC_MUTE_MIXCTL, MASK_ALL, 0xa0 },
+ { RK817_CODEC_DDAC_RVOLL, MASK_ALL, 0xff },
+ { RK817_CODEC_DDAC_RVOLR, MASK_ALL, 0xff },
+ { RK817_CODEC_AHP_ANTI0, MASK_ALL, 0x00 },
+ { RK817_CODEC_AHP_ANTI1, MASK_ALL, 0x00 },
+ { RK817_CODEC_AHP_CFG0, MASK_ALL, 0xe0 },
+ { RK817_CODEC_AHP_CFG1, MASK_ALL, 0x1f },
+ { RK817_CODEC_AHP_CP, MASK_ALL, 0x09 },
+ { RK817_CODEC_ACLASSD_CFG1, MASK_ALL, 0x69 },
+ { RK817_CODEC_ACLASSD_CFG2, MASK_ALL, 0x44 },
+ { RK817_CODEC_APLL_CFG0, MASK_ALL, 0x04 },
+ { RK817_CODEC_APLL_CFG1, MASK_ALL, 0x00 },
+ { RK817_CODEC_APLL_CFG2, MASK_ALL, 0x30 },
+ { RK817_CODEC_APLL_CFG3, MASK_ALL, 0x19 },
+ { RK817_CODEC_APLL_CFG4, MASK_ALL, 0x65 },
+ { RK817_CODEC_APLL_CFG5, MASK_ALL, 0x01 },
+ { RK817_CODEC_DI2S_CKM, MASK_ALL, 0x01 },
+ { RK817_CODEC_DI2S_RSD, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_RXCR1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_RXCR2, MASK_ALL, 0x17 },
+ { RK817_CODEC_DI2S_RXCMD_TSD, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_TXCR1, MASK_ALL, 0x00 },
+ { RK817_CODEC_DI2S_TXCR2, MASK_ALL, 0x17 },
+ { RK817_CODEC_DI2S_TXCR3_TXCMD, MASK_ALL, 0x00 },
{RK817_GPIO_INT_CFG, RK817_INT_POL_MSK, RK817_INT_POL_L},
{RK817_SYS_CFG(1), RK817_HOTDIE_TEMP_MSK | RK817_TSD_TEMP_MSK,
RK817_HOTDIE_105 | RK817_TSD_140},
diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
index e07f6e61cd38..a96e6d43ca06 100644
--- a/include/linux/mfd/rk808.h
+++ b/include/linux/mfd/rk808.h
@@ -437,6 +437,87 @@ enum rk809_reg_id {
#define RK817_RTC_COMP_LSB_REG 0x10
#define RK817_RTC_COMP_MSB_REG 0x11
+/* RK817 Codec Registers */
+#define RK817_CODEC_DTOP_VUCTL 0x12
+#define RK817_CODEC_DTOP_VUCTIME 0x13
+#define RK817_CODEC_DTOP_LPT_SRST 0x14
+#define RK817_CODEC_DTOP_DIGEN_CLKE 0x15
+#define RK817_CODEC_AREF_RTCFG0 0x16
+#define RK817_CODEC_AREF_RTCFG1 0x17
+#define RK817_CODEC_AADC_CFG0 0x18
+#define RK817_CODEC_AADC_CFG1 0x19
+#define RK817_CODEC_DADC_VOLL 0x1a
+#define RK817_CODEC_DADC_VOLR 0x1b
+#define RK817_CODEC_DADC_SR_ACL0 0x1e
+#define RK817_CODEC_DADC_ALC1 0x1f
+#define RK817_CODEC_DADC_ALC2 0x20
+#define RK817_CODEC_DADC_NG 0x21
+#define RK817_CODEC_DADC_HPF 0x22
+#define RK817_CODEC_DADC_RVOLL 0x23
+#define RK817_CODEC_DADC_RVOLR 0x24
+#define RK817_CODEC_AMIC_CFG0 0x27
+#define RK817_CODEC_AMIC_CFG1 0x28
+#define RK817_CODEC_DMIC_PGA_GAIN 0x29
+#define RK817_CODEC_DMIC_LMT1 0x2a
+#define RK817_CODEC_DMIC_LMT2 0x2b
+#define RK817_CODEC_DMIC_NG1 0x2c
+#define RK817_CODEC_DMIC_NG2 0x2d
+#define RK817_CODEC_ADAC_CFG0 0x2e
+#define RK817_CODEC_ADAC_CFG1 0x2f
+#define RK817_CODEC_DDAC_POPD_DACST 0x30
+#define RK817_CODEC_DDAC_VOLL 0x31
+#define RK817_CODEC_DDAC_VOLR 0x32
+#define RK817_CODEC_DDAC_SR_LMT0 0x35
+#define RK817_CODEC_DDAC_LMT1 0x36
+#define RK817_CODEC_DDAC_LMT2 0x37
+#define RK817_CODEC_DDAC_MUTE_MIXCTL 0x38
+#define RK817_CODEC_DDAC_RVOLL 0x39
+#define RK817_CODEC_DDAC_RVOLR 0x3a
+#define RK817_CODEC_AHP_ANTI0 0x3b
+#define RK817_CODEC_AHP_ANTI1 0x3c
+#define RK817_CODEC_AHP_CFG0 0x3d
+#define RK817_CODEC_AHP_CFG1 0x3e
+#define RK817_CODEC_AHP_CP 0x3f
+#define RK817_CODEC_ACLASSD_CFG1 0x40
+#define RK817_CODEC_ACLASSD_CFG2 0x41
+#define RK817_CODEC_APLL_CFG0 0x42
+#define RK817_CODEC_APLL_CFG1 0x43
+#define RK817_CODEC_APLL_CFG2 0x44
+#define RK817_CODEC_APLL_CFG3 0x45
+#define RK817_CODEC_APLL_CFG4 0x46
+#define RK817_CODEC_APLL_CFG5 0x47
+#define RK817_CODEC_DI2S_CKM 0x48
+#define RK817_CODEC_DI2S_RSD 0x49
+#define RK817_CODEC_DI2S_RXCR1 0x4a
+#define RK817_CODEC_DI2S_RXCR2 0x4b
+#define RK817_CODEC_DI2S_RXCMD_TSD 0x4c
+#define RK817_CODEC_DI2S_TXCR1 0x4d
+#define RK817_CODEC_DI2S_TXCR2 0x4e
+#define RK817_CODEC_DI2S_TXCR3_TXCMD 0x4f
+
+/* RK817_CODEC_DI2S_CKM */
+#define RK817_I2S_MODE_MASK (0x1 << 0)
+#define RK817_I2S_MODE_MST (0x1 << 0)
+#define RK817_I2S_MODE_SLV (0x0 << 0)
+
+/* RK817_CODEC_DDAC_MUTE_MIXCTL */
+#define DACMT_MASK (0x1 << 0)
+#define DACMT_ENABLE (0x1 << 0)
+#define DACMT_DISABLE (0x0 << 0)
+
+/* RK817_CODEC_DI2S_RXCR2 */
+#define VDW_RX_24BITS (0x17)
+#define VDW_RX_16BITS (0x0f)
+
+/* RK817_CODEC_DI2S_TXCR2 */
+#define VDW_TX_24BITS (0x17)
+#define VDW_TX_16BITS (0x0f)
+
+/* RK817_CODEC_AMIC_CFG0 */
+#define MIC_DIFF_MASK (0x1 << 7)
+#define MIC_DIFF_DIS (0x0 << 7)
+#define MIC_DIFF_EN (0x1 << 7)
+
#define RK817_POWER_EN_REG(i) (0xb1 + (i))
#define RK817_POWER_SLP_EN_REG(i) (0xb5 + (i))
--
2.25.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 2/4] ASoC: Add Rockchip rk817 audio CODEC support
2021-05-05 14:08 ` Chris Morgan
(?)
@ 2021-05-05 14:08 ` Chris Morgan
-1 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
Add support for the Rockchip rk817 audio codec integrated into the
rk817 PMIC. This is based on the sources provided by Rockchip from
their BSP kernel.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
sound/soc/codecs/Kconfig | 6 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/rk817_codec.c | 558 +++++++++++++++++++++++++++++++++
3 files changed, 566 insertions(+)
create mode 100644 sound/soc/codecs/rk817_codec.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 2a7b3e363069..4fbd404566c5 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -155,6 +155,7 @@ config SND_SOC_ALL_CODECS
imply SND_SOC_PCM512x_I2C
imply SND_SOC_PCM512x_SPI
imply SND_SOC_RK3328
+ imply SND_SOC_RK817
imply SND_SOC_RT274
imply SND_SOC_RT286
imply SND_SOC_RT298
@@ -1063,6 +1064,11 @@ config SND_SOC_RK3328
tristate "Rockchip RK3328 audio CODEC"
select REGMAP_MMIO
+config SND_SOC_RK817
+ tristate "Rockchip RK817 audio CODEC"
+ depends on MFD_RK808
+ select REGMAP_I2C
+
config SND_SOC_RL6231
tristate
default y if SND_SOC_RT5514=y
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 0efdba609048..d4a75ba43c18 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -166,6 +166,7 @@ snd-soc-pcm512x-objs := pcm512x.o
snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
snd-soc-pcm512x-spi-objs := pcm512x-spi.o
snd-soc-rk3328-objs := rk3328_codec.o
+snd-soc-rk817-objs := rk817_codec.o
snd-soc-rl6231-objs := rl6231.o
snd-soc-rl6347a-objs := rl6347a.o
snd-soc-rt1011-objs := rt1011.o
@@ -487,6 +488,7 @@ obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o
obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o
obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o
obj-$(CONFIG_SND_SOC_RK3328) += snd-soc-rk3328.o
+obj-$(CONFIG_SND_SOC_RK817) += snd-soc-rk817.o
obj-$(CONFIG_SND_SOC_RL6231) += snd-soc-rl6231.o
obj-$(CONFIG_SND_SOC_RL6347A) += snd-soc-rl6347a.o
obj-$(CONFIG_SND_SOC_RT1011) += snd-soc-rt1011.o
diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c
new file mode 100644
index 000000000000..8f4e9c0983ae
--- /dev/null
+++ b/sound/soc/codecs/rk817_codec.c
@@ -0,0 +1,558 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// rk817 ALSA SoC Audio driver
+//
+// Copyright (c) 2018, Fuzhou Rockchip Electronics Co., Ltd All rights reserved.
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/mfd/rk808.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <sound/core.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+
+struct rk817_codec_priv {
+ struct snd_soc_component *component;
+ struct rk808 *rk808;
+ struct clk *mclk;
+ unsigned int stereo_sysclk;
+ bool mic_in_differential;
+};
+
+/*
+ * This sets the codec up with the values defined in the default implementation including the APLL
+ * from the Rockchip vendor kernel. I do not know if these values are universal despite differing
+ * from the default values defined above and taken from the datasheet, or implementation specific.
+ * I don't have another implementation to compare from the Rockchip sources. Hard-coding for now.
+ * Additionally, I do not know according to the documentation the units accepted for the clock
+ * values, so for the moment those are left unvalidated.
+ */
+
+static int rk817_init(struct snd_soc_component *component)
+{
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+
+ snd_soc_component_write(component, RK817_CODEC_DDAC_POPD_DACST, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DDAC_SR_LMT0, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DADC_SR_ACL0, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DTOP_VUCTIME, 0xf4);
+ if (rk817->mic_in_differential) {
+ snd_soc_component_update_bits(component, RK817_CODEC_AMIC_CFG0, MIC_DIFF_MASK,
+ MIC_DIFF_EN);
+ };
+ return 0;
+}
+
+static int rk817_set_component_pll(struct snd_soc_component *component,
+ int pll_id, int source, unsigned int freq_in,
+ unsigned int freq_out)
+{
+ /* Set resistor value and charge pump current for PLL. */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG1, 0x58);
+ /* Set the PLL feedback clock divide value (values not documented). */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG2, 0x2d);
+ /* Set the PLL pre-divide value (values not documented). */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG3, 0x0c);
+ /* Set the PLL VCO output clock divide and PLL divided ratio of PLL High Clk (values not
+ * documented).
+ */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG4, 0xa5);
+
+ return 0;
+}
+
+/*
+ * DDAC/DADC L/R volume setting
+ * 0db~-95db, 0.375db/step, for example:
+ * 0x00: 0dB
+ * 0xff: -95dB
+ */
+
+static const DECLARE_TLV_DB_MINMAX(rk817_vol_tlv, -9500, 0);
+
+/*
+ * PGA GAIN L/R volume setting
+ * 27db~-18db, 3db/step, for example:
+ * 0x0: -18dB
+ * 0xf: 27dB
+ */
+
+static const DECLARE_TLV_DB_MINMAX(rk817_gain_tlv, -1800, 2700);
+
+static const struct snd_kcontrol_new rk817_volume_controls[] = {
+ SOC_DOUBLE_R_RANGE_TLV("Master Playback Volume", RK817_CODEC_DDAC_VOLL,
+ RK817_CODEC_DDAC_VOLR, 0, 0x00, 0xff, 1, rk817_vol_tlv),
+ SOC_DOUBLE_R_RANGE_TLV("Master Capture Volume", RK817_CODEC_DADC_VOLL,
+ RK817_CODEC_DADC_VOLR, 0, 0x00, 0xff, 1, rk817_vol_tlv),
+ SOC_DOUBLE_TLV("Mic Capture Gain", RK817_CODEC_DMIC_PGA_GAIN, 4, 0, 0xf, 0,
+ rk817_gain_tlv),
+};
+
+/* Since the speaker output and L headphone pin are internally the same, make audio path mutually
+ * exclusive with a mux.
+ */
+
+static const char *dac_mux_text[] = {
+ "HP",
+ "SPK",
+};
+
+static SOC_ENUM_SINGLE_VIRT_DECL(dac_enum, dac_mux_text);
+
+static const struct snd_kcontrol_new dac_mux =
+ SOC_DAPM_ENUM("Playback Mux", dac_enum);
+
+static const struct snd_soc_dapm_widget rk817_dapm_widgets[] = {
+
+ /* capture/playback common */
+ SND_SOC_DAPM_SUPPLY("LDO Regulator", RK817_CODEC_AREF_RTCFG1, 6, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("IBIAS Block", RK817_CODEC_AREF_RTCFG1, 2, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("VAvg Buffer", RK817_CODEC_AREF_RTCFG1, 1, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("PLL Power", RK817_CODEC_APLL_CFG5, 0, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX1 Transfer Start", RK817_CODEC_DI2S_RXCMD_TSD, 5, 0, NULL, 0),
+
+ /* capture path common */
+ SND_SOC_DAPM_SUPPLY("ADC Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 6, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("ADC Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 5, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("MIC Power On", RK817_CODEC_AMIC_CFG0, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX3 Transfer Start", RK817_CODEC_DI2S_TXCR3_TXCMD, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX3 Right Justified", RK817_CODEC_DI2S_TXCR3_TXCMD, 3, 0, NULL, 0),
+
+ /* capture path L */
+ SND_SOC_DAPM_ADC("ADC L", "Capture", RK817_CODEC_AADC_CFG0, 7, 1),
+ SND_SOC_DAPM_SUPPLY("PGA L Power On", RK817_CODEC_AMIC_CFG0, 5, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost L1", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost L2", RK817_CODEC_AMIC_CFG0, 2, 0, NULL, 0),
+
+ /* capture path R */
+ SND_SOC_DAPM_ADC("ADC R", "Capture", RK817_CODEC_AADC_CFG0, 6, 1),
+ SND_SOC_DAPM_SUPPLY("PGA R Power On", RK817_CODEC_AMIC_CFG0, 4, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost R1", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost R2", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+
+ /* playback path common */
+ SND_SOC_DAPM_SUPPLY("DAC Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S RX Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 2, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 1, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S RX Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 0, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Bias", RK817_CODEC_ADAC_CFG1, 3, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Mute Off", RK817_CODEC_DDAC_MUTE_MIXCTL, 0, 1, NULL, 0),
+
+ /* playback path speaker */
+ SND_SOC_DAPM_SUPPLY("Class D Mode", RK817_CODEC_DDAC_MUTE_MIXCTL, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("High Pass Filter", RK817_CODEC_DDAC_MUTE_MIXCTL, 7, 0, NULL, 0),
+ SND_SOC_DAPM_DAC("SPK DAC", "Playback", RK817_CODEC_ADAC_CFG1, 2, 1),
+ SND_SOC_DAPM_SUPPLY("Enable Class D", RK817_CODEC_ACLASSD_CFG1, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Disable Class D Mute Ramp", RK817_CODEC_ACLASSD_CFG1, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D Mute Rate 1", RK817_CODEC_ACLASSD_CFG1, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D Mute Rate 2", RK817_CODEC_ACLASSD_CFG1, 2, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPP 2", RK817_CODEC_ACLASSD_CFG2, 5, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPP 3", RK817_CODEC_ACLASSD_CFG2, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPN 2", RK817_CODEC_ACLASSD_CFG2, 1, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPN 3", RK817_CODEC_ACLASSD_CFG2, 0, 0, NULL, 0),
+
+ /* playback path headphones */
+ SND_SOC_DAPM_SUPPLY("Headphone Charge Pump", RK817_CODEC_AHP_CP, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone CP Discharge LDO", RK817_CODEC_AHP_CP, 3, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone OStage", RK817_CODEC_AHP_CFG0, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone Pre Amp", RK817_CODEC_AHP_CFG0, 5, 1, NULL, 0),
+ SND_SOC_DAPM_DAC("DAC L", "Playback", RK817_CODEC_ADAC_CFG1, 1, 1),
+ SND_SOC_DAPM_DAC("DAC R", "Playback", RK817_CODEC_ADAC_CFG1, 0, 1),
+
+ /* Mux for input/output path selection */
+ SND_SOC_DAPM_MUX("Playback Mux", SND_SOC_NOPM, 1, 0, &dac_mux),
+
+ /* Pins for Simple Card Bindings */
+ SND_SOC_DAPM_INPUT("MICL"),
+ SND_SOC_DAPM_INPUT("MICR"),
+ SND_SOC_DAPM_OUTPUT("HPOL"),
+ SND_SOC_DAPM_OUTPUT("HPOR"),
+ SND_SOC_DAPM_OUTPUT("SPKO"),
+};
+
+static const struct snd_soc_dapm_route rk817_dapm_routes[] = {
+
+ /* capture path */
+ /* left mic */
+ {"ADC L", NULL, "LDO Regulator"},
+ {"ADC L", NULL, "IBIAS Block"},
+ {"ADC L", NULL, "VAvg Buffer"},
+ {"ADC L", NULL, "PLL Power"},
+ {"ADC L", NULL, "ADC Clock"},
+ {"ADC L", NULL, "I2S TX Clock"},
+ {"ADC L", NULL, "ADC Channel Enable"},
+ {"ADC L", NULL, "I2S TX Channel Enable"},
+ {"ADC L", NULL, "I2S TX1 Transfer Start"},
+ {"MICL", NULL, "MIC Power On"},
+ {"MICL", NULL, "PGA L Power On"},
+ {"MICL", NULL, "Mic Boost L1"},
+ {"MICL", NULL, "Mic Boost L2"},
+ {"MICL", NULL, "I2S TX3 Transfer Start"},
+ {"MICL", NULL, "I2S TX3 Right Justified"},
+ {"ADC L", NULL, "MICL"},
+
+ /* right mic */
+ {"ADC R", NULL, "LDO Regulator"},
+ {"ADC R", NULL, "IBIAS Block"},
+ {"ADC R", NULL, "VAvg Buffer"},
+ {"ADC R", NULL, "PLL Power"},
+ {"ADC R", NULL, "ADC Clock"},
+ {"ADC R", NULL, "I2S TX Clock"},
+ {"ADC R", NULL, "ADC Channel Enable"},
+ {"ADC R", NULL, "I2S TX Channel Enable"},
+ {"ADC R", NULL, "I2S TX1 Transfer Start"},
+ {"MICR", NULL, "MIC Power On"},
+ {"MICR", NULL, "PGA R Power On"},
+ {"MICR", NULL, "Mic Boost R1"},
+ {"MICR", NULL, "Mic Boost R2"},
+ {"MICR", NULL, "I2S TX3 Transfer Start"},
+ {"MICR", NULL, "I2S TX3 Right Justified"},
+ {"ADC R", NULL, "MICR"},
+
+ /* playback path */
+ /* speaker path */
+ {"SPK DAC", NULL, "LDO Regulator"},
+ {"SPK DAC", NULL, "IBIAS Block"},
+ {"SPK DAC", NULL, "VAvg Buffer"},
+ {"SPK DAC", NULL, "PLL Power"},
+ {"SPK DAC", NULL, "I2S TX1 Transfer Start"},
+ {"SPK DAC", NULL, "DAC Clock"},
+ {"SPK DAC", NULL, "I2S RX Clock"},
+ {"SPK DAC", NULL, "DAC Channel Enable"},
+ {"SPK DAC", NULL, "I2S RX Channel Enable"},
+ {"SPK DAC", NULL, "Class D Mode"},
+ {"SPK DAC", NULL, "DAC Bias"},
+ {"SPK DAC", NULL, "DAC Mute Off"},
+ {"SPK DAC", NULL, "Enable Class D"},
+ {"SPK DAC", NULL, "Disable Class D Mute Ramp"},
+ {"SPK DAC", NULL, "Class D Mute Rate 1"},
+ {"SPK DAC", NULL, "Class D Mute Rate 2"},
+ {"SPK DAC", NULL, "Class D OCPP 2"},
+ {"SPK DAC", NULL, "Class D OCPP 3"},
+ {"SPK DAC", NULL, "Class D OCPN 2"},
+ {"SPK DAC", NULL, "Class D OCPN 3"},
+ {"SPK DAC", NULL, "High Pass Filter"},
+
+ /* headphone path L */
+ {"DAC L", NULL, "LDO Regulator"},
+ {"DAC L", NULL, "IBIAS Block"},
+ {"DAC L", NULL, "VAvg Buffer"},
+ {"DAC L", NULL, "PLL Power"},
+ {"DAC L", NULL, "I2S TX1 Transfer Start"},
+ {"DAC L", NULL, "DAC Clock"},
+ {"DAC L", NULL, "I2S RX Clock"},
+ {"DAC L", NULL, "DAC Channel Enable"},
+ {"DAC L", NULL, "I2S RX Channel Enable"},
+ {"DAC L", NULL, "DAC Bias"},
+ {"DAC L", NULL, "DAC Mute Off"},
+ {"DAC L", NULL, "Headphone Charge Pump"},
+ {"DAC L", NULL, "Headphone CP Discharge LDO"},
+ {"DAC L", NULL, "Headphone OStage"},
+ {"DAC L", NULL, "Headphone Pre Amp"},
+
+ /* headphone path R */
+ {"DAC R", NULL, "LDO Regulator"},
+ {"DAC R", NULL, "IBIAS Block"},
+ {"DAC R", NULL, "VAvg Buffer"},
+ {"DAC R", NULL, "PLL Power"},
+ {"DAC R", NULL, "I2S TX1 Transfer Start"},
+ {"DAC R", NULL, "DAC Clock"},
+ {"DAC R", NULL, "I2S RX Clock"},
+ {"DAC R", NULL, "DAC Channel Enable"},
+ {"DAC R", NULL, "I2S RX Channel Enable"},
+ {"DAC R", NULL, "DAC Bias"},
+ {"DAC R", NULL, "DAC Mute Off"},
+ {"DAC R", NULL, "Headphone Charge Pump"},
+ {"DAC R", NULL, "Headphone CP Discharge LDO"},
+ {"DAC R", NULL, "Headphone OStage"},
+ {"DAC R", NULL, "Headphone Pre Amp"},
+
+ /* mux path for output selection */
+ {"Playback Mux", "HP", "DAC L"},
+ {"Playback Mux", "HP", "DAC R"},
+ {"Playback Mux", "SPK", "SPK DAC"},
+ {"SPKO", NULL, "Playback Mux"},
+ {"HPOL", NULL, "Playback Mux"},
+ {"HPOR", NULL, "Playback Mux"},
+};
+
+static int rk817_set_dai_sysclk(struct snd_soc_dai *codec_dai,
+ int clk_id, unsigned int freq, int dir)
+{
+ struct snd_soc_component *component = codec_dai->component;
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+
+ rk817->stereo_sysclk = freq;
+
+ return 0;
+}
+
+static int rk817_set_dai_fmt(struct snd_soc_dai *codec_dai,
+ unsigned int fmt)
+{
+ struct snd_soc_component *component = codec_dai->component;
+ unsigned int i2s_mst = 0;
+
+ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+ case SND_SOC_DAIFMT_CBS_CFS:
+ i2s_mst |= RK817_I2S_MODE_SLV;
+ break;
+ case SND_SOC_DAIFMT_CBM_CFM:
+ i2s_mst |= RK817_I2S_MODE_MST;
+ break;
+ default:
+ dev_err(component->dev, "%s : set master mask failed!\n", __func__);
+ return -EINVAL;
+ }
+
+ snd_soc_component_update_bits(component, RK817_CODEC_DI2S_CKM,
+ RK817_I2S_MODE_MASK, i2s_mst);
+
+ return 0;
+}
+
+static int rk817_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai)
+{
+ struct snd_soc_component *component = dai->component;
+
+ switch (params_format(params)) {
+ case SNDRV_PCM_FORMAT_S16_LE:
+ snd_soc_component_write(component, RK817_CODEC_DI2S_RXCR2,
+ VDW_RX_16BITS);
+ snd_soc_component_write(component, RK817_CODEC_DI2S_TXCR2,
+ VDW_TX_16BITS);
+ break;
+ case SNDRV_PCM_FORMAT_S24_LE:
+ case SNDRV_PCM_FORMAT_S32_LE:
+ snd_soc_component_write(component, RK817_CODEC_DI2S_RXCR2,
+ VDW_RX_24BITS);
+ snd_soc_component_write(component, RK817_CODEC_DI2S_TXCR2,
+ VDW_TX_24BITS);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int rk817_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
+{
+ struct snd_soc_component *component = dai->component;
+
+ if (mute)
+ snd_soc_component_update_bits(component,
+ RK817_CODEC_DDAC_MUTE_MIXCTL,
+ DACMT_MASK, DACMT_ENABLE);
+ else
+ snd_soc_component_update_bits(component,
+ RK817_CODEC_DDAC_MUTE_MIXCTL,
+ DACMT_MASK, DACMT_DISABLE);
+
+ return 0;
+}
+
+#define RK817_PLAYBACK_RATES (SNDRV_PCM_RATE_8000 |\
+ SNDRV_PCM_RATE_16000 | \
+ SNDRV_PCM_RATE_32000 | \
+ SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | \
+ SNDRV_PCM_RATE_96000)
+
+#define RK817_CAPTURE_RATES (SNDRV_PCM_RATE_8000 |\
+ SNDRV_PCM_RATE_16000 | \
+ SNDRV_PCM_RATE_32000 | \
+ SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | \
+ SNDRV_PCM_RATE_96000)
+
+#define RK817_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
+ SNDRV_PCM_FMTBIT_S20_3LE |\
+ SNDRV_PCM_FMTBIT_S24_LE |\
+ SNDRV_PCM_FMTBIT_S32_LE)
+
+static struct snd_soc_dai_ops rk817_dai_ops = {
+ .hw_params = rk817_hw_params,
+ .set_fmt = rk817_set_dai_fmt,
+ .set_sysclk = rk817_set_dai_sysclk,
+ .mute_stream = rk817_digital_mute,
+ .no_capture_mute = 1,
+};
+
+static struct snd_soc_dai_driver rk817_dai[] = {
+ {
+ .name = "rk817-hifi",
+ .playback = {
+ .stream_name = "Playback",
+ .channels_min = 2,
+ .channels_max = 8,
+ .rates = RK817_PLAYBACK_RATES,
+ .formats = RK817_FORMATS,
+ },
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 1,
+ .channels_max = 2,
+ .rates = RK817_CAPTURE_RATES,
+ .formats = RK817_FORMATS,
+ },
+ .ops = &rk817_dai_ops,
+ },
+};
+
+static int rk817_probe(struct snd_soc_component *component)
+{
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+ struct rk808 *rk808 = dev_get_drvdata(component->dev->parent);
+ int ret;
+
+ snd_soc_component_init_regmap(component, rk808->regmap);
+ rk817->component = component;
+
+ ret = snd_soc_component_write(component, RK817_CODEC_DTOP_LPT_SRST, 0x40);
+
+ rk817_init(component);
+
+ /* setting initial pll values so that we can continue to leverage simple-audio-card.
+ * The values aren't important since no parameters are used.
+ */
+
+ snd_soc_component_set_pll(component, 0, 0, 0, 0);
+
+ return 0;
+}
+
+static void rk817_remove(struct snd_soc_component *component)
+{
+ snd_soc_component_exit_regmap(component);
+}
+
+static const struct snd_soc_component_driver soc_codec_dev_rk817 = {
+ .probe = rk817_probe,
+ .remove = rk817_remove,
+ .idle_bias_on = 1,
+ .use_pmdown_time = 1,
+ .endianness = 1,
+ .non_legacy_dai_naming = 1,
+ .controls = rk817_volume_controls,
+ .num_controls = ARRAY_SIZE(rk817_volume_controls),
+ .dapm_routes = rk817_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(rk817_dapm_routes),
+ .dapm_widgets = rk817_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(rk817_dapm_widgets),
+ .set_pll = rk817_set_component_pll,
+};
+
+static int rk817_codec_parse_dt_property(struct device *dev,
+ struct rk817_codec_priv *rk817)
+{
+ struct device_node *node = dev->parent->of_node;
+
+ if (!node) {
+ dev_err(dev, "%s() dev->parent->of_node is NULL\n",
+ __func__);
+ return -ENODEV;
+ }
+
+ node = of_get_child_by_name(dev->parent->of_node, "codec");
+ if (!node) {
+ dev_err(dev, "%s() Can not get child: codec\n",
+ __func__);
+ return -ENODEV;
+ }
+
+ rk817->mic_in_differential =
+ of_property_read_bool(node, "rockchip,mic-in-differential");
+
+ return 0;
+}
+
+static int rk817_platform_probe(struct platform_device *pdev)
+{
+ struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent);
+ struct rk817_codec_priv *rk817_codec_data;
+ int ret;
+
+ if (!rk808) {
+ dev_err(&pdev->dev, "%s : rk817 is NULL\n", __func__);
+ return -EINVAL;
+ }
+
+ rk817_codec_data = devm_kzalloc(&pdev->dev,
+ sizeof(struct rk817_codec_priv),
+ GFP_KERNEL);
+ if (!rk817_codec_data)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, rk817_codec_data);
+
+ rk817_codec_data->rk808 = rk808;
+
+ ret = rk817_codec_parse_dt_property(&pdev->dev, rk817_codec_data);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() parse device tree property error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ rk817_codec_data->mclk = clk_get(pdev->dev.parent, "mclk");
+ if (IS_ERR(rk817_codec_data->mclk)) {
+ dev_err(&pdev->dev, "Unable to get mclk\n");
+ ret = -ENXIO;
+ goto err_;
+ }
+
+ ret = clk_prepare_enable(rk817_codec_data->mclk);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() clock prepare error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ ret = devm_snd_soc_register_component(&pdev->dev, &soc_codec_dev_rk817,
+ rk817_dai, ARRAY_SIZE(rk817_dai));
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() register codec error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ return 0;
+err_:
+
+ return ret;
+}
+
+static int rk817_platform_remove(struct platform_device *pdev)
+{
+ struct rk817_codec_priv *rk817 = platform_get_drvdata(pdev);
+
+ clk_disable_unprepare(rk817->mclk);
+
+ return 0;
+}
+
+static struct platform_driver rk817_codec_driver = {
+ .driver = {
+ .name = "rk817-codec",
+ },
+ .probe = rk817_platform_probe,
+ .remove = rk817_platform_remove,
+};
+
+module_platform_driver(rk817_codec_driver);
+
+MODULE_DESCRIPTION("ASoC RK817 codec driver");
+MODULE_AUTHOR("binyuan <kevan.lan@rock-chips.com>");
+MODULE_LICENSE("GPL v2");
--
2.25.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 2/4] ASoC: Add Rockchip rk817 audio CODEC support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: pierre-louis.bossart, heiko, devicetree, tiwai, robh+dt,
lgirdwood, linux-rockchip, broonie, Chris Morgan, jbx6244,
lee.jones, maccraft123mc
From: Chris Morgan <macromorgan@hotmail.com>
Add support for the Rockchip rk817 audio codec integrated into the
rk817 PMIC. This is based on the sources provided by Rockchip from
their BSP kernel.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
sound/soc/codecs/Kconfig | 6 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/rk817_codec.c | 558 +++++++++++++++++++++++++++++++++
3 files changed, 566 insertions(+)
create mode 100644 sound/soc/codecs/rk817_codec.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 2a7b3e363069..4fbd404566c5 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -155,6 +155,7 @@ config SND_SOC_ALL_CODECS
imply SND_SOC_PCM512x_I2C
imply SND_SOC_PCM512x_SPI
imply SND_SOC_RK3328
+ imply SND_SOC_RK817
imply SND_SOC_RT274
imply SND_SOC_RT286
imply SND_SOC_RT298
@@ -1063,6 +1064,11 @@ config SND_SOC_RK3328
tristate "Rockchip RK3328 audio CODEC"
select REGMAP_MMIO
+config SND_SOC_RK817
+ tristate "Rockchip RK817 audio CODEC"
+ depends on MFD_RK808
+ select REGMAP_I2C
+
config SND_SOC_RL6231
tristate
default y if SND_SOC_RT5514=y
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 0efdba609048..d4a75ba43c18 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -166,6 +166,7 @@ snd-soc-pcm512x-objs := pcm512x.o
snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
snd-soc-pcm512x-spi-objs := pcm512x-spi.o
snd-soc-rk3328-objs := rk3328_codec.o
+snd-soc-rk817-objs := rk817_codec.o
snd-soc-rl6231-objs := rl6231.o
snd-soc-rl6347a-objs := rl6347a.o
snd-soc-rt1011-objs := rt1011.o
@@ -487,6 +488,7 @@ obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o
obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o
obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o
obj-$(CONFIG_SND_SOC_RK3328) += snd-soc-rk3328.o
+obj-$(CONFIG_SND_SOC_RK817) += snd-soc-rk817.o
obj-$(CONFIG_SND_SOC_RL6231) += snd-soc-rl6231.o
obj-$(CONFIG_SND_SOC_RL6347A) += snd-soc-rl6347a.o
obj-$(CONFIG_SND_SOC_RT1011) += snd-soc-rt1011.o
diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c
new file mode 100644
index 000000000000..8f4e9c0983ae
--- /dev/null
+++ b/sound/soc/codecs/rk817_codec.c
@@ -0,0 +1,558 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// rk817 ALSA SoC Audio driver
+//
+// Copyright (c) 2018, Fuzhou Rockchip Electronics Co., Ltd All rights reserved.
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/mfd/rk808.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <sound/core.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+
+struct rk817_codec_priv {
+ struct snd_soc_component *component;
+ struct rk808 *rk808;
+ struct clk *mclk;
+ unsigned int stereo_sysclk;
+ bool mic_in_differential;
+};
+
+/*
+ * This sets the codec up with the values defined in the default implementation including the APLL
+ * from the Rockchip vendor kernel. I do not know if these values are universal despite differing
+ * from the default values defined above and taken from the datasheet, or implementation specific.
+ * I don't have another implementation to compare from the Rockchip sources. Hard-coding for now.
+ * Additionally, I do not know according to the documentation the units accepted for the clock
+ * values, so for the moment those are left unvalidated.
+ */
+
+static int rk817_init(struct snd_soc_component *component)
+{
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+
+ snd_soc_component_write(component, RK817_CODEC_DDAC_POPD_DACST, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DDAC_SR_LMT0, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DADC_SR_ACL0, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DTOP_VUCTIME, 0xf4);
+ if (rk817->mic_in_differential) {
+ snd_soc_component_update_bits(component, RK817_CODEC_AMIC_CFG0, MIC_DIFF_MASK,
+ MIC_DIFF_EN);
+ };
+ return 0;
+}
+
+static int rk817_set_component_pll(struct snd_soc_component *component,
+ int pll_id, int source, unsigned int freq_in,
+ unsigned int freq_out)
+{
+ /* Set resistor value and charge pump current for PLL. */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG1, 0x58);
+ /* Set the PLL feedback clock divide value (values not documented). */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG2, 0x2d);
+ /* Set the PLL pre-divide value (values not documented). */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG3, 0x0c);
+ /* Set the PLL VCO output clock divide and PLL divided ratio of PLL High Clk (values not
+ * documented).
+ */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG4, 0xa5);
+
+ return 0;
+}
+
+/*
+ * DDAC/DADC L/R volume setting
+ * 0db~-95db, 0.375db/step, for example:
+ * 0x00: 0dB
+ * 0xff: -95dB
+ */
+
+static const DECLARE_TLV_DB_MINMAX(rk817_vol_tlv, -9500, 0);
+
+/*
+ * PGA GAIN L/R volume setting
+ * 27db~-18db, 3db/step, for example:
+ * 0x0: -18dB
+ * 0xf: 27dB
+ */
+
+static const DECLARE_TLV_DB_MINMAX(rk817_gain_tlv, -1800, 2700);
+
+static const struct snd_kcontrol_new rk817_volume_controls[] = {
+ SOC_DOUBLE_R_RANGE_TLV("Master Playback Volume", RK817_CODEC_DDAC_VOLL,
+ RK817_CODEC_DDAC_VOLR, 0, 0x00, 0xff, 1, rk817_vol_tlv),
+ SOC_DOUBLE_R_RANGE_TLV("Master Capture Volume", RK817_CODEC_DADC_VOLL,
+ RK817_CODEC_DADC_VOLR, 0, 0x00, 0xff, 1, rk817_vol_tlv),
+ SOC_DOUBLE_TLV("Mic Capture Gain", RK817_CODEC_DMIC_PGA_GAIN, 4, 0, 0xf, 0,
+ rk817_gain_tlv),
+};
+
+/* Since the speaker output and L headphone pin are internally the same, make audio path mutually
+ * exclusive with a mux.
+ */
+
+static const char *dac_mux_text[] = {
+ "HP",
+ "SPK",
+};
+
+static SOC_ENUM_SINGLE_VIRT_DECL(dac_enum, dac_mux_text);
+
+static const struct snd_kcontrol_new dac_mux =
+ SOC_DAPM_ENUM("Playback Mux", dac_enum);
+
+static const struct snd_soc_dapm_widget rk817_dapm_widgets[] = {
+
+ /* capture/playback common */
+ SND_SOC_DAPM_SUPPLY("LDO Regulator", RK817_CODEC_AREF_RTCFG1, 6, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("IBIAS Block", RK817_CODEC_AREF_RTCFG1, 2, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("VAvg Buffer", RK817_CODEC_AREF_RTCFG1, 1, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("PLL Power", RK817_CODEC_APLL_CFG5, 0, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX1 Transfer Start", RK817_CODEC_DI2S_RXCMD_TSD, 5, 0, NULL, 0),
+
+ /* capture path common */
+ SND_SOC_DAPM_SUPPLY("ADC Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 6, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("ADC Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 5, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("MIC Power On", RK817_CODEC_AMIC_CFG0, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX3 Transfer Start", RK817_CODEC_DI2S_TXCR3_TXCMD, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX3 Right Justified", RK817_CODEC_DI2S_TXCR3_TXCMD, 3, 0, NULL, 0),
+
+ /* capture path L */
+ SND_SOC_DAPM_ADC("ADC L", "Capture", RK817_CODEC_AADC_CFG0, 7, 1),
+ SND_SOC_DAPM_SUPPLY("PGA L Power On", RK817_CODEC_AMIC_CFG0, 5, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost L1", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost L2", RK817_CODEC_AMIC_CFG0, 2, 0, NULL, 0),
+
+ /* capture path R */
+ SND_SOC_DAPM_ADC("ADC R", "Capture", RK817_CODEC_AADC_CFG0, 6, 1),
+ SND_SOC_DAPM_SUPPLY("PGA R Power On", RK817_CODEC_AMIC_CFG0, 4, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost R1", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost R2", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+
+ /* playback path common */
+ SND_SOC_DAPM_SUPPLY("DAC Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S RX Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 2, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 1, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S RX Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 0, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Bias", RK817_CODEC_ADAC_CFG1, 3, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Mute Off", RK817_CODEC_DDAC_MUTE_MIXCTL, 0, 1, NULL, 0),
+
+ /* playback path speaker */
+ SND_SOC_DAPM_SUPPLY("Class D Mode", RK817_CODEC_DDAC_MUTE_MIXCTL, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("High Pass Filter", RK817_CODEC_DDAC_MUTE_MIXCTL, 7, 0, NULL, 0),
+ SND_SOC_DAPM_DAC("SPK DAC", "Playback", RK817_CODEC_ADAC_CFG1, 2, 1),
+ SND_SOC_DAPM_SUPPLY("Enable Class D", RK817_CODEC_ACLASSD_CFG1, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Disable Class D Mute Ramp", RK817_CODEC_ACLASSD_CFG1, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D Mute Rate 1", RK817_CODEC_ACLASSD_CFG1, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D Mute Rate 2", RK817_CODEC_ACLASSD_CFG1, 2, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPP 2", RK817_CODEC_ACLASSD_CFG2, 5, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPP 3", RK817_CODEC_ACLASSD_CFG2, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPN 2", RK817_CODEC_ACLASSD_CFG2, 1, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPN 3", RK817_CODEC_ACLASSD_CFG2, 0, 0, NULL, 0),
+
+ /* playback path headphones */
+ SND_SOC_DAPM_SUPPLY("Headphone Charge Pump", RK817_CODEC_AHP_CP, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone CP Discharge LDO", RK817_CODEC_AHP_CP, 3, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone OStage", RK817_CODEC_AHP_CFG0, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone Pre Amp", RK817_CODEC_AHP_CFG0, 5, 1, NULL, 0),
+ SND_SOC_DAPM_DAC("DAC L", "Playback", RK817_CODEC_ADAC_CFG1, 1, 1),
+ SND_SOC_DAPM_DAC("DAC R", "Playback", RK817_CODEC_ADAC_CFG1, 0, 1),
+
+ /* Mux for input/output path selection */
+ SND_SOC_DAPM_MUX("Playback Mux", SND_SOC_NOPM, 1, 0, &dac_mux),
+
+ /* Pins for Simple Card Bindings */
+ SND_SOC_DAPM_INPUT("MICL"),
+ SND_SOC_DAPM_INPUT("MICR"),
+ SND_SOC_DAPM_OUTPUT("HPOL"),
+ SND_SOC_DAPM_OUTPUT("HPOR"),
+ SND_SOC_DAPM_OUTPUT("SPKO"),
+};
+
+static const struct snd_soc_dapm_route rk817_dapm_routes[] = {
+
+ /* capture path */
+ /* left mic */
+ {"ADC L", NULL, "LDO Regulator"},
+ {"ADC L", NULL, "IBIAS Block"},
+ {"ADC L", NULL, "VAvg Buffer"},
+ {"ADC L", NULL, "PLL Power"},
+ {"ADC L", NULL, "ADC Clock"},
+ {"ADC L", NULL, "I2S TX Clock"},
+ {"ADC L", NULL, "ADC Channel Enable"},
+ {"ADC L", NULL, "I2S TX Channel Enable"},
+ {"ADC L", NULL, "I2S TX1 Transfer Start"},
+ {"MICL", NULL, "MIC Power On"},
+ {"MICL", NULL, "PGA L Power On"},
+ {"MICL", NULL, "Mic Boost L1"},
+ {"MICL", NULL, "Mic Boost L2"},
+ {"MICL", NULL, "I2S TX3 Transfer Start"},
+ {"MICL", NULL, "I2S TX3 Right Justified"},
+ {"ADC L", NULL, "MICL"},
+
+ /* right mic */
+ {"ADC R", NULL, "LDO Regulator"},
+ {"ADC R", NULL, "IBIAS Block"},
+ {"ADC R", NULL, "VAvg Buffer"},
+ {"ADC R", NULL, "PLL Power"},
+ {"ADC R", NULL, "ADC Clock"},
+ {"ADC R", NULL, "I2S TX Clock"},
+ {"ADC R", NULL, "ADC Channel Enable"},
+ {"ADC R", NULL, "I2S TX Channel Enable"},
+ {"ADC R", NULL, "I2S TX1 Transfer Start"},
+ {"MICR", NULL, "MIC Power On"},
+ {"MICR", NULL, "PGA R Power On"},
+ {"MICR", NULL, "Mic Boost R1"},
+ {"MICR", NULL, "Mic Boost R2"},
+ {"MICR", NULL, "I2S TX3 Transfer Start"},
+ {"MICR", NULL, "I2S TX3 Right Justified"},
+ {"ADC R", NULL, "MICR"},
+
+ /* playback path */
+ /* speaker path */
+ {"SPK DAC", NULL, "LDO Regulator"},
+ {"SPK DAC", NULL, "IBIAS Block"},
+ {"SPK DAC", NULL, "VAvg Buffer"},
+ {"SPK DAC", NULL, "PLL Power"},
+ {"SPK DAC", NULL, "I2S TX1 Transfer Start"},
+ {"SPK DAC", NULL, "DAC Clock"},
+ {"SPK DAC", NULL, "I2S RX Clock"},
+ {"SPK DAC", NULL, "DAC Channel Enable"},
+ {"SPK DAC", NULL, "I2S RX Channel Enable"},
+ {"SPK DAC", NULL, "Class D Mode"},
+ {"SPK DAC", NULL, "DAC Bias"},
+ {"SPK DAC", NULL, "DAC Mute Off"},
+ {"SPK DAC", NULL, "Enable Class D"},
+ {"SPK DAC", NULL, "Disable Class D Mute Ramp"},
+ {"SPK DAC", NULL, "Class D Mute Rate 1"},
+ {"SPK DAC", NULL, "Class D Mute Rate 2"},
+ {"SPK DAC", NULL, "Class D OCPP 2"},
+ {"SPK DAC", NULL, "Class D OCPP 3"},
+ {"SPK DAC", NULL, "Class D OCPN 2"},
+ {"SPK DAC", NULL, "Class D OCPN 3"},
+ {"SPK DAC", NULL, "High Pass Filter"},
+
+ /* headphone path L */
+ {"DAC L", NULL, "LDO Regulator"},
+ {"DAC L", NULL, "IBIAS Block"},
+ {"DAC L", NULL, "VAvg Buffer"},
+ {"DAC L", NULL, "PLL Power"},
+ {"DAC L", NULL, "I2S TX1 Transfer Start"},
+ {"DAC L", NULL, "DAC Clock"},
+ {"DAC L", NULL, "I2S RX Clock"},
+ {"DAC L", NULL, "DAC Channel Enable"},
+ {"DAC L", NULL, "I2S RX Channel Enable"},
+ {"DAC L", NULL, "DAC Bias"},
+ {"DAC L", NULL, "DAC Mute Off"},
+ {"DAC L", NULL, "Headphone Charge Pump"},
+ {"DAC L", NULL, "Headphone CP Discharge LDO"},
+ {"DAC L", NULL, "Headphone OStage"},
+ {"DAC L", NULL, "Headphone Pre Amp"},
+
+ /* headphone path R */
+ {"DAC R", NULL, "LDO Regulator"},
+ {"DAC R", NULL, "IBIAS Block"},
+ {"DAC R", NULL, "VAvg Buffer"},
+ {"DAC R", NULL, "PLL Power"},
+ {"DAC R", NULL, "I2S TX1 Transfer Start"},
+ {"DAC R", NULL, "DAC Clock"},
+ {"DAC R", NULL, "I2S RX Clock"},
+ {"DAC R", NULL, "DAC Channel Enable"},
+ {"DAC R", NULL, "I2S RX Channel Enable"},
+ {"DAC R", NULL, "DAC Bias"},
+ {"DAC R", NULL, "DAC Mute Off"},
+ {"DAC R", NULL, "Headphone Charge Pump"},
+ {"DAC R", NULL, "Headphone CP Discharge LDO"},
+ {"DAC R", NULL, "Headphone OStage"},
+ {"DAC R", NULL, "Headphone Pre Amp"},
+
+ /* mux path for output selection */
+ {"Playback Mux", "HP", "DAC L"},
+ {"Playback Mux", "HP", "DAC R"},
+ {"Playback Mux", "SPK", "SPK DAC"},
+ {"SPKO", NULL, "Playback Mux"},
+ {"HPOL", NULL, "Playback Mux"},
+ {"HPOR", NULL, "Playback Mux"},
+};
+
+static int rk817_set_dai_sysclk(struct snd_soc_dai *codec_dai,
+ int clk_id, unsigned int freq, int dir)
+{
+ struct snd_soc_component *component = codec_dai->component;
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+
+ rk817->stereo_sysclk = freq;
+
+ return 0;
+}
+
+static int rk817_set_dai_fmt(struct snd_soc_dai *codec_dai,
+ unsigned int fmt)
+{
+ struct snd_soc_component *component = codec_dai->component;
+ unsigned int i2s_mst = 0;
+
+ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+ case SND_SOC_DAIFMT_CBS_CFS:
+ i2s_mst |= RK817_I2S_MODE_SLV;
+ break;
+ case SND_SOC_DAIFMT_CBM_CFM:
+ i2s_mst |= RK817_I2S_MODE_MST;
+ break;
+ default:
+ dev_err(component->dev, "%s : set master mask failed!\n", __func__);
+ return -EINVAL;
+ }
+
+ snd_soc_component_update_bits(component, RK817_CODEC_DI2S_CKM,
+ RK817_I2S_MODE_MASK, i2s_mst);
+
+ return 0;
+}
+
+static int rk817_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai)
+{
+ struct snd_soc_component *component = dai->component;
+
+ switch (params_format(params)) {
+ case SNDRV_PCM_FORMAT_S16_LE:
+ snd_soc_component_write(component, RK817_CODEC_DI2S_RXCR2,
+ VDW_RX_16BITS);
+ snd_soc_component_write(component, RK817_CODEC_DI2S_TXCR2,
+ VDW_TX_16BITS);
+ break;
+ case SNDRV_PCM_FORMAT_S24_LE:
+ case SNDRV_PCM_FORMAT_S32_LE:
+ snd_soc_component_write(component, RK817_CODEC_DI2S_RXCR2,
+ VDW_RX_24BITS);
+ snd_soc_component_write(component, RK817_CODEC_DI2S_TXCR2,
+ VDW_TX_24BITS);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int rk817_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
+{
+ struct snd_soc_component *component = dai->component;
+
+ if (mute)
+ snd_soc_component_update_bits(component,
+ RK817_CODEC_DDAC_MUTE_MIXCTL,
+ DACMT_MASK, DACMT_ENABLE);
+ else
+ snd_soc_component_update_bits(component,
+ RK817_CODEC_DDAC_MUTE_MIXCTL,
+ DACMT_MASK, DACMT_DISABLE);
+
+ return 0;
+}
+
+#define RK817_PLAYBACK_RATES (SNDRV_PCM_RATE_8000 |\
+ SNDRV_PCM_RATE_16000 | \
+ SNDRV_PCM_RATE_32000 | \
+ SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | \
+ SNDRV_PCM_RATE_96000)
+
+#define RK817_CAPTURE_RATES (SNDRV_PCM_RATE_8000 |\
+ SNDRV_PCM_RATE_16000 | \
+ SNDRV_PCM_RATE_32000 | \
+ SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | \
+ SNDRV_PCM_RATE_96000)
+
+#define RK817_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
+ SNDRV_PCM_FMTBIT_S20_3LE |\
+ SNDRV_PCM_FMTBIT_S24_LE |\
+ SNDRV_PCM_FMTBIT_S32_LE)
+
+static struct snd_soc_dai_ops rk817_dai_ops = {
+ .hw_params = rk817_hw_params,
+ .set_fmt = rk817_set_dai_fmt,
+ .set_sysclk = rk817_set_dai_sysclk,
+ .mute_stream = rk817_digital_mute,
+ .no_capture_mute = 1,
+};
+
+static struct snd_soc_dai_driver rk817_dai[] = {
+ {
+ .name = "rk817-hifi",
+ .playback = {
+ .stream_name = "Playback",
+ .channels_min = 2,
+ .channels_max = 8,
+ .rates = RK817_PLAYBACK_RATES,
+ .formats = RK817_FORMATS,
+ },
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 1,
+ .channels_max = 2,
+ .rates = RK817_CAPTURE_RATES,
+ .formats = RK817_FORMATS,
+ },
+ .ops = &rk817_dai_ops,
+ },
+};
+
+static int rk817_probe(struct snd_soc_component *component)
+{
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+ struct rk808 *rk808 = dev_get_drvdata(component->dev->parent);
+ int ret;
+
+ snd_soc_component_init_regmap(component, rk808->regmap);
+ rk817->component = component;
+
+ ret = snd_soc_component_write(component, RK817_CODEC_DTOP_LPT_SRST, 0x40);
+
+ rk817_init(component);
+
+ /* setting initial pll values so that we can continue to leverage simple-audio-card.
+ * The values aren't important since no parameters are used.
+ */
+
+ snd_soc_component_set_pll(component, 0, 0, 0, 0);
+
+ return 0;
+}
+
+static void rk817_remove(struct snd_soc_component *component)
+{
+ snd_soc_component_exit_regmap(component);
+}
+
+static const struct snd_soc_component_driver soc_codec_dev_rk817 = {
+ .probe = rk817_probe,
+ .remove = rk817_remove,
+ .idle_bias_on = 1,
+ .use_pmdown_time = 1,
+ .endianness = 1,
+ .non_legacy_dai_naming = 1,
+ .controls = rk817_volume_controls,
+ .num_controls = ARRAY_SIZE(rk817_volume_controls),
+ .dapm_routes = rk817_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(rk817_dapm_routes),
+ .dapm_widgets = rk817_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(rk817_dapm_widgets),
+ .set_pll = rk817_set_component_pll,
+};
+
+static int rk817_codec_parse_dt_property(struct device *dev,
+ struct rk817_codec_priv *rk817)
+{
+ struct device_node *node = dev->parent->of_node;
+
+ if (!node) {
+ dev_err(dev, "%s() dev->parent->of_node is NULL\n",
+ __func__);
+ return -ENODEV;
+ }
+
+ node = of_get_child_by_name(dev->parent->of_node, "codec");
+ if (!node) {
+ dev_err(dev, "%s() Can not get child: codec\n",
+ __func__);
+ return -ENODEV;
+ }
+
+ rk817->mic_in_differential =
+ of_property_read_bool(node, "rockchip,mic-in-differential");
+
+ return 0;
+}
+
+static int rk817_platform_probe(struct platform_device *pdev)
+{
+ struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent);
+ struct rk817_codec_priv *rk817_codec_data;
+ int ret;
+
+ if (!rk808) {
+ dev_err(&pdev->dev, "%s : rk817 is NULL\n", __func__);
+ return -EINVAL;
+ }
+
+ rk817_codec_data = devm_kzalloc(&pdev->dev,
+ sizeof(struct rk817_codec_priv),
+ GFP_KERNEL);
+ if (!rk817_codec_data)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, rk817_codec_data);
+
+ rk817_codec_data->rk808 = rk808;
+
+ ret = rk817_codec_parse_dt_property(&pdev->dev, rk817_codec_data);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() parse device tree property error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ rk817_codec_data->mclk = clk_get(pdev->dev.parent, "mclk");
+ if (IS_ERR(rk817_codec_data->mclk)) {
+ dev_err(&pdev->dev, "Unable to get mclk\n");
+ ret = -ENXIO;
+ goto err_;
+ }
+
+ ret = clk_prepare_enable(rk817_codec_data->mclk);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() clock prepare error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ ret = devm_snd_soc_register_component(&pdev->dev, &soc_codec_dev_rk817,
+ rk817_dai, ARRAY_SIZE(rk817_dai));
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() register codec error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ return 0;
+err_:
+
+ return ret;
+}
+
+static int rk817_platform_remove(struct platform_device *pdev)
+{
+ struct rk817_codec_priv *rk817 = platform_get_drvdata(pdev);
+
+ clk_disable_unprepare(rk817->mclk);
+
+ return 0;
+}
+
+static struct platform_driver rk817_codec_driver = {
+ .driver = {
+ .name = "rk817-codec",
+ },
+ .probe = rk817_platform_probe,
+ .remove = rk817_platform_remove,
+};
+
+module_platform_driver(rk817_codec_driver);
+
+MODULE_DESCRIPTION("ASoC RK817 codec driver");
+MODULE_AUTHOR("binyuan <kevan.lan@rock-chips.com>");
+MODULE_LICENSE("GPL v2");
--
2.25.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 2/4] ASoC: Add Rockchip rk817 audio CODEC support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
Add support for the Rockchip rk817 audio codec integrated into the
rk817 PMIC. This is based on the sources provided by Rockchip from
their BSP kernel.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
sound/soc/codecs/Kconfig | 6 +
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/rk817_codec.c | 558 +++++++++++++++++++++++++++++++++
3 files changed, 566 insertions(+)
create mode 100644 sound/soc/codecs/rk817_codec.c
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 2a7b3e363069..4fbd404566c5 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -155,6 +155,7 @@ config SND_SOC_ALL_CODECS
imply SND_SOC_PCM512x_I2C
imply SND_SOC_PCM512x_SPI
imply SND_SOC_RK3328
+ imply SND_SOC_RK817
imply SND_SOC_RT274
imply SND_SOC_RT286
imply SND_SOC_RT298
@@ -1063,6 +1064,11 @@ config SND_SOC_RK3328
tristate "Rockchip RK3328 audio CODEC"
select REGMAP_MMIO
+config SND_SOC_RK817
+ tristate "Rockchip RK817 audio CODEC"
+ depends on MFD_RK808
+ select REGMAP_I2C
+
config SND_SOC_RL6231
tristate
default y if SND_SOC_RT5514=y
diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile
index 0efdba609048..d4a75ba43c18 100644
--- a/sound/soc/codecs/Makefile
+++ b/sound/soc/codecs/Makefile
@@ -166,6 +166,7 @@ snd-soc-pcm512x-objs := pcm512x.o
snd-soc-pcm512x-i2c-objs := pcm512x-i2c.o
snd-soc-pcm512x-spi-objs := pcm512x-spi.o
snd-soc-rk3328-objs := rk3328_codec.o
+snd-soc-rk817-objs := rk817_codec.o
snd-soc-rl6231-objs := rl6231.o
snd-soc-rl6347a-objs := rl6347a.o
snd-soc-rt1011-objs := rt1011.o
@@ -487,6 +488,7 @@ obj-$(CONFIG_SND_SOC_PCM512x) += snd-soc-pcm512x.o
obj-$(CONFIG_SND_SOC_PCM512x_I2C) += snd-soc-pcm512x-i2c.o
obj-$(CONFIG_SND_SOC_PCM512x_SPI) += snd-soc-pcm512x-spi.o
obj-$(CONFIG_SND_SOC_RK3328) += snd-soc-rk3328.o
+obj-$(CONFIG_SND_SOC_RK817) += snd-soc-rk817.o
obj-$(CONFIG_SND_SOC_RL6231) += snd-soc-rl6231.o
obj-$(CONFIG_SND_SOC_RL6347A) += snd-soc-rl6347a.o
obj-$(CONFIG_SND_SOC_RT1011) += snd-soc-rt1011.o
diff --git a/sound/soc/codecs/rk817_codec.c b/sound/soc/codecs/rk817_codec.c
new file mode 100644
index 000000000000..8f4e9c0983ae
--- /dev/null
+++ b/sound/soc/codecs/rk817_codec.c
@@ -0,0 +1,558 @@
+// SPDX-License-Identifier: GPL-2.0
+//
+// rk817 ALSA SoC Audio driver
+//
+// Copyright (c) 2018, Fuzhou Rockchip Electronics Co., Ltd All rights reserved.
+
+#include <linux/clk.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/mfd/rk808.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <sound/core.h>
+#include <sound/pcm_params.h>
+#include <sound/soc.h>
+#include <sound/tlv.h>
+
+struct rk817_codec_priv {
+ struct snd_soc_component *component;
+ struct rk808 *rk808;
+ struct clk *mclk;
+ unsigned int stereo_sysclk;
+ bool mic_in_differential;
+};
+
+/*
+ * This sets the codec up with the values defined in the default implementation including the APLL
+ * from the Rockchip vendor kernel. I do not know if these values are universal despite differing
+ * from the default values defined above and taken from the datasheet, or implementation specific.
+ * I don't have another implementation to compare from the Rockchip sources. Hard-coding for now.
+ * Additionally, I do not know according to the documentation the units accepted for the clock
+ * values, so for the moment those are left unvalidated.
+ */
+
+static int rk817_init(struct snd_soc_component *component)
+{
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+
+ snd_soc_component_write(component, RK817_CODEC_DDAC_POPD_DACST, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DDAC_SR_LMT0, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DADC_SR_ACL0, 0x02);
+ snd_soc_component_write(component, RK817_CODEC_DTOP_VUCTIME, 0xf4);
+ if (rk817->mic_in_differential) {
+ snd_soc_component_update_bits(component, RK817_CODEC_AMIC_CFG0, MIC_DIFF_MASK,
+ MIC_DIFF_EN);
+ };
+ return 0;
+}
+
+static int rk817_set_component_pll(struct snd_soc_component *component,
+ int pll_id, int source, unsigned int freq_in,
+ unsigned int freq_out)
+{
+ /* Set resistor value and charge pump current for PLL. */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG1, 0x58);
+ /* Set the PLL feedback clock divide value (values not documented). */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG2, 0x2d);
+ /* Set the PLL pre-divide value (values not documented). */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG3, 0x0c);
+ /* Set the PLL VCO output clock divide and PLL divided ratio of PLL High Clk (values not
+ * documented).
+ */
+ snd_soc_component_write(component, RK817_CODEC_APLL_CFG4, 0xa5);
+
+ return 0;
+}
+
+/*
+ * DDAC/DADC L/R volume setting
+ * 0db~-95db, 0.375db/step, for example:
+ * 0x00: 0dB
+ * 0xff: -95dB
+ */
+
+static const DECLARE_TLV_DB_MINMAX(rk817_vol_tlv, -9500, 0);
+
+/*
+ * PGA GAIN L/R volume setting
+ * 27db~-18db, 3db/step, for example:
+ * 0x0: -18dB
+ * 0xf: 27dB
+ */
+
+static const DECLARE_TLV_DB_MINMAX(rk817_gain_tlv, -1800, 2700);
+
+static const struct snd_kcontrol_new rk817_volume_controls[] = {
+ SOC_DOUBLE_R_RANGE_TLV("Master Playback Volume", RK817_CODEC_DDAC_VOLL,
+ RK817_CODEC_DDAC_VOLR, 0, 0x00, 0xff, 1, rk817_vol_tlv),
+ SOC_DOUBLE_R_RANGE_TLV("Master Capture Volume", RK817_CODEC_DADC_VOLL,
+ RK817_CODEC_DADC_VOLR, 0, 0x00, 0xff, 1, rk817_vol_tlv),
+ SOC_DOUBLE_TLV("Mic Capture Gain", RK817_CODEC_DMIC_PGA_GAIN, 4, 0, 0xf, 0,
+ rk817_gain_tlv),
+};
+
+/* Since the speaker output and L headphone pin are internally the same, make audio path mutually
+ * exclusive with a mux.
+ */
+
+static const char *dac_mux_text[] = {
+ "HP",
+ "SPK",
+};
+
+static SOC_ENUM_SINGLE_VIRT_DECL(dac_enum, dac_mux_text);
+
+static const struct snd_kcontrol_new dac_mux =
+ SOC_DAPM_ENUM("Playback Mux", dac_enum);
+
+static const struct snd_soc_dapm_widget rk817_dapm_widgets[] = {
+
+ /* capture/playback common */
+ SND_SOC_DAPM_SUPPLY("LDO Regulator", RK817_CODEC_AREF_RTCFG1, 6, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("IBIAS Block", RK817_CODEC_AREF_RTCFG1, 2, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("VAvg Buffer", RK817_CODEC_AREF_RTCFG1, 1, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("PLL Power", RK817_CODEC_APLL_CFG5, 0, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX1 Transfer Start", RK817_CODEC_DI2S_RXCMD_TSD, 5, 0, NULL, 0),
+
+ /* capture path common */
+ SND_SOC_DAPM_SUPPLY("ADC Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 6, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("ADC Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 5, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("MIC Power On", RK817_CODEC_AMIC_CFG0, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX3 Transfer Start", RK817_CODEC_DI2S_TXCR3_TXCMD, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S TX3 Right Justified", RK817_CODEC_DI2S_TXCR3_TXCMD, 3, 0, NULL, 0),
+
+ /* capture path L */
+ SND_SOC_DAPM_ADC("ADC L", "Capture", RK817_CODEC_AADC_CFG0, 7, 1),
+ SND_SOC_DAPM_SUPPLY("PGA L Power On", RK817_CODEC_AMIC_CFG0, 5, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost L1", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost L2", RK817_CODEC_AMIC_CFG0, 2, 0, NULL, 0),
+
+ /* capture path R */
+ SND_SOC_DAPM_ADC("ADC R", "Capture", RK817_CODEC_AADC_CFG0, 6, 1),
+ SND_SOC_DAPM_SUPPLY("PGA R Power On", RK817_CODEC_AMIC_CFG0, 4, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost R1", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Mic Boost R2", RK817_CODEC_AMIC_CFG0, 3, 0, NULL, 0),
+
+ /* playback path common */
+ SND_SOC_DAPM_SUPPLY("DAC Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S RX Clock", RK817_CODEC_DTOP_DIGEN_CLKE, 2, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 1, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("I2S RX Channel Enable", RK817_CODEC_DTOP_DIGEN_CLKE, 0, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Bias", RK817_CODEC_ADAC_CFG1, 3, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("DAC Mute Off", RK817_CODEC_DDAC_MUTE_MIXCTL, 0, 1, NULL, 0),
+
+ /* playback path speaker */
+ SND_SOC_DAPM_SUPPLY("Class D Mode", RK817_CODEC_DDAC_MUTE_MIXCTL, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("High Pass Filter", RK817_CODEC_DDAC_MUTE_MIXCTL, 7, 0, NULL, 0),
+ SND_SOC_DAPM_DAC("SPK DAC", "Playback", RK817_CODEC_ADAC_CFG1, 2, 1),
+ SND_SOC_DAPM_SUPPLY("Enable Class D", RK817_CODEC_ACLASSD_CFG1, 7, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Disable Class D Mute Ramp", RK817_CODEC_ACLASSD_CFG1, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D Mute Rate 1", RK817_CODEC_ACLASSD_CFG1, 3, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D Mute Rate 2", RK817_CODEC_ACLASSD_CFG1, 2, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPP 2", RK817_CODEC_ACLASSD_CFG2, 5, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPP 3", RK817_CODEC_ACLASSD_CFG2, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPN 2", RK817_CODEC_ACLASSD_CFG2, 1, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Class D OCPN 3", RK817_CODEC_ACLASSD_CFG2, 0, 0, NULL, 0),
+
+ /* playback path headphones */
+ SND_SOC_DAPM_SUPPLY("Headphone Charge Pump", RK817_CODEC_AHP_CP, 4, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone CP Discharge LDO", RK817_CODEC_AHP_CP, 3, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone OStage", RK817_CODEC_AHP_CFG0, 6, 1, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("Headphone Pre Amp", RK817_CODEC_AHP_CFG0, 5, 1, NULL, 0),
+ SND_SOC_DAPM_DAC("DAC L", "Playback", RK817_CODEC_ADAC_CFG1, 1, 1),
+ SND_SOC_DAPM_DAC("DAC R", "Playback", RK817_CODEC_ADAC_CFG1, 0, 1),
+
+ /* Mux for input/output path selection */
+ SND_SOC_DAPM_MUX("Playback Mux", SND_SOC_NOPM, 1, 0, &dac_mux),
+
+ /* Pins for Simple Card Bindings */
+ SND_SOC_DAPM_INPUT("MICL"),
+ SND_SOC_DAPM_INPUT("MICR"),
+ SND_SOC_DAPM_OUTPUT("HPOL"),
+ SND_SOC_DAPM_OUTPUT("HPOR"),
+ SND_SOC_DAPM_OUTPUT("SPKO"),
+};
+
+static const struct snd_soc_dapm_route rk817_dapm_routes[] = {
+
+ /* capture path */
+ /* left mic */
+ {"ADC L", NULL, "LDO Regulator"},
+ {"ADC L", NULL, "IBIAS Block"},
+ {"ADC L", NULL, "VAvg Buffer"},
+ {"ADC L", NULL, "PLL Power"},
+ {"ADC L", NULL, "ADC Clock"},
+ {"ADC L", NULL, "I2S TX Clock"},
+ {"ADC L", NULL, "ADC Channel Enable"},
+ {"ADC L", NULL, "I2S TX Channel Enable"},
+ {"ADC L", NULL, "I2S TX1 Transfer Start"},
+ {"MICL", NULL, "MIC Power On"},
+ {"MICL", NULL, "PGA L Power On"},
+ {"MICL", NULL, "Mic Boost L1"},
+ {"MICL", NULL, "Mic Boost L2"},
+ {"MICL", NULL, "I2S TX3 Transfer Start"},
+ {"MICL", NULL, "I2S TX3 Right Justified"},
+ {"ADC L", NULL, "MICL"},
+
+ /* right mic */
+ {"ADC R", NULL, "LDO Regulator"},
+ {"ADC R", NULL, "IBIAS Block"},
+ {"ADC R", NULL, "VAvg Buffer"},
+ {"ADC R", NULL, "PLL Power"},
+ {"ADC R", NULL, "ADC Clock"},
+ {"ADC R", NULL, "I2S TX Clock"},
+ {"ADC R", NULL, "ADC Channel Enable"},
+ {"ADC R", NULL, "I2S TX Channel Enable"},
+ {"ADC R", NULL, "I2S TX1 Transfer Start"},
+ {"MICR", NULL, "MIC Power On"},
+ {"MICR", NULL, "PGA R Power On"},
+ {"MICR", NULL, "Mic Boost R1"},
+ {"MICR", NULL, "Mic Boost R2"},
+ {"MICR", NULL, "I2S TX3 Transfer Start"},
+ {"MICR", NULL, "I2S TX3 Right Justified"},
+ {"ADC R", NULL, "MICR"},
+
+ /* playback path */
+ /* speaker path */
+ {"SPK DAC", NULL, "LDO Regulator"},
+ {"SPK DAC", NULL, "IBIAS Block"},
+ {"SPK DAC", NULL, "VAvg Buffer"},
+ {"SPK DAC", NULL, "PLL Power"},
+ {"SPK DAC", NULL, "I2S TX1 Transfer Start"},
+ {"SPK DAC", NULL, "DAC Clock"},
+ {"SPK DAC", NULL, "I2S RX Clock"},
+ {"SPK DAC", NULL, "DAC Channel Enable"},
+ {"SPK DAC", NULL, "I2S RX Channel Enable"},
+ {"SPK DAC", NULL, "Class D Mode"},
+ {"SPK DAC", NULL, "DAC Bias"},
+ {"SPK DAC", NULL, "DAC Mute Off"},
+ {"SPK DAC", NULL, "Enable Class D"},
+ {"SPK DAC", NULL, "Disable Class D Mute Ramp"},
+ {"SPK DAC", NULL, "Class D Mute Rate 1"},
+ {"SPK DAC", NULL, "Class D Mute Rate 2"},
+ {"SPK DAC", NULL, "Class D OCPP 2"},
+ {"SPK DAC", NULL, "Class D OCPP 3"},
+ {"SPK DAC", NULL, "Class D OCPN 2"},
+ {"SPK DAC", NULL, "Class D OCPN 3"},
+ {"SPK DAC", NULL, "High Pass Filter"},
+
+ /* headphone path L */
+ {"DAC L", NULL, "LDO Regulator"},
+ {"DAC L", NULL, "IBIAS Block"},
+ {"DAC L", NULL, "VAvg Buffer"},
+ {"DAC L", NULL, "PLL Power"},
+ {"DAC L", NULL, "I2S TX1 Transfer Start"},
+ {"DAC L", NULL, "DAC Clock"},
+ {"DAC L", NULL, "I2S RX Clock"},
+ {"DAC L", NULL, "DAC Channel Enable"},
+ {"DAC L", NULL, "I2S RX Channel Enable"},
+ {"DAC L", NULL, "DAC Bias"},
+ {"DAC L", NULL, "DAC Mute Off"},
+ {"DAC L", NULL, "Headphone Charge Pump"},
+ {"DAC L", NULL, "Headphone CP Discharge LDO"},
+ {"DAC L", NULL, "Headphone OStage"},
+ {"DAC L", NULL, "Headphone Pre Amp"},
+
+ /* headphone path R */
+ {"DAC R", NULL, "LDO Regulator"},
+ {"DAC R", NULL, "IBIAS Block"},
+ {"DAC R", NULL, "VAvg Buffer"},
+ {"DAC R", NULL, "PLL Power"},
+ {"DAC R", NULL, "I2S TX1 Transfer Start"},
+ {"DAC R", NULL, "DAC Clock"},
+ {"DAC R", NULL, "I2S RX Clock"},
+ {"DAC R", NULL, "DAC Channel Enable"},
+ {"DAC R", NULL, "I2S RX Channel Enable"},
+ {"DAC R", NULL, "DAC Bias"},
+ {"DAC R", NULL, "DAC Mute Off"},
+ {"DAC R", NULL, "Headphone Charge Pump"},
+ {"DAC R", NULL, "Headphone CP Discharge LDO"},
+ {"DAC R", NULL, "Headphone OStage"},
+ {"DAC R", NULL, "Headphone Pre Amp"},
+
+ /* mux path for output selection */
+ {"Playback Mux", "HP", "DAC L"},
+ {"Playback Mux", "HP", "DAC R"},
+ {"Playback Mux", "SPK", "SPK DAC"},
+ {"SPKO", NULL, "Playback Mux"},
+ {"HPOL", NULL, "Playback Mux"},
+ {"HPOR", NULL, "Playback Mux"},
+};
+
+static int rk817_set_dai_sysclk(struct snd_soc_dai *codec_dai,
+ int clk_id, unsigned int freq, int dir)
+{
+ struct snd_soc_component *component = codec_dai->component;
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+
+ rk817->stereo_sysclk = freq;
+
+ return 0;
+}
+
+static int rk817_set_dai_fmt(struct snd_soc_dai *codec_dai,
+ unsigned int fmt)
+{
+ struct snd_soc_component *component = codec_dai->component;
+ unsigned int i2s_mst = 0;
+
+ switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
+ case SND_SOC_DAIFMT_CBS_CFS:
+ i2s_mst |= RK817_I2S_MODE_SLV;
+ break;
+ case SND_SOC_DAIFMT_CBM_CFM:
+ i2s_mst |= RK817_I2S_MODE_MST;
+ break;
+ default:
+ dev_err(component->dev, "%s : set master mask failed!\n", __func__);
+ return -EINVAL;
+ }
+
+ snd_soc_component_update_bits(component, RK817_CODEC_DI2S_CKM,
+ RK817_I2S_MODE_MASK, i2s_mst);
+
+ return 0;
+}
+
+static int rk817_hw_params(struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct snd_soc_dai *dai)
+{
+ struct snd_soc_component *component = dai->component;
+
+ switch (params_format(params)) {
+ case SNDRV_PCM_FORMAT_S16_LE:
+ snd_soc_component_write(component, RK817_CODEC_DI2S_RXCR2,
+ VDW_RX_16BITS);
+ snd_soc_component_write(component, RK817_CODEC_DI2S_TXCR2,
+ VDW_TX_16BITS);
+ break;
+ case SNDRV_PCM_FORMAT_S24_LE:
+ case SNDRV_PCM_FORMAT_S32_LE:
+ snd_soc_component_write(component, RK817_CODEC_DI2S_RXCR2,
+ VDW_RX_24BITS);
+ snd_soc_component_write(component, RK817_CODEC_DI2S_TXCR2,
+ VDW_TX_24BITS);
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
+static int rk817_digital_mute(struct snd_soc_dai *dai, int mute, int stream)
+{
+ struct snd_soc_component *component = dai->component;
+
+ if (mute)
+ snd_soc_component_update_bits(component,
+ RK817_CODEC_DDAC_MUTE_MIXCTL,
+ DACMT_MASK, DACMT_ENABLE);
+ else
+ snd_soc_component_update_bits(component,
+ RK817_CODEC_DDAC_MUTE_MIXCTL,
+ DACMT_MASK, DACMT_DISABLE);
+
+ return 0;
+}
+
+#define RK817_PLAYBACK_RATES (SNDRV_PCM_RATE_8000 |\
+ SNDRV_PCM_RATE_16000 | \
+ SNDRV_PCM_RATE_32000 | \
+ SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | \
+ SNDRV_PCM_RATE_96000)
+
+#define RK817_CAPTURE_RATES (SNDRV_PCM_RATE_8000 |\
+ SNDRV_PCM_RATE_16000 | \
+ SNDRV_PCM_RATE_32000 | \
+ SNDRV_PCM_RATE_44100 | \
+ SNDRV_PCM_RATE_48000 | \
+ SNDRV_PCM_RATE_96000)
+
+#define RK817_FORMATS (SNDRV_PCM_FMTBIT_S16_LE |\
+ SNDRV_PCM_FMTBIT_S20_3LE |\
+ SNDRV_PCM_FMTBIT_S24_LE |\
+ SNDRV_PCM_FMTBIT_S32_LE)
+
+static struct snd_soc_dai_ops rk817_dai_ops = {
+ .hw_params = rk817_hw_params,
+ .set_fmt = rk817_set_dai_fmt,
+ .set_sysclk = rk817_set_dai_sysclk,
+ .mute_stream = rk817_digital_mute,
+ .no_capture_mute = 1,
+};
+
+static struct snd_soc_dai_driver rk817_dai[] = {
+ {
+ .name = "rk817-hifi",
+ .playback = {
+ .stream_name = "Playback",
+ .channels_min = 2,
+ .channels_max = 8,
+ .rates = RK817_PLAYBACK_RATES,
+ .formats = RK817_FORMATS,
+ },
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 1,
+ .channels_max = 2,
+ .rates = RK817_CAPTURE_RATES,
+ .formats = RK817_FORMATS,
+ },
+ .ops = &rk817_dai_ops,
+ },
+};
+
+static int rk817_probe(struct snd_soc_component *component)
+{
+ struct rk817_codec_priv *rk817 = snd_soc_component_get_drvdata(component);
+ struct rk808 *rk808 = dev_get_drvdata(component->dev->parent);
+ int ret;
+
+ snd_soc_component_init_regmap(component, rk808->regmap);
+ rk817->component = component;
+
+ ret = snd_soc_component_write(component, RK817_CODEC_DTOP_LPT_SRST, 0x40);
+
+ rk817_init(component);
+
+ /* setting initial pll values so that we can continue to leverage simple-audio-card.
+ * The values aren't important since no parameters are used.
+ */
+
+ snd_soc_component_set_pll(component, 0, 0, 0, 0);
+
+ return 0;
+}
+
+static void rk817_remove(struct snd_soc_component *component)
+{
+ snd_soc_component_exit_regmap(component);
+}
+
+static const struct snd_soc_component_driver soc_codec_dev_rk817 = {
+ .probe = rk817_probe,
+ .remove = rk817_remove,
+ .idle_bias_on = 1,
+ .use_pmdown_time = 1,
+ .endianness = 1,
+ .non_legacy_dai_naming = 1,
+ .controls = rk817_volume_controls,
+ .num_controls = ARRAY_SIZE(rk817_volume_controls),
+ .dapm_routes = rk817_dapm_routes,
+ .num_dapm_routes = ARRAY_SIZE(rk817_dapm_routes),
+ .dapm_widgets = rk817_dapm_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(rk817_dapm_widgets),
+ .set_pll = rk817_set_component_pll,
+};
+
+static int rk817_codec_parse_dt_property(struct device *dev,
+ struct rk817_codec_priv *rk817)
+{
+ struct device_node *node = dev->parent->of_node;
+
+ if (!node) {
+ dev_err(dev, "%s() dev->parent->of_node is NULL\n",
+ __func__);
+ return -ENODEV;
+ }
+
+ node = of_get_child_by_name(dev->parent->of_node, "codec");
+ if (!node) {
+ dev_err(dev, "%s() Can not get child: codec\n",
+ __func__);
+ return -ENODEV;
+ }
+
+ rk817->mic_in_differential =
+ of_property_read_bool(node, "rockchip,mic-in-differential");
+
+ return 0;
+}
+
+static int rk817_platform_probe(struct platform_device *pdev)
+{
+ struct rk808 *rk808 = dev_get_drvdata(pdev->dev.parent);
+ struct rk817_codec_priv *rk817_codec_data;
+ int ret;
+
+ if (!rk808) {
+ dev_err(&pdev->dev, "%s : rk817 is NULL\n", __func__);
+ return -EINVAL;
+ }
+
+ rk817_codec_data = devm_kzalloc(&pdev->dev,
+ sizeof(struct rk817_codec_priv),
+ GFP_KERNEL);
+ if (!rk817_codec_data)
+ return -ENOMEM;
+
+ platform_set_drvdata(pdev, rk817_codec_data);
+
+ rk817_codec_data->rk808 = rk808;
+
+ ret = rk817_codec_parse_dt_property(&pdev->dev, rk817_codec_data);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() parse device tree property error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ rk817_codec_data->mclk = clk_get(pdev->dev.parent, "mclk");
+ if (IS_ERR(rk817_codec_data->mclk)) {
+ dev_err(&pdev->dev, "Unable to get mclk\n");
+ ret = -ENXIO;
+ goto err_;
+ }
+
+ ret = clk_prepare_enable(rk817_codec_data->mclk);
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() clock prepare error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ ret = devm_snd_soc_register_component(&pdev->dev, &soc_codec_dev_rk817,
+ rk817_dai, ARRAY_SIZE(rk817_dai));
+ if (ret < 0) {
+ dev_err(&pdev->dev, "%s() register codec error %d\n",
+ __func__, ret);
+ goto err_;
+ }
+
+ return 0;
+err_:
+
+ return ret;
+}
+
+static int rk817_platform_remove(struct platform_device *pdev)
+{
+ struct rk817_codec_priv *rk817 = platform_get_drvdata(pdev);
+
+ clk_disable_unprepare(rk817->mclk);
+
+ return 0;
+}
+
+static struct platform_driver rk817_codec_driver = {
+ .driver = {
+ .name = "rk817-codec",
+ },
+ .probe = rk817_platform_probe,
+ .remove = rk817_platform_remove,
+};
+
+module_platform_driver(rk817_codec_driver);
+
+MODULE_DESCRIPTION("ASoC RK817 codec driver");
+MODULE_AUTHOR("binyuan <kevan.lan@rock-chips.com>");
+MODULE_LICENSE("GPL v2");
--
2.25.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 3/4] dt-bindings: Add Rockchip rk817 audio CODEC support
2021-05-05 14:08 ` Chris Morgan
(?)
@ 2021-05-05 14:08 ` Chris Morgan
-1 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan, Rob Herring
From: Chris Morgan <macromorgan@hotmail.com>
Create dt-binding documentation to document rk817 codec.
New property name of rockchip,mic-in-differential added to control if
the microphone is in differential mode or not.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
.../devicetree/bindings/mfd/rk808.txt | 186 ++++++++++++++++++
1 file changed, 186 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/rk808.txt b/Documentation/devicetree/bindings/mfd/rk808.txt
index 04df07f6f793..56121039154f 100644
--- a/Documentation/devicetree/bindings/mfd/rk808.txt
+++ b/Documentation/devicetree/bindings/mfd/rk808.txt
@@ -23,6 +23,7 @@ Optional properties:
default output clock name
- rockchip,system-power-controller: Telling whether or not this pmic is controlling
the system power.
+- wakeup-source: Device can be used as a wakeup source.
Optional RK805 properties:
- vcc1-supply: The input supply for DCDC_REG1
@@ -63,8 +64,16 @@ Optional RK809 properties:
- vcc9-supply: The input supply for DCDC_REG5, SWITCH_REG2
Optional RK817 properties:
+- clocks: The input clock for the audio codec
+- clock-names: The clock name for the codec clock. Should be "mclk".
+- #sound-dai-cells: Needed for the interpretation of sound dais. Should be 0.
+
- vcc8-supply: The input supply for BOOST
- vcc9-supply: The input supply for OTG_SWITCH
+- codec: The child node for the codec to hold additional properties.
+
+- rockchip,mic-in-differential: Telling if the microphone uses differential
+ mode. Should be under the codec child node.
Optional RK818 properties:
- vcc1-supply: The input supply for DCDC_REG1
@@ -275,3 +284,180 @@ Example:
};
};
};
+
+ rk817: pmic@20 {
+ compatible = "rockchip,rk817";
+ reg = <0x20>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+ clock-output-names = "rk808-clkout1", "xin32k";
+ clock-names = "mclk";
+ clocks = <&cru SCLK_I2S1_OUT>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>;
+ wakeup-source;
+ #clock-cells = <1>;
+ #sound-dai-cells = <0>;
+
+ vcc1-supply = <&vccsys>;
+ vcc2-supply = <&vccsys>;
+ vcc3-supply = <&vccsys>;
+ vcc4-supply = <&vccsys>;
+ vcc5-supply = <&vccsys>;
+ vcc6-supply = <&vccsys>;
+ vcc7-supply = <&vccsys>;
+
+ regulators {
+ vdd_logic: DCDC_REG1 {
+ regulator-name = "vdd_logic";
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1150000>;
+ regulator-ramp-delay = <6001>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+
+ vdd_arm: DCDC_REG2 {
+ regulator-name = "vdd_arm";
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1350000>;
+ regulator-ramp-delay = <6001>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+
+ vcc_ddr: DCDC_REG3 {
+ regulator-name = "vcc_ddr";
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
+ };
+
+ vcc_3v3: DCDC_REG4 {
+ regulator-name = "vcc_3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_1v8: LDO_REG2 {
+ regulator-name = "vcc_1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1800000>;
+ };
+ };
+
+ vdd_1v0: LDO_REG3 {
+ regulator-name = "vdd_1v0";
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1000000>;
+ };
+ };
+
+ vcc3v3_pmu: LDO_REG4 {
+ regulator-name = "vcc3v3_pmu";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vccio_sd: LDO_REG5 {
+ regulator-name = "vccio_sd";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_sd: LDO_REG6 {
+ regulator-name = "vcc_sd";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_bl: LDO_REG7 {
+ regulator-name = "vcc_bl";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_lcd: LDO_REG8 {
+ regulator-name = "vcc_lcd";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <2800000>;
+ };
+ };
+
+ vcc_cam: LDO_REG9 {
+ regulator-name = "vcc_cam";
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3000000>;
+ };
+ };
+ };
+
+ rk817_codec: codec {
+ rockchip,mic-in-differential;
+ };
+ };
--
2.25.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 3/4] dt-bindings: Add Rockchip rk817 audio CODEC support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: pierre-louis.bossart, heiko, devicetree, tiwai, robh+dt,
lgirdwood, linux-rockchip, broonie, Chris Morgan, jbx6244,
lee.jones, Rob Herring, maccraft123mc
From: Chris Morgan <macromorgan@hotmail.com>
Create dt-binding documentation to document rk817 codec.
New property name of rockchip,mic-in-differential added to control if
the microphone is in differential mode or not.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
.../devicetree/bindings/mfd/rk808.txt | 186 ++++++++++++++++++
1 file changed, 186 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/rk808.txt b/Documentation/devicetree/bindings/mfd/rk808.txt
index 04df07f6f793..56121039154f 100644
--- a/Documentation/devicetree/bindings/mfd/rk808.txt
+++ b/Documentation/devicetree/bindings/mfd/rk808.txt
@@ -23,6 +23,7 @@ Optional properties:
default output clock name
- rockchip,system-power-controller: Telling whether or not this pmic is controlling
the system power.
+- wakeup-source: Device can be used as a wakeup source.
Optional RK805 properties:
- vcc1-supply: The input supply for DCDC_REG1
@@ -63,8 +64,16 @@ Optional RK809 properties:
- vcc9-supply: The input supply for DCDC_REG5, SWITCH_REG2
Optional RK817 properties:
+- clocks: The input clock for the audio codec
+- clock-names: The clock name for the codec clock. Should be "mclk".
+- #sound-dai-cells: Needed for the interpretation of sound dais. Should be 0.
+
- vcc8-supply: The input supply for BOOST
- vcc9-supply: The input supply for OTG_SWITCH
+- codec: The child node for the codec to hold additional properties.
+
+- rockchip,mic-in-differential: Telling if the microphone uses differential
+ mode. Should be under the codec child node.
Optional RK818 properties:
- vcc1-supply: The input supply for DCDC_REG1
@@ -275,3 +284,180 @@ Example:
};
};
};
+
+ rk817: pmic@20 {
+ compatible = "rockchip,rk817";
+ reg = <0x20>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+ clock-output-names = "rk808-clkout1", "xin32k";
+ clock-names = "mclk";
+ clocks = <&cru SCLK_I2S1_OUT>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>;
+ wakeup-source;
+ #clock-cells = <1>;
+ #sound-dai-cells = <0>;
+
+ vcc1-supply = <&vccsys>;
+ vcc2-supply = <&vccsys>;
+ vcc3-supply = <&vccsys>;
+ vcc4-supply = <&vccsys>;
+ vcc5-supply = <&vccsys>;
+ vcc6-supply = <&vccsys>;
+ vcc7-supply = <&vccsys>;
+
+ regulators {
+ vdd_logic: DCDC_REG1 {
+ regulator-name = "vdd_logic";
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1150000>;
+ regulator-ramp-delay = <6001>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+
+ vdd_arm: DCDC_REG2 {
+ regulator-name = "vdd_arm";
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1350000>;
+ regulator-ramp-delay = <6001>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+
+ vcc_ddr: DCDC_REG3 {
+ regulator-name = "vcc_ddr";
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
+ };
+
+ vcc_3v3: DCDC_REG4 {
+ regulator-name = "vcc_3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_1v8: LDO_REG2 {
+ regulator-name = "vcc_1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1800000>;
+ };
+ };
+
+ vdd_1v0: LDO_REG3 {
+ regulator-name = "vdd_1v0";
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1000000>;
+ };
+ };
+
+ vcc3v3_pmu: LDO_REG4 {
+ regulator-name = "vcc3v3_pmu";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vccio_sd: LDO_REG5 {
+ regulator-name = "vccio_sd";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_sd: LDO_REG6 {
+ regulator-name = "vcc_sd";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_bl: LDO_REG7 {
+ regulator-name = "vcc_bl";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_lcd: LDO_REG8 {
+ regulator-name = "vcc_lcd";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <2800000>;
+ };
+ };
+
+ vcc_cam: LDO_REG9 {
+ regulator-name = "vcc_cam";
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3000000>;
+ };
+ };
+ };
+
+ rk817_codec: codec {
+ rockchip,mic-in-differential;
+ };
+ };
--
2.25.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 3/4] dt-bindings: Add Rockchip rk817 audio CODEC support
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan, Rob Herring
From: Chris Morgan <macromorgan@hotmail.com>
Create dt-binding documentation to document rk817 codec.
New property name of rockchip,mic-in-differential added to control if
the microphone is in differential mode or not.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
.../devicetree/bindings/mfd/rk808.txt | 186 ++++++++++++++++++
1 file changed, 186 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/rk808.txt b/Documentation/devicetree/bindings/mfd/rk808.txt
index 04df07f6f793..56121039154f 100644
--- a/Documentation/devicetree/bindings/mfd/rk808.txt
+++ b/Documentation/devicetree/bindings/mfd/rk808.txt
@@ -23,6 +23,7 @@ Optional properties:
default output clock name
- rockchip,system-power-controller: Telling whether or not this pmic is controlling
the system power.
+- wakeup-source: Device can be used as a wakeup source.
Optional RK805 properties:
- vcc1-supply: The input supply for DCDC_REG1
@@ -63,8 +64,16 @@ Optional RK809 properties:
- vcc9-supply: The input supply for DCDC_REG5, SWITCH_REG2
Optional RK817 properties:
+- clocks: The input clock for the audio codec
+- clock-names: The clock name for the codec clock. Should be "mclk".
+- #sound-dai-cells: Needed for the interpretation of sound dais. Should be 0.
+
- vcc8-supply: The input supply for BOOST
- vcc9-supply: The input supply for OTG_SWITCH
+- codec: The child node for the codec to hold additional properties.
+
+- rockchip,mic-in-differential: Telling if the microphone uses differential
+ mode. Should be under the codec child node.
Optional RK818 properties:
- vcc1-supply: The input supply for DCDC_REG1
@@ -275,3 +284,180 @@ Example:
};
};
};
+
+ rk817: pmic@20 {
+ compatible = "rockchip,rk817";
+ reg = <0x20>;
+ interrupt-parent = <&gpio0>;
+ interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+ clock-output-names = "rk808-clkout1", "xin32k";
+ clock-names = "mclk";
+ clocks = <&cru SCLK_I2S1_OUT>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>;
+ wakeup-source;
+ #clock-cells = <1>;
+ #sound-dai-cells = <0>;
+
+ vcc1-supply = <&vccsys>;
+ vcc2-supply = <&vccsys>;
+ vcc3-supply = <&vccsys>;
+ vcc4-supply = <&vccsys>;
+ vcc5-supply = <&vccsys>;
+ vcc6-supply = <&vccsys>;
+ vcc7-supply = <&vccsys>;
+
+ regulators {
+ vdd_logic: DCDC_REG1 {
+ regulator-name = "vdd_logic";
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1150000>;
+ regulator-ramp-delay = <6001>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+
+ vdd_arm: DCDC_REG2 {
+ regulator-name = "vdd_arm";
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1350000>;
+ regulator-ramp-delay = <6001>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <950000>;
+ };
+ };
+
+ vcc_ddr: DCDC_REG3 {
+ regulator-name = "vcc_ddr";
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ };
+ };
+
+ vcc_3v3: DCDC_REG4 {
+ regulator-name = "vcc_3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_1v8: LDO_REG2 {
+ regulator-name = "vcc_1v8";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <1800000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1800000>;
+ };
+ };
+
+ vdd_1v0: LDO_REG3 {
+ regulator-name = "vdd_1v0";
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <1000000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <1000000>;
+ };
+ };
+
+ vcc3v3_pmu: LDO_REG4 {
+ regulator-name = "vcc3v3_pmu";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vccio_sd: LDO_REG5 {
+ regulator-name = "vccio_sd";
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_sd: LDO_REG6 {
+ regulator-name = "vcc_sd";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+
+ regulator-state-mem {
+ regulator-on-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_bl: LDO_REG7 {
+ regulator-name = "vcc_bl";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3300000>;
+ };
+ };
+
+ vcc_lcd: LDO_REG8 {
+ regulator-name = "vcc_lcd";
+ regulator-min-microvolt = <2800000>;
+ regulator-max-microvolt = <2800000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <2800000>;
+ };
+ };
+
+ vcc_cam: LDO_REG9 {
+ regulator-name = "vcc_cam";
+ regulator-min-microvolt = <3000000>;
+ regulator-max-microvolt = <3000000>;
+
+ regulator-state-mem {
+ regulator-off-in-suspend;
+ regulator-suspend-microvolt = <3000000>;
+ };
+ };
+ };
+
+ rk817_codec: codec {
+ rockchip,mic-in-differential;
+ };
+ };
--
2.25.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 4/4] arm64: dts: rockchip: add rk817 codec to Odroid Go
2021-05-05 14:08 ` Chris Morgan
(?)
@ 2021-05-05 14:08 ` Chris Morgan
-1 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
Add the new rk817 codec driver to the Odroid Go Advance.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
.../boot/dts/rockchip/rk3326-odroid-go2.dts | 36 +++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
index 49c97f76df77..e8c2b5a817a7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
@@ -165,6 +165,31 @@ blue_led: led-0 {
};
};
+ rk817-sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "Analog";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,mclk-fs = <256>;
+ simple-audio-card,widgets =
+ "Microphone", "Mic Jack",
+ "Headphone", "Headphones",
+ "Speaker", "Speaker";
+ simple-audio-card,routing =
+ "MICL", "Mic Jack",
+ "Headphones", "HPOL",
+ "Headphones", "HPOR",
+ "Speaker", "SPKO";
+ simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
+
+ simple-audio-card,cpu {
+ sound-dai = <&i2s1_2ch>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&rk817>;
+ };
+ };
+
vccsys: vccsys {
compatible = "regulator-fixed";
regulator-name = "vcc3v8_sys";
@@ -269,11 +294,14 @@ rk817: pmic@20 {
reg = <0x20>;
interrupt-parent = <&gpio0>;
interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+ clock-output-names = "rk808-clkout1", "xin32k";
+ clock-names = "mclk";
+ clocks = <&cru SCLK_I2S1_OUT>;
pinctrl-names = "default";
- pinctrl-0 = <&pmic_int>;
+ pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>;
wakeup-source;
#clock-cells = <1>;
- clock-output-names = "rk808-clkout1", "xin32k";
+ #sound-dai-cells = <0>;
vcc1-supply = <&vccsys>;
vcc2-supply = <&vccsys>;
@@ -432,6 +460,10 @@ regulator-state-mem {
};
};
};
+
+ rk817_codec: codec {
+ rockchip,mic-in-differential;
+ };
};
};
--
2.25.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 4/4] arm64: dts: rockchip: add rk817 codec to Odroid Go
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: pierre-louis.bossart, heiko, devicetree, tiwai, robh+dt,
lgirdwood, linux-rockchip, broonie, Chris Morgan, jbx6244,
lee.jones, maccraft123mc
From: Chris Morgan <macromorgan@hotmail.com>
Add the new rk817 codec driver to the Odroid Go Advance.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
.../boot/dts/rockchip/rk3326-odroid-go2.dts | 36 +++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
index 49c97f76df77..e8c2b5a817a7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
@@ -165,6 +165,31 @@ blue_led: led-0 {
};
};
+ rk817-sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "Analog";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,mclk-fs = <256>;
+ simple-audio-card,widgets =
+ "Microphone", "Mic Jack",
+ "Headphone", "Headphones",
+ "Speaker", "Speaker";
+ simple-audio-card,routing =
+ "MICL", "Mic Jack",
+ "Headphones", "HPOL",
+ "Headphones", "HPOR",
+ "Speaker", "SPKO";
+ simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
+
+ simple-audio-card,cpu {
+ sound-dai = <&i2s1_2ch>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&rk817>;
+ };
+ };
+
vccsys: vccsys {
compatible = "regulator-fixed";
regulator-name = "vcc3v8_sys";
@@ -269,11 +294,14 @@ rk817: pmic@20 {
reg = <0x20>;
interrupt-parent = <&gpio0>;
interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+ clock-output-names = "rk808-clkout1", "xin32k";
+ clock-names = "mclk";
+ clocks = <&cru SCLK_I2S1_OUT>;
pinctrl-names = "default";
- pinctrl-0 = <&pmic_int>;
+ pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>;
wakeup-source;
#clock-cells = <1>;
- clock-output-names = "rk808-clkout1", "xin32k";
+ #sound-dai-cells = <0>;
vcc1-supply = <&vccsys>;
vcc2-supply = <&vccsys>;
@@ -432,6 +460,10 @@ regulator-state-mem {
};
};
};
+
+ rk817_codec: codec {
+ rockchip,mic-in-differential;
+ };
};
};
--
2.25.1
^ permalink raw reply related [flat|nested] 33+ messages in thread
* [PATCH 4/4] arm64: dts: rockchip: add rk817 codec to Odroid Go
@ 2021-05-05 14:08 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-05 14:08 UTC (permalink / raw)
To: alsa-devel
Cc: broonie, lgirdwood, pierre-louis.bossart, tiwai, heiko,
lee.jones, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
Add the new rk817 codec driver to the Odroid Go Advance.
Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
---
Changes in v9:
- Add cover letter.
- Remove documentation for interrupt parent per Rob Herring's request.
- Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
robot.
Changes in v8:
- Added additional documentation for missing properties of #sound-dai-cells,
interrupt-parent, and wakeup-source for mfd documentation.
- Corrected order of elements descriptions in device tree documentation.
- Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
- Changed name of sound card from "rockchip,rk817-codec" to "Analog".
- Removed unused resets and reset-names from the i2s1_2ch node.
Changes in v7:
- Removed ifdef around register definitions for MFD.
- Replaced codec documentation with updates to MFD documentation.
- Reordered elements in example to comply with upstream rules.
- Added binding update back for Odroid Go Advance as requested.
- Submitting patches from gmail now.
Changes in v6:
- Included additional project maintainers for correct subsystems.
- Removed unneeded compatible from DT documentation.
- Removed binding update for Odroid Go Advance (will do in seperate series).
Changes in v5:
- Move register definitions from rk817_codec.h to main rk808.h register
definitions.
- Add volatile register for codec bits.
- Add default values for codec bits.
- Removed of_compatible from mtd driver (not necessary).
- Switched to using parent regmap instead of private regmap for codec.
Changes in v4:
- Created set_pll() call.
- Created user visible gain control in mic.
- Check for return value of clk_prepare_enable().
- Removed duplicate clk_prepare_enable().
- Split DT documentation to separate commit.
Changes in v3:
- Use DAPM macros to set audio path.
- Updated devicetree binding (as every rk817 has this codec chip).
- Changed documentation to yaml format.
- Split MFD changes to separate commit.
Changes in v2:
- Fixed audio path registers to solve some bugs.
.../boot/dts/rockchip/rk3326-odroid-go2.dts | 36 +++++++++++++++++--
1 file changed, 34 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
index 49c97f76df77..e8c2b5a817a7 100644
--- a/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3326-odroid-go2.dts
@@ -165,6 +165,31 @@ blue_led: led-0 {
};
};
+ rk817-sound {
+ compatible = "simple-audio-card";
+ simple-audio-card,name = "Analog";
+ simple-audio-card,format = "i2s";
+ simple-audio-card,mclk-fs = <256>;
+ simple-audio-card,widgets =
+ "Microphone", "Mic Jack",
+ "Headphone", "Headphones",
+ "Speaker", "Speaker";
+ simple-audio-card,routing =
+ "MICL", "Mic Jack",
+ "Headphones", "HPOL",
+ "Headphones", "HPOR",
+ "Speaker", "SPKO";
+ simple-audio-card,hp-det-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_HIGH>;
+
+ simple-audio-card,cpu {
+ sound-dai = <&i2s1_2ch>;
+ };
+
+ simple-audio-card,codec {
+ sound-dai = <&rk817>;
+ };
+ };
+
vccsys: vccsys {
compatible = "regulator-fixed";
regulator-name = "vcc3v8_sys";
@@ -269,11 +294,14 @@ rk817: pmic@20 {
reg = <0x20>;
interrupt-parent = <&gpio0>;
interrupts = <RK_PB2 IRQ_TYPE_LEVEL_LOW>;
+ clock-output-names = "rk808-clkout1", "xin32k";
+ clock-names = "mclk";
+ clocks = <&cru SCLK_I2S1_OUT>;
pinctrl-names = "default";
- pinctrl-0 = <&pmic_int>;
+ pinctrl-0 = <&pmic_int>, <&i2s1_2ch_mclk>;
wakeup-source;
#clock-cells = <1>;
- clock-output-names = "rk808-clkout1", "xin32k";
+ #sound-dai-cells = <0>;
vcc1-supply = <&vccsys>;
vcc2-supply = <&vccsys>;
@@ -432,6 +460,10 @@ regulator-state-mem {
};
};
};
+
+ rk817_codec: codec {
+ rockchip,mic-in-differential;
+ };
};
};
--
2.25.1
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply related [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
2021-05-05 14:08 ` Chris Morgan
(?)
@ 2021-05-10 16:23 ` Lee Jones
-1 siblings, 0 replies; 33+ messages in thread
From: Lee Jones @ 2021-05-10 16:23 UTC (permalink / raw)
To: Chris Morgan
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
heiko, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Wed, 05 May 2021, Chris Morgan wrote:
> From: Chris Morgan <macromorgan@hotmail.com>
>
> Add rk817 codec support cell to rk808 mfd driver.
>
> Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Nit: These should be chronological.
> ---
> Changes in v9:
> - Add cover letter.
> - Remove documentation for interrupt parent per Rob Herring's request.
> - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> robot.
> Changes in v8:
> - Added additional documentation for missing properties of #sound-dai-cells,
> interrupt-parent, and wakeup-source for mfd documentation.
> - Corrected order of elements descriptions in device tree documentation.
> - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> - Removed unused resets and reset-names from the i2s1_2ch node.
> Changes in v7:
> - Removed ifdef around register definitions for MFD.
> - Replaced codec documentation with updates to MFD documentation.
> - Reordered elements in example to comply with upstream rules.
> - Added binding update back for Odroid Go Advance as requested.
> - Submitting patches from gmail now.
> Changes in v6:
> - Included additional project maintainers for correct subsystems.
> - Removed unneeded compatible from DT documentation.
> - Removed binding update for Odroid Go Advance (will do in seperate series).
> Changes in v5:
> - Move register definitions from rk817_codec.h to main rk808.h register
> definitions.
> - Add volatile register for codec bits.
> - Add default values for codec bits.
> - Removed of_compatible from mtd driver (not necessary).
> - Switched to using parent regmap instead of private regmap for codec.
> Changes in v4:
> - Created set_pll() call.
> - Created user visible gain control in mic.
> - Check for return value of clk_prepare_enable().
> - Removed duplicate clk_prepare_enable().
> - Split DT documentation to separate commit.
> Changes in v3:
> - Use DAPM macros to set audio path.
> - Updated devicetree binding (as every rk817 has this codec chip).
> - Changed documentation to yaml format.
> - Split MFD changes to separate commit.
> Changes in v2:
> - Fixed audio path registers to solve some bugs.
>
> drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 166 insertions(+)
>
> diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> index ad923dd4e007..9231209184e0 100644
> --- a/drivers/mfd/rk808.c
> +++ b/drivers/mfd/rk808.c
> @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> switch (reg) {
> case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> case RK817_RTC_STATUS_REG:
> + case RK817_CODEC_DTOP_LPT_SRST:
> case RK817_INT_STS_REG0:
> case RK817_INT_STS_REG1:
> case RK817_INT_STS_REG2:
> @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> .resources = &rk817_rtc_resources[0],
> },
> +#ifdef CONFIG_SND_SOC_RK817
> + {
> + .name = "rk817-codec",
> + },
> +#endif
No #ifery please.
Just replace it with a comment.
If no associated driver exists, it just won't match/bind.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-10 16:23 ` Lee Jones
0 siblings, 0 replies; 33+ messages in thread
From: Lee Jones @ 2021-05-10 16:23 UTC (permalink / raw)
To: Chris Morgan
Cc: pierre-louis.bossart, alsa-devel, heiko, devicetree, tiwai,
robh+dt, lgirdwood, linux-rockchip, broonie, Chris Morgan,
jbx6244, maccraft123mc
On Wed, 05 May 2021, Chris Morgan wrote:
> From: Chris Morgan <macromorgan@hotmail.com>
>
> Add rk817 codec support cell to rk808 mfd driver.
>
> Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Nit: These should be chronological.
> ---
> Changes in v9:
> - Add cover letter.
> - Remove documentation for interrupt parent per Rob Herring's request.
> - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> robot.
> Changes in v8:
> - Added additional documentation for missing properties of #sound-dai-cells,
> interrupt-parent, and wakeup-source for mfd documentation.
> - Corrected order of elements descriptions in device tree documentation.
> - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> - Removed unused resets and reset-names from the i2s1_2ch node.
> Changes in v7:
> - Removed ifdef around register definitions for MFD.
> - Replaced codec documentation with updates to MFD documentation.
> - Reordered elements in example to comply with upstream rules.
> - Added binding update back for Odroid Go Advance as requested.
> - Submitting patches from gmail now.
> Changes in v6:
> - Included additional project maintainers for correct subsystems.
> - Removed unneeded compatible from DT documentation.
> - Removed binding update for Odroid Go Advance (will do in seperate series).
> Changes in v5:
> - Move register definitions from rk817_codec.h to main rk808.h register
> definitions.
> - Add volatile register for codec bits.
> - Add default values for codec bits.
> - Removed of_compatible from mtd driver (not necessary).
> - Switched to using parent regmap instead of private regmap for codec.
> Changes in v4:
> - Created set_pll() call.
> - Created user visible gain control in mic.
> - Check for return value of clk_prepare_enable().
> - Removed duplicate clk_prepare_enable().
> - Split DT documentation to separate commit.
> Changes in v3:
> - Use DAPM macros to set audio path.
> - Updated devicetree binding (as every rk817 has this codec chip).
> - Changed documentation to yaml format.
> - Split MFD changes to separate commit.
> Changes in v2:
> - Fixed audio path registers to solve some bugs.
>
> drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 166 insertions(+)
>
> diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> index ad923dd4e007..9231209184e0 100644
> --- a/drivers/mfd/rk808.c
> +++ b/drivers/mfd/rk808.c
> @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> switch (reg) {
> case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> case RK817_RTC_STATUS_REG:
> + case RK817_CODEC_DTOP_LPT_SRST:
> case RK817_INT_STS_REG0:
> case RK817_INT_STS_REG1:
> case RK817_INT_STS_REG2:
> @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> .resources = &rk817_rtc_resources[0],
> },
> +#ifdef CONFIG_SND_SOC_RK817
> + {
> + .name = "rk817-codec",
> + },
> +#endif
No #ifery please.
Just replace it with a comment.
If no associated driver exists, it just won't match/bind.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-10 16:23 ` Lee Jones
0 siblings, 0 replies; 33+ messages in thread
From: Lee Jones @ 2021-05-10 16:23 UTC (permalink / raw)
To: Chris Morgan
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
heiko, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Wed, 05 May 2021, Chris Morgan wrote:
> From: Chris Morgan <macromorgan@hotmail.com>
>
> Add rk817 codec support cell to rk808 mfd driver.
>
> Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
Nit: These should be chronological.
> ---
> Changes in v9:
> - Add cover letter.
> - Remove documentation for interrupt parent per Rob Herring's request.
> - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> robot.
> Changes in v8:
> - Added additional documentation for missing properties of #sound-dai-cells,
> interrupt-parent, and wakeup-source for mfd documentation.
> - Corrected order of elements descriptions in device tree documentation.
> - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> - Removed unused resets and reset-names from the i2s1_2ch node.
> Changes in v7:
> - Removed ifdef around register definitions for MFD.
> - Replaced codec documentation with updates to MFD documentation.
> - Reordered elements in example to comply with upstream rules.
> - Added binding update back for Odroid Go Advance as requested.
> - Submitting patches from gmail now.
> Changes in v6:
> - Included additional project maintainers for correct subsystems.
> - Removed unneeded compatible from DT documentation.
> - Removed binding update for Odroid Go Advance (will do in seperate series).
> Changes in v5:
> - Move register definitions from rk817_codec.h to main rk808.h register
> definitions.
> - Add volatile register for codec bits.
> - Add default values for codec bits.
> - Removed of_compatible from mtd driver (not necessary).
> - Switched to using parent regmap instead of private regmap for codec.
> Changes in v4:
> - Created set_pll() call.
> - Created user visible gain control in mic.
> - Check for return value of clk_prepare_enable().
> - Removed duplicate clk_prepare_enable().
> - Split DT documentation to separate commit.
> Changes in v3:
> - Use DAPM macros to set audio path.
> - Updated devicetree binding (as every rk817 has this codec chip).
> - Changed documentation to yaml format.
> - Split MFD changes to separate commit.
> Changes in v2:
> - Fixed audio path registers to solve some bugs.
>
> drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> 2 files changed, 166 insertions(+)
>
> diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> index ad923dd4e007..9231209184e0 100644
> --- a/drivers/mfd/rk808.c
> +++ b/drivers/mfd/rk808.c
> @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> switch (reg) {
> case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> case RK817_RTC_STATUS_REG:
> + case RK817_CODEC_DTOP_LPT_SRST:
> case RK817_INT_STS_REG0:
> case RK817_INT_STS_REG1:
> case RK817_INT_STS_REG2:
> @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> .resources = &rk817_rtc_resources[0],
> },
> +#ifdef CONFIG_SND_SOC_RK817
> + {
> + .name = "rk817-codec",
> + },
> +#endif
No #ifery please.
Just replace it with a comment.
If no associated driver exists, it just won't match/bind.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
2021-05-10 16:23 ` Lee Jones
(?)
@ 2021-05-13 15:01 ` Chris Morgan
-1 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-13 15:01 UTC (permalink / raw)
To: Lee Jones
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
heiko, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> On Wed, 05 May 2021, Chris Morgan wrote:
>
> > From: Chris Morgan <macromorgan@hotmail.com>
> >
> > Add rk817 codec support cell to rk808 mfd driver.
> >
> > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
>
> Nit: These should be chronological.
Acknowledged. I will make sure to do this if a v10 is necessary.
>
> > ---
> > Changes in v9:
> > - Add cover letter.
> > - Remove documentation for interrupt parent per Rob Herring's request.
> > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > robot.
> > Changes in v8:
> > - Added additional documentation for missing properties of #sound-dai-cells,
> > interrupt-parent, and wakeup-source for mfd documentation.
> > - Corrected order of elements descriptions in device tree documentation.
> > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > - Removed unused resets and reset-names from the i2s1_2ch node.
> > Changes in v7:
> > - Removed ifdef around register definitions for MFD.
> > - Replaced codec documentation with updates to MFD documentation.
> > - Reordered elements in example to comply with upstream rules.
> > - Added binding update back for Odroid Go Advance as requested.
> > - Submitting patches from gmail now.
> > Changes in v6:
> > - Included additional project maintainers for correct subsystems.
> > - Removed unneeded compatible from DT documentation.
> > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > Changes in v5:
> > - Move register definitions from rk817_codec.h to main rk808.h register
> > definitions.
> > - Add volatile register for codec bits.
> > - Add default values for codec bits.
> > - Removed of_compatible from mtd driver (not necessary).
> > - Switched to using parent regmap instead of private regmap for codec.
> > Changes in v4:
> > - Created set_pll() call.
> > - Created user visible gain control in mic.
> > - Check for return value of clk_prepare_enable().
> > - Removed duplicate clk_prepare_enable().
> > - Split DT documentation to separate commit.
> > Changes in v3:
> > - Use DAPM macros to set audio path.
> > - Updated devicetree binding (as every rk817 has this codec chip).
> > - Changed documentation to yaml format.
> > - Split MFD changes to separate commit.
> > Changes in v2:
> > - Fixed audio path registers to solve some bugs.
> >
> > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > 2 files changed, 166 insertions(+)
> >
> > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > index ad923dd4e007..9231209184e0 100644
> > --- a/drivers/mfd/rk808.c
> > +++ b/drivers/mfd/rk808.c
> > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > switch (reg) {
> > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > case RK817_RTC_STATUS_REG:
> > + case RK817_CODEC_DTOP_LPT_SRST:
> > case RK817_INT_STS_REG0:
> > case RK817_INT_STS_REG1:
> > case RK817_INT_STS_REG2:
> > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > .resources = &rk817_rtc_resources[0],
> > },
> > +#ifdef CONFIG_SND_SOC_RK817
> > + {
> > + .name = "rk817-codec",
> > + },
> > +#endif
>
> No #ifery please.
>
> Just replace it with a comment.
>
> If no associated driver exists, it just won't match/bind.
I did the "if" here because I noticed that if I have a rk817 and do not
utilize the codec I receive a dmesg warning. I put the if here to silence
it in the event that someone was using this PMIC but didn't want to use
the audio codec. I will make the change if you say so though, but I just
want to confirm that it's acceptable to have a warning for all rk817s
that do not use the codec about a missing codec. The hardware is always
present, I just can't say for certain it will always be used.
Thank you.
>
> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-13 15:01 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-13 15:01 UTC (permalink / raw)
To: Lee Jones
Cc: pierre-louis.bossart, alsa-devel, heiko, devicetree, tiwai,
robh+dt, lgirdwood, linux-rockchip, broonie, Chris Morgan,
jbx6244, maccraft123mc
On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> On Wed, 05 May 2021, Chris Morgan wrote:
>
> > From: Chris Morgan <macromorgan@hotmail.com>
> >
> > Add rk817 codec support cell to rk808 mfd driver.
> >
> > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
>
> Nit: These should be chronological.
Acknowledged. I will make sure to do this if a v10 is necessary.
>
> > ---
> > Changes in v9:
> > - Add cover letter.
> > - Remove documentation for interrupt parent per Rob Herring's request.
> > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > robot.
> > Changes in v8:
> > - Added additional documentation for missing properties of #sound-dai-cells,
> > interrupt-parent, and wakeup-source for mfd documentation.
> > - Corrected order of elements descriptions in device tree documentation.
> > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > - Removed unused resets and reset-names from the i2s1_2ch node.
> > Changes in v7:
> > - Removed ifdef around register definitions for MFD.
> > - Replaced codec documentation with updates to MFD documentation.
> > - Reordered elements in example to comply with upstream rules.
> > - Added binding update back for Odroid Go Advance as requested.
> > - Submitting patches from gmail now.
> > Changes in v6:
> > - Included additional project maintainers for correct subsystems.
> > - Removed unneeded compatible from DT documentation.
> > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > Changes in v5:
> > - Move register definitions from rk817_codec.h to main rk808.h register
> > definitions.
> > - Add volatile register for codec bits.
> > - Add default values for codec bits.
> > - Removed of_compatible from mtd driver (not necessary).
> > - Switched to using parent regmap instead of private regmap for codec.
> > Changes in v4:
> > - Created set_pll() call.
> > - Created user visible gain control in mic.
> > - Check for return value of clk_prepare_enable().
> > - Removed duplicate clk_prepare_enable().
> > - Split DT documentation to separate commit.
> > Changes in v3:
> > - Use DAPM macros to set audio path.
> > - Updated devicetree binding (as every rk817 has this codec chip).
> > - Changed documentation to yaml format.
> > - Split MFD changes to separate commit.
> > Changes in v2:
> > - Fixed audio path registers to solve some bugs.
> >
> > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > 2 files changed, 166 insertions(+)
> >
> > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > index ad923dd4e007..9231209184e0 100644
> > --- a/drivers/mfd/rk808.c
> > +++ b/drivers/mfd/rk808.c
> > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > switch (reg) {
> > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > case RK817_RTC_STATUS_REG:
> > + case RK817_CODEC_DTOP_LPT_SRST:
> > case RK817_INT_STS_REG0:
> > case RK817_INT_STS_REG1:
> > case RK817_INT_STS_REG2:
> > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > .resources = &rk817_rtc_resources[0],
> > },
> > +#ifdef CONFIG_SND_SOC_RK817
> > + {
> > + .name = "rk817-codec",
> > + },
> > +#endif
>
> No #ifery please.
>
> Just replace it with a comment.
>
> If no associated driver exists, it just won't match/bind.
I did the "if" here because I noticed that if I have a rk817 and do not
utilize the codec I receive a dmesg warning. I put the if here to silence
it in the event that someone was using this PMIC but didn't want to use
the audio codec. I will make the change if you say so though, but I just
want to confirm that it's acceptable to have a warning for all rk817s
that do not use the codec about a missing codec. The hardware is always
present, I just can't say for certain it will always be used.
Thank you.
>
> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-13 15:01 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-13 15:01 UTC (permalink / raw)
To: Lee Jones
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
heiko, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> On Wed, 05 May 2021, Chris Morgan wrote:
>
> > From: Chris Morgan <macromorgan@hotmail.com>
> >
> > Add rk817 codec support cell to rk808 mfd driver.
> >
> > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
>
> Nit: These should be chronological.
Acknowledged. I will make sure to do this if a v10 is necessary.
>
> > ---
> > Changes in v9:
> > - Add cover letter.
> > - Remove documentation for interrupt parent per Rob Herring's request.
> > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > robot.
> > Changes in v8:
> > - Added additional documentation for missing properties of #sound-dai-cells,
> > interrupt-parent, and wakeup-source for mfd documentation.
> > - Corrected order of elements descriptions in device tree documentation.
> > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > - Removed unused resets and reset-names from the i2s1_2ch node.
> > Changes in v7:
> > - Removed ifdef around register definitions for MFD.
> > - Replaced codec documentation with updates to MFD documentation.
> > - Reordered elements in example to comply with upstream rules.
> > - Added binding update back for Odroid Go Advance as requested.
> > - Submitting patches from gmail now.
> > Changes in v6:
> > - Included additional project maintainers for correct subsystems.
> > - Removed unneeded compatible from DT documentation.
> > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > Changes in v5:
> > - Move register definitions from rk817_codec.h to main rk808.h register
> > definitions.
> > - Add volatile register for codec bits.
> > - Add default values for codec bits.
> > - Removed of_compatible from mtd driver (not necessary).
> > - Switched to using parent regmap instead of private regmap for codec.
> > Changes in v4:
> > - Created set_pll() call.
> > - Created user visible gain control in mic.
> > - Check for return value of clk_prepare_enable().
> > - Removed duplicate clk_prepare_enable().
> > - Split DT documentation to separate commit.
> > Changes in v3:
> > - Use DAPM macros to set audio path.
> > - Updated devicetree binding (as every rk817 has this codec chip).
> > - Changed documentation to yaml format.
> > - Split MFD changes to separate commit.
> > Changes in v2:
> > - Fixed audio path registers to solve some bugs.
> >
> > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > 2 files changed, 166 insertions(+)
> >
> > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > index ad923dd4e007..9231209184e0 100644
> > --- a/drivers/mfd/rk808.c
> > +++ b/drivers/mfd/rk808.c
> > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > switch (reg) {
> > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > case RK817_RTC_STATUS_REG:
> > + case RK817_CODEC_DTOP_LPT_SRST:
> > case RK817_INT_STS_REG0:
> > case RK817_INT_STS_REG1:
> > case RK817_INT_STS_REG2:
> > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > .resources = &rk817_rtc_resources[0],
> > },
> > +#ifdef CONFIG_SND_SOC_RK817
> > + {
> > + .name = "rk817-codec",
> > + },
> > +#endif
>
> No #ifery please.
>
> Just replace it with a comment.
>
> If no associated driver exists, it just won't match/bind.
I did the "if" here because I noticed that if I have a rk817 and do not
utilize the codec I receive a dmesg warning. I put the if here to silence
it in the event that someone was using this PMIC but didn't want to use
the audio codec. I will make the change if you say so though, but I just
want to confirm that it's acceptable to have a warning for all rk817s
that do not use the codec about a missing codec. The hardware is always
present, I just can't say for certain it will always be used.
Thank you.
>
> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
2021-05-13 15:01 ` Chris Morgan
(?)
@ 2021-05-13 20:11 ` Lee Jones
-1 siblings, 0 replies; 33+ messages in thread
From: Lee Jones @ 2021-05-13 20:11 UTC (permalink / raw)
To: Chris Morgan
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
heiko, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Thu, 13 May 2021, Chris Morgan wrote:
> On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > On Wed, 05 May 2021, Chris Morgan wrote:
> >
> > > From: Chris Morgan <macromorgan@hotmail.com>
> > >
> > > Add rk817 codec support cell to rk808 mfd driver.
> > >
> > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> >
> > Nit: These should be chronological.
>
> Acknowledged. I will make sure to do this if a v10 is necessary.
>
> >
> > > ---
> > > Changes in v9:
> > > - Add cover letter.
> > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > robot.
> > > Changes in v8:
> > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > interrupt-parent, and wakeup-source for mfd documentation.
> > > - Corrected order of elements descriptions in device tree documentation.
> > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > Changes in v7:
> > > - Removed ifdef around register definitions for MFD.
> > > - Replaced codec documentation with updates to MFD documentation.
> > > - Reordered elements in example to comply with upstream rules.
> > > - Added binding update back for Odroid Go Advance as requested.
> > > - Submitting patches from gmail now.
> > > Changes in v6:
> > > - Included additional project maintainers for correct subsystems.
> > > - Removed unneeded compatible from DT documentation.
> > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > Changes in v5:
> > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > definitions.
> > > - Add volatile register for codec bits.
> > > - Add default values for codec bits.
> > > - Removed of_compatible from mtd driver (not necessary).
> > > - Switched to using parent regmap instead of private regmap for codec.
> > > Changes in v4:
> > > - Created set_pll() call.
> > > - Created user visible gain control in mic.
> > > - Check for return value of clk_prepare_enable().
> > > - Removed duplicate clk_prepare_enable().
> > > - Split DT documentation to separate commit.
> > > Changes in v3:
> > > - Use DAPM macros to set audio path.
> > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > - Changed documentation to yaml format.
> > > - Split MFD changes to separate commit.
> > > Changes in v2:
> > > - Fixed audio path registers to solve some bugs.
> > >
> > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > 2 files changed, 166 insertions(+)
> > >
> > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > index ad923dd4e007..9231209184e0 100644
> > > --- a/drivers/mfd/rk808.c
> > > +++ b/drivers/mfd/rk808.c
> > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > switch (reg) {
> > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > case RK817_RTC_STATUS_REG:
> > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > case RK817_INT_STS_REG0:
> > > case RK817_INT_STS_REG1:
> > > case RK817_INT_STS_REG2:
> > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > .resources = &rk817_rtc_resources[0],
> > > },
> > > +#ifdef CONFIG_SND_SOC_RK817
> > > + {
> > > + .name = "rk817-codec",
> > > + },
> > > +#endif
> >
> > No #ifery please.
> >
> > Just replace it with a comment.
> >
> > If no associated driver exists, it just won't match/bind.
>
> I did the "if" here because I noticed that if I have a rk817 and do not
> utilize the codec I receive a dmesg warning. I put the if here to silence
> it in the event that someone was using this PMIC but didn't want to use
> the audio codec. I will make the change if you say so though, but I just
> want to confirm that it's acceptable to have a warning for all rk817s
> that do not use the codec about a missing codec. The hardware is always
> present, I just can't say for certain it will always be used.
What is the dmesg warning you receive?
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-13 20:11 ` Lee Jones
0 siblings, 0 replies; 33+ messages in thread
From: Lee Jones @ 2021-05-13 20:11 UTC (permalink / raw)
To: Chris Morgan
Cc: pierre-louis.bossart, alsa-devel, heiko, devicetree, tiwai,
robh+dt, lgirdwood, linux-rockchip, broonie, Chris Morgan,
jbx6244, maccraft123mc
On Thu, 13 May 2021, Chris Morgan wrote:
> On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > On Wed, 05 May 2021, Chris Morgan wrote:
> >
> > > From: Chris Morgan <macromorgan@hotmail.com>
> > >
> > > Add rk817 codec support cell to rk808 mfd driver.
> > >
> > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> >
> > Nit: These should be chronological.
>
> Acknowledged. I will make sure to do this if a v10 is necessary.
>
> >
> > > ---
> > > Changes in v9:
> > > - Add cover letter.
> > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > robot.
> > > Changes in v8:
> > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > interrupt-parent, and wakeup-source for mfd documentation.
> > > - Corrected order of elements descriptions in device tree documentation.
> > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > Changes in v7:
> > > - Removed ifdef around register definitions for MFD.
> > > - Replaced codec documentation with updates to MFD documentation.
> > > - Reordered elements in example to comply with upstream rules.
> > > - Added binding update back for Odroid Go Advance as requested.
> > > - Submitting patches from gmail now.
> > > Changes in v6:
> > > - Included additional project maintainers for correct subsystems.
> > > - Removed unneeded compatible from DT documentation.
> > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > Changes in v5:
> > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > definitions.
> > > - Add volatile register for codec bits.
> > > - Add default values for codec bits.
> > > - Removed of_compatible from mtd driver (not necessary).
> > > - Switched to using parent regmap instead of private regmap for codec.
> > > Changes in v4:
> > > - Created set_pll() call.
> > > - Created user visible gain control in mic.
> > > - Check for return value of clk_prepare_enable().
> > > - Removed duplicate clk_prepare_enable().
> > > - Split DT documentation to separate commit.
> > > Changes in v3:
> > > - Use DAPM macros to set audio path.
> > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > - Changed documentation to yaml format.
> > > - Split MFD changes to separate commit.
> > > Changes in v2:
> > > - Fixed audio path registers to solve some bugs.
> > >
> > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > 2 files changed, 166 insertions(+)
> > >
> > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > index ad923dd4e007..9231209184e0 100644
> > > --- a/drivers/mfd/rk808.c
> > > +++ b/drivers/mfd/rk808.c
> > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > switch (reg) {
> > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > case RK817_RTC_STATUS_REG:
> > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > case RK817_INT_STS_REG0:
> > > case RK817_INT_STS_REG1:
> > > case RK817_INT_STS_REG2:
> > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > .resources = &rk817_rtc_resources[0],
> > > },
> > > +#ifdef CONFIG_SND_SOC_RK817
> > > + {
> > > + .name = "rk817-codec",
> > > + },
> > > +#endif
> >
> > No #ifery please.
> >
> > Just replace it with a comment.
> >
> > If no associated driver exists, it just won't match/bind.
>
> I did the "if" here because I noticed that if I have a rk817 and do not
> utilize the codec I receive a dmesg warning. I put the if here to silence
> it in the event that someone was using this PMIC but didn't want to use
> the audio codec. I will make the change if you say so though, but I just
> want to confirm that it's acceptable to have a warning for all rk817s
> that do not use the codec about a missing codec. The hardware is always
> present, I just can't say for certain it will always be used.
What is the dmesg warning you receive?
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-13 20:11 ` Lee Jones
0 siblings, 0 replies; 33+ messages in thread
From: Lee Jones @ 2021-05-13 20:11 UTC (permalink / raw)
To: Chris Morgan
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
heiko, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Thu, 13 May 2021, Chris Morgan wrote:
> On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > On Wed, 05 May 2021, Chris Morgan wrote:
> >
> > > From: Chris Morgan <macromorgan@hotmail.com>
> > >
> > > Add rk817 codec support cell to rk808 mfd driver.
> > >
> > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> >
> > Nit: These should be chronological.
>
> Acknowledged. I will make sure to do this if a v10 is necessary.
>
> >
> > > ---
> > > Changes in v9:
> > > - Add cover letter.
> > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > robot.
> > > Changes in v8:
> > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > interrupt-parent, and wakeup-source for mfd documentation.
> > > - Corrected order of elements descriptions in device tree documentation.
> > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > Changes in v7:
> > > - Removed ifdef around register definitions for MFD.
> > > - Replaced codec documentation with updates to MFD documentation.
> > > - Reordered elements in example to comply with upstream rules.
> > > - Added binding update back for Odroid Go Advance as requested.
> > > - Submitting patches from gmail now.
> > > Changes in v6:
> > > - Included additional project maintainers for correct subsystems.
> > > - Removed unneeded compatible from DT documentation.
> > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > Changes in v5:
> > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > definitions.
> > > - Add volatile register for codec bits.
> > > - Add default values for codec bits.
> > > - Removed of_compatible from mtd driver (not necessary).
> > > - Switched to using parent regmap instead of private regmap for codec.
> > > Changes in v4:
> > > - Created set_pll() call.
> > > - Created user visible gain control in mic.
> > > - Check for return value of clk_prepare_enable().
> > > - Removed duplicate clk_prepare_enable().
> > > - Split DT documentation to separate commit.
> > > Changes in v3:
> > > - Use DAPM macros to set audio path.
> > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > - Changed documentation to yaml format.
> > > - Split MFD changes to separate commit.
> > > Changes in v2:
> > > - Fixed audio path registers to solve some bugs.
> > >
> > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > 2 files changed, 166 insertions(+)
> > >
> > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > index ad923dd4e007..9231209184e0 100644
> > > --- a/drivers/mfd/rk808.c
> > > +++ b/drivers/mfd/rk808.c
> > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > switch (reg) {
> > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > case RK817_RTC_STATUS_REG:
> > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > case RK817_INT_STS_REG0:
> > > case RK817_INT_STS_REG1:
> > > case RK817_INT_STS_REG2:
> > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > .resources = &rk817_rtc_resources[0],
> > > },
> > > +#ifdef CONFIG_SND_SOC_RK817
> > > + {
> > > + .name = "rk817-codec",
> > > + },
> > > +#endif
> >
> > No #ifery please.
> >
> > Just replace it with a comment.
> >
> > If no associated driver exists, it just won't match/bind.
>
> I did the "if" here because I noticed that if I have a rk817 and do not
> utilize the codec I receive a dmesg warning. I put the if here to silence
> it in the event that someone was using this PMIC but didn't want to use
> the audio codec. I will make the change if you say so though, but I just
> want to confirm that it's acceptable to have a warning for all rk817s
> that do not use the codec about a missing codec. The hardware is always
> present, I just can't say for certain it will always be used.
What is the dmesg warning you receive?
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
2021-05-13 20:11 ` Lee Jones
(?)
@ 2021-05-14 15:50 ` Chris Morgan
-1 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-14 15:50 UTC (permalink / raw)
To: Lee Jones
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
heiko, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> On Thu, 13 May 2021, Chris Morgan wrote:
>
> > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > On Wed, 05 May 2021, Chris Morgan wrote:
> > >
> > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > >
> > > > Add rk817 codec support cell to rk808 mfd driver.
> > > >
> > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > >
> > > Nit: These should be chronological.
> >
> > Acknowledged. I will make sure to do this if a v10 is necessary.
> >
> > >
> > > > ---
> > > > Changes in v9:
> > > > - Add cover letter.
> > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > robot.
> > > > Changes in v8:
> > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > - Corrected order of elements descriptions in device tree documentation.
> > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > Changes in v7:
> > > > - Removed ifdef around register definitions for MFD.
> > > > - Replaced codec documentation with updates to MFD documentation.
> > > > - Reordered elements in example to comply with upstream rules.
> > > > - Added binding update back for Odroid Go Advance as requested.
> > > > - Submitting patches from gmail now.
> > > > Changes in v6:
> > > > - Included additional project maintainers for correct subsystems.
> > > > - Removed unneeded compatible from DT documentation.
> > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > Changes in v5:
> > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > definitions.
> > > > - Add volatile register for codec bits.
> > > > - Add default values for codec bits.
> > > > - Removed of_compatible from mtd driver (not necessary).
> > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > Changes in v4:
> > > > - Created set_pll() call.
> > > > - Created user visible gain control in mic.
> > > > - Check for return value of clk_prepare_enable().
> > > > - Removed duplicate clk_prepare_enable().
> > > > - Split DT documentation to separate commit.
> > > > Changes in v3:
> > > > - Use DAPM macros to set audio path.
> > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > - Changed documentation to yaml format.
> > > > - Split MFD changes to separate commit.
> > > > Changes in v2:
> > > > - Fixed audio path registers to solve some bugs.
> > > >
> > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > 2 files changed, 166 insertions(+)
> > > >
> > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > index ad923dd4e007..9231209184e0 100644
> > > > --- a/drivers/mfd/rk808.c
> > > > +++ b/drivers/mfd/rk808.c
> > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > switch (reg) {
> > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > case RK817_RTC_STATUS_REG:
> > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > case RK817_INT_STS_REG0:
> > > > case RK817_INT_STS_REG1:
> > > > case RK817_INT_STS_REG2:
> > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > .resources = &rk817_rtc_resources[0],
> > > > },
> > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > + {
> > > > + .name = "rk817-codec",
> > > > + },
> > > > +#endif
> > >
> > > No #ifery please.
> > >
> > > Just replace it with a comment.
> > >
> > > If no associated driver exists, it just won't match/bind.
> >
> > I did the "if" here because I noticed that if I have a rk817 and do not
> > utilize the codec I receive a dmesg warning. I put the if here to silence
> > it in the event that someone was using this PMIC but didn't want to use
> > the audio codec. I will make the change if you say so though, but I just
> > want to confirm that it's acceptable to have a warning for all rk817s
> > that do not use the codec about a missing codec. The hardware is always
> > present, I just can't say for certain it will always be used.
>
> What is the dmesg warning you receive?
It appears I was confused, I will update the code. No warning is
received when I take away the ifdef guard. However, if I build the
codec and don't include a devicetree node for it I get the following
lines in dmesg:
rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
So it looks like this ifdef was meant to "fix" a problem that it
doesn't even fix. I'll get rid of it and resubmit. To that end, do you
think these messages above are okay, or should we try to fix them in
the edge case of a user with an rk817 who doesn't use the codec but
still has the codec driver compiled?
Thank you.
>
> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-14 15:50 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-14 15:50 UTC (permalink / raw)
To: Lee Jones
Cc: pierre-louis.bossart, alsa-devel, heiko, devicetree, tiwai,
robh+dt, lgirdwood, linux-rockchip, broonie, Chris Morgan,
jbx6244, maccraft123mc
On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> On Thu, 13 May 2021, Chris Morgan wrote:
>
> > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > On Wed, 05 May 2021, Chris Morgan wrote:
> > >
> > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > >
> > > > Add rk817 codec support cell to rk808 mfd driver.
> > > >
> > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > >
> > > Nit: These should be chronological.
> >
> > Acknowledged. I will make sure to do this if a v10 is necessary.
> >
> > >
> > > > ---
> > > > Changes in v9:
> > > > - Add cover letter.
> > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > robot.
> > > > Changes in v8:
> > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > - Corrected order of elements descriptions in device tree documentation.
> > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > Changes in v7:
> > > > - Removed ifdef around register definitions for MFD.
> > > > - Replaced codec documentation with updates to MFD documentation.
> > > > - Reordered elements in example to comply with upstream rules.
> > > > - Added binding update back for Odroid Go Advance as requested.
> > > > - Submitting patches from gmail now.
> > > > Changes in v6:
> > > > - Included additional project maintainers for correct subsystems.
> > > > - Removed unneeded compatible from DT documentation.
> > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > Changes in v5:
> > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > definitions.
> > > > - Add volatile register for codec bits.
> > > > - Add default values for codec bits.
> > > > - Removed of_compatible from mtd driver (not necessary).
> > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > Changes in v4:
> > > > - Created set_pll() call.
> > > > - Created user visible gain control in mic.
> > > > - Check for return value of clk_prepare_enable().
> > > > - Removed duplicate clk_prepare_enable().
> > > > - Split DT documentation to separate commit.
> > > > Changes in v3:
> > > > - Use DAPM macros to set audio path.
> > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > - Changed documentation to yaml format.
> > > > - Split MFD changes to separate commit.
> > > > Changes in v2:
> > > > - Fixed audio path registers to solve some bugs.
> > > >
> > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > 2 files changed, 166 insertions(+)
> > > >
> > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > index ad923dd4e007..9231209184e0 100644
> > > > --- a/drivers/mfd/rk808.c
> > > > +++ b/drivers/mfd/rk808.c
> > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > switch (reg) {
> > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > case RK817_RTC_STATUS_REG:
> > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > case RK817_INT_STS_REG0:
> > > > case RK817_INT_STS_REG1:
> > > > case RK817_INT_STS_REG2:
> > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > .resources = &rk817_rtc_resources[0],
> > > > },
> > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > + {
> > > > + .name = "rk817-codec",
> > > > + },
> > > > +#endif
> > >
> > > No #ifery please.
> > >
> > > Just replace it with a comment.
> > >
> > > If no associated driver exists, it just won't match/bind.
> >
> > I did the "if" here because I noticed that if I have a rk817 and do not
> > utilize the codec I receive a dmesg warning. I put the if here to silence
> > it in the event that someone was using this PMIC but didn't want to use
> > the audio codec. I will make the change if you say so though, but I just
> > want to confirm that it's acceptable to have a warning for all rk817s
> > that do not use the codec about a missing codec. The hardware is always
> > present, I just can't say for certain it will always be used.
>
> What is the dmesg warning you receive?
It appears I was confused, I will update the code. No warning is
received when I take away the ifdef guard. However, if I build the
codec and don't include a devicetree node for it I get the following
lines in dmesg:
rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
So it looks like this ifdef was meant to "fix" a problem that it
doesn't even fix. I'll get rid of it and resubmit. To that end, do you
think these messages above are okay, or should we try to fix them in
the edge case of a user with an rk817 who doesn't use the codec but
still has the codec driver compiled?
Thank you.
>
> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-14 15:50 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-14 15:50 UTC (permalink / raw)
To: Lee Jones
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
heiko, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> On Thu, 13 May 2021, Chris Morgan wrote:
>
> > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > On Wed, 05 May 2021, Chris Morgan wrote:
> > >
> > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > >
> > > > Add rk817 codec support cell to rk808 mfd driver.
> > > >
> > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > >
> > > Nit: These should be chronological.
> >
> > Acknowledged. I will make sure to do this if a v10 is necessary.
> >
> > >
> > > > ---
> > > > Changes in v9:
> > > > - Add cover letter.
> > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > robot.
> > > > Changes in v8:
> > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > - Corrected order of elements descriptions in device tree documentation.
> > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > Changes in v7:
> > > > - Removed ifdef around register definitions for MFD.
> > > > - Replaced codec documentation with updates to MFD documentation.
> > > > - Reordered elements in example to comply with upstream rules.
> > > > - Added binding update back for Odroid Go Advance as requested.
> > > > - Submitting patches from gmail now.
> > > > Changes in v6:
> > > > - Included additional project maintainers for correct subsystems.
> > > > - Removed unneeded compatible from DT documentation.
> > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > Changes in v5:
> > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > definitions.
> > > > - Add volatile register for codec bits.
> > > > - Add default values for codec bits.
> > > > - Removed of_compatible from mtd driver (not necessary).
> > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > Changes in v4:
> > > > - Created set_pll() call.
> > > > - Created user visible gain control in mic.
> > > > - Check for return value of clk_prepare_enable().
> > > > - Removed duplicate clk_prepare_enable().
> > > > - Split DT documentation to separate commit.
> > > > Changes in v3:
> > > > - Use DAPM macros to set audio path.
> > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > - Changed documentation to yaml format.
> > > > - Split MFD changes to separate commit.
> > > > Changes in v2:
> > > > - Fixed audio path registers to solve some bugs.
> > > >
> > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > 2 files changed, 166 insertions(+)
> > > >
> > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > index ad923dd4e007..9231209184e0 100644
> > > > --- a/drivers/mfd/rk808.c
> > > > +++ b/drivers/mfd/rk808.c
> > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > switch (reg) {
> > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > case RK817_RTC_STATUS_REG:
> > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > case RK817_INT_STS_REG0:
> > > > case RK817_INT_STS_REG1:
> > > > case RK817_INT_STS_REG2:
> > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > .resources = &rk817_rtc_resources[0],
> > > > },
> > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > + {
> > > > + .name = "rk817-codec",
> > > > + },
> > > > +#endif
> > >
> > > No #ifery please.
> > >
> > > Just replace it with a comment.
> > >
> > > If no associated driver exists, it just won't match/bind.
> >
> > I did the "if" here because I noticed that if I have a rk817 and do not
> > utilize the codec I receive a dmesg warning. I put the if here to silence
> > it in the event that someone was using this PMIC but didn't want to use
> > the audio codec. I will make the change if you say so though, but I just
> > want to confirm that it's acceptable to have a warning for all rk817s
> > that do not use the codec about a missing codec. The hardware is always
> > present, I just can't say for certain it will always be used.
>
> What is the dmesg warning you receive?
It appears I was confused, I will update the code. No warning is
received when I take away the ifdef guard. However, if I build the
codec and don't include a devicetree node for it I get the following
lines in dmesg:
rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
So it looks like this ifdef was meant to "fix" a problem that it
doesn't even fix. I'll get rid of it and resubmit. To that end, do you
think these messages above are okay, or should we try to fix them in
the edge case of a user with an rk817 who doesn't use the codec but
still has the codec driver compiled?
Thank you.
>
> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
2021-05-14 15:50 ` Chris Morgan
(?)
@ 2021-05-14 16:36 ` Heiko Stuebner
-1 siblings, 0 replies; 33+ messages in thread
From: Heiko Stuebner @ 2021-05-14 16:36 UTC (permalink / raw)
To: Lee Jones, Chris Morgan
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
Hi Chris,
Am Freitag, 14. Mai 2021, 17:50:08 CEST schrieb Chris Morgan:
> On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> > On Thu, 13 May 2021, Chris Morgan wrote:
> >
> > > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > > On Wed, 05 May 2021, Chris Morgan wrote:
> > > >
> > > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > > >
> > > > > Add rk817 codec support cell to rk808 mfd driver.
> > > > >
> > > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > > >
> > > > Nit: These should be chronological.
> > >
> > > Acknowledged. I will make sure to do this if a v10 is necessary.
> > >
> > > >
> > > > > ---
> > > > > Changes in v9:
> > > > > - Add cover letter.
> > > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > > robot.
> > > > > Changes in v8:
> > > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > > - Corrected order of elements descriptions in device tree documentation.
> > > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > > Changes in v7:
> > > > > - Removed ifdef around register definitions for MFD.
> > > > > - Replaced codec documentation with updates to MFD documentation.
> > > > > - Reordered elements in example to comply with upstream rules.
> > > > > - Added binding update back for Odroid Go Advance as requested.
> > > > > - Submitting patches from gmail now.
> > > > > Changes in v6:
> > > > > - Included additional project maintainers for correct subsystems.
> > > > > - Removed unneeded compatible from DT documentation.
> > > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > > Changes in v5:
> > > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > > definitions.
> > > > > - Add volatile register for codec bits.
> > > > > - Add default values for codec bits.
> > > > > - Removed of_compatible from mtd driver (not necessary).
> > > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > > Changes in v4:
> > > > > - Created set_pll() call.
> > > > > - Created user visible gain control in mic.
> > > > > - Check for return value of clk_prepare_enable().
> > > > > - Removed duplicate clk_prepare_enable().
> > > > > - Split DT documentation to separate commit.
> > > > > Changes in v3:
> > > > > - Use DAPM macros to set audio path.
> > > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > > - Changed documentation to yaml format.
> > > > > - Split MFD changes to separate commit.
> > > > > Changes in v2:
> > > > > - Fixed audio path registers to solve some bugs.
> > > > >
> > > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > > 2 files changed, 166 insertions(+)
> > > > >
> > > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > > index ad923dd4e007..9231209184e0 100644
> > > > > --- a/drivers/mfd/rk808.c
> > > > > +++ b/drivers/mfd/rk808.c
> > > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > > switch (reg) {
> > > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > > case RK817_RTC_STATUS_REG:
> > > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > > case RK817_INT_STS_REG0:
> > > > > case RK817_INT_STS_REG1:
> > > > > case RK817_INT_STS_REG2:
> > > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > > .resources = &rk817_rtc_resources[0],
> > > > > },
> > > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > > + {
> > > > > + .name = "rk817-codec",
> > > > > + },
> > > > > +#endif
> > > >
> > > > No #ifery please.
> > > >
> > > > Just replace it with a comment.
> > > >
> > > > If no associated driver exists, it just won't match/bind.
> > >
> > > I did the "if" here because I noticed that if I have a rk817 and do not
> > > utilize the codec I receive a dmesg warning. I put the if here to silence
> > > it in the event that someone was using this PMIC but didn't want to use
> > > the audio codec. I will make the change if you say so though, but I just
> > > want to confirm that it's acceptable to have a warning for all rk817s
> > > that do not use the codec about a missing codec. The hardware is always
> > > present, I just can't say for certain it will always be used.
> >
> > What is the dmesg warning you receive?
>
> It appears I was confused, I will update the code. No warning is
> received when I take away the ifdef guard. However, if I build the
> codec and don't include a devicetree node for it I get the following
> lines in dmesg:
>
> rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
> rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
>
> So it looks like this ifdef was meant to "fix" a problem that it
> doesn't even fix. I'll get rid of it and resubmit. To that end, do you
> think these messages above are okay, or should we try to fix them in
> the edge case of a user with an rk817 who doesn't use the codec but
> still has the codec driver compiled?
The general case is always having most stuff enabled (as modules)
think distro-kernels. So having the codec available but a board not
using it should not result in error messages confusing the user ;-) .
I don't think the rk817-codec will be the first mfd to stumble upon
this, so I guess just looking through others might provide the
solution on how to resolve this "silently" ;-)
Heiko
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-14 16:36 ` Heiko Stuebner
0 siblings, 0 replies; 33+ messages in thread
From: Heiko Stuebner @ 2021-05-14 16:36 UTC (permalink / raw)
To: Lee Jones, Chris Morgan
Cc: pierre-louis.bossart, alsa-devel, devicetree, tiwai, robh+dt,
lgirdwood, linux-rockchip, broonie, Chris Morgan, jbx6244,
maccraft123mc
Hi Chris,
Am Freitag, 14. Mai 2021, 17:50:08 CEST schrieb Chris Morgan:
> On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> > On Thu, 13 May 2021, Chris Morgan wrote:
> >
> > > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > > On Wed, 05 May 2021, Chris Morgan wrote:
> > > >
> > > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > > >
> > > > > Add rk817 codec support cell to rk808 mfd driver.
> > > > >
> > > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > > >
> > > > Nit: These should be chronological.
> > >
> > > Acknowledged. I will make sure to do this if a v10 is necessary.
> > >
> > > >
> > > > > ---
> > > > > Changes in v9:
> > > > > - Add cover letter.
> > > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > > robot.
> > > > > Changes in v8:
> > > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > > - Corrected order of elements descriptions in device tree documentation.
> > > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > > Changes in v7:
> > > > > - Removed ifdef around register definitions for MFD.
> > > > > - Replaced codec documentation with updates to MFD documentation.
> > > > > - Reordered elements in example to comply with upstream rules.
> > > > > - Added binding update back for Odroid Go Advance as requested.
> > > > > - Submitting patches from gmail now.
> > > > > Changes in v6:
> > > > > - Included additional project maintainers for correct subsystems.
> > > > > - Removed unneeded compatible from DT documentation.
> > > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > > Changes in v5:
> > > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > > definitions.
> > > > > - Add volatile register for codec bits.
> > > > > - Add default values for codec bits.
> > > > > - Removed of_compatible from mtd driver (not necessary).
> > > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > > Changes in v4:
> > > > > - Created set_pll() call.
> > > > > - Created user visible gain control in mic.
> > > > > - Check for return value of clk_prepare_enable().
> > > > > - Removed duplicate clk_prepare_enable().
> > > > > - Split DT documentation to separate commit.
> > > > > Changes in v3:
> > > > > - Use DAPM macros to set audio path.
> > > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > > - Changed documentation to yaml format.
> > > > > - Split MFD changes to separate commit.
> > > > > Changes in v2:
> > > > > - Fixed audio path registers to solve some bugs.
> > > > >
> > > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > > 2 files changed, 166 insertions(+)
> > > > >
> > > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > > index ad923dd4e007..9231209184e0 100644
> > > > > --- a/drivers/mfd/rk808.c
> > > > > +++ b/drivers/mfd/rk808.c
> > > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > > switch (reg) {
> > > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > > case RK817_RTC_STATUS_REG:
> > > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > > case RK817_INT_STS_REG0:
> > > > > case RK817_INT_STS_REG1:
> > > > > case RK817_INT_STS_REG2:
> > > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > > .resources = &rk817_rtc_resources[0],
> > > > > },
> > > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > > + {
> > > > > + .name = "rk817-codec",
> > > > > + },
> > > > > +#endif
> > > >
> > > > No #ifery please.
> > > >
> > > > Just replace it with a comment.
> > > >
> > > > If no associated driver exists, it just won't match/bind.
> > >
> > > I did the "if" here because I noticed that if I have a rk817 and do not
> > > utilize the codec I receive a dmesg warning. I put the if here to silence
> > > it in the event that someone was using this PMIC but didn't want to use
> > > the audio codec. I will make the change if you say so though, but I just
> > > want to confirm that it's acceptable to have a warning for all rk817s
> > > that do not use the codec about a missing codec. The hardware is always
> > > present, I just can't say for certain it will always be used.
> >
> > What is the dmesg warning you receive?
>
> It appears I was confused, I will update the code. No warning is
> received when I take away the ifdef guard. However, if I build the
> codec and don't include a devicetree node for it I get the following
> lines in dmesg:
>
> rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
> rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
>
> So it looks like this ifdef was meant to "fix" a problem that it
> doesn't even fix. I'll get rid of it and resubmit. To that end, do you
> think these messages above are okay, or should we try to fix them in
> the edge case of a user with an rk817 who doesn't use the codec but
> still has the codec driver compiled?
The general case is always having most stuff enabled (as modules)
think distro-kernels. So having the codec available but a board not
using it should not result in error messages confusing the user ;-) .
I don't think the rk817-codec will be the first mfd to stumble upon
this, so I guess just looking through others might provide the
solution on how to resolve this "silently" ;-)
Heiko
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-14 16:36 ` Heiko Stuebner
0 siblings, 0 replies; 33+ messages in thread
From: Heiko Stuebner @ 2021-05-14 16:36 UTC (permalink / raw)
To: Lee Jones, Chris Morgan
Cc: alsa-devel, broonie, lgirdwood, pierre-louis.bossart, tiwai,
robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
Hi Chris,
Am Freitag, 14. Mai 2021, 17:50:08 CEST schrieb Chris Morgan:
> On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> > On Thu, 13 May 2021, Chris Morgan wrote:
> >
> > > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > > On Wed, 05 May 2021, Chris Morgan wrote:
> > > >
> > > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > > >
> > > > > Add rk817 codec support cell to rk808 mfd driver.
> > > > >
> > > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > > >
> > > > Nit: These should be chronological.
> > >
> > > Acknowledged. I will make sure to do this if a v10 is necessary.
> > >
> > > >
> > > > > ---
> > > > > Changes in v9:
> > > > > - Add cover letter.
> > > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > > robot.
> > > > > Changes in v8:
> > > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > > - Corrected order of elements descriptions in device tree documentation.
> > > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > > Changes in v7:
> > > > > - Removed ifdef around register definitions for MFD.
> > > > > - Replaced codec documentation with updates to MFD documentation.
> > > > > - Reordered elements in example to comply with upstream rules.
> > > > > - Added binding update back for Odroid Go Advance as requested.
> > > > > - Submitting patches from gmail now.
> > > > > Changes in v6:
> > > > > - Included additional project maintainers for correct subsystems.
> > > > > - Removed unneeded compatible from DT documentation.
> > > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > > Changes in v5:
> > > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > > definitions.
> > > > > - Add volatile register for codec bits.
> > > > > - Add default values for codec bits.
> > > > > - Removed of_compatible from mtd driver (not necessary).
> > > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > > Changes in v4:
> > > > > - Created set_pll() call.
> > > > > - Created user visible gain control in mic.
> > > > > - Check for return value of clk_prepare_enable().
> > > > > - Removed duplicate clk_prepare_enable().
> > > > > - Split DT documentation to separate commit.
> > > > > Changes in v3:
> > > > > - Use DAPM macros to set audio path.
> > > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > > - Changed documentation to yaml format.
> > > > > - Split MFD changes to separate commit.
> > > > > Changes in v2:
> > > > > - Fixed audio path registers to solve some bugs.
> > > > >
> > > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > > 2 files changed, 166 insertions(+)
> > > > >
> > > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > > index ad923dd4e007..9231209184e0 100644
> > > > > --- a/drivers/mfd/rk808.c
> > > > > +++ b/drivers/mfd/rk808.c
> > > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > > switch (reg) {
> > > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > > case RK817_RTC_STATUS_REG:
> > > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > > case RK817_INT_STS_REG0:
> > > > > case RK817_INT_STS_REG1:
> > > > > case RK817_INT_STS_REG2:
> > > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > > .resources = &rk817_rtc_resources[0],
> > > > > },
> > > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > > + {
> > > > > + .name = "rk817-codec",
> > > > > + },
> > > > > +#endif
> > > >
> > > > No #ifery please.
> > > >
> > > > Just replace it with a comment.
> > > >
> > > > If no associated driver exists, it just won't match/bind.
> > >
> > > I did the "if" here because I noticed that if I have a rk817 and do not
> > > utilize the codec I receive a dmesg warning. I put the if here to silence
> > > it in the event that someone was using this PMIC but didn't want to use
> > > the audio codec. I will make the change if you say so though, but I just
> > > want to confirm that it's acceptable to have a warning for all rk817s
> > > that do not use the codec about a missing codec. The hardware is always
> > > present, I just can't say for certain it will always be used.
> >
> > What is the dmesg warning you receive?
>
> It appears I was confused, I will update the code. No warning is
> received when I take away the ifdef guard. However, if I build the
> codec and don't include a devicetree node for it I get the following
> lines in dmesg:
>
> rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
> rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
>
> So it looks like this ifdef was meant to "fix" a problem that it
> doesn't even fix. I'll get rid of it and resubmit. To that end, do you
> think these messages above are okay, or should we try to fix them in
> the edge case of a user with an rk817 who doesn't use the codec but
> still has the codec driver compiled?
The general case is always having most stuff enabled (as modules)
think distro-kernels. So having the codec available but a board not
using it should not result in error messages confusing the user ;-) .
I don't think the rk817-codec will be the first mfd to stumble upon
this, so I guess just looking through others might provide the
solution on how to resolve this "silently" ;-)
Heiko
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
2021-05-14 16:36 ` Heiko Stuebner
(?)
@ 2021-05-14 16:59 ` Chris Morgan
-1 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-14 16:59 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Lee Jones, alsa-devel, broonie, lgirdwood, pierre-louis.bossart,
tiwai, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Fri, May 14, 2021 at 06:36:47PM +0200, Heiko Stuebner wrote:
> Hi Chris,
>
> Am Freitag, 14. Mai 2021, 17:50:08 CEST schrieb Chris Morgan:
> > On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> > > On Thu, 13 May 2021, Chris Morgan wrote:
> > >
> > > > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > > > On Wed, 05 May 2021, Chris Morgan wrote:
> > > > >
> > > > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > > > >
> > > > > > Add rk817 codec support cell to rk808 mfd driver.
> > > > > >
> > > > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > > > >
> > > > > Nit: These should be chronological.
> > > >
> > > > Acknowledged. I will make sure to do this if a v10 is necessary.
> > > >
> > > > >
> > > > > > ---
> > > > > > Changes in v9:
> > > > > > - Add cover letter.
> > > > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > > > robot.
> > > > > > Changes in v8:
> > > > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > > > - Corrected order of elements descriptions in device tree documentation.
> > > > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > > > Changes in v7:
> > > > > > - Removed ifdef around register definitions for MFD.
> > > > > > - Replaced codec documentation with updates to MFD documentation.
> > > > > > - Reordered elements in example to comply with upstream rules.
> > > > > > - Added binding update back for Odroid Go Advance as requested.
> > > > > > - Submitting patches from gmail now.
> > > > > > Changes in v6:
> > > > > > - Included additional project maintainers for correct subsystems.
> > > > > > - Removed unneeded compatible from DT documentation.
> > > > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > > > Changes in v5:
> > > > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > > > definitions.
> > > > > > - Add volatile register for codec bits.
> > > > > > - Add default values for codec bits.
> > > > > > - Removed of_compatible from mtd driver (not necessary).
> > > > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > > > Changes in v4:
> > > > > > - Created set_pll() call.
> > > > > > - Created user visible gain control in mic.
> > > > > > - Check for return value of clk_prepare_enable().
> > > > > > - Removed duplicate clk_prepare_enable().
> > > > > > - Split DT documentation to separate commit.
> > > > > > Changes in v3:
> > > > > > - Use DAPM macros to set audio path.
> > > > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > > > - Changed documentation to yaml format.
> > > > > > - Split MFD changes to separate commit.
> > > > > > Changes in v2:
> > > > > > - Fixed audio path registers to solve some bugs.
> > > > > >
> > > > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > > > 2 files changed, 166 insertions(+)
> > > > > >
> > > > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > > > index ad923dd4e007..9231209184e0 100644
> > > > > > --- a/drivers/mfd/rk808.c
> > > > > > +++ b/drivers/mfd/rk808.c
> > > > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > > > switch (reg) {
> > > > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > > > case RK817_RTC_STATUS_REG:
> > > > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > > > case RK817_INT_STS_REG0:
> > > > > > case RK817_INT_STS_REG1:
> > > > > > case RK817_INT_STS_REG2:
> > > > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > > > .resources = &rk817_rtc_resources[0],
> > > > > > },
> > > > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > > > + {
> > > > > > + .name = "rk817-codec",
> > > > > > + },
> > > > > > +#endif
> > > > >
> > > > > No #ifery please.
> > > > >
> > > > > Just replace it with a comment.
> > > > >
> > > > > If no associated driver exists, it just won't match/bind.
> > > >
> > > > I did the "if" here because I noticed that if I have a rk817 and do not
> > > > utilize the codec I receive a dmesg warning. I put the if here to silence
> > > > it in the event that someone was using this PMIC but didn't want to use
> > > > the audio codec. I will make the change if you say so though, but I just
> > > > want to confirm that it's acceptable to have a warning for all rk817s
> > > > that do not use the codec about a missing codec. The hardware is always
> > > > present, I just can't say for certain it will always be used.
> > >
> > > What is the dmesg warning you receive?
> >
> > It appears I was confused, I will update the code. No warning is
> > received when I take away the ifdef guard. However, if I build the
> > codec and don't include a devicetree node for it I get the following
> > lines in dmesg:
> >
> > rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
> > rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
> >
> > So it looks like this ifdef was meant to "fix" a problem that it
> > doesn't even fix. I'll get rid of it and resubmit. To that end, do you
> > think these messages above are okay, or should we try to fix them in
> > the edge case of a user with an rk817 who doesn't use the codec but
> > still has the codec driver compiled?
>
> The general case is always having most stuff enabled (as modules)
> think distro-kernels. So having the codec available but a board not
> using it should not result in error messages confusing the user ;-) .
>
> I don't think the rk817-codec will be the first mfd to stumble upon
> this, so I guess just looking through others might provide the
> solution on how to resolve this "silently" ;-)
>
>
> Heiko
>
>
>
>
>
I'm just going to change the message to a dev_dbg, since it's coming
from the codec driver anyway. That way if you purposefully aren't using
the codec the messages shouldn't appear in the dmesg log, however if
you're troubleshooting a problem that exists because of a missing or
invalid entry and enable debug messages you'll see this error. Again, I
expect this to be an edge case where a user has an rk817 but
purposefully doesn't want to use the codec hardware that's on 100% of
all rk817s.
Thank you.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-14 16:59 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-14 16:59 UTC (permalink / raw)
To: Heiko Stuebner
Cc: pierre-louis.bossart, alsa-devel, devicetree, tiwai, robh+dt,
lgirdwood, linux-rockchip, broonie, Chris Morgan, jbx6244,
Lee Jones, maccraft123mc
On Fri, May 14, 2021 at 06:36:47PM +0200, Heiko Stuebner wrote:
> Hi Chris,
>
> Am Freitag, 14. Mai 2021, 17:50:08 CEST schrieb Chris Morgan:
> > On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> > > On Thu, 13 May 2021, Chris Morgan wrote:
> > >
> > > > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > > > On Wed, 05 May 2021, Chris Morgan wrote:
> > > > >
> > > > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > > > >
> > > > > > Add rk817 codec support cell to rk808 mfd driver.
> > > > > >
> > > > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > > > >
> > > > > Nit: These should be chronological.
> > > >
> > > > Acknowledged. I will make sure to do this if a v10 is necessary.
> > > >
> > > > >
> > > > > > ---
> > > > > > Changes in v9:
> > > > > > - Add cover letter.
> > > > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > > > robot.
> > > > > > Changes in v8:
> > > > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > > > - Corrected order of elements descriptions in device tree documentation.
> > > > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > > > Changes in v7:
> > > > > > - Removed ifdef around register definitions for MFD.
> > > > > > - Replaced codec documentation with updates to MFD documentation.
> > > > > > - Reordered elements in example to comply with upstream rules.
> > > > > > - Added binding update back for Odroid Go Advance as requested.
> > > > > > - Submitting patches from gmail now.
> > > > > > Changes in v6:
> > > > > > - Included additional project maintainers for correct subsystems.
> > > > > > - Removed unneeded compatible from DT documentation.
> > > > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > > > Changes in v5:
> > > > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > > > definitions.
> > > > > > - Add volatile register for codec bits.
> > > > > > - Add default values for codec bits.
> > > > > > - Removed of_compatible from mtd driver (not necessary).
> > > > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > > > Changes in v4:
> > > > > > - Created set_pll() call.
> > > > > > - Created user visible gain control in mic.
> > > > > > - Check for return value of clk_prepare_enable().
> > > > > > - Removed duplicate clk_prepare_enable().
> > > > > > - Split DT documentation to separate commit.
> > > > > > Changes in v3:
> > > > > > - Use DAPM macros to set audio path.
> > > > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > > > - Changed documentation to yaml format.
> > > > > > - Split MFD changes to separate commit.
> > > > > > Changes in v2:
> > > > > > - Fixed audio path registers to solve some bugs.
> > > > > >
> > > > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > > > 2 files changed, 166 insertions(+)
> > > > > >
> > > > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > > > index ad923dd4e007..9231209184e0 100644
> > > > > > --- a/drivers/mfd/rk808.c
> > > > > > +++ b/drivers/mfd/rk808.c
> > > > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > > > switch (reg) {
> > > > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > > > case RK817_RTC_STATUS_REG:
> > > > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > > > case RK817_INT_STS_REG0:
> > > > > > case RK817_INT_STS_REG1:
> > > > > > case RK817_INT_STS_REG2:
> > > > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > > > .resources = &rk817_rtc_resources[0],
> > > > > > },
> > > > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > > > + {
> > > > > > + .name = "rk817-codec",
> > > > > > + },
> > > > > > +#endif
> > > > >
> > > > > No #ifery please.
> > > > >
> > > > > Just replace it with a comment.
> > > > >
> > > > > If no associated driver exists, it just won't match/bind.
> > > >
> > > > I did the "if" here because I noticed that if I have a rk817 and do not
> > > > utilize the codec I receive a dmesg warning. I put the if here to silence
> > > > it in the event that someone was using this PMIC but didn't want to use
> > > > the audio codec. I will make the change if you say so though, but I just
> > > > want to confirm that it's acceptable to have a warning for all rk817s
> > > > that do not use the codec about a missing codec. The hardware is always
> > > > present, I just can't say for certain it will always be used.
> > >
> > > What is the dmesg warning you receive?
> >
> > It appears I was confused, I will update the code. No warning is
> > received when I take away the ifdef guard. However, if I build the
> > codec and don't include a devicetree node for it I get the following
> > lines in dmesg:
> >
> > rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
> > rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
> >
> > So it looks like this ifdef was meant to "fix" a problem that it
> > doesn't even fix. I'll get rid of it and resubmit. To that end, do you
> > think these messages above are okay, or should we try to fix them in
> > the edge case of a user with an rk817 who doesn't use the codec but
> > still has the codec driver compiled?
>
> The general case is always having most stuff enabled (as modules)
> think distro-kernels. So having the codec available but a board not
> using it should not result in error messages confusing the user ;-) .
>
> I don't think the rk817-codec will be the first mfd to stumble upon
> this, so I guess just looking through others might provide the
> solution on how to resolve this "silently" ;-)
>
>
> Heiko
>
>
>
>
>
I'm just going to change the message to a dev_dbg, since it's coming
from the codec driver anyway. That way if you purposefully aren't using
the codec the messages shouldn't appear in the dmesg log, however if
you're troubleshooting a problem that exists because of a missing or
invalid entry and enable debug messages you'll see this error. Again, I
expect this to be an edge case where a user has an rk817 but
purposefully doesn't want to use the codec hardware that's on 100% of
all rk817s.
Thank you.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support
@ 2021-05-14 16:59 ` Chris Morgan
0 siblings, 0 replies; 33+ messages in thread
From: Chris Morgan @ 2021-05-14 16:59 UTC (permalink / raw)
To: Heiko Stuebner
Cc: Lee Jones, alsa-devel, broonie, lgirdwood, pierre-louis.bossart,
tiwai, robh+dt, perex, jbx6244, devicetree, linux-rockchip,
maccraft123mc, Chris Morgan
On Fri, May 14, 2021 at 06:36:47PM +0200, Heiko Stuebner wrote:
> Hi Chris,
>
> Am Freitag, 14. Mai 2021, 17:50:08 CEST schrieb Chris Morgan:
> > On Thu, May 13, 2021 at 09:11:14PM +0100, Lee Jones wrote:
> > > On Thu, 13 May 2021, Chris Morgan wrote:
> > >
> > > > On Mon, May 10, 2021 at 05:23:29PM +0100, Lee Jones wrote:
> > > > > On Wed, 05 May 2021, Chris Morgan wrote:
> > > > >
> > > > > > From: Chris Morgan <macromorgan@hotmail.com>
> > > > > >
> > > > > > Add rk817 codec support cell to rk808 mfd driver.
> > > > > >
> > > > > > Tested-by: Maciej Matuszczyk <maccraft123mc@gmail.com>
> > > > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com>
> > > > >
> > > > > Nit: These should be chronological.
> > > >
> > > > Acknowledged. I will make sure to do this if a v10 is necessary.
> > > >
> > > > >
> > > > > > ---
> > > > > > Changes in v9:
> > > > > > - Add cover letter.
> > > > > > - Remove documentation for interrupt parent per Rob Herring's request.
> > > > > > - Remove unused MODULE_DEVICE_TABLE to fix a bug identified by kernel test
> > > > > > robot.
> > > > > > Changes in v8:
> > > > > > - Added additional documentation for missing properties of #sound-dai-cells,
> > > > > > interrupt-parent, and wakeup-source for mfd documentation.
> > > > > > - Corrected order of elements descriptions in device tree documentation.
> > > > > > - Changed name of "mic-in-differential" to "rockchip,mic-in-differential".
> > > > > > - Changed name of sound card from "rockchip,rk817-codec" to "Analog".
> > > > > > - Removed unused resets and reset-names from the i2s1_2ch node.
> > > > > > Changes in v7:
> > > > > > - Removed ifdef around register definitions for MFD.
> > > > > > - Replaced codec documentation with updates to MFD documentation.
> > > > > > - Reordered elements in example to comply with upstream rules.
> > > > > > - Added binding update back for Odroid Go Advance as requested.
> > > > > > - Submitting patches from gmail now.
> > > > > > Changes in v6:
> > > > > > - Included additional project maintainers for correct subsystems.
> > > > > > - Removed unneeded compatible from DT documentation.
> > > > > > - Removed binding update for Odroid Go Advance (will do in seperate series).
> > > > > > Changes in v5:
> > > > > > - Move register definitions from rk817_codec.h to main rk808.h register
> > > > > > definitions.
> > > > > > - Add volatile register for codec bits.
> > > > > > - Add default values for codec bits.
> > > > > > - Removed of_compatible from mtd driver (not necessary).
> > > > > > - Switched to using parent regmap instead of private regmap for codec.
> > > > > > Changes in v4:
> > > > > > - Created set_pll() call.
> > > > > > - Created user visible gain control in mic.
> > > > > > - Check for return value of clk_prepare_enable().
> > > > > > - Removed duplicate clk_prepare_enable().
> > > > > > - Split DT documentation to separate commit.
> > > > > > Changes in v3:
> > > > > > - Use DAPM macros to set audio path.
> > > > > > - Updated devicetree binding (as every rk817 has this codec chip).
> > > > > > - Changed documentation to yaml format.
> > > > > > - Split MFD changes to separate commit.
> > > > > > Changes in v2:
> > > > > > - Fixed audio path registers to solve some bugs.
> > > > > >
> > > > > > drivers/mfd/rk808.c | 85 +++++++++++++++++++++++++++++++++++++++
> > > > > > include/linux/mfd/rk808.h | 81 +++++++++++++++++++++++++++++++++++++
> > > > > > 2 files changed, 166 insertions(+)
> > > > > >
> > > > > > diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
> > > > > > index ad923dd4e007..9231209184e0 100644
> > > > > > --- a/drivers/mfd/rk808.c
> > > > > > +++ b/drivers/mfd/rk808.c
> > > > > > @@ -65,6 +65,7 @@ static bool rk817_is_volatile_reg(struct device *dev, unsigned int reg)
> > > > > > switch (reg) {
> > > > > > case RK817_SECONDS_REG ... RK817_WEEKS_REG:
> > > > > > case RK817_RTC_STATUS_REG:
> > > > > > + case RK817_CODEC_DTOP_LPT_SRST:
> > > > > > case RK817_INT_STS_REG0:
> > > > > > case RK817_INT_STS_REG1:
> > > > > > case RK817_INT_STS_REG2:
> > > > > > @@ -163,6 +164,11 @@ static const struct mfd_cell rk817s[] = {
> > > > > > .num_resources = ARRAY_SIZE(rk817_rtc_resources),
> > > > > > .resources = &rk817_rtc_resources[0],
> > > > > > },
> > > > > > +#ifdef CONFIG_SND_SOC_RK817
> > > > > > + {
> > > > > > + .name = "rk817-codec",
> > > > > > + },
> > > > > > +#endif
> > > > >
> > > > > No #ifery please.
> > > > >
> > > > > Just replace it with a comment.
> > > > >
> > > > > If no associated driver exists, it just won't match/bind.
> > > >
> > > > I did the "if" here because I noticed that if I have a rk817 and do not
> > > > utilize the codec I receive a dmesg warning. I put the if here to silence
> > > > it in the event that someone was using this PMIC but didn't want to use
> > > > the audio codec. I will make the change if you say so though, but I just
> > > > want to confirm that it's acceptable to have a warning for all rk817s
> > > > that do not use the codec about a missing codec. The hardware is always
> > > > present, I just can't say for certain it will always be used.
> > >
> > > What is the dmesg warning you receive?
> >
> > It appears I was confused, I will update the code. No warning is
> > received when I take away the ifdef guard. However, if I build the
> > codec and don't include a devicetree node for it I get the following
> > lines in dmesg:
> >
> > rk817-codec rk817-codec: rk817_codec_parse_dt_property() Can not get child: codec
> > rk817-codec rk817-codec: rk817_platform_probe() parse device tree property error -19
> >
> > So it looks like this ifdef was meant to "fix" a problem that it
> > doesn't even fix. I'll get rid of it and resubmit. To that end, do you
> > think these messages above are okay, or should we try to fix them in
> > the edge case of a user with an rk817 who doesn't use the codec but
> > still has the codec driver compiled?
>
> The general case is always having most stuff enabled (as modules)
> think distro-kernels. So having the codec available but a board not
> using it should not result in error messages confusing the user ;-) .
>
> I don't think the rk817-codec will be the first mfd to stumble upon
> this, so I guess just looking through others might provide the
> solution on how to resolve this "silently" ;-)
>
>
> Heiko
>
>
>
>
>
I'm just going to change the message to a dev_dbg, since it's coming
from the codec driver anyway. That way if you purposefully aren't using
the codec the messages shouldn't appear in the dmesg log, however if
you're troubleshooting a problem that exists because of a missing or
invalid entry and enable debug messages you'll see this error. Again, I
expect this to be an edge case where a user has an rk817 but
purposefully doesn't want to use the codec hardware that's on 100% of
all rk817s.
Thank you.
_______________________________________________
Linux-rockchip mailing list
Linux-rockchip@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-rockchip
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2021-05-14 17:00 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-05 14:08 [PATCH v9 0/4] ASoC: codecs: add rk817 support Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-05 14:08 ` [PATCH v9 1/4] mfd: Add Rockchip rk817 audio CODEC support Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-10 16:23 ` Lee Jones
2021-05-10 16:23 ` Lee Jones
2021-05-10 16:23 ` Lee Jones
2021-05-13 15:01 ` Chris Morgan
2021-05-13 15:01 ` Chris Morgan
2021-05-13 15:01 ` Chris Morgan
2021-05-13 20:11 ` Lee Jones
2021-05-13 20:11 ` Lee Jones
2021-05-13 20:11 ` Lee Jones
2021-05-14 15:50 ` Chris Morgan
2021-05-14 15:50 ` Chris Morgan
2021-05-14 15:50 ` Chris Morgan
2021-05-14 16:36 ` Heiko Stuebner
2021-05-14 16:36 ` Heiko Stuebner
2021-05-14 16:36 ` Heiko Stuebner
2021-05-14 16:59 ` Chris Morgan
2021-05-14 16:59 ` Chris Morgan
2021-05-14 16:59 ` Chris Morgan
2021-05-05 14:08 ` [PATCH 2/4] ASoC: " Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-05 14:08 ` [PATCH 3/4] dt-bindings: " Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-05 14:08 ` [PATCH 4/4] arm64: dts: rockchip: add rk817 codec to Odroid Go Chris Morgan
2021-05-05 14:08 ` Chris Morgan
2021-05-05 14:08 ` Chris Morgan
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.