change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/arch/arm/mach-imx/mxc.h
..
..
@@ -1,52 +1,22 @@
1
+/* SPDX-License-Identifier: GPL-2.0-or-later */
1
2
 /*
2
3
  * Copyright 2004-2007, 2010-2015 Freescale Semiconductor, Inc.
3
4
  * Copyright (C) 2008 Juergen Beisert (kernel@pengutronix.de)
4
- *
5
- * This program is free software; you can redistribute it and/or
6
- * modify it under the terms of the GNU General Public License
7
- * as published by the Free Software Foundation; either version 2
8
- * of the License, or (at your option) any later version.
9
- * This program is distributed in the hope that it will be useful,
10
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
- * GNU General Public License for more details.
13
- *
14
- * You should have received a copy of the GNU General Public License
15
- * along with this program; if not, write to the Free Software
16
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
17
- * MA 02110-1301, USA.
18
5
  */
19
6
 
20
7
 #ifndef __ASM_ARCH_MXC_H__
21
8
 #define __ASM_ARCH_MXC_H__
22
9
 
23
10
 #include <linux/types.h>
11
+#include <soc/imx/cpu.h>
24
12
 
25
13
 #ifndef __ASM_ARCH_MXC_HARDWARE_H__
26
14
 #error "Do not include directly."
27
15
 #endif
28
16
 
29
-#define MXC_CPU_MX1		1
30
-#define MXC_CPU_MX21		21
31
-#define MXC_CPU_MX25		25
32
-#define MXC_CPU_MX27		27
33
-#define MXC_CPU_MX31		31
34
-#define MXC_CPU_MX35		35
35
-#define MXC_CPU_MX51		51
36
-#define MXC_CPU_MX53		53
37
-#define MXC_CPU_IMX6SL		0x60
38
-#define MXC_CPU_IMX6DL		0x61
39
-#define MXC_CPU_IMX6SX		0x62
40
-#define MXC_CPU_IMX6Q		0x63
41
-#define MXC_CPU_IMX6UL		0x64
42
-#define MXC_CPU_IMX6ULL		0x65
43
-#define MXC_CPU_IMX6SLL		0x67
44
-#define MXC_CPU_IMX7D		0x72
45
-
46
17
 #define IMX_DDR_TYPE_LPDDR2		1
47
18
 
48
19
 #ifndef __ASSEMBLY__
49
-extern unsigned int __mxc_cpu_type;
50
20
 
51
21
 #ifdef CONFIG_SOC_IMX6SL
52
22
 static inline bool cpu_is_imx6sl(void)
..
..
@@ -80,6 +50,11 @@
80
50
 	return __mxc_cpu_type == MXC_CPU_IMX6ULL;
81
51
 }
82
52
 
53
+static inline bool cpu_is_imx6ulz(void)
54
+{
55
+	return __mxc_cpu_type == MXC_CPU_IMX6ULZ;
56
+}
57
+
83
58
 static inline bool cpu_is_imx6sll(void)
84
59
 {
85
60
 	return __mxc_cpu_type == MXC_CPU_IMX6SLL;