From: Arnd Bergmann <arnd@arndb.de> To: Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, Sylwester Nawrocki <s.nawrocki@samsung.com>, Tomasz Figa <tomasz.figa@gmail.com>, Chanwoo Choi <cw00.choi@samsung.com> Cc: linux-samsung-soc@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Stephen Boyd <sboyd@kernel.org>, Michael Turquette <mturquette@baylibre.com>, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Date: Thu, 10 Oct 2019 22:29:45 +0200 [thread overview] Message-ID: <20191010203043.1241612-1-arnd@arndb.de> (raw) In-Reply-To: <20191010202802.1132272-1-arnd@arndb.de> The clk driver uses both a function call into an exported platform file and a direct register access to a hardcoded virtual address for accessing the MISCCR register, both become are a problem for a multiplatform kernel because of the header file dependency. Make this an indirect function call through platform data instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-s3c24xx/common.c | 3 +++ drivers/clk/samsung/clk-s3c2410-dclk.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index 3dc029c2d2cb..ebf6bde67816 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c @@ -667,5 +667,8 @@ struct platform_device s3c2410_device_dclk = { .id = 0, .num_resources = ARRAY_SIZE(s3c2410_dclk_resource), .resource = s3c2410_dclk_resource, + .dev = { + .platform_data = s3c2410_modify_misccr, + }, }; #endif diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/clk-s3c2410-dclk.c index 1281672cb00e..fbcec0252c45 100644 --- a/drivers/clk/samsung/clk-s3c2410-dclk.c +++ b/drivers/clk/samsung/clk-s3c2410-dclk.c @@ -14,10 +14,6 @@ #include <linux/module.h> #include "clk.h" -/* legacy access to misccr, until dt conversion is finished */ -#include <mach/hardware.h> -#include <mach/regs-gpio.h> - #define MUX_DCLK0 0 #define MUX_DCLK1 1 #define DIV_DCLK0 2 @@ -52,6 +48,7 @@ struct s3c24xx_clkout { struct clk_hw hw; u32 mask; u8 shift; + unsigned int (*modify_misccr)(unsigned int clr, unsigned int chg); }; #define to_s3c24xx_clkout(_hw) container_of(_hw, struct s3c24xx_clkout, hw) @@ -62,7 +59,7 @@ static u8 s3c24xx_clkout_get_parent(struct clk_hw *hw) int num_parents = clk_hw_get_num_parents(hw); u32 val; - val = readl_relaxed(S3C24XX_MISCCR) >> clkout->shift; + val = clkout->modify_misccr(0, 0) >> clkout->shift; val >>= clkout->shift; val &= clkout->mask; @@ -76,7 +73,7 @@ static int s3c24xx_clkout_set_parent(struct clk_hw *hw, u8 index) { struct s3c24xx_clkout *clkout = to_s3c24xx_clkout(hw); - s3c2410_modify_misccr((clkout->mask << clkout->shift), + clkout->modify_misccr((clkout->mask << clkout->shift), (index << clkout->shift)); return 0; @@ -110,6 +107,7 @@ static struct clk_hw *s3c24xx_register_clkout(struct device *dev, clkout->shift = shift; clkout->mask = mask; clkout->hw.init = &init; + clkout->modify_misccr = dev->platform_data; ret = clk_hw_register(dev, &clkout->hw); if (ret) -- 2.20.0
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de> To: Kukjin Kim <kgene@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, Sylwester Nawrocki <s.nawrocki@samsung.com>, Tomasz Figa <tomasz.figa@gmail.com>, Chanwoo Choi <cw00.choi@samsung.com> Cc: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org, Arnd Bergmann <arnd@arndb.de>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org Subject: [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Date: Thu, 10 Oct 2019 22:29:45 +0200 [thread overview] Message-ID: <20191010203043.1241612-1-arnd@arndb.de> (raw) Message-ID: <20191010202945.e1O-anp7-475iVTqOEmhua1NBkpVk522Y2N__6DdkPI@z> (raw) In-Reply-To: <20191010202802.1132272-1-arnd@arndb.de> The clk driver uses both a function call into an exported platform file and a direct register access to a hardcoded virtual address for accessing the MISCCR register, both become are a problem for a multiplatform kernel because of the header file dependency. Make this an indirect function call through platform data instead. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/mach-s3c24xx/common.c | 3 +++ drivers/clk/samsung/clk-s3c2410-dclk.c | 10 ++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index 3dc029c2d2cb..ebf6bde67816 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c @@ -667,5 +667,8 @@ struct platform_device s3c2410_device_dclk = { .id = 0, .num_resources = ARRAY_SIZE(s3c2410_dclk_resource), .resource = s3c2410_dclk_resource, + .dev = { + .platform_data = s3c2410_modify_misccr, + }, }; #endif diff --git a/drivers/clk/samsung/clk-s3c2410-dclk.c b/drivers/clk/samsung/clk-s3c2410-dclk.c index 1281672cb00e..fbcec0252c45 100644 --- a/drivers/clk/samsung/clk-s3c2410-dclk.c +++ b/drivers/clk/samsung/clk-s3c2410-dclk.c @@ -14,10 +14,6 @@ #include <linux/module.h> #include "clk.h" -/* legacy access to misccr, until dt conversion is finished */ -#include <mach/hardware.h> -#include <mach/regs-gpio.h> - #define MUX_DCLK0 0 #define MUX_DCLK1 1 #define DIV_DCLK0 2 @@ -52,6 +48,7 @@ struct s3c24xx_clkout { struct clk_hw hw; u32 mask; u8 shift; + unsigned int (*modify_misccr)(unsigned int clr, unsigned int chg); }; #define to_s3c24xx_clkout(_hw) container_of(_hw, struct s3c24xx_clkout, hw) @@ -62,7 +59,7 @@ static u8 s3c24xx_clkout_get_parent(struct clk_hw *hw) int num_parents = clk_hw_get_num_parents(hw); u32 val; - val = readl_relaxed(S3C24XX_MISCCR) >> clkout->shift; + val = clkout->modify_misccr(0, 0) >> clkout->shift; val >>= clkout->shift; val &= clkout->mask; @@ -76,7 +73,7 @@ static int s3c24xx_clkout_set_parent(struct clk_hw *hw, u8 index) { struct s3c24xx_clkout *clkout = to_s3c24xx_clkout(hw); - s3c2410_modify_misccr((clkout->mask << clkout->shift), + clkout->modify_misccr((clkout->mask << clkout->shift), (index << clkout->shift)); return 0; @@ -110,6 +107,7 @@ static struct clk_hw *s3c24xx_register_clkout(struct device *dev, clkout->shift = shift; clkout->mask = mask; clkout->hw.init = &init; + clkout->modify_misccr = dev->platform_data; ret = clk_hw_register(dev, &clkout->hw); if (ret) -- 2.20.0
next prev parent reply other threads:[~2019-10-10 20:29 UTC|newest] Thread overview: 135+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-10-10 20:28 [PATCH 00/36] ARM: samsung platform cleanup Arnd Bergmann 2019-10-10 20:28 ` Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann [this message] 2019-10-10 20:29 ` [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Arnd Bergmann 2019-10-10 20:29 ` [PATCH 02/36] ARM: s3c: simplify mach/io.h Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 03/36] usb: gadget: s3c: use platform resources Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:06 ` Krzysztof Kozlowski 2019-10-23 12:46 ` Krzysztof Kozlowski 2019-10-23 13:26 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 04/36] usb: gadget: s3c-hsudc: remove platform header dependency Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:09 ` Krzysztof Kozlowski 2019-10-23 12:21 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 05/36] ARM: samsung: make pm-debug platform independent Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:27 ` Krzysztof Kozlowski 2019-10-23 12:13 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 06/36] ARM: samsung: move CONFIG_DEBUG_S3C_UART to Kconfig.debug Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:12 ` Krzysztof Kozlowski 2019-10-23 12:22 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 07/36] ARM: exynos: use private samsung_cpu_id copy Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 10:54 ` Krzysztof Kozlowski 2019-10-23 12:37 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 08/36] ARM: exynos: stop selecting PLAT_SAMSUNG Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-15 14:12 ` Ulf Hansson 2019-10-23 10:57 ` Krzysztof Kozlowski 2019-10-23 12:43 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 09/36] ARM: samsung: move pm check code to drivers/soc Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 11:32 ` Krzysztof Kozlowski 2019-10-23 12:45 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 10/36] ARM: s5pv210: use private pm save/restore Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 11:55 ` Krzysztof Kozlowski 2019-10-23 13:12 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 11/36] ARM: s5pv210: split from plat-samsung Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-11 5:51 ` Uwe Kleine-König 2019-10-11 5:51 ` Uwe Kleine-König 2019-10-22 14:01 ` Arnd Bergmann 2019-10-22 15:53 ` Uwe Kleine-König 2019-10-22 16:20 ` Arnd Bergmann 2019-10-15 14:13 ` Ulf Hansson 2019-10-15 14:23 ` Thierry Reding 2019-10-23 12:14 ` Krzysztof Kozlowski 2019-10-23 13:17 ` Arnd Bergmann 2019-10-23 14:12 ` Krzysztof Kozlowski 2019-10-10 20:29 ` [PATCH 12/36] ARM: s3c64xx: remove mach/hardware.h Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-16 10:09 ` Charles Keepax 2019-10-10 20:29 ` [PATCH 13/36] ARM: s3c: move regs-spi.h into spi driver Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-23 12:32 ` Krzysztof Kozlowski 2019-10-23 13:21 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 14/36] ARM: s3c: move irqchip driver back into platform Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-10 20:29 ` [PATCH 15/36] ARM: s3c: adc: move header to linux/soc/samsung Arnd Bergmann 2019-10-10 20:29 ` Arnd Bergmann 2019-10-10 22:20 ` Guenter Roeck 2019-10-10 22:20 ` Guenter Roeck 2019-10-10 22:29 ` Dmitry Torokhov 2019-10-10 22:29 ` Dmitry Torokhov 2019-10-10 22:44 ` Sebastian Reichel 2019-10-10 22:44 ` Sebastian Reichel 2019-10-23 12:37 ` Krzysztof Kozlowski 2019-10-23 13:23 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 16/36] ARM: s3c: move spi fiq handler into platform Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 17/36] ARM: s3c: h1940-audio: turn into platform driver Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 18/36] ARM: s3c: gta02-audio: " Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 19/36] ARM: s3c: rx1950: " Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 20/36] ASoC: samsung: s3c2412-i2s: avoid hardcoded S3C2410_PA_IIS Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-11 10:50 ` Mark Brown 2019-10-11 10:50 ` Mark Brown 2019-10-10 20:30 ` [PATCH 21/36] ARM: s3c: move iis pinctrl config into boards Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 12:50 ` Krzysztof Kozlowski 2019-10-23 13:29 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 22/36] ARM: s3c: leds: move setpull() calls into board files Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 23/36] ARM: s3c: move s3cmci pinctrl handling " Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-15 14:12 ` Ulf Hansson 2019-10-16 13:12 ` Linus Walleij 2019-10-10 20:30 ` [PATCH 24/36] ARM: s3c: include mach/irqs.h where needed Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 25/36] ARM: s3c: spi: avoid hardcoding fiq number in driver Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 26/36] ARM: s3c: bast: avoid irq_desc array usage Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 27/36] ARM: s3c: fix mmc gpio lookup tables Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 28/36] fbdev: s3c2410fb: remove mach header dependency Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 13:13 ` Krzysztof Kozlowski 2019-10-23 13:35 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 29/36] ARM: s3c: cpufreq: split out registers Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 30/36] ARM: s3c: remove cpufreq header dependencies Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 13:38 ` Krzysztof Kozlowski 2019-10-23 13:46 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 31/36] ARM: s3c: cpufreq: use global s3c2412_cpufreq_setrefresh Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 13:44 ` Krzysztof Kozlowski 2019-10-23 13:57 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 32/36] ARM: s3c: iotiming: make functions static Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 33/36] ARM: s3c: move low-level clk reg access into platform code Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-23 13:49 ` Krzysztof Kozlowski 2019-10-23 13:54 ` Arnd Bergmann 2019-10-10 20:30 ` [PATCH 34/36] ARM: s3c: stop including mach/hardware.h from mach/io.h Arnd Bergmann 2019-10-10 20:30 ` Arnd Bergmann 2019-10-10 21:02 ` Russell King - ARM Linux admin 2019-10-10 21:02 ` Russell King - ARM Linux admin 2019-10-10 21:53 ` Arnd Bergmann 2019-10-10 21:53 ` Arnd Bergmann 2019-10-15 14:52 ` [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Tomasz Figa 2019-10-10 21:07 ` [PATCH 35/36] ARM: s3c: move into a common directory Arnd Bergmann 2019-10-10 21:07 ` Arnd Bergmann 2019-10-23 14:05 ` Krzysztof Kozlowski 2019-10-10 21:07 ` [PATCH 36/36] ARM: s3c: make headers local if possible Arnd Bergmann 2019-10-10 21:07 ` Arnd Bergmann 2019-10-23 13:10 ` [PATCH 00/36] ARM: samsung platform cleanup Krzysztof Kozlowski 2019-10-23 13:39 ` Arnd Bergmann
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=20191010203043.1241612-1-arnd@arndb.de \ --to=arnd@arndb.de \ --cc=cw00.choi@samsung.com \ --cc=kgene@kernel.org \ --cc=krzk@kernel.org \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-clk@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=mturquette@baylibre.com \ --cc=s.nawrocki@samsung.com \ --cc=sboyd@kernel.org \ --cc=tomasz.figa@gmail.com \ /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 a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).