~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,3 +1,4 @@
	1	+// SPDX-License-Identifier: GPL-2.0-or-later
1	2	/*
2	3	* PowerPC 476FPE board specific routines
3	4	*
..	..	@@ -14,11 +15,6 @@
14	15	* Rewritten and ported to the merged powerpc tree:
15	16	* Copyright 2007 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
16	17	* Copyright © 2011 David Kliekamp IBM Corporation
17		- *
18		- * This program is free software; you can redistribute it and/or modify it
19		- * under the terms of the GNU General Public License as published by the
20		- * Free Software Foundation; either version 2 of the License, or (at your
21		- * option) any later version.
22	18	*/
23	19
24	20	#include <linux/init.h>
..	..	@@ -34,6 +30,7 @@
34	30	#include <asm/ppc4xx.h>
35	31	#include <asm/mpic.h>
36	32	#include <asm/mmu.h>
	33	+#include <asm/swiotlb.h>
37	34
38	35	#include <linux/pci.h>
39	36	#include <linux/i2c.h>
..	..	@@ -89,8 +86,7 @@
89	86	avr_halt_system(AVR_PWRCTL_RESET);
90	87	}
91	88
92		-static int avr_probe(struct i2c_client *client,
93		- const struct i2c_device_id *id)
	89	+static int avr_probe(struct i2c_client *client)
94	90	{
95	91	avr_i2c_client = client;
96	92	ppc_md.restart = avr_reset_system;
..	..	@@ -107,7 +103,7 @@
107	103	.driver = {
108	104	.name = "akebono-avr",
109	105	},
110		- .probe = avr_probe,
	106	+ .probe_new = avr_probe,
111	107	.id_table = avr_id,
112	108	};
113	109