Commit c9c7ddd0 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'versatile-soc-v5.10-1' of...

Merge tag 'versatile-soc-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into arm/soc

Versatile SoC updates for the v5.10 kernel cycle:

- Drop a static qualifier in integrator_soc_init()
- Remove Integrator and Versatile from PHYS_OFFSET

* tag 'versatile-soc-v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: versatile: Remove Integrator and Realview from PHYS_OFFSET
  soc: integrator: Drop pointless static qualifier in integrator_soc_init()

Link: https://lore.kernel.org/r/CACRpkdYYDSg8FAjJAqew5yEu7H1Y3E1rPN9TL25K31T=QWATuA@mail.gmail.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 465c335b 5d007a09
...@@ -265,9 +265,7 @@ config PHYS_OFFSET ...@@ -265,9 +265,7 @@ config PHYS_OFFSET
depends on !ARM_PATCH_PHYS_VIRT depends on !ARM_PATCH_PHYS_VIRT
default DRAM_BASE if !MMU default DRAM_BASE if !MMU
default 0x00000000 if ARCH_EBSA110 || \ default 0x00000000 if ARCH_EBSA110 || \
ARCH_FOOTBRIDGE || \ ARCH_FOOTBRIDGE
ARCH_INTEGRATOR || \
ARCH_REALVIEW
default 0x10000000 if ARCH_OMAP1 || ARCH_RPC default 0x10000000 if ARCH_OMAP1 || ARCH_RPC
default 0x20000000 if ARCH_S5PV210 default 0x20000000 if ARCH_S5PV210
default 0xc0000000 if ARCH_SA1100 default 0xc0000000 if ARCH_SA1100
......
...@@ -100,7 +100,7 @@ ATTRIBUTE_GROUPS(integrator); ...@@ -100,7 +100,7 @@ ATTRIBUTE_GROUPS(integrator);
static int __init integrator_soc_init(void) static int __init integrator_soc_init(void)
{ {
static struct regmap *syscon_regmap; struct regmap *syscon_regmap;
struct soc_device *soc_dev; struct soc_device *soc_dev;
struct soc_device_attribute *soc_dev_attr; struct soc_device_attribute *soc_dev_attr;
struct device_node *np; struct device_node *np;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment