change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/spi/spi-bcm63xx.c
..
..
@@ -1,18 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Broadcom BCM63xx SPI controller support
3
4
  *
4
5
  * Copyright (C) 2009-2012 Florian Fainelli <florian@openwrt.org>
5
6
  * Copyright (C) 2010 Tanguy Bouzeloc <tanguy.bouzeloc@efixo.com>
6
- *
7
- * This program is free software; you can redistribute it and/or
8
- * modify it under the terms of the GNU General Public License
9
- * as published by the Free Software Foundation; either version 2
10
- * of the License, or (at your option) any later version.
11
- *
12
- * This program is distributed in the hope that it will be useful,
13
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15
- * GNU General Public License for more details.
16
7
  */
17
8
 
18
9
 #include <linux/kernel.h>
..
..
@@ -27,6 +18,7 @@
27
18
 #include <linux/err.h>
28
19
 #include <linux/pm_runtime.h>
29
20
 #include <linux/of.h>
21
+#include <linux/reset.h>
30
22
 
31
23
 /* BCM 6338/6348 SPI core */
32
24
 #define SPI_6348_RSET_SIZE		64
..
..
@@ -134,7 +126,7 @@
134
126
 	SPI_MSG_DATA_SIZE,
135
127
 };
136
128
 
137
-#define BCM63XX_SPI_MAX_PREPEND		15
129
+#define BCM63XX_SPI_MAX_PREPEND		7
138
130
 
139
131
 #define BCM63XX_SPI_MAX_CS		8
140
132
 #define BCM63XX_SPI_BUS_NUM		0
..
..
@@ -377,7 +369,7 @@
377
369
 		}
378
370
 
379
371
 		/* CS will be deasserted directly after transfer */
380
-		if (t->delay_usecs) {
372
+		if (t->delay_usecs || t->delay.value) {
381
373
 			dev_err(&spi->dev, "unable to keep CS asserted after transfer\n");
382
374
 			status = -EINVAL;
383
375
 			goto exit;
..
..
@@ -502,6 +494,7 @@
502
494
 	struct bcm63xx_spi *bs;
503
495
 	int ret;
504
496
 	u32 num_cs = BCM63XX_SPI_MAX_CS;
497
+	struct reset_control *reset;
505
498
 
506
499
 	if (dev->of_node) {
507
500
 		const struct of_device_id *match;
..
..
@@ -529,16 +522,18 @@
529
522
 	}
530
523
 
531
524
 	irq = platform_get_irq(pdev, 0);
532
-	if (irq < 0) {
533
-		dev_err(dev, "no irq: %d\n", irq);
525
+	if (irq < 0)
534
526
 		return irq;
535
-	}
536
527
 
537
528
 	clk = devm_clk_get(dev, "spi");
538
529
 	if (IS_ERR(clk)) {
539
530
 		dev_err(dev, "no clock for device\n");
540
531
 		return PTR_ERR(clk);
541
532
 	}
533
+
534
+	reset = devm_reset_control_get_optional_exclusive(dev, NULL);
535
+	if (IS_ERR(reset))
536
+		return PTR_ERR(reset);
542
537
 
543
538
 	master = spi_alloc_master(dev, sizeof(*bs));
544
539
 	if (!master) {
..
..
@@ -590,6 +585,12 @@
590
585
 	if (ret)
591
586
 		goto out_err;
592
587
 
588
+	ret = reset_control_reset(reset);
589
+	if (ret) {
590
+		dev_err(dev, "unable to reset device: %d\n", ret);
591
+		goto out_clk_disable;
592
+	}
593
+
593
594
 	bcm_spi_writeb(bs, SPI_INTR_CLEAR_ALL, SPI_INT_STATUS);
594
595
 
595
596
 	/* register and we are done */