diff --git a/Documentation/devicetree/bindings/sound/rockchip,pdm.txt b/Documentation/devicetree/bindings/sound/rockchip,pdm.txt index 688b6c7c5453..4f6da7edf3b2 100644 --- a/Documentation/devicetree/bindings/sound/rockchip,pdm.txt +++ b/Documentation/devicetree/bindings/sound/rockchip,pdm.txt @@ -2,10 +2,11 @@ Required properties: -- compatible: "rockchip,pdm" +- compatible: - "rockchip,px30-pdm" - "rockchip,rk1808-pdm" - "rockchip,rk3308-pdm" + - "rockchip,rk3328-pdm" - "rockchip,rk3568-pdm" - "rockchip,rv1126-pdm" - reg: physical base address of the controller and length of memory mapped diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi index d059409263f8..35eacbec074d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -286,7 +286,7 @@ }; pdm: pdm@ff040000 { - compatible = "rockchip,pdm"; + compatible = "rockchip,rk3328-pdm"; reg = <0x0 0xff040000 0x0 0x1000>; clocks = <&cru SCLK_PDM>, <&cru HCLK_PDM>; clock-names = "pdm_clk", "pdm_hclk"; diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index a54c8caca291..4b69ee9ac0bc 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c @@ -36,8 +36,8 @@ #define CLK_PPM_MAX (1000) enum rk_pdm_version { - RK_PDM_RK3229, RK_PDM_RK3308, + RK_PDM_RK3328, RK_PDM_RV1126, }; @@ -359,7 +359,7 @@ static int rockchip_pdm_hw_params(struct snd_pcm_substream *substream, regmap_update_bits(pdm->regmap, PDM_HPF_CTRL, PDM_HPF_LE | PDM_HPF_RE, PDM_HPF_LE | PDM_HPF_RE); regmap_update_bits(pdm->regmap, PDM_CLK_CTRL, PDM_CLK_EN, PDM_CLK_EN); - if (pdm->version != RK_PDM_RK3229) + if (pdm->version != RK_PDM_RK3328) regmap_update_bits(pdm->regmap, PDM_CTRL0, PDM_MODE_MSK, PDM_MODE_LJ); @@ -668,14 +668,14 @@ static const struct regmap_config rockchip_pdm_regmap_config = { }; static const struct of_device_id rockchip_pdm_match[] = { - { .compatible = "rockchip,pdm", - .data = (void *)RK_PDM_RK3229 }, { .compatible = "rockchip,px30-pdm", .data = (void *)RK_PDM_RK3308 }, { .compatible = "rockchip,rk1808-pdm", .data = (void *)RK_PDM_RK3308 }, { .compatible = "rockchip,rk3308-pdm", .data = (void *)RK_PDM_RK3308 }, + { .compatible = "rockchip,rk3328-pdm", + .data = (void *)RK_PDM_RK3328 }, { .compatible = "rockchip,rk3568-pdm", .data = (void *)RK_PDM_RV1126 }, { .compatible = "rockchip,rv1126-pdm",