diff options
| author | Wilson Sung <wilsonsung@google.com> | 2020-10-21 17:05:32 +0800 |
|---|---|---|
| committer | Wilson Sung <wilsonsung@google.com> | 2020-10-21 17:05:32 +0800 |
| commit | 935f0b18ffed97fed2aa4de0a1ccb3152ad7c317 (patch) | |
| tree | ec3650b5652a5a5ad608b9a00d8158bc06771667 /asoc/codecs/bolero/wsa-macro.c | |
| parent | 9051f7270f73ab35f8fc5a2e8e90b13543ad7310 (diff) | |
| parent | 5bb43ef0946102997f21a4e86a2bc3bd4f639801 (diff) | |
| download | msm-extra-935f0b18ffed97fed2aa4de0a1ccb3152ad7c317.tar.gz | |
Merge branch 'LA.UM.9.12.R2.10.00.00.685.039' into qcom-msm-4.19-7250-audio-drivers.lnx.4.0.r3
Change-Id: I86a23ae364372a1324005ae87222a01eb27ebf29
Diffstat (limited to 'asoc/codecs/bolero/wsa-macro.c')
| -rw-r--r-- | asoc/codecs/bolero/wsa-macro.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/asoc/codecs/bolero/wsa-macro.c b/asoc/codecs/bolero/wsa-macro.c index fd8a3a84..ca7391d0 100644 --- a/asoc/codecs/bolero/wsa-macro.c +++ b/asoc/codecs/bolero/wsa-macro.c @@ -166,7 +166,6 @@ struct wsa_macro_swr_ctrl_platform_data { void *data), void *swrm_handle, int action); - int (*pinctrl_setup)(void *handle, bool enable); }; struct wsa_macro_bcl_pmic_params { @@ -3145,6 +3144,12 @@ static int wsa_macro_probe(struct platform_device *pdev) u32 is_used_wsa_swr_gpio = 1; const char *is_used_wsa_swr_gpio_dt = "qcom,is-used-swr-gpio"; + if (!bolero_is_va_macro_registered(&pdev->dev)) { + dev_err(&pdev->dev, + "%s: va-macro not registered yet, defer\n", __func__); + return -EPROBE_DEFER; + } + wsa_priv = devm_kzalloc(&pdev->dev, sizeof(struct wsa_macro_priv), GFP_KERNEL); if (!wsa_priv) @@ -3200,7 +3205,6 @@ static int wsa_macro_probe(struct platform_device *pdev) wsa_priv->swr_plat_data.clk = wsa_swrm_clock; wsa_priv->swr_plat_data.core_vote = wsa_macro_core_vote; wsa_priv->swr_plat_data.handle_irq = NULL; - wsa_priv->swr_plat_data.pinctrl_setup = NULL; ret = of_property_read_u32(pdev->dev.of_node, "qcom,default-clk-id", &default_clk_id); @@ -3229,6 +3233,7 @@ static int wsa_macro_probe(struct platform_device *pdev) wsa_macro_init_ops(&ops, wsa_io_base); ops.clk_id_req = wsa_priv->default_clk_id; ops.default_clk_id = wsa_priv->default_clk_id; + ret = bolero_register_macro(&pdev->dev, WSA_MACRO, &ops); if (ret < 0) { dev_err(&pdev->dev, "%s: register macro failed\n", __func__); |