~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,19 +1,6 @@
	1	+// SPDX-License-Identifier: GPL-2.0-only
1	2	/*
2	3	* Copyright (C) 2013 Intel Corporation. All rights reserved.
3		- *
4		- * This program is free software; you can redistribute it and/or modify it
5		- * under the terms and conditions of the GNU General Public License,
6		- * version 2, as published by the Free Software Foundation.
7		- *
8		- * This program is distributed in the hope it will be useful, but WITHOUT
9		- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
10		- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
11		- * more details.
12		- *
13		- * You should have received a copy of the GNU General Public License along with
14		- * this program; if not, write to the Free Software Foundation, Inc.,
15		- * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
16		- *
17	4	*/
18	5
19	6	#define pr_fmt(fmt) "nci_spi: %s: " fmt, __func__
..	..	@@ -57,7 +44,8 @@
57	44	t.len = 0;
58	45	}
59	46	t.cs_change = cs_change;
60		- t.delay_usecs = nspi->xfer_udelay;
	47	+ t.delay.value = nspi->xfer_udelay;
	48	+ t.delay.unit = SPI_DELAY_UNIT_USECS;
61	49	t.speed_hz = nspi->xfer_speed_hz;
62	50
63	51	spi_message_init(&m);
..	..	@@ -229,7 +217,8 @@
229	217	rx.rx_buf = skb_put(skb, rx_len);
230	218	rx.len = rx_len;
231	219	rx.cs_change = 0;
232		- rx.delay_usecs = nspi->xfer_udelay;
	220	+ rx.delay.value = nspi->xfer_udelay;
	221	+ rx.delay.unit = SPI_DELAY_UNIT_USECS;
233	222	rx.speed_hz = nspi->xfer_speed_hz;
234	223	spi_message_add_tail(&rx, &m);
235	224