mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/regulator/uniphier-regulator.c
..
..
@@ -32,7 +32,7 @@
32
32
 	const struct uniphier_regulator_soc_data *data;
33
33
 };
34
34
 
35
-static struct regulator_ops uniphier_regulator_ops = {
35
+static const struct regulator_ops uniphier_regulator_ops = {
36
36
 	.enable     = regulator_enable_regmap,
37
37
 	.disable    = regulator_disable_regmap,
38
38
 	.is_enabled = regulator_is_enabled_regmap,
..
..
@@ -45,7 +45,6 @@
45
45
 	struct regulator_config config = { };
46
46
 	struct regulator_dev *rdev;
47
47
 	struct regmap *regmap;
48
-	struct resource *res;
49
48
 	void __iomem *base;
50
49
 	const char *name;
51
50
 	int i, ret, nr;
..
..
@@ -58,8 +57,7 @@
58
57
 	if (WARN_ON(!priv->data))
59
58
 		return -EINVAL;
60
59
 
61
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
62
-	base = devm_ioremap_resource(dev, res);
60
+	base = devm_platform_ioremap_resource(pdev, 0);
63
61
 	if (IS_ERR(base))
64
62
 		return PTR_ERR(base);
65
63
 
..
..
@@ -87,8 +85,10 @@
87
85
 	}
88
86
 
89
87
 	regmap = devm_regmap_init_mmio(dev, base, priv->data->regconf);
90
-	if (IS_ERR(regmap))
91
-		return PTR_ERR(regmap);
88
+	if (IS_ERR(regmap)) {
89
+		ret = PTR_ERR(regmap);
90
+		goto out_rst_assert;
91
+	}
92
92
 
93
93
 	config.dev = dev;
94
94
 	config.driver_data = priv;
..
..
@@ -184,6 +184,10 @@
184
184
 		.data = &uniphier_pro4_usb3_data,
185
185
 	},
186
186
 	{
187
+		.compatible = "socionext,uniphier-pro5-usb3-regulator",
188
+		.data = &uniphier_pro4_usb3_data,
189
+	},
190
+	{
187
191
 		.compatible = "socionext,uniphier-pxs2-usb3-regulator",
188
192
 		.data = &uniphier_pxs2_usb3_data,
189
193
 	},