mirror of
https://github.com/torvalds/linux.git
synced 2024-12-23 19:31:53 +00:00
8c60969856
Most of the commits are for defconfig changes, to enable newly added
drivers or features that people have started using. For the changed
lines lines, we have mostly cleanups, the affected platforms are
OMAP, Versatile, EP93xx, Samsung, Broadcom, i.MX, and Actions.
The largest single change is the introduction of the TI "sysc" bus
driver, with the intention of cleaning up more legacy code.
Two new SoC platforms get added this time:
- Allwinner R40 is a modernized version of the A20 chip, now
with a Quad-Core ARM Cortex-A7. According to the manufacturer,
it is intended for "Smart Hardware"
- Broadcom Hurricane 2 (Aka Strataconnect BCM5334X) is a family
of chips meant for managed gigabit ethernet switches, based
around a Cortex-A9 CPU.
Finally, we gain SMP support for two platforms: Renesas R-Car E2
and Amlogic Meson8/8b, which were previously added but only supported
uniprocessor operation.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABAgAGBQJaDgf/AAoJEGCrR//JCVIntcMQAKI2q0Dr2giWtKSoH9GDh5co
137MamTj1YExIcmtbDVO22jV4WSKhIduo+rRBYmQ/uvrkUe9tf7I172JeAIzMzGf
HGYJ6fxpaEMUAbUlNcjuXJc7jQXNKLBK2X9CMuwXX3X3HddxKkL38D1d/Mxv5RGu
G1pEe0j734Qio9LpACnb0xnluwyUBJOYNwo7Agj5RWzOrXZ+TdwkiIW0JdQiG7Z5
wabzDa7OW1maB+hVYMAM3wHcqO7DKEvGvjYLRoT12cnOLXq7BNbXqXFufuMUNmNE
ABhWA1h9SYrXT3n5pQLwoonvvTsI7KXCefrZ0wuxbjrdD4yGW1gmgpRee9RfoggD
A6/62wpmSS61X5QWC6BLEa5v/o5NKewndyWhnjLllgJX8sRUbnPQa/xKv7ngdlN5
7YL5HWoNpMQv7fEweSc6j5l/F3yRBndn9TpeKiqCiUiNDrIGlZYhYKIcr9rGESFk
pu2KgK+e9+1k7F4s7LotsA65Q5bZIMveyyVtx0XHXz1G4O8NksoQCLJ3wcqQ2pzI
WpyOO5R1CNltPhKGC7EP3OZcIMlCtCnsNcedb/AGHgPS+ert2UxBnlSeSMBQlLZY
4fDwEAlA1qx9PuG9N3xrK/gAFiFLafK2sNxtVc7NSmXkkdm3xgJ95Y9sa72Y2qNO
rU2LL8SM7cOwhXHrlEFB
=jlJ2
-----END PGP SIGNATURE-----
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC platform updates from Arnd Bergmann:
"Most of the commits are for defconfig changes, to enable newly added
drivers or features that people have started using. For the changed
lines lines, we have mostly cleanups, the affected platforms are OMAP,
Versatile, EP93xx, Samsung, Broadcom, i.MX, and Actions.
The largest single change is the introduction of the TI "sysc" bus
driver, with the intention of cleaning up more legacy code.
Two new SoC platforms get added this time:
- Allwinner R40 is a modernized version of the A20 chip, now with a
Quad-Core ARM Cortex-A7. According to the manufacturer, it is
intended for "Smart Hardware"
- Broadcom Hurricane 2 (Aka Strataconnect BCM5334X) is a family of
chips meant for managed gigabit ethernet switches, based around a
Cortex-A9 CPU.
Finally, we gain SMP support for two platforms: Renesas R-Car E2 and
Amlogic Meson8/8b, which were previously added but only supported
uniprocessor operation"
* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (118 commits)
ARM: multi_v7_defconfig: Select RPMSG_VIRTIO as module
ARM: multi_v7_defconfig: enable CONFIG_GPIO_UNIPHIER
arm64: defconfig: enable CONFIG_GPIO_UNIPHIER
ARM: meson: enable MESON_IRQ_GPIO in Kconfig for meson8b
ARM: meson: Add SMP bringup code for Meson8 and Meson8b
ARM: smp_scu: allow the platform code to read the SCU CPU status
ARM: smp_scu: add a helper for powering on a specific CPU
dt-bindings: Amlogic: Add Meson8 and Meson8b SMP related documentation
ARM: OMAP3: Delete an unnecessary variable initialisation in omap3xxx_hwmod_init()
ARM: OMAP3: Use common error handling code in omap3xxx_hwmod_init()
ARM: defconfig: select the right SX150X driver
arm64: defconfig: Enable QCOM_IOMMU
arm64: Add ThunderX drivers to defconfig
arm64: defconfig: Enable Tegra PCI controller
cpufreq: imx6q: Move speed grading check to cpufreq driver
arm64: defconfig: re-enable Qualcomm DB410c USB
ARM: configs: stm32: Add MDMA support in STM32 defconfig
ARM: imx: Enable cpuidle for i.MX6DL starting at 1.1
bus: ti-sysc: Fix unbalanced pm_runtime_enable by adding remove
bus: ti-sysc: mark PM functions as __maybe_unused
...
86 lines
1.9 KiB
C
86 lines
1.9 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* arch/arm/mach-ep93xx/include/mach/ts72xx.h
|
|
*/
|
|
|
|
/*
|
|
* TS72xx memory map:
|
|
*
|
|
* virt phys size
|
|
* febff000 22000000 4K model number register (bits 0-2)
|
|
* febfe000 22400000 4K options register
|
|
* febfd000 22800000 4K options register #2
|
|
*/
|
|
|
|
#define TS72XX_MODEL_PHYS_BASE 0x22000000
|
|
#define TS72XX_MODEL_VIRT_BASE IOMEM(0xfebff000)
|
|
#define TS72XX_MODEL_SIZE 0x00001000
|
|
|
|
#define TS72XX_MODEL_TS7200 0x00
|
|
#define TS72XX_MODEL_TS7250 0x01
|
|
#define TS72XX_MODEL_TS7260 0x02
|
|
#define TS72XX_MODEL_TS7300 0x03
|
|
#define TS72XX_MODEL_TS7400 0x04
|
|
#define TS72XX_MODEL_MASK 0x07
|
|
|
|
|
|
#define TS72XX_OPTIONS_PHYS_BASE 0x22400000
|
|
#define TS72XX_OPTIONS_VIRT_BASE IOMEM(0xfebfe000)
|
|
#define TS72XX_OPTIONS_SIZE 0x00001000
|
|
|
|
#define TS72XX_OPTIONS_COM2_RS485 0x02
|
|
#define TS72XX_OPTIONS_MAX197 0x01
|
|
|
|
|
|
#define TS72XX_OPTIONS2_PHYS_BASE 0x22800000
|
|
#define TS72XX_OPTIONS2_VIRT_BASE IOMEM(0xfebfd000)
|
|
#define TS72XX_OPTIONS2_SIZE 0x00001000
|
|
|
|
#define TS72XX_OPTIONS2_TS9420 0x04
|
|
#define TS72XX_OPTIONS2_TS9420_BOOT 0x02
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
static inline int ts72xx_model(void)
|
|
{
|
|
return __raw_readb(TS72XX_MODEL_VIRT_BASE) & TS72XX_MODEL_MASK;
|
|
}
|
|
|
|
static inline int board_is_ts7200(void)
|
|
{
|
|
return ts72xx_model() == TS72XX_MODEL_TS7200;
|
|
}
|
|
|
|
static inline int board_is_ts7250(void)
|
|
{
|
|
return ts72xx_model() == TS72XX_MODEL_TS7250;
|
|
}
|
|
|
|
static inline int board_is_ts7260(void)
|
|
{
|
|
return ts72xx_model() == TS72XX_MODEL_TS7260;
|
|
}
|
|
|
|
static inline int board_is_ts7300(void)
|
|
{
|
|
return ts72xx_model() == TS72XX_MODEL_TS7300;
|
|
}
|
|
|
|
static inline int board_is_ts7400(void)
|
|
{
|
|
return ts72xx_model() == TS72XX_MODEL_TS7400;
|
|
}
|
|
|
|
static inline int is_max197_installed(void)
|
|
{
|
|
return !!(__raw_readb(TS72XX_OPTIONS_VIRT_BASE) &
|
|
TS72XX_OPTIONS_MAX197);
|
|
}
|
|
|
|
static inline int is_ts9420_installed(void)
|
|
{
|
|
return !!(__raw_readb(TS72XX_OPTIONS2_VIRT_BASE) &
|
|
TS72XX_OPTIONS2_TS9420);
|
|
}
|
|
#endif
|