Unverified Commit 1a395a56 authored by Samuel Holland's avatar Samuel Holland Committed by Maxime Ripard
Browse files

drm/sun4i: sun8i-hdmi-phy: Use of_device_get_match_data 



Now that the HDMI PHY is using a platform driver, we can use the usual
helper function for getting the variant structure.

Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20220615045543.62813-2-samuel@sholland.org
parent c0c87382

drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ struct sun8i_hdmi_phy { 
	unsigned int			rcal;

	struct regmap			*regs;

	struct reset_control		*rst_phy;

	struct sun8i_hdmi_phy_variant	*variant;

	const struct sun8i_hdmi_phy_variant *variant;

};



struct sun8i_dw_hdmi_quirks {

drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c

+2 −9
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ void sun8i_hdmi_phy_deinit(struct sun8i_hdmi_phy *phy) 
void sun8i_hdmi_phy_set_ops(struct sun8i_hdmi_phy *phy,

			    struct dw_hdmi_plat_data *plat_data)

{

	struct sun8i_hdmi_phy_variant *variant = phy->variant;

	const struct sun8i_hdmi_phy_variant *variant = phy->variant;



	if (variant->is_custom_phy) {

		plat_data->phy_ops = &sun8i_hdmi_phy_ops;
@@ -672,7 +672,6 @@ int sun8i_hdmi_phy_get(struct sun8i_dw_hdmi *hdmi, struct device_node *node) 


static int sun8i_hdmi_phy_probe(struct platform_device *pdev)

{

	const struct of_device_id *match;

	struct device *dev = &pdev->dev;

	struct device_node *node = dev->of_node;

	struct sun8i_hdmi_phy *phy;
@@ -680,17 +679,11 @@ static int sun8i_hdmi_phy_probe(struct platform_device *pdev) 
	void __iomem *regs;

	int ret;



	match = of_match_node(sun8i_hdmi_phy_of_table, node);

	if (!match) {

		dev_err(dev, "Incompatible HDMI PHY\n");

		return -EINVAL;

	}



	phy = devm_kzalloc(dev, sizeof(*phy), GFP_KERNEL);

	if (!phy)

		return -ENOMEM;



	phy->variant = (struct sun8i_hdmi_phy_variant *)match->data;

	phy->variant = of_device_get_match_data(dev);

	phy->dev = dev;



	ret = of_address_to_resource(node, 0, &res);