add stmac read mac form eeprom

hc

2023-12-09 b22da3d8526a935aa31e086e63f60ff3246cb61c

 kernel/drivers/clk/davinci/psc.c
..
..
@@ -235,7 +235,7 @@
235
235
 			  const char *parent_name, struct regmap *regmap,
236
236
 			  u32 md, u32 pd, u32 flags)
237
237
 {
238
-	struct clk_init_data init = {};
238
+	struct clk_init_data init;
239
239
 	struct davinci_lpsc_clk *lpsc;
240
240
 	int ret;
241
241
 	bool is_on;
..
..
@@ -302,24 +302,6 @@
302
302
 
303
303
 	return 0;
304
304
 }
305
-
306
-/*
307
- * REVISIT: These exported functions can be removed after a non-DT lookup is
308
- * added to the reset controller framework and the davinci-rproc driver is
309
- * updated to use the generic reset controller framework.
310
- */
311
-
312
-int davinci_clk_reset_assert(struct clk *clk)
313
-{
314
-	return davinci_lpsc_clk_reset(clk, true);
315
-}
316
-EXPORT_SYMBOL(davinci_clk_reset_assert);
317
-
318
-int davinci_clk_reset_deassert(struct clk *clk)
319
-{
320
-	return davinci_lpsc_clk_reset(clk, false);
321
-}
322
-EXPORT_SYMBOL(davinci_clk_reset_deassert);
323
305
 
324
306
 static int davinci_psc_reset_assert(struct reset_controller_dev *rcdev,
325
307
 				    unsigned long id)
..
..
@@ -549,7 +531,6 @@
549
531
 	struct device *dev = &pdev->dev;
550
532
 	const struct of_device_id *of_id;
551
533
 	const struct davinci_psc_init_data *init_data = NULL;
552
-	struct resource *res;
553
534
 	void __iomem *base;
554
535
 	int ret;
555
536
 
..
..
@@ -564,8 +545,7 @@
564
545
 		return -EINVAL;
565
546
 	}
566
547
 
567
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
568
-	base = devm_ioremap_resource(dev, res);
548
+	base = devm_platform_ioremap_resource(pdev, 0);
569
549
 	if (IS_ERR(base))
570
550
 		return PTR_ERR(base);
571
551