diff --git a/drivers/mmc/host/meson-mx-sdhc-clkc.c b/drivers/mmc/host/meson-mx-sdhc-clkc.c
index a36483d859f8..d2e36517e0f6 100644
--- a/drivers/mmc/host/meson-mx-sdhc-clkc.c
+++ b/drivers/mmc/host/meson-mx-sdhc-clkc.c
@@ -7,6 +7,7 @@
 
 #include <dt-bindings/clock/meson-mx-sdhc-clkc.h>
 
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
@@ -22,7 +23,6 @@ struct meson_mx_sdhc_clkc {
 	struct clk_gate			tx_clk_en;
 	struct clk_gate			rx_clk_en;
 	struct clk_gate			sd_clk_en;
-	struct clk_hw_onecell_data	hw_onecell_data;
 };
 
 static const struct clk_parent_data meson_mx_sdhc_src_sel_parents[4] = {
@@ -83,17 +83,14 @@ static int meson_mx_sdhc_gate_clk_hw_register(struct device *dev,
 					     &clk_gate_ops, hw);
 }
 
-int meson_mx_sdhc_register_clkc(struct device *dev, void __iomem *base)
+int meson_mx_sdhc_register_clkc(struct device *dev, void __iomem *base,
+				struct clk_bulk_data *clk_bulk_data)
 {
 	struct clk_parent_data div_parent = { 0 };
-	struct clk_hw_onecell_data *onecell_data;
 	struct meson_mx_sdhc_clkc *clkc_data;
 	int ret;
 
-	clkc_data = devm_kzalloc(dev, struct_size(clkc_data,
-						  hw_onecell_data.hws,
-						  MESON_SDHC_NUM_BUILTIN_CLKS),
-				 GFP_KERNEL);
+	clkc_data = devm_kzalloc(dev, sizeof(*clkc_data), GFP_KERNEL);
 	if (!clkc_data)
 		return -ENOMEM;
 
@@ -150,16 +147,14 @@ int meson_mx_sdhc_register_clkc(struct device *dev, void __iomem *base)
 	if (ret)
 		return ret;
 
-	onecell_data = &clkc_data->hw_onecell_data;
-	onecell_data->hws[SDHC_CLKID_SRC_SEL] = &clkc_data->src_sel.hw;
-	onecell_data->hws[SDHC_CLKID_DIV] = &clkc_data->div.hw;
-	onecell_data->hws[SDHC_CLKID_MOD_CLK] = &clkc_data->mod_clk_en.hw;
-	onecell_data->hws[SDHC_CLKID_SD_CLK] = &clkc_data->sd_clk_en.hw;
-	onecell_data->hws[SDHC_CLKID_TX_CLK] = &clkc_data->tx_clk_en.hw;
-	onecell_data->hws[SDHC_CLKID_RX_CLK] = &clkc_data->rx_clk_en.hw;
+	/*
+	 * TODO: Replace clk_hw.clk with devm_clk_hw_get_clk() once that is
+	 * available.
+	 */
+	clk_bulk_data[0].clk = clkc_data->mod_clk_en.hw.clk;
+	clk_bulk_data[1].clk = clkc_data->sd_clk_en.hw.clk;
+	clk_bulk_data[2].clk = clkc_data->tx_clk_en.hw.clk;
+	clk_bulk_data[3].clk = clkc_data->rx_clk_en.hw.clk;
 
-	onecell_data->num = MESON_SDHC_NUM_BUILTIN_CLKS;
-
-	return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,
-					   onecell_data);
+	return 0;
 }
diff --git a/drivers/mmc/host/meson-mx-sdhc.c b/drivers/mmc/host/meson-mx-sdhc.c
index 3c54d5f91fbc..322570570c98 100644
--- a/drivers/mmc/host/meson-mx-sdhc.c
+++ b/drivers/mmc/host/meson-mx-sdhc.c
@@ -803,16 +803,7 @@ static int meson_mx_sdhc_probe(struct platform_device *pdev)
 
 	meson_mx_sdhc_init_hw(mmc);
 
-	ret = meson_mx_sdhc_register_clkc(dev, base);
-	if (ret)
-		goto err_disable_pclk;
-
-	host->bulk_clks[0].id = "mod_clk";
-	host->bulk_clks[1].id = "sd_clk";
-	host->bulk_clks[2].id = "tx_clk";
-	host->bulk_clks[3].id = "rx_clk";
-	ret = devm_clk_bulk_get(dev, MESON_SDHC_NUM_BULK_CLKS,
-				host->bulk_clks);
+	ret = meson_mx_sdhc_register_clkc(dev, base, host->bulk_clks);
 	if (ret)
 		goto err_disable_pclk;
 
diff --git a/drivers/mmc/host/meson-mx-sdhc.h b/drivers/mmc/host/meson-mx-sdhc.h
index 2aa1e4401173..230e8fbe6b3f 100644
--- a/drivers/mmc/host/meson-mx-sdhc.h
+++ b/drivers/mmc/host/meson-mx-sdhc.h
@@ -133,6 +133,9 @@
 	#define MESON_SDHC_CLK2_RX_CLK_PHASE			GENMASK(11, 0)
 	#define MESON_SDHC_CLK2_SD_CLK_PHASE			GENMASK(23, 12)
 
-int meson_mx_sdhc_register_clkc(struct device *dev, void __iomem *base);
+struct clk_bulk_data;
+
+int meson_mx_sdhc_register_clkc(struct device *dev, void __iomem *base,
+				struct clk_bulk_data *clk_bulk_data);
 
 #endif /* _MESON_MX_SDHC_H_ */