AX88772C_eeprom and ax8872c build together

hc

2024-05-16 8d2a02b24d66aa359e83eebc1ed3c0f85367a1cb

 kernel/drivers/spi/spi-axi-spi-engine.c
..
..
@@ -1,9 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * SPI-Engine SPI controller driver
3
4
  * Copyright 2015 Analog Devices Inc.
4
5
  *  Author: Lars-Peter Clausen <lars@metafoo.de>
5
- *
6
- * Licensed under the GPL-2.
7
6
  */
8
7
 
9
8
 #include <linux/clk.h>
..
..
@@ -164,10 +163,21 @@
164
163
 }
165
164
 
166
165
 static void spi_engine_gen_sleep(struct spi_engine_program *p, bool dry,
167
-	struct spi_engine *spi_engine, unsigned int clk_div, unsigned int delay)
166
+	struct spi_engine *spi_engine, unsigned int clk_div,
167
+	struct spi_transfer *xfer)
168
168
 {
169
169
 	unsigned int spi_clk = clk_get_rate(spi_engine->ref_clk);
170
170
 	unsigned int t;
171
+	int delay;
172
+
173
+	if (xfer->delay_usecs) {
174
+		delay = xfer->delay_usecs;
175
+	} else {
176
+		delay = spi_delay_to_ns(&xfer->delay, xfer);
177
+		if (delay < 0)
178
+			return;
179
+		delay /= 1000;
180
+	}
171
181
 
172
182
 	if (delay == 0)
173
183
 		return;
..
..
@@ -219,8 +229,7 @@
219
229
 			spi_engine_gen_cs(p, dry, spi, true);
220
230
 
221
231
 		spi_engine_gen_xfer(p, dry, xfer);
222
-		spi_engine_gen_sleep(p, dry, spi_engine, clk_div,
223
-			xfer->delay_usecs);
232
+		spi_engine_gen_sleep(p, dry, spi_engine, clk_div, xfer);
224
233
 
225
234
 		cs_change = xfer->cs_change;
226
235
 		if (list_is_last(&xfer->transfer_list, &msg->transfers))
..
..
@@ -461,7 +470,6 @@
461
470
 	struct spi_engine *spi_engine;
462
471
 	struct spi_master *master;
463
472
 	unsigned int version;
464
-	struct resource *res;
465
473
 	int irq;
466
474
 	int ret;
467
475
 
..
..
@@ -480,23 +488,6 @@
480
488
 	spi_master_set_devdata(master, spi_engine);
481
489
 
482
490
 	spin_lock_init(&spi_engine->lock);
483
-
484
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
485
-	spi_engine->base = devm_ioremap_resource(&pdev->dev, res);
486
-	if (IS_ERR(spi_engine->base)) {
487
-		ret = PTR_ERR(spi_engine->base);
488
-		goto err_put_master;
489
-	}
490
-
491
-	version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);
492
-	if (SPI_ENGINE_VERSION_MAJOR(version) != 1) {
493
-		dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n",
494
-			SPI_ENGINE_VERSION_MAJOR(version),
495
-			SPI_ENGINE_VERSION_MINOR(version),
496
-			SPI_ENGINE_VERSION_PATCH(version));
497
-		ret = -ENODEV;
498
-		goto err_put_master;
499
-	}
500
491
 
501
492
 	spi_engine->clk = devm_clk_get(&pdev->dev, "s_axi_aclk");
502
493
 	if (IS_ERR(spi_engine->clk)) {
..
..
@@ -518,6 +509,22 @@
518
509
 	if (ret)
519
510
 		goto err_clk_disable;
520
511
 
512
+	spi_engine->base = devm_platform_ioremap_resource(pdev, 0);
513
+	if (IS_ERR(spi_engine->base)) {
514
+		ret = PTR_ERR(spi_engine->base);
515
+		goto err_ref_clk_disable;
516
+	}
517
+
518
+	version = readl(spi_engine->base + SPI_ENGINE_REG_VERSION);
519
+	if (SPI_ENGINE_VERSION_MAJOR(version) != 1) {
520
+		dev_err(&pdev->dev, "Unsupported peripheral version %u.%u.%c\n",
521
+			SPI_ENGINE_VERSION_MAJOR(version),
522
+			SPI_ENGINE_VERSION_MINOR(version),
523
+			SPI_ENGINE_VERSION_PATCH(version));
524
+		ret = -ENODEV;
525
+		goto err_ref_clk_disable;
526
+	}
527
+
521
528
 	writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_RESET);
522
529
 	writel_relaxed(0xff, spi_engine->base + SPI_ENGINE_REG_INT_PENDING);
523
530
 	writel_relaxed(0x00, spi_engine->base + SPI_ENGINE_REG_INT_ENABLE);