change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/spi/spi-rb4xx.c
..
..
@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * SPI controller driver for the Mikrotik RB4xx boards
3
4
  *
..
..
@@ -6,11 +7,6 @@
6
7
  *
7
8
  * This file was based on the patches for Linux 2.6.27.39 published by
8
9
  * MikroTik for their RouterBoard 4xx series devices.
9
- *
10
- * This program is free software; you can redistribute it and/or modify
11
- * it under the terms of the GNU General Public License version 2 as
12
- * published by the Free Software Foundation.
13
- *
14
10
  */
15
11
 
16
12
 #include <linux/kernel.h>
..
..
@@ -18,6 +14,7 @@
18
14
 #include <linux/platform_device.h>
19
15
 #include <linux/clk.h>
20
16
 #include <linux/spi/spi.h>
17
+#include <linux/of.h>
21
18
 
22
19
 #include <asm/mach-ath79/ar71xx_regs.h>
23
20
 
..
..
@@ -139,12 +136,10 @@
139
136
 	struct spi_master *master;
140
137
 	struct clk *ahb_clk;
141
138
 	struct rb4xx_spi *rbspi;
142
-	struct resource *r;
143
139
 	int err;
144
140
 	void __iomem *spi_base;
145
141
 
146
-	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
147
-	spi_base = devm_ioremap_resource(&pdev->dev, r);
142
+	spi_base = devm_platform_ioremap_resource(pdev, 0);
148
143
 	if (IS_ERR(spi_base))
149
144
 		return PTR_ERR(spi_base);
150
145
 
..
..
@@ -156,13 +151,19 @@
156
151
 	if (IS_ERR(ahb_clk))
157
152
 		return PTR_ERR(ahb_clk);
158
153
 
154
+	master->dev.of_node = pdev->dev.of_node;
159
155
 	master->bus_num = 0;
160
156
 	master->num_chipselect = 3;
161
157
 	master->mode_bits = SPI_TX_DUAL;
162
-	master->bits_per_word_mask = BIT(7);
158
+	master->bits_per_word_mask = SPI_BPW_MASK(8);
163
159
 	master->flags = SPI_MASTER_MUST_TX;
164
160
 	master->transfer_one = rb4xx_transfer_one;
165
161
 	master->set_cs = rb4xx_set_cs;
162
+
163
+	rbspi = spi_master_get_devdata(master);
164
+	rbspi->base = spi_base;
165
+	rbspi->clk = ahb_clk;
166
+	platform_set_drvdata(pdev, rbspi);
166
167
 
167
168
 	err = devm_spi_register_master(&pdev->dev, master);
168
169
 	if (err) {
..
..
@@ -173,11 +174,6 @@
173
174
 	err = clk_prepare_enable(ahb_clk);
174
175
 	if (err)
175
176
 		return err;
176
-
177
-	rbspi = spi_master_get_devdata(master);
178
-	rbspi->base = spi_base;
179
-	rbspi->clk = ahb_clk;
180
-	platform_set_drvdata(pdev, rbspi);
181
177
 
182
178
 	/* Enable SPI */
183
179
 	rb4xx_write(rbspi, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
..
..
@@ -194,11 +190,18 @@
194
190
 	return 0;
195
191
 }
196
192
 
193
+static const struct of_device_id rb4xx_spi_dt_match[] = {
194
+	{ .compatible = "mikrotik,rb4xx-spi" },
195
+	{ },
196
+};
197
+MODULE_DEVICE_TABLE(of, rb4xx_spi_dt_match);
198
+
197
199
 static struct platform_driver rb4xx_spi_drv = {
198
200
 	.probe = rb4xx_spi_probe,
199
201
 	.remove = rb4xx_spi_remove,
200
202
 	.driver = {
201
203
 		.name = "rb4xx-spi",
204
+		.of_match_table = of_match_ptr(rb4xx_spi_dt_match),
202
205
 	},
203
206
 };
204
207