ARM: pxa: split up mach/hardware.h
authorArnd Bergmann <arnd@arndb.de>
Sun, 1 Sep 2019 20:26:10 +0000 (22:26 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Apr 2022 14:27:05 +0000 (16:27 +0200)
The mach/hardware.h is included in lots of places, and it provides
three different things on pxa:

- the cpu_is_pxa* macros
- an indirect inclusion of mach/addr-map.h
- the __REG() and io_pv2() helper macros

Split it up into separate <linux/soc/pxa/cpu.h> and mach/pxa-regs.h
headers, then change all the files that use mach/hardware.h to
include the exact set of those three headers that they actually
need, allowing for further more targeted cleanup.

linux/soc/pxa/cpu.h can remain permanently exported and is now in
a global location along with similar headers. pxa-regs.h and
addr-map.h are only used in a very small number of drivers now
and can be moved to arch/arm/mach-pxa/ directly when those drivers
are to pass the necessary data as resources.

Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Jacek Anaszewski <jacek.anaszewski@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guenter Roeck <linux@roeck-us.net>
Acked-by: Mark Brown <broonie@kernel.org>
Cc: linux-clk@vger.kernel.org
Cc: linux-pm@vger.kernel.org
Cc: linux-input@vger.kernel.org
Cc: linux-leds@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-mtd@lists.infradead.org
Cc: linux-rtc@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Cc: linux-fbdev@vger.kernel.org
Cc: linux-watchdog@vger.kernel.org
Cc: alsa-devel@alsa-project.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
78 files changed:
arch/arm/common/locomo.c
arch/arm/common/sa1111.c
arch/arm/mach-pxa/cm-x300.c
arch/arm/mach-pxa/colibri-evalboard.c
arch/arm/mach-pxa/colibri-pxa270-income.c
arch/arm/mach-pxa/colibri-pxa300.c
arch/arm/mach-pxa/colibri-pxa3xx.c
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/corgi_pm.c
arch/arm/mach-pxa/csb726.c
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/ezx.c
arch/arm/mach-pxa/generic.c
arch/arm/mach-pxa/gumstix.c
arch/arm/mach-pxa/hx4700.c
arch/arm/mach-pxa/idp.c
arch/arm/mach-pxa/include/mach/hardware.h [deleted file]
arch/arm/mach-pxa/include/mach/pxa-regs.h [new file with mode: 0644]
arch/arm/mach-pxa/include/mach/pxa2xx-regs.h
arch/arm/mach-pxa/include/mach/pxa3xx-regs.h
arch/arm/mach-pxa/include/mach/regs-ac97.h
arch/arm/mach-pxa/include/mach/regs-ost.h
arch/arm/mach-pxa/include/mach/trizeps4.h
arch/arm/mach-pxa/irq.c
arch/arm/mach-pxa/littleton.c
arch/arm/mach-pxa/lpd270.c
arch/arm/mach-pxa/lubbock.c
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/mainstone.c
arch/arm/mach-pxa/mfp-pxa2xx.c
arch/arm/mach-pxa/mfp-pxa3xx.c
arch/arm/mach-pxa/poodle.c
arch/arm/mach-pxa/pxa-regs.h [new file with mode: 0644]
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa25x.h
arch/arm/mach-pxa/pxa27x-udc.h
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa27x.h
arch/arm/mach-pxa/pxa2xx.c
arch/arm/mach-pxa/pxa300.c
arch/arm/mach-pxa/pxa320.c
arch/arm/mach-pxa/pxa3xx-ulpi.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/pxa3xx.h
arch/arm/mach-pxa/pxa930.c
arch/arm/mach-pxa/regs-rtc.h
arch/arm/mach-pxa/regs-uart.h
arch/arm/mach-pxa/sleep.S
arch/arm/mach-pxa/smemc.c
arch/arm/mach-pxa/spitz_pm.c
arch/arm/mach-pxa/standby.S
arch/arm/mach-pxa/xcep.c
arch/arm/mach-pxa/zylonite.c
arch/arm/mach-pxa/zylonite.h
arch/arm/mach-pxa/zylonite_pxa300.c
arch/arm/mach-pxa/zylonite_pxa320.c
drivers/clk/pxa/clk-pxa3xx.c
drivers/cpufreq/pxa2xx-cpufreq.c
drivers/cpufreq/pxa3xx-cpufreq.c
drivers/input/mouse/pxa930_trkball.c
drivers/input/touchscreen/zylonite-wm97xx.c
drivers/leds/leds-locomo.c
drivers/mmc/host/pxamci.c
drivers/mtd/maps/pxa2xx-flash.c
drivers/pcmcia/pxa2xx_base.c
drivers/pcmcia/pxa2xx_sharpsl.c
drivers/pcmcia/sa1111_generic.c
drivers/pcmcia/sa1111_lubbock.c
drivers/pcmcia/soc_common.c
drivers/rtc/rtc-pxa.c
drivers/usb/host/ohci-pxa27x.c
drivers/video/fbdev/pxafb.c
drivers/watchdog/sa1100_wdt.c
include/linux/soc/pxa/cpu.h [new file with mode: 0644]
sound/arm/pxa2xx-ac97-lib.c
sound/soc/pxa/pxa2xx-ac97.c
sound/soc/pxa/pxa2xx-i2s.c
sound/soc/pxa/z2.c

index 24d21ba630305447d0ba03d07ae58c599c6eebbe..da30a4d4f35cd0751da37d6dcae7592618df0543 100644 (file)
@@ -23,7 +23,6 @@
 #include <linux/spinlock.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/mach/irq.h>
 
index 5367f03beb4680c638505825c94ea32b64ae42df..2343e2b6214d7a39fe8b3a5e5429f87508fb7aa2 100644 (file)
 #include <linux/clk.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
 #include <asm/mach/irq.h>
 #include <asm/mach-types.h>
 #include <linux/sizes.h>
 
 #include <asm/hardware/sa1111.h>
 
+#ifdef CONFIG_ARCH_SA1100
+#include <mach/hardware.h>
+#endif
+
 /* SA1111 IRQs */
 #define IRQ_GPAIN0             (0)
 #define IRQ_GPAIN1             (1)
index 2e35354b61f56436745af60a67e2143e816cbdde..85e2537fdc15ee6e53a4b73634f2af98c054039b 100644 (file)
@@ -40,6 +40,8 @@
 #include <linux/spi/spi_gpio.h>
 #include <linux/spi/tdo24m.h>
 
+#include <linux/soc/pxa/cpu.h>
+
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/setup.h>
index b9c173ede891eb88fc4d68f76f4c1daec154e49d..b62af07b8f96c4d594aa2ac46b729f572d4d4bbf 100644 (file)
@@ -13,7 +13,6 @@
 #include <linux/interrupt.h>
 #include <linux/gpio/machine.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/mach/arch.h>
 #include <linux/i2c.h>
 #include <linux/platform_data/i2c-pxa.h>
index e5879e8b068243eca8357226d58bc429c66a5cff..f6eaf464ca8361a2054a07cabce8beda7cb0a6ae 100644 (file)
@@ -25,7 +25,6 @@
 #include <asm/irq.h>
 #include <asm/mach-types.h>
 
-#include <mach/hardware.h>
 #include <linux/platform_data/mmc-pxamci.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include "pxa27x.h"
index 82052dfd96b69e27a1527dfda23689fd6c3a72de..4ceeea142bfd07fa728997c6adc6a5ff52f84866 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <asm/mach-types.h>
 #include <linux/sizes.h>
index 3cead80a2b3720e96faf17ec31d6d14d6499f3d7..701dfef930ebdb5634169a51a0b9531a330db5d0 100644 (file)
@@ -13,7 +13,6 @@
 #include <linux/gpio.h>
 #include <linux/etherdevice.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <linux/sizes.h>
 #include <asm/system_info.h>
 #include <asm/mach/arch.h>
index 44659fbc37bab8e8f7f31622fb2b5cf4cda9ef74..f897762c8b58ece2f77f23a285ff5c4aac51b6c1 100644 (file)
@@ -39,7 +39,6 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/mach/arch.h>
index 092dcb9fced5feb9efc0e7458998679edbdbb29e..ff1ac9bf37cb95df2193ce75889e8a47002ea5fc 100644 (file)
@@ -19,7 +19,6 @@
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 
 #include <mach/corgi.h>
 #include <mach/pxa2xx-regs.h>
index 98fcdc6e2944ecf9c9c7a188132a4cea024af5f8..d48493445ae53101b4463151a43f93b776ce3ece 100644 (file)
@@ -17,6 +17,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+
 #include "csb726.h"
 #include "pxa27x.h"
 #include <linux/platform_data/mmc-pxamci.h>
index 09b8495f3fd91b5bd603b82d86ee27f5d4f21e53..7ca97ddef6febcdabf400de9b5977befca4b9d23 100644 (file)
@@ -9,6 +9,7 @@
 #include <linux/dmaengine.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/platform_data/i2c-pxa.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include "udc.h"
 #include <linux/platform_data/usb-pxa3xx-ulpi.h>
@@ -20,7 +21,6 @@
 #include <linux/platform_data/keypad-pxa27x.h>
 #include <linux/platform_data/media/camera-pxa.h>
 #include <mach/audio.h>
-#include <mach/hardware.h>
 #include <linux/platform_data/mmp_dma.h>
 #include <linux/platform_data/mtd-nand-pxa3xx.h>
 
index eb85950e7c0e8afef641b5f6dc94e727d6010aff..69c2ec02a16c7fc3a6f88e6d3aa3b8e94bf1b489 100644 (file)
@@ -29,7 +29,6 @@
 #include "pxa27x.h"
 #include <linux/platform_data/video-pxafb.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
-#include <mach/hardware.h>
 #include <linux/platform_data/keypad-pxa27x.h>
 #include <linux/platform_data/media/camera-pxa.h>
 
index ab7cdffd7ea807c09a0289c35a0e7b6460f3d6fd..3c3cd90bb9b4b87b986779de7b7a71d5c93eca76 100644 (file)
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
+#include <linux/soc/pxa/cpu.h>
 
-#include <mach/hardware.h>
 #include <asm/mach/map.h>
 #include <asm/mach-types.h>
 
+#include <mach/addr-map.h>
 #include <mach/irqs.h>
 #include <mach/reset.h>
 #include <mach/smemc.h>
index 49dd618b10f7ef742fee5f996ca1ff6cc73ebf24..72b08a9bf0fd2a70962c4e943d3acfed851567a5 100644 (file)
@@ -28,7 +28,6 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <linux/sizes.h>
 
index e1870fbb19e7e933641a2c53c4ec46fd2bad5318..191a6c24fe19d1eda998ce85e3d7ac2e7851d05d 100644 (file)
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/platform_data/i2c-pxa.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
 #include "pxa27x.h"
+#include <mach/addr-map.h>
 #include <mach/hx4700.h>
 #include <linux/platform_data/irda-pxaficp.h>
 
index fb0850af84968a792e273161e6b0e0699f0ebc35..57c0511472bc5b39f07a080c1de4efb77cafcbd8 100644 (file)
@@ -22,7 +22,6 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h
deleted file mode 100644 (file)
index ee7eab1..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- *  arch/arm/mach-pxa/include/mach/hardware.h
- *
- *  Author:    Nicolas Pitre
- *  Created:   Jun 15, 2001
- *  Copyright: MontaVista Software Inc.
- */
-
-#ifndef __ASM_ARCH_HARDWARE_H
-#define __ASM_ARCH_HARDWARE_H
-
-#include <mach/addr-map.h>
-
-/*
- * Workarounds for at least 2 errata so far require this.
- * The mapping is set in mach-pxa/generic.c.
- */
-#define UNCACHED_PHYS_0                0xfe000000
-#define UNCACHED_PHYS_0_SIZE   0x00100000
-
-/*
- * Intel PXA2xx internal register mapping:
- *
- * 0x40000000 - 0x41ffffff <--> 0xf2000000 - 0xf3ffffff
- * 0x44000000 - 0x45ffffff <--> 0xf4000000 - 0xf5ffffff
- * 0x48000000 - 0x49ffffff <--> 0xf6000000 - 0xf7ffffff
- * 0x4c000000 - 0x4dffffff <--> 0xf8000000 - 0xf9ffffff
- * 0x50000000 - 0x51ffffff <--> 0xfa000000 - 0xfbffffff
- * 0x54000000 - 0x55ffffff <--> 0xfc000000 - 0xfdffffff
- * 0x58000000 - 0x59ffffff <--> 0xfe000000 - 0xffffffff
- *
- * Note that not all PXA2xx chips implement all those addresses, and the
- * kernel only maps the minimum needed range of this mapping.
- */
-#define io_v2p(x) (0x3c000000 + ((x) & 0x01ffffff) + (((x) & 0x0e000000) << 1))
-#define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1))
-
-#ifndef __ASSEMBLY__
-# define __REG(x)      (*((volatile u32 __iomem *)io_p2v(x)))
-
-/* With indexed regs we don't want to feed the index through io_p2v()
-   especially if it is a variable, otherwise horrible code will result. */
-# define __REG2(x,y)   \
-       (*(volatile u32 __iomem*)((u32)&__REG(x) + (y)))
-
-# define __PREG(x)     (io_v2p((u32)&(x)))
-
-#else
-
-# define __REG(x)      io_p2v(x)
-# define __PREG(x)     io_v2p(x)
-
-#endif
-
-#ifndef __ASSEMBLY__
-
-#include <asm/cputype.h>
-
-/*
- *   CPU     Stepping     CPU_ID         JTAG_ID
- *
- *  PXA210     B0      0x69052922      0x2926C013
- *  PXA210     B1      0x69052923      0x3926C013
- *  PXA210     B2      0x69052924      0x4926C013
- *  PXA210     C0      0x69052D25      0x5926C013
- *
- *  PXA250     A0      0x69052100      0x09264013
- *  PXA250     A1      0x69052101      0x19264013
- *  PXA250     B0      0x69052902      0x29264013
- *  PXA250     B1      0x69052903      0x39264013
- *  PXA250     B2      0x69052904      0x49264013
- *  PXA250     C0      0x69052D05      0x59264013
- *
- *  PXA255     A0      0x69052D06      0x69264013
- *
- *  PXA26x     A0      0x69052903      0x39264013
- *  PXA26x     B0      0x69052D05      0x59264013
- *
- *  PXA27x     A0      0x69054110      0x09265013
- *  PXA27x     A1      0x69054111      0x19265013
- *  PXA27x     B0      0x69054112      0x29265013
- *  PXA27x     B1      0x69054113      0x39265013
- *  PXA27x     C0      0x69054114      0x49265013
- *  PXA27x     C5      0x69054117      0x79265013
- *
- *  PXA30x     A0      0x69056880      0x0E648013
- *  PXA30x     A1      0x69056881      0x1E648013
- *  PXA31x     A0      0x69056890      0x0E649013
- *  PXA31x     A1      0x69056891      0x1E649013
- *  PXA31x     A2      0x69056892      0x2E649013
- *  PXA32x     B1      0x69056825      0x5E642013
- *  PXA32x     B2      0x69056826      0x6E642013
- *
- *  PXA930     B0      0x69056835      0x5E643013
- *  PXA930     B1      0x69056837      0x7E643013
- *  PXA930     B2      0x69056838      0x8E643013
- *
- *  PXA935     A0      0x56056931      0x1E653013
- *  PXA935     B0      0x56056936      0x6E653013
- *  PXA935     B1      0x56056938      0x8E653013
- */
-#ifdef CONFIG_PXA25x
-#define __cpu_is_pxa210(id)                            \
-       ({                                              \
-               unsigned int _id = (id) & 0xf3f0;       \
-               _id == 0x2120;                          \
-       })
-
-#define __cpu_is_pxa250(id)                            \
-       ({                                              \
-               unsigned int _id = (id) & 0xf3ff;       \
-               _id <= 0x2105;                          \
-       })
-
-#define __cpu_is_pxa255(id)                            \
-       ({                                              \
-               unsigned int _id = (id) & 0xffff;       \
-               _id == 0x2d06;                          \
-       })
-
-#define __cpu_is_pxa25x(id)                            \
-       ({                                              \
-               unsigned int _id = (id) & 0xf300;       \
-               _id == 0x2100;                          \
-       })
-#else
-#define __cpu_is_pxa210(id)    (0)
-#define __cpu_is_pxa250(id)    (0)
-#define __cpu_is_pxa255(id)    (0)
-#define __cpu_is_pxa25x(id)    (0)
-#endif
-
-#ifdef CONFIG_PXA27x
-#define __cpu_is_pxa27x(id)                            \
-       ({                                              \
-               unsigned int _id = (id) >> 4 & 0xfff;   \
-               _id == 0x411;                           \
-       })
-#else
-#define __cpu_is_pxa27x(id)    (0)
-#endif
-
-#ifdef CONFIG_CPU_PXA300
-#define __cpu_is_pxa300(id)                            \
-       ({                                              \
-               unsigned int _id = (id) >> 4 & 0xfff;   \
-               _id == 0x688;                           \
-        })
-#else
-#define __cpu_is_pxa300(id)    (0)
-#endif
-
-#ifdef CONFIG_CPU_PXA310
-#define __cpu_is_pxa310(id)                            \
-       ({                                              \
-               unsigned int _id = (id) >> 4 & 0xfff;   \
-               _id == 0x689;                           \
-        })
-#else
-#define __cpu_is_pxa310(id)    (0)
-#endif
-
-#ifdef CONFIG_CPU_PXA320
-#define __cpu_is_pxa320(id)                            \
-       ({                                              \
-               unsigned int _id = (id) >> 4 & 0xfff;   \
-               _id == 0x603 || _id == 0x682;           \
-        })
-#else
-#define __cpu_is_pxa320(id)    (0)
-#endif
-
-#ifdef CONFIG_CPU_PXA930
-#define __cpu_is_pxa930(id)                            \
-       ({                                              \
-               unsigned int _id = (id) >> 4 & 0xfff;   \
-               _id == 0x683;                           \
-        })
-#else
-#define __cpu_is_pxa930(id)    (0)
-#endif
-
-#ifdef CONFIG_CPU_PXA935
-#define __cpu_is_pxa935(id)                            \
-       ({                                              \
-               unsigned int _id = (id) >> 4 & 0xfff;   \
-               _id == 0x693;                           \
-        })
-#else
-#define __cpu_is_pxa935(id)    (0)
-#endif
-
-#define cpu_is_pxa210()                                        \
-       ({                                              \
-               __cpu_is_pxa210(read_cpuid_id());       \
-       })
-
-#define cpu_is_pxa250()                                        \
-       ({                                              \
-               __cpu_is_pxa250(read_cpuid_id());       \
-       })
-
-#define cpu_is_pxa255()                                 \
-       ({                                              \
-               __cpu_is_pxa255(read_cpuid_id());       \
-       })
-
-#define cpu_is_pxa25x()                                        \
-       ({                                              \
-               __cpu_is_pxa25x(read_cpuid_id());       \
-       })
-
-#define cpu_is_pxa27x()                                        \
-       ({                                              \
-               __cpu_is_pxa27x(read_cpuid_id());       \
-       })
-
-#define cpu_is_pxa300()                                        \
-       ({                                              \
-               __cpu_is_pxa300(read_cpuid_id());       \
-        })
-
-#define cpu_is_pxa310()                                        \
-       ({                                              \
-               __cpu_is_pxa310(read_cpuid_id());       \
-        })
-
-#define cpu_is_pxa320()                                        \
-       ({                                              \
-               __cpu_is_pxa320(read_cpuid_id());       \
-        })
-
-#define cpu_is_pxa930()                                        \
-       ({                                              \
-               __cpu_is_pxa930(read_cpuid_id());       \
-        })
-
-#define cpu_is_pxa935()                                        \
-       ({                                              \
-               __cpu_is_pxa935(read_cpuid_id());       \
-        })
-
-
-
-/*
- * CPUID Core Generation Bit
- * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
- */
-#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
-#define __cpu_is_pxa2xx(id)                            \
-       ({                                              \
-               unsigned int _id = (id) >> 13 & 0x7;    \
-               _id <= 0x2;                             \
-        })
-#else
-#define __cpu_is_pxa2xx(id)    (0)
-#endif
-
-#ifdef CONFIG_PXA3xx
-#define __cpu_is_pxa3xx(id)                            \
-       ({                                              \
-               __cpu_is_pxa300(id)                     \
-                       || __cpu_is_pxa310(id)          \
-                       || __cpu_is_pxa320(id)          \
-                       || __cpu_is_pxa93x(id);         \
-        })
-#else
-#define __cpu_is_pxa3xx(id)    (0)
-#endif
-
-#if defined(CONFIG_CPU_PXA930) || defined(CONFIG_CPU_PXA935)
-#define __cpu_is_pxa93x(id)                            \
-       ({                                              \
-               __cpu_is_pxa930(id)                     \
-                       || __cpu_is_pxa935(id);         \
-        })
-#else
-#define __cpu_is_pxa93x(id)    (0)
-#endif
-
-#define cpu_is_pxa2xx()                                        \
-       ({                                              \
-               __cpu_is_pxa2xx(read_cpuid_id());       \
-        })
-
-#define cpu_is_pxa3xx()                                        \
-       ({                                              \
-               __cpu_is_pxa3xx(read_cpuid_id());       \
-        })
-
-#define cpu_is_pxa93x()                                        \
-       ({                                              \
-               __cpu_is_pxa93x(read_cpuid_id());       \
-        })
-
-
-/*
- * return current memory and LCD clock frequency in units of 10kHz
- */
-extern unsigned int get_memclk_frequency_10khz(void);
-
-#endif
-
-#endif  /* _ASM_ARCH_HARDWARE_H */
diff --git a/arch/arm/mach-pxa/include/mach/pxa-regs.h b/arch/arm/mach-pxa/include/mach/pxa-regs.h
new file mode 100644 (file)
index 0000000..ba5120c
--- /dev/null
@@ -0,0 +1,52 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ *  Author:    Nicolas Pitre
+ *  Created:   Jun 15, 2001
+ *  Copyright: MontaVista Software Inc.
+ */
+#ifndef __ASM_MACH_PXA_REGS_H
+#define __ASM_MACH_PXA_REGS_H
+
+/*
+ * Workarounds for at least 2 errata so far require this.
+ * The mapping is set in mach-pxa/generic.c.
+ */
+#define UNCACHED_PHYS_0                0xfe000000
+#define UNCACHED_PHYS_0_SIZE   0x00100000
+
+/*
+ * Intel PXA2xx internal register mapping:
+ *
+ * 0x40000000 - 0x41ffffff <--> 0xf2000000 - 0xf3ffffff
+ * 0x44000000 - 0x45ffffff <--> 0xf4000000 - 0xf5ffffff
+ * 0x48000000 - 0x49ffffff <--> 0xf6000000 - 0xf7ffffff
+ * 0x4c000000 - 0x4dffffff <--> 0xf8000000 - 0xf9ffffff
+ * 0x50000000 - 0x51ffffff <--> 0xfa000000 - 0xfbffffff
+ * 0x54000000 - 0x55ffffff <--> 0xfc000000 - 0xfdffffff
+ * 0x58000000 - 0x59ffffff <--> 0xfe000000 - 0xffffffff
+ *
+ * Note that not all PXA2xx chips implement all those addresses, and the
+ * kernel only maps the minimum needed range of this mapping.
+ */
+#define io_v2p(x) (0x3c000000 + ((x) & 0x01ffffff) + (((x) & 0x0e000000) << 1))
+#define io_p2v(x) IOMEM(0xf2000000 + ((x) & 0x01ffffff) + (((x) & 0x1c000000) >> 1))
+
+#ifndef __ASSEMBLY__
+# define __REG(x)      (*((volatile u32 __iomem *)io_p2v(x)))
+
+/* With indexed regs we don't want to feed the index through io_p2v()
+   especially if it is a variable, otherwise horrible code will result. */
+# define __REG2(x,y)   \
+       (*(volatile u32 __iomem*)((u32)&__REG(x) + (y)))
+
+# define __PREG(x)     (io_v2p((u32)&(x)))
+
+#else
+
+# define __REG(x)      io_p2v(x)
+# define __PREG(x)     io_v2p(x)
+
+#endif
+
+
+#endif
index fa121e1359157e47157722689cd2e0e1c6785642..f68b573ab4a0fa5ba5b168b8ba80d95b59015621 100644 (file)
@@ -11,7 +11,7 @@
 #ifndef __PXA2XX_REGS_H
 #define __PXA2XX_REGS_H
 
-#include <mach/hardware.h>
+#include "pxa-regs.h"
 
 /*
  * Power Manager
index 070f6c74196e8aad49c096fa56e39842388b116b..8eb1ba533e1cc29aa9f44e3eebc4161ba0aa13c8 100644 (file)
@@ -10,7 +10,7 @@
 #ifndef __ASM_ARCH_PXA3XX_REGS_H
 #define __ASM_ARCH_PXA3XX_REGS_H
 
-#include <mach/hardware.h>
+#include "pxa-regs.h"
 
 /*
  * Oscillator Configuration Register (OSCC)
index 1db96fd4df32dd26e257451f29d4a1e34d0bd071..ec09b9635e25101967ec4a3aef3edd025030f48d 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef __ASM_ARCH_REGS_AC97_H
 #define __ASM_ARCH_REGS_AC97_H
 
-#include <mach/hardware.h>
+#include "pxa-regs.h"
 
 /*
  * AC97 Controller registers
index deb564ed8ee76834e3d406b2f3aac5d966eb8917..109d0ed264df940dc5be9873d4d6ee515b86b8e0 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef __ASM_MACH_REGS_OST_H
 #define __ASM_MACH_REGS_OST_H
 
-#include <mach/hardware.h>
+#include "pxa-regs.h"
 
 /*
  * OS Timer & Match Registers
index 3cddb1428c5ee39b5e3c2b6ccd939cb6123ab172..27926629f9c689688741eb44fc14eae31a0add1f 100644 (file)
@@ -11,6 +11,7 @@
 #ifndef _TRIPEPS4_H_
 #define _TRIPEPS4_H_
 
+#include <mach/addr-map.h>
 #include "irqs.h" /* PXA_GPIO_TO_IRQ */
 
 /* physical memory regions */
index 74efc3ab595fde4fe1e3befc1021b4ef0f0460b2..f25c30e8a8341ca9c29893deac795416e1dabe96 100644 (file)
 #include <linux/irq.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <asm/exception.h>
 
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 
 #include "generic.h"
+#include "pxa-regs.h"
 
 #define ICIP                   (0x000)
 #define ICMR                   (0x004)
index 73f5953b3bb6b07d59d146853c4b452ea122f957..f98dc61e87afbd412d6dc9e4f26f27537933149b 100644 (file)
@@ -31,7 +31,6 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 
 #include <asm/mach/arch.h>
index 6fc40bc06910478afd9200aaf97dbbe7ae620af3..eac32bd9e385dfdcbc4bd84e68409bcdf49c5e39 100644 (file)
@@ -28,7 +28,6 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <linux/sizes.h>
 
@@ -39,6 +38,7 @@
 
 #include "pxa27x.h"
 #include "lpd270.h"
+#include <mach/addr-map.h>
 #include <mach/audio.h>
 #include <linux/platform_data/video-pxafb.h>
 #include <linux/platform_data/mmc-pxamci.h>
index e2411971422d7be2f13a903610106a75cd881613..72816e7c206f0c74a1b8067b0e9d854707565f3b 100644 (file)
@@ -34,7 +34,6 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <linux/sizes.h>
 
index 200fd35168e050fdbe7db9e73846a2b3941de454..345a44d15a2c19783ab3560817ebf26b78368fc0 100644 (file)
 #include <linux/regulator/machine.h>
 #include <linux/platform_data/i2c-pxa.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/system_info.h>
 
 #include "pxa27x.h"
+#include <mach/addr-map.h>
 #include <mach/magician.h>
 #include <linux/platform_data/video-pxafb.h>
 #include <linux/platform_data/mmc-pxamci.h>
index 997f6e50220132ab6d0441f446405bb00ffbb6e8..cf74adfe65df85089ebd75c41d3e94fa323319f4 100644 (file)
@@ -35,7 +35,6 @@
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <linux/sizes.h>
 
@@ -52,6 +51,7 @@
 #include <linux/platform_data/irda-pxaficp.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include <linux/platform_data/keypad-pxa27x.h>
+#include <mach/addr-map.h>
 #include <mach/smemc.h>
 
 #include "generic.h"
index 6a5451b186c2eecc4f5ea572ced5b77eac6a03f5..6bc7206fd2ac30eeecaf929eadf21c20316764b0 100644 (file)
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/syscore_ops.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <mach/pxa2xx-regs.h>
 #include "mfp-pxa2xx.h"
index 56114df9700dd38cfa099f2eb48f6f731be6d0ad..f26b5e5412cf441d0d80b8532aee178aed25482e 100644 (file)
@@ -16,7 +16,6 @@
 #include <linux/io.h>
 #include <linux/syscore_ops.h>
 
-#include <mach/hardware.h>
 #include "mfp-pxa3xx.h"
 #include <mach/pxa3xx-regs.h>
 
index 58cfa434afdebc0031bb1e2c449bc8d32514e28f..ca52882433d4b16ab067561c9693f3f5111a5825 100644 (file)
@@ -30,7 +30,6 @@
 #include <linux/mtd/sharpsl.h>
 #include <linux/memblock.h>
 
-#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
 #include <asm/setup.h>
diff --git a/arch/arm/mach-pxa/pxa-regs.h b/arch/arm/mach-pxa/pxa-regs.h
new file mode 100644 (file)
index 0000000..584d2ac
--- /dev/null
@@ -0,0 +1 @@
+#include <mach/pxa-regs.h>
index 0d25cc45f8253f5b47096a47c56a7a716ea3b0a5..305047ebd2f17f2bfdb40bb2331dab254fd753ea 100644 (file)
 #include <linux/irq.h>
 #include <linux/irqchip.h>
 #include <linux/platform_data/mmp_dma.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <asm/mach/map.h>
 #include <asm/suspend.h>
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 #include "pxa25x.h"
 #include <mach/reset.h>
 #include "pm.h"
+#include <mach/addr-map.h>
 #include <mach/smemc.h>
 
 #include "generic.h"
index b58d0fbdb4db9a2b7d2e87d4f02ee383b4a869b6..403bc16c2ed21dfc0d764d4778ea62444b30b287 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef __MACH_PXA25x_H
 #define __MACH_PXA25x_H
 
-#include <mach/hardware.h>
+#include <mach/addr-map.h>
 #include <mach/pxa2xx-regs.h>
 #include "mfp-pxa25x.h"
 #include <mach/irqs.h>
index faf73804697f52f2971a64f63130289061601f60..2d3df3b1cb68a2e59cf1836ca22b5102a6918b13 100644 (file)
@@ -2,6 +2,8 @@
 #ifndef _ASM_ARCH_PXA27X_UDC_H
 #define _ASM_ARCH_PXA27X_UDC_H
 
+#include "pxa-regs.h"
+
 #ifdef _ASM_ARCH_PXA25X_UDC_H
 #error You cannot include both PXA25x and PXA27x UDC support
 #endif
index f7e89831e85bee080b1e0ac22723e97335388c52..a81ac88ecbfdeaff5d372127754ccf86bcfde578 100644 (file)
@@ -23,9 +23,9 @@
 #include <linux/irq.h>
 #include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/mmp_dma.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <asm/mach/map.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/suspend.h>
 #include <mach/irqs.h>
@@ -33,6 +33,7 @@
 #include <mach/reset.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include "pm.h"
+#include <mach/addr-map.h>
 #include <mach/smemc.h>
 
 #include "generic.h"
index abdc02fb4f031d3abbbc23c6dc250b1ba54c7853..6c99090647d2964537f6010ae1a71da28c84379b 100644 (file)
@@ -3,7 +3,7 @@
 #define __MACH_PXA27x_H
 
 #include <linux/suspend.h>
-#include <mach/hardware.h>
+#include <mach/addr-map.h>
 #include <mach/pxa2xx-regs.h>
 #include "mfp-pxa27x.h"
 #include <mach/irqs.h>
index 2d26cd2afbf35872074e8eb66b462e973b8ff393..ac72acb43e26f8ea5f5d0ed0a1c0e2b4a13fef86 100644 (file)
@@ -12,7 +12,6 @@
 #include <linux/device.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
 #include <mach/pxa2xx-regs.h>
 #include "mfp-pxa25x.h"
 #include <mach/reset.h>
index 7f2f5a6a2263d52a37792c84b6e9f13f1d7bf8bf..f77ec118d5b9fe6113a23483aaf33248fcc9653a 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include "pxa300.h"
 
index 78abcc741df77afc1693825512a7784c7f807c91..e372e6c118de3f01a29851153740364da40906b0 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include "pxa320.h"
 
index 4bd7da1f8657323af93fb6183d9604e994ed5c49..c29a7f0fa1b0987dde2901e3ca74c7331084839d 100644 (file)
@@ -21,8 +21,8 @@
 #include <linux/clk.h>
 #include <linux/usb.h>
 #include <linux/usb/otg.h>
+#include <linux/soc/pxa/cpu.h>
 
-#include <mach/hardware.h>
 #include "regs-u2d.h"
 #include <linux/platform_data/usb-pxa3xx-ulpi.h>
 
index 6eb1c24d73952f339a2aae8179379300e73b0961..fc84aed99481d8d40364d9d2394b56d8490fc40b 100644 (file)
 #include <linux/syscore_ops.h>
 #include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/mmp_dma.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <asm/mach/map.h>
 #include <asm/suspend.h>
-#include <mach/hardware.h>
 #include <mach/pxa3xx-regs.h>
 #include <mach/reset.h>
 #include <linux/platform_data/usb-ohci-pxa27x.h>
 #include "pm.h"
+#include <mach/addr-map.h>
 #include <mach/smemc.h>
 #include <mach/irqs.h>
 
index 6d4502aa9d067d38327f8ac944d8ff6365c46a24..22ace053ea25a7736c4f835a7d4638b798049e45 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef __MACH_PXA3XX_H        
 #define __MACH_PXA3XX_H
 
-#include <mach/hardware.h>
+#include <mach/addr-map.h>
 #include <mach/pxa3xx-regs.h>
 #include <mach/irqs.h>
 
index bf91de4267e58b9166d81a920091b0e243e47979..b9021a40cbd17c9e2398eccb6145577d9721e2a3 100644 (file)
@@ -13,6 +13,7 @@
 #include <linux/irq.h>
 #include <linux/gpio-pxa.h>
 #include <linux/platform_device.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include "pxa930.h"
 
index b1f9ff14e335937ada78be595f803683c05c826d..96255a0f595e91fdaa94b24fff574eccb16f5e2b 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef __ASM_MACH_REGS_RTC_H
 #define __ASM_MACH_REGS_RTC_H
 
-#include <mach/hardware.h>
+#include "pxa-regs.h"
 
 /*
  * Real Time Clock
index 9a168f83afeb373b5489c3a0495a76da4909a836..490e9ca16297af40fe3405de523994685111be9d 100644 (file)
@@ -2,6 +2,8 @@
 #ifndef __ASM_ARCH_REGS_UART_H
 #define __ASM_ARCH_REGS_UART_H
 
+#include "pxa-regs.h"
+
 /*
  * UARTs
  */
index 6c5b3ffd2cd3f53900a4106696566dee2a2b9c5f..272efeb954f463814158f1d55fbefefc4e226b7d 100644 (file)
@@ -13,7 +13,6 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <mach/hardware.h>
 #include <mach/smemc.h>
 #include <mach/pxa2xx-regs.h>
 
index 32e82cc92ea57de64b5d8152308c8e80ca062381..47b99549d6168cf441943f2b0b4d810787ef96f0 100644 (file)
@@ -8,8 +8,8 @@
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/syscore_ops.h>
+#include <linux/soc/pxa/cpu.h>
 
-#include <mach/hardware.h>
 #include <mach/smemc.h>
 
 #ifdef CONFIG_PM
index 25a1f8c5a7382d505207f12b7f0b07e548c32f54..201dabe883b68185662efe3e4e50108170b881c5 100644 (file)
@@ -18,7 +18,6 @@
 
 #include <asm/irq.h>
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 
 #include <mach/spitz.h>
 #include "pxa27x.h"
index eab1645bb4adb93a37108dc30f6c335dc75f31e1..626fecdefb1cb004e8d3b4bc3296f1135afaebaf 100644 (file)
@@ -11,7 +11,6 @@
 
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <mach/hardware.h>
 
 #include <mach/pxa2xx-regs.h>
 
index f485146b899fb335c12de4029e1a63d3b891168b..e6ab428287aef806c61549b0cef1818aa9ee6262 100644 (file)
@@ -24,8 +24,8 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
-#include <mach/hardware.h>
 #include "pxa25x.h"
+#include <mach/addr-map.h>
 #include <mach/smemc.h>
 
 #include "generic.h"
index 79f0025fa17a5c5fe621707d4cf922ab6e296db3..9bcb8168820110daec1683bac0ae4f133763f75d 100644 (file)
@@ -20,6 +20,7 @@
 #include <linux/pwm.h>
 #include <linux/pwm_backlight.h>
 #include <linux/smc91x.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
index 7300ec2aac0d43b8944aaa36ee6d36170c3b6452..afe3efcb8e04b74a24857dda7f0e82d28b988e07 100644 (file)
@@ -2,6 +2,8 @@
 #ifndef __ASM_ARCH_ZYLONITE_H
 #define __ASM_ARCH_ZYLONITE_H
 
+#include <linux/soc/pxa/cpu.h>
+
 #define ZYLONITE_ETH_PHYS      0x14000000
 
 #define EXT_GPIO(x)            (128 + (x))
index 956fec1c4940647545367598848743efb8d5d40d..50a8a3547dbc86d484b1182a2c2a37b0b4f917a4 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/platform_data/i2c-pxa.h>
 #include <linux/platform_data/pca953x.h>
 #include <linux/gpio.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include "pxa300.h"
 #include "devices.h"
index 94cb834f36cda35bff6f5ce86ea0384d5cd7a73e..67cab4f1194bb071a40403e6cdd8303ad3fdc9fe 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/gpio.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include "pxa320.h"
 #include "zylonite.h"
index 60db92772e72c1a56a2a898ed65bbdd7ec6dd7e6..027b78183565838cef5af214846cfe75161a94d1 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/clk-provider.h>
 #include <linux/clkdev.h>
 #include <linux/of.h>
+#include <linux/soc/pxa/cpu.h>
 #include <mach/smemc.h>
 #include <mach/pxa3xx-regs.h>
 
index f0b6f52eb2c35e30f1452164becde44a5f2f5544..0f0e676ff781117ef9e9e3c585255b34c3ff903b 100644 (file)
@@ -24,6 +24,7 @@
 #include <linux/cpufreq.h>
 #include <linux/err.h>
 #include <linux/regulator/consumer.h>
+#include <linux/soc/pxa/cpu.h>
 #include <linux/io.h>
 
 #include <mach/pxa2xx-regs.h>
index 32f993c94675332191ea874264298d1805f3d0f0..d3b398b4aa6a9d7e3426d15ac4be238b8e3eeec6 100644 (file)
@@ -8,6 +8,7 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/cpufreq.h>
+#include <linux/soc/pxa/cpu.h>
 #include <linux/slab.h>
 #include <linux/io.h>
 
index 3332b77eef2aecbe5748722d6ea40eae42677649..f04ba12dbfa8fa1b6e283162c5654bdad2ab9a6a 100644 (file)
@@ -15,7 +15,6 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
-#include <mach/hardware.h>
 #include <linux/platform_data/mouse-pxa930_trkball.h>
 
 /* Trackball Controller Register Definitions */
index 0f4ac7f844cebec37b2cbd1d30821022d44a7c20..f57bdf08318898237da6ccc96f5e31e634a7d24c 100644 (file)
@@ -21,9 +21,9 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
+#include <linux/soc/pxa/cpu.h>
 #include <linux/wm97xx.h>
 
-#include <mach/hardware.h>
 #include <mach/mfp.h>
 #include <mach/regs-ac97.h>
 
index 42dc46e3f00fda52c9ad87f3a7a44c59c0fe84a7..9aa3fccd71fb2eb7d5b5b0d89200d287720f24b3 100644 (file)
@@ -11,7 +11,6 @@
 #include <linux/device.h>
 #include <linux/leds.h>
 
-#include <mach/hardware.h>
 #include <asm/hardware/locomo.h>
 
 static void locomoled_brightness_set(struct led_classdev *led_cdev,
index 316393c694d7a6dd73c39b2a2a57e0a1d7628195..0db9490dc6595a18ddea35717341259168a690f5 100644 (file)
 #include <linux/gfp.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <linux/sizes.h>
 
-#include <mach/hardware.h>
 #include <linux/platform_data/mmc-pxamci.h>
 
 #include "pxamci.h"
index 7d96758a8f04e0cf2a8b0da4eec31e8cab363e23..1749dbbacc135af325ee5030eddb8fb7496a07e6 100644 (file)
@@ -16,8 +16,6 @@
 #include <linux/mtd/partitions.h>
 
 #include <asm/io.h>
-#include <mach/hardware.h>
-
 #include <asm/mach/flash.h>
 
 #define CACHELINESIZE  32
index d6d2f75f8f470b4ecc57a6c4a7c053b3bd4f42f3..7cd1375d60875236b46ca002b433b8eb10e843db 100644 (file)
@@ -23,8 +23,8 @@
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
+#include <linux/soc/pxa/cpu.h>
 
-#include <mach/hardware.h>
 #include <mach/smemc.h>
 #include <asm/io.h>
 #include <asm/irq.h>
index 5fdd25a9e28eea6e7c7be7aac7329260cf4507d4..66fe1d1af12a7bc0ad89ae50323edec9275f84c4 100644 (file)
@@ -15,7 +15,6 @@
 #include <linux/platform_device.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <asm/irq.h>
 #include <asm/hardware/scoop.h>
 
index 29fdd174bc23295bddf77e6158c7a20985d6d725..bce664bbdc98f42c42754833185048f39f5bb04c 100644 (file)
@@ -17,7 +17,6 @@
 
 #include <pcmcia/ss.h>
 
-#include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/mach-types.h>
 #include <asm/irq.h>
index 7feb8d61c639579d63b9109441581440c0cef933..f1b5160cb8fa0e4f5abc766210e8087267ba8880 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
-#include <mach/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/mach-types.h>
 
index 3a8c84bb174d73992570cd89a0f8ea4c3fce1983..9276a628473df0dfec62fd54552b67a010ba7ca4 100644 (file)
@@ -47,8 +47,6 @@
 #include <linux/spinlock.h>
 #include <linux/timer.h>
 
-#include <mach/hardware.h>
-
 #include "soc_common.h"
 
 static irqreturn_t soc_common_pcmcia_interrupt(int irq, void *dev);
index cf8119b6d32044b343d63e71f669190cc38ecfa1..eeacf480cf3621a0576a7e800b9adea88493534e 100644 (file)
@@ -16,8 +16,6 @@
 #include <linux/of.h>
 #include <linux/of_device.h>
 
-#include <mach/hardware.h>
-
 #include "rtc-sa1100.h"
 
 #define RTC_DEF_DIVIDER                (32768 - 1)
index 54aa5c77e5493b0430484f0cff4fea026b7ab255..ab4f610a0140f2bc87bd283c17344dac1d6f0130 100644 (file)
@@ -36,8 +36,7 @@
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
 #include <linux/usb/otg.h>
-
-#include <mach/hardware.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include "ohci.h"
 
index f1551e00eb12f149e94857d94d1c4747a2d0adb8..e3d1a184d2bead314e9b7bd10cc3d861cc60904c 100644 (file)
 #include <linux/console.h>
 #include <linux/of_graph.h>
 #include <linux/regulator/consumer.h>
+#include <linux/soc/pxa/cpu.h>
 #include <video/of_display_timing.h>
 #include <video/videomode.h>
 
-#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/div64.h>
index 27846c6bdfb00c4ae410e15527c73ff52dd5f6f3..d33f0375112f9fab304eb5f33ad32a6906e02da1 100644 (file)
@@ -35,7 +35,6 @@
 #endif
 
 #include <mach/reset.h>
-#include <mach/hardware.h>
 
 static unsigned long oscr_freq;
 static unsigned long sa1100wdt_users;
diff --git a/include/linux/soc/pxa/cpu.h b/include/linux/soc/pxa/cpu.h
new file mode 100644 (file)
index 0000000..5782450
--- /dev/null
@@ -0,0 +1,252 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ *  Author:    Nicolas Pitre
+ *  Created:   Jun 15, 2001
+ *  Copyright: MontaVista Software Inc.
+ */
+
+#ifndef __SOC_PXA_CPU_H
+#define __SOC_PXA_CPU_H
+
+#ifdef CONFIG_ARM
+#include <asm/cputype.h>
+#endif
+
+/*
+ *   CPU     Stepping     CPU_ID         JTAG_ID
+ *
+ *  PXA210     B0      0x69052922      0x2926C013
+ *  PXA210     B1      0x69052923      0x3926C013
+ *  PXA210     B2      0x69052924      0x4926C013
+ *  PXA210     C0      0x69052D25      0x5926C013
+ *
+ *  PXA250     A0      0x69052100      0x09264013
+ *  PXA250     A1      0x69052101      0x19264013
+ *  PXA250     B0      0x69052902      0x29264013
+ *  PXA250     B1      0x69052903      0x39264013
+ *  PXA250     B2      0x69052904      0x49264013
+ *  PXA250     C0      0x69052D05      0x59264013
+ *
+ *  PXA255     A0      0x69052D06      0x69264013
+ *
+ *  PXA26x     A0      0x69052903      0x39264013
+ *  PXA26x     B0      0x69052D05      0x59264013
+ *
+ *  PXA27x     A0      0x69054110      0x09265013
+ *  PXA27x     A1      0x69054111      0x19265013
+ *  PXA27x     B0      0x69054112      0x29265013
+ *  PXA27x     B1      0x69054113      0x39265013
+ *  PXA27x     C0      0x69054114      0x49265013
+ *  PXA27x     C5      0x69054117      0x79265013
+ *
+ *  PXA30x     A0      0x69056880      0x0E648013
+ *  PXA30x     A1      0x69056881      0x1E648013
+ *  PXA31x     A0      0x69056890      0x0E649013
+ *  PXA31x     A1      0x69056891      0x1E649013
+ *  PXA31x     A2      0x69056892      0x2E649013
+ *  PXA32x     B1      0x69056825      0x5E642013
+ *  PXA32x     B2      0x69056826      0x6E642013
+ *
+ *  PXA930     B0      0x69056835      0x5E643013
+ *  PXA930     B1      0x69056837      0x7E643013
+ *  PXA930     B2      0x69056838      0x8E643013
+ *
+ *  PXA935     A0      0x56056931      0x1E653013
+ *  PXA935     B0      0x56056936      0x6E653013
+ *  PXA935     B1      0x56056938      0x8E653013
+ */
+#ifdef CONFIG_PXA25x
+#define __cpu_is_pxa210(id)                            \
+       ({                                              \
+               unsigned int _id = (id) & 0xf3f0;       \
+               _id == 0x2120;                          \
+       })
+
+#define __cpu_is_pxa250(id)                            \
+       ({                                              \
+               unsigned int _id = (id) & 0xf3ff;       \
+               _id <= 0x2105;                          \
+       })
+
+#define __cpu_is_pxa255(id)                            \
+       ({                                              \
+               unsigned int _id = (id) & 0xffff;       \
+               _id == 0x2d06;                          \
+       })
+
+#define __cpu_is_pxa25x(id)                            \
+       ({                                              \
+               unsigned int _id = (id) & 0xf300;       \
+               _id == 0x2100;                          \
+       })
+#else
+#define __cpu_is_pxa210(id)    (0)
+#define __cpu_is_pxa250(id)    (0)
+#define __cpu_is_pxa255(id)    (0)
+#define __cpu_is_pxa25x(id)    (0)
+#endif
+
+#ifdef CONFIG_PXA27x
+#define __cpu_is_pxa27x(id)                            \
+       ({                                              \
+               unsigned int _id = (id) >> 4 & 0xfff;   \
+               _id == 0x411;                           \
+       })
+#else
+#define __cpu_is_pxa27x(id)    (0)
+#endif
+
+#ifdef CONFIG_CPU_PXA300
+#define __cpu_is_pxa300(id)                            \
+       ({                                              \
+               unsigned int _id = (id) >> 4 & 0xfff;   \
+               _id == 0x688;                           \
+        })
+#else
+#define __cpu_is_pxa300(id)    (0)
+#endif
+
+#ifdef CONFIG_CPU_PXA310
+#define __cpu_is_pxa310(id)                            \
+       ({                                              \
+               unsigned int _id = (id) >> 4 & 0xfff;   \
+               _id == 0x689;                           \
+        })
+#else
+#define __cpu_is_pxa310(id)    (0)
+#endif
+
+#ifdef CONFIG_CPU_PXA320
+#define __cpu_is_pxa320(id)                            \
+       ({                                              \
+               unsigned int _id = (id) >> 4 & 0xfff;   \
+               _id == 0x603 || _id == 0x682;           \
+        })
+#else
+#define __cpu_is_pxa320(id)    (0)
+#endif
+
+#ifdef CONFIG_CPU_PXA930
+#define __cpu_is_pxa930(id)                            \
+       ({                                              \
+               unsigned int _id = (id) >> 4 & 0xfff;   \
+               _id == 0x683;                           \
+        })
+#else
+#define __cpu_is_pxa930(id)    (0)
+#endif
+
+#ifdef CONFIG_CPU_PXA935
+#define __cpu_is_pxa935(id)                            \
+       ({                                              \
+               unsigned int _id = (id) >> 4 & 0xfff;   \
+               _id == 0x693;                           \
+        })
+#else
+#define __cpu_is_pxa935(id)    (0)
+#endif
+
+#define cpu_is_pxa210()                                        \
+       ({                                              \
+               __cpu_is_pxa210(read_cpuid_id());       \
+       })
+
+#define cpu_is_pxa250()                                        \
+       ({                                              \
+               __cpu_is_pxa250(read_cpuid_id());       \
+       })
+
+#define cpu_is_pxa255()                                 \
+       ({                                              \
+               __cpu_is_pxa255(read_cpuid_id());       \
+       })
+
+#define cpu_is_pxa25x()                                        \
+       ({                                              \
+               __cpu_is_pxa25x(read_cpuid_id());       \
+       })
+
+#define cpu_is_pxa27x()                                        \
+       ({                                              \
+               __cpu_is_pxa27x(read_cpuid_id());       \
+       })
+
+#define cpu_is_pxa300()                                        \
+       ({                                              \
+               __cpu_is_pxa300(read_cpuid_id());       \
+        })
+
+#define cpu_is_pxa310()                                        \
+       ({                                              \
+               __cpu_is_pxa310(read_cpuid_id());       \
+        })
+
+#define cpu_is_pxa320()                                        \
+       ({                                              \
+               __cpu_is_pxa320(read_cpuid_id());       \
+        })
+
+#define cpu_is_pxa930()                                        \
+       ({                                              \
+               __cpu_is_pxa930(read_cpuid_id());       \
+        })
+
+#define cpu_is_pxa935()                                        \
+       ({                                              \
+               __cpu_is_pxa935(read_cpuid_id());       \
+        })
+
+
+
+/*
+ * CPUID Core Generation Bit
+ * <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
+ */
+#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
+#define __cpu_is_pxa2xx(id)                            \
+       ({                                              \
+               unsigned int _id = (id) >> 13 & 0x7;    \
+               _id <= 0x2;                             \
+        })
+#else
+#define __cpu_is_pxa2xx(id)    (0)
+#endif
+
+#ifdef CONFIG_PXA3xx
+#define __cpu_is_pxa3xx(id)                            \
+       ({                                              \
+               __cpu_is_pxa300(id)                     \
+                       || __cpu_is_pxa310(id)          \
+                       || __cpu_is_pxa320(id)          \
+                       || __cpu_is_pxa93x(id);         \
+        })
+#else
+#define __cpu_is_pxa3xx(id)    (0)
+#endif
+
+#if defined(CONFIG_CPU_PXA930) || defined(CONFIG_CPU_PXA935)
+#define __cpu_is_pxa93x(id)                            \
+       ({                                              \
+               __cpu_is_pxa930(id)                     \
+                       || __cpu_is_pxa935(id);         \
+        })
+#else
+#define __cpu_is_pxa93x(id)    (0)
+#endif
+
+#define cpu_is_pxa2xx()                                        \
+       ({                                              \
+               __cpu_is_pxa2xx(read_cpuid_id());       \
+        })
+
+#define cpu_is_pxa3xx()                                        \
+       ({                                              \
+               __cpu_is_pxa3xx(read_cpuid_id());       \
+        })
+
+#define cpu_is_pxa93x()                                        \
+       ({                                              \
+               __cpu_is_pxa93x(read_cpuid_id());       \
+        })
+
+#endif
index 58274b4a1f0909d913e69084260438223d476227..84d5f85073b957ce3b0ff3f560beb6671fc5c5a3 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
+#include <linux/soc/pxa/cpu.h>
 
 #include <sound/pxa2xx-lib.h>
 
index 58f8541ba55c640612b5c6f0d69814522f0528de..8f78c5a359c5849b6fde4f0b00f8ab3ffbc75e4e 100644 (file)
@@ -21,7 +21,7 @@
 #include <sound/pxa2xx-lib.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 #include <mach/regs-ac97.h>
 #include <mach/audio.h>
 
index 5bfc1a9665320668871eca500ca34815012c02a8..114a33c4a06476592dbeabc89095dc14d8f0ee71 100644 (file)
@@ -21,7 +21,7 @@
 #include <sound/pxa2xx-lib.h>
 #include <sound/dmaengine_pcm.h>
 
-#include <mach/hardware.h>
+#include <mach/pxa-regs.h>
 #include <mach/audio.h>
 
 #include "pxa2xx-i2s.h"
index edf2b9eec5b8b4f92baae3f3bb486690cbfa733b..7e8f33d7b83f972316ab9c86323b55c69a8768a9 100644 (file)
@@ -21,7 +21,6 @@
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
-#include <mach/hardware.h>
 #include <mach/audio.h>
 #include <mach/z2.h>