~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,14 +1,10 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/*
2	3	* Copyright (C) 2012 - 2014 Allwinner Tech
3	4	* Pan Nan <pannan@allwinnertech.com>
4	5	*
5	6	* Copyright (C) 2014 Maxime Ripard
6	7	* Maxime Ripard <maxime.ripard@free-electrons.com>
7		- *
8		- * This program is free software; you can redistribute it and/or
9		- * modify it under the terms of the GNU General Public License as
10		- * published by the Free Software Foundation; either version 2 of
11		- * the License, or (at your option) any later version.
12	8	*/
13	9
14	10	#include <linux/clk.h>
..	..	@@ -202,7 +198,7 @@
202	198
203	199	static size_t sun4i_spi_max_transfer_size(struct spi_device *spi)
204	200	{
205		- return SUN4I_FIFO_DEPTH - 1;
	201	+ return SUN4I_MAX_XFER_SIZE - 1;
206	202	}
207	203
208	204	static int sun4i_spi_transfer_one(struct spi_master *master,
..	..	@@ -432,7 +428,6 @@
432	428	{
433	429	struct spi_master *master;
434	430	struct sun4i_spi *sspi;
435		- struct resource *res;
436	431	int ret = 0, irq;
437	432
438	433	master = spi_alloc_master(&pdev->dev, sizeof(struct sun4i_spi));
..	..	@@ -444,8 +439,7 @@
444	439	platform_set_drvdata(pdev, master);
445	440	sspi = spi_master_get_devdata(master);
446	441
447		- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
448		- sspi->base_addr = devm_ioremap_resource(&pdev->dev, res);
	442	+ sspi->base_addr = devm_platform_ioremap_resource(pdev, 0);
449	443	if (IS_ERR(sspi->base_addr)) {
450	444	ret = PTR_ERR(sspi->base_addr);
451	445	goto err_free_master;
..	..	@@ -453,7 +447,6 @@
453	447
454	448	irq = platform_get_irq(pdev, 0);
455	449	if (irq < 0) {
456		- dev_err(&pdev->dev, "No spi IRQ specified\n");
457	450	ret = -ENXIO;
458	451	goto err_free_master;
459	452	}