From: Rob Herring <robh@kernel.org> To: Linus Walleij <linus.walleij@linaro.org>, Liviu Dudau <liviu.dudau@arm.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Sudeep Holla <sudeep.holla@arm.com> Cc: Kevin Brodsky <Kevin.Brodsky@arm.com>, Arnd Bergmann <arnd@arndb.de>, Catalin Marinas <catalin.marinas@arm.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Lee Jones <lee.jones@linaro.org>, Sebastian Reichel <sre@kernel.org>, Stephen Boyd <sboyd@kernel.org>, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH v2 01/16] ARM: vexpress: Move vexpress_flags_set() into arch code Date: Wed, 29 Apr 2020 15:58:10 -0500 [thread overview] Message-ID: <20200429205825.10604-2-robh@kernel.org> (raw) In-Reply-To: <20200429205825.10604-1-robh@kernel.org> vexpress_flags_set() is only used by the platform SMP related code and has nothing to do with the vexpress-sysreg MFD driver other than both access the same h/w block. It's also only needed for 32-bit systems and must be built-in for them. Let's move vexpress_flags_set() closer to where it is being used. This will allow for vexpress-sysreg to be built as a module. Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Lee Jones <lee.jones@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Rob Herring <robh@kernel.org> --- arch/arm/mach-vexpress/Kconfig | 1 - arch/arm/mach-vexpress/core.h | 1 + arch/arm/mach-vexpress/dcscb.c | 1 + arch/arm/mach-vexpress/v2m.c | 23 +++++++++++++++++++++++ drivers/mfd/vexpress-sysreg.c | 19 ------------------- include/linux/vexpress.h | 4 ---- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 726a68085c3b..18951cd20d9d 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -22,7 +22,6 @@ menuconfig ARCH_VEXPRESS select REGULATOR_FIXED_VOLTAGE if REGULATOR select VEXPRESS_CONFIG select VEXPRESS_SYSCFG - select MFD_VEXPRESS_SYSREG help This option enables support for systems using Cortex processor based ARM core and logic (FPGA) tiles on the Versatile Express motherboard, diff --git a/arch/arm/mach-vexpress/core.h b/arch/arm/mach-vexpress/core.h index f4a7519084f1..bda78675c55d 100644 --- a/arch/arm/mach-vexpress/core.h +++ b/arch/arm/mach-vexpress/core.h @@ -1,3 +1,4 @@ bool vexpress_smp_init_ops(void); +void vexpress_flags_set(u32 data); extern const struct smp_operations vexpress_smp_dt_ops; diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c index 46a903c88c6a..a0554d7d04f7 100644 --- a/arch/arm/mach-vexpress/dcscb.c +++ b/arch/arm/mach-vexpress/dcscb.c @@ -20,6 +20,7 @@ #include <asm/cputype.h> #include <asm/cp15.h> +#include "core.h" #define RST_HOLD0 0x0 #define RST_HOLD1 0x4 diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 95886b3bb9dd..ffe7c7a85ae9 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -1,8 +1,31 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/of.h> +#include <linux/of_address.h> #include <asm/mach/arch.h> #include "core.h" +#define SYS_FLAGSSET 0x030 +#define SYS_FLAGSCLR 0x034 + +void vexpress_flags_set(u32 data) +{ + static void __iomem *base; + + if (!base) { + struct device_node *node = of_find_compatible_node(NULL, NULL, + "arm,vexpress-sysreg"); + + base = of_iomap(node, 0); + } + + if (WARN_ON(!base)) + return; + + writel(~0, base + SYS_FLAGSCLR); + writel(data, base + SYS_FLAGSSET); +} + static const char * const v2m_dt_match[] __initconst = { "arm,vexpress", NULL, diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c index c68ff56dbdb1..0b9cc67706c7 100644 --- a/drivers/mfd/vexpress-sysreg.c +++ b/drivers/mfd/vexpress-sysreg.c @@ -8,7 +8,6 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/mfd/core.h> -#include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/platform_data/syscon.h> #include <linux/platform_device.h> @@ -42,24 +41,6 @@ #define SYS_MISC_MASTERSITE (1 << 14) -void vexpress_flags_set(u32 data) -{ - static void __iomem *base; - - if (!base) { - struct device_node *node = of_find_compatible_node(NULL, NULL, - "arm,vexpress-sysreg"); - - base = of_iomap(node, 0); - } - - if (WARN_ON(!base)) - return; - - writel(~0, base + SYS_FLAGSCLR); - writel(data, base + SYS_FLAGSSET); -} - /* The sysreg block is just a random collection of various functions... */ static struct syscon_platform_data vexpress_sysreg_sys_id_pdata = { diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h index 0e130b5077a5..2ec7992b054c 100644 --- a/include/linux/vexpress.h +++ b/include/linux/vexpress.h @@ -40,8 +40,4 @@ struct device *vexpress_config_bridge_register(struct device *parent, struct regmap *devm_regmap_init_vexpress_config(struct device *dev); -/* Platform control */ - -void vexpress_flags_set(u32 data); - #endif -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robh@kernel.org> To: Linus Walleij <linus.walleij@linaro.org>, Liviu Dudau <liviu.dudau@arm.com>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Sudeep Holla <sudeep.holla@arm.com> Cc: Arnd Bergmann <arnd@arndb.de>, linux-pm@vger.kernel.org, Stephen Boyd <sboyd@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Kevin Brodsky <Kevin.Brodsky@arm.com>, Sebastian Reichel <sre@kernel.org>, Will Deacon <will@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Lee Jones <lee.jones@linaro.org>, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 01/16] ARM: vexpress: Move vexpress_flags_set() into arch code Date: Wed, 29 Apr 2020 15:58:10 -0500 [thread overview] Message-ID: <20200429205825.10604-2-robh@kernel.org> (raw) In-Reply-To: <20200429205825.10604-1-robh@kernel.org> vexpress_flags_set() is only used by the platform SMP related code and has nothing to do with the vexpress-sysreg MFD driver other than both access the same h/w block. It's also only needed for 32-bit systems and must be built-in for them. Let's move vexpress_flags_set() closer to where it is being used. This will allow for vexpress-sysreg to be built as a module. Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Lee Jones <lee.jones@linaro.org> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Liviu Dudau <liviu.dudau@arm.com> Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Rob Herring <robh@kernel.org> --- arch/arm/mach-vexpress/Kconfig | 1 - arch/arm/mach-vexpress/core.h | 1 + arch/arm/mach-vexpress/dcscb.c | 1 + arch/arm/mach-vexpress/v2m.c | 23 +++++++++++++++++++++++ drivers/mfd/vexpress-sysreg.c | 19 ------------------- include/linux/vexpress.h | 4 ---- 6 files changed, 25 insertions(+), 24 deletions(-) diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig index 726a68085c3b..18951cd20d9d 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -22,7 +22,6 @@ menuconfig ARCH_VEXPRESS select REGULATOR_FIXED_VOLTAGE if REGULATOR select VEXPRESS_CONFIG select VEXPRESS_SYSCFG - select MFD_VEXPRESS_SYSREG help This option enables support for systems using Cortex processor based ARM core and logic (FPGA) tiles on the Versatile Express motherboard, diff --git a/arch/arm/mach-vexpress/core.h b/arch/arm/mach-vexpress/core.h index f4a7519084f1..bda78675c55d 100644 --- a/arch/arm/mach-vexpress/core.h +++ b/arch/arm/mach-vexpress/core.h @@ -1,3 +1,4 @@ bool vexpress_smp_init_ops(void); +void vexpress_flags_set(u32 data); extern const struct smp_operations vexpress_smp_dt_ops; diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c index 46a903c88c6a..a0554d7d04f7 100644 --- a/arch/arm/mach-vexpress/dcscb.c +++ b/arch/arm/mach-vexpress/dcscb.c @@ -20,6 +20,7 @@ #include <asm/cputype.h> #include <asm/cp15.h> +#include "core.h" #define RST_HOLD0 0x0 #define RST_HOLD1 0x4 diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 95886b3bb9dd..ffe7c7a85ae9 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -1,8 +1,31 @@ // SPDX-License-Identifier: GPL-2.0 +#include <linux/of.h> +#include <linux/of_address.h> #include <asm/mach/arch.h> #include "core.h" +#define SYS_FLAGSSET 0x030 +#define SYS_FLAGSCLR 0x034 + +void vexpress_flags_set(u32 data) +{ + static void __iomem *base; + + if (!base) { + struct device_node *node = of_find_compatible_node(NULL, NULL, + "arm,vexpress-sysreg"); + + base = of_iomap(node, 0); + } + + if (WARN_ON(!base)) + return; + + writel(~0, base + SYS_FLAGSCLR); + writel(data, base + SYS_FLAGSSET); +} + static const char * const v2m_dt_match[] __initconst = { "arm,vexpress", NULL, diff --git a/drivers/mfd/vexpress-sysreg.c b/drivers/mfd/vexpress-sysreg.c index c68ff56dbdb1..0b9cc67706c7 100644 --- a/drivers/mfd/vexpress-sysreg.c +++ b/drivers/mfd/vexpress-sysreg.c @@ -8,7 +8,6 @@ #include <linux/err.h> #include <linux/io.h> #include <linux/mfd/core.h> -#include <linux/of_address.h> #include <linux/of_platform.h> #include <linux/platform_data/syscon.h> #include <linux/platform_device.h> @@ -42,24 +41,6 @@ #define SYS_MISC_MASTERSITE (1 << 14) -void vexpress_flags_set(u32 data) -{ - static void __iomem *base; - - if (!base) { - struct device_node *node = of_find_compatible_node(NULL, NULL, - "arm,vexpress-sysreg"); - - base = of_iomap(node, 0); - } - - if (WARN_ON(!base)) - return; - - writel(~0, base + SYS_FLAGSCLR); - writel(data, base + SYS_FLAGSSET); -} - /* The sysreg block is just a random collection of various functions... */ static struct syscon_platform_data vexpress_sysreg_sys_id_pdata = { diff --git a/include/linux/vexpress.h b/include/linux/vexpress.h index 0e130b5077a5..2ec7992b054c 100644 --- a/include/linux/vexpress.h +++ b/include/linux/vexpress.h @@ -40,8 +40,4 @@ struct device *vexpress_config_bridge_register(struct device *parent, struct regmap *devm_regmap_init_vexpress_config(struct device *dev); -/* Platform control */ - -void vexpress_flags_set(u32 data); - #endif -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-04-29 20:58 UTC|newest] Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-29 20:58 [PATCH v2 00/17] Modularizing Versatile Express Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-04-29 20:58 ` Rob Herring [this message] 2020-04-29 20:58 ` [PATCH v2 01/16] ARM: vexpress: Move vexpress_flags_set() into arch code Rob Herring 2020-05-04 8:56 ` Lee Jones 2020-05-04 8:56 ` Lee Jones 2020-04-29 20:58 ` [PATCH v2 02/16] arm64: vexpress: Don't select CONFIG_POWER_RESET_VEXPRESS Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-04-29 20:58 ` [PATCH v2 03/16] amba: Retry adding deferred devices at late_initcall Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-04-29 20:58 ` [PATCH v2 04/16] clk: versatile: Rework kconfig structure Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:26 ` Sudeep Holla 2020-05-01 16:26 ` Sudeep Holla 2020-05-05 6:20 ` Stephen Boyd 2020-05-05 6:20 ` Stephen Boyd 2020-04-29 20:58 ` [PATCH v2 05/16] clk: versatile: Only enable SP810 on 32-bit by default Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:32 ` Sudeep Holla 2020-05-01 16:32 ` Sudeep Holla 2020-05-05 6:20 ` Stephen Boyd 2020-05-05 6:20 ` Stephen Boyd 2020-04-29 20:58 ` [PATCH v2 06/16] clk: vexpress-osc: Use the devres clock API variants Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-04-29 20:58 ` [PATCH v2 07/16] clk: vexpress-osc: Support building as a module Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:36 ` Sudeep Holla 2020-05-01 16:36 ` Sudeep Holla 2020-05-05 6:21 ` Stephen Boyd 2020-05-05 6:21 ` Stephen Boyd 2020-04-29 20:58 ` [PATCH v2 08/16] mfd: vexpress-sysreg: Drop selecting CONFIG_CLKSRC_MMIO Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:37 ` Sudeep Holla 2020-05-01 16:37 ` Sudeep Holla 2020-05-04 8:55 ` Lee Jones 2020-05-04 8:55 ` Lee Jones 2020-04-29 20:58 ` [PATCH v2 09/16] mfd: vexpress-sysreg: Drop unused syscon child devices Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:50 ` Sudeep Holla 2020-05-01 16:50 ` Sudeep Holla 2020-05-04 8:41 ` Lee Jones 2020-05-04 8:41 ` Lee Jones 2020-04-29 20:58 ` [PATCH v2 10/16] mfd: vexpress-sysreg: Use devres API variants Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:56 ` Sudeep Holla 2020-05-01 16:56 ` Sudeep Holla 2020-05-04 8:41 ` Lee Jones 2020-05-04 8:41 ` Lee Jones 2020-04-29 20:58 ` [PATCH v2 11/16] mfd: vexpress-sysreg: Support building as a module Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:58 ` Sudeep Holla 2020-05-01 16:58 ` Sudeep Holla 2020-05-04 8:40 ` Lee Jones 2020-05-04 8:40 ` Lee Jones 2020-04-29 20:58 ` [PATCH v2 12/16] bus: vexpress-config: Merge vexpress-syscfg into vexpress-config Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 17:02 ` Sudeep Holla 2020-05-01 17:02 ` Sudeep Holla 2020-04-29 20:58 ` [PATCH v2 13/16] bus: vexpress-config: simplify config bus probing Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 17:10 ` Sudeep Holla 2020-05-01 17:10 ` Sudeep Holla 2020-04-29 20:58 ` [PATCH v2 14/16] vexpress: Move setting master site to vexpress-config bus Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 17:18 ` Sudeep Holla 2020-05-01 17:18 ` Sudeep Holla 2020-05-04 8:26 ` Lee Jones 2020-05-04 8:26 ` Lee Jones 2020-04-29 20:58 ` [PATCH v2 15/16] bus: vexpress-config: Support building as module Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:58 ` Sudeep Holla 2020-05-01 16:58 ` Sudeep Holla 2020-04-29 20:58 ` [PATCH v2 16/16] ARM: vexpress: Don't select VEXPRESS_CONFIG Rob Herring 2020-04-29 20:58 ` Rob Herring 2020-05-01 16:55 ` Sudeep Holla 2020-05-01 16:55 ` Sudeep Holla 2020-04-29 22:11 ` [PATCH v2 00/17] Modularizing Versatile Express Sebastian Reichel 2020-04-29 22:11 ` Sebastian Reichel 2020-05-01 17:20 ` Sudeep Holla 2020-05-01 17:20 ` Sudeep Holla 2020-06-17 15:08 ` Daniel Thompson 2020-06-17 15:08 ` Daniel Thompson 2020-07-08 16:39 ` Rob Herring 2020-07-08 16:39 ` Rob Herring 2020-07-09 11:33 ` Daniel Thompson 2020-07-09 11:33 ` Daniel Thompson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200429205825.10604-2-robh@kernel.org \ --to=robh@kernel.org \ --cc=Kevin.Brodsky@arm.com \ --cc=arnd@arndb.de \ --cc=catalin.marinas@arm.com \ --cc=gregkh@linuxfoundation.org \ --cc=lee.jones@linaro.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=liviu.dudau@arm.com \ --cc=lorenzo.pieralisi@arm.com \ --cc=sboyd@kernel.org \ --cc=sre@kernel.org \ --cc=sudeep.holla@arm.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.