change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/arm/mach-omap2/i2c.c
..
..
@@ -1,22 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Helper module for board specific I2C bus registration
3
4
  *
4
5
  * Copyright (C) 2009 Nokia Corporation.
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- * modify it under the terms of the GNU General Public License
8
- * version 2 as published by the Free Software Foundation.
9
- *
10
- * This program is distributed in the hope that it will be useful, but
11
- * WITHOUT ANY WARRANTY; without even the implied warranty of
12
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
13
- * General Public License for more details.
14
- *
15
- * You should have received a copy of the GNU General Public License
16
- * along with this program; if not, write to the Free Software
17
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
18
- * 02110-1301 USA
19
- *
20
6
  */
21
7
 
22
8
 #include "soc.h"
..
..
@@ -53,15 +39,10 @@
53
39
 	u16 i2c_con;
54
40
 	int c = 0;
55
41
 
56
-	if (oh->class->rev == OMAP_I2C_IP_VERSION_2) {
57
-		i2c_con = OMAP4_I2C_CON_OFFSET;
58
-	} else if (oh->class->rev == OMAP_I2C_IP_VERSION_1) {
42
+	if (soc_is_omap24xx() || soc_is_omap34xx() || soc_is_am35xx())
59
43
 		i2c_con = OMAP2_I2C_CON_OFFSET;
60
-	} else {
61
-		WARN(1, "Cannot reset I2C block %s: unsupported revision\n",
62
-		     oh->name);
63
-		return -EINVAL;
64
-	}
44
+	else
45
+		i2c_con = OMAP4_I2C_CON_OFFSET;
65
46
 
66
47
 	/* Disable I2C */
67
48
 	v = omap_hwmod_read(oh, i2c_con);