Merge branch 'linux-6.6-trunk/at91/csi2host' into linux-6.6-mchp

Author: cristibirsan

drivers/media/platform/dwc/dw-dphy-plat.c

@@ -27,11 +27,14 @@ static struct phy_provider *phy_provider;
 static u8 get_config_8l(struct device *dev, struct dw_dphy_rx *dphy)
 {
 	if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
-		dphy->config_8l = of_get_gpio(dev->of_node, 0);
-		if (!gpio_is_valid(dphy->config_8l)) {
-			dev_warn(dev,
-				 "failed to parse 8l config, default is 0\n");
-			dphy->config_8l = 0;
+		struct gpio_desc *conf;
+
+		conf = devm_fwnode_gpiod_get_index(dev, dev->fwnode, "config",
+						   0, GPIOD_IN,
+						   fwnode_get_name(dev->fwnode));
+		if (IS_ERR(conf)) {
+			dev_warn(dev, "8L config parse err, default is 4L\n");
+			dphy->config_8l = CTRL_4_LANES;
 		}
 	} else {
 		struct dw_phy_pdata *pdata = dev->platform_data;

drivers/media/platform/dwc/dw-dphy-rx.c

@@ -66,20 +66,21 @@ u8 dw_dphy_setup_config(struct dw_dphy_rx *dphy)
 {
 #if IS_ENABLED(CONFIG_DWC_MIPI_TC_DPHY_GEN3)
 	int ret;
+	struct gpio_desc *config_gpio;
 
 	if (dphy->max_lanes == CTRL_4_LANES) {
 		dev_vdbg(&dphy->phy->dev, "CONFIG 4L\n");
 		return CTRL_4_LANES;
 	}
 	if (IS_ENABLED(CONFIG_OF)) {
-		ret = gpio_request(dphy->config_8l, "config");
-		if (ret < 0) {
+		config_gpio = devm_gpiod_get(&dphy->phy->dev, "config",
+					     GPIOD_IN);
+		if (IS_ERR(config_gpio)) {
 			dev_vdbg(&dphy->phy->dev,
-				 "could not acquire config (err=%d)\n", ret);
-			return ret;
+				 "8L config parse err, default 4L");
+			return CTRL_4_LANES;
 		}
-		ret = gpio_get_value(dphy->config_8l);
-		gpio_free(dphy->config_8l);
+		ret = gpiod_get_value(config_gpio);
 	} else {
 		ret = dphy->config_8l;
 	}