From: Krzysztof Kozlowski <krzk@kernel.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Kukjin Kim <kgene@kernel.org>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
linux-samsung-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linus.walleij@linaro.org,
linux-kernel@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org
Subject: Re: [PATCH 28/36] fbdev: s3c2410fb: remove mach header dependency
Date: Wed, 23 Oct 2019 15:13:21 +0200 [thread overview]
Message-ID: <20191023131321.GH11048@pi3> (raw)
In-Reply-To: <20191010203043.1241612-28-arnd@arndb.de>
On Thu, Oct 10, 2019 at 10:30:12PM +0200, Arnd Bergmann wrote:
> The s3c2410fb driver is too deeply intertwined with the s3c24xx
> platform code. Change it in a way that avoids the use of platform
> header files but having all interface data in a platform_data
> header, and the private register definitions next to the driver
> itself.
>
> One ugly bit here is that the driver pokes directly into gpio
> registers, which are owned by another driver. Passing the
> mapped addresses in platform_data is somewhat suboptimal, but
> it is a small improvement over the previous version.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/mach-s3c24xx/include/mach/fb.h | 2 --
> arch/arm/mach-s3c24xx/mach-amlm5900.c | 7 ++--
> arch/arm/mach-s3c24xx/mach-anubis.c | 1 -
> arch/arm/mach-s3c24xx/mach-at2440evb.c | 3 +-
> arch/arm/mach-s3c24xx/mach-bast.c | 3 +-
> arch/arm/mach-s3c24xx/mach-gta02.c | 2 +-
> arch/arm/mach-s3c24xx/mach-h1940.c | 7 ++--
> arch/arm/mach-s3c24xx/mach-jive.c | 10 ++++--
> arch/arm/mach-s3c24xx/mach-mini2440.c | 9 +++--
> arch/arm/mach-s3c24xx/mach-n30.c | 3 +-
> arch/arm/mach-s3c24xx/mach-osiris.c | 1 -
> arch/arm/mach-s3c24xx/mach-qt2410.c | 3 +-
> arch/arm/mach-s3c24xx/mach-rx1950.c | 8 +++--
> arch/arm/mach-s3c24xx/mach-rx3715.c | 7 ++--
> arch/arm/mach-s3c24xx/mach-smdk2413.c | 3 +-
> arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 -
> arch/arm/mach-s3c24xx/mach-smdk2440.c | 8 +++--
> arch/arm/mach-s3c24xx/mach-smdk2443.c | 3 +-
> arch/arm/mach-s3c24xx/mach-vstms.c | 3 +-
> arch/arm/plat-samsung/devs.c | 2 +-
> .../video/fbdev/s3c2410fb-regs-lcd.h | 28 ++++------------
> drivers/video/fbdev/s3c2410fb.c | 16 +++++----
> .../linux/platform_data}/fb-s3c2410.h | 33 ++++++++++++++++++-
> 23 files changed, 98 insertions(+), 65 deletions(-)
> delete mode 100644 arch/arm/mach-s3c24xx/include/mach/fb.h
> rename arch/arm/mach-s3c24xx/include/mach/regs-lcd.h => drivers/video/fbdev/s3c2410fb-regs-lcd.h (84%)
> rename {arch/arm/plat-samsung/include/plat => include/linux/platform_data}/fb-s3c2410.h (57%)
>
> diff --git a/arch/arm/mach-s3c24xx/include/mach/fb.h b/arch/arm/mach-s3c24xx/include/mach/fb.h
> deleted file mode 100644
> index 4e539cb8b884..000000000000
> --- a/arch/arm/mach-s3c24xx/include/mach/fb.h
> +++ /dev/null
> @@ -1,2 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -#include <plat/fb-s3c2410.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-amlm5900.c b/arch/arm/mach-s3c24xx/mach-amlm5900.c
> index 40ad23b52bc0..ef6de1b1d0c6 100644
> --- a/arch/arm/mach-s3c24xx/mach-amlm5900.c
> +++ b/arch/arm/mach-s3c24xx/mach-amlm5900.c
> @@ -30,9 +30,8 @@
> #include <mach/hardware.h>
> #include <asm/irq.h>
> #include <asm/mach-types.h>
> -#include <mach/fb.h>
> +#include <linux/platform_data/fb-s3c2410.h>
>
> -#include <mach/regs-lcd.h>
> #include <mach/regs-gpio.h>
> #include <mach/gpio-samsung.h>
>
> @@ -194,13 +193,17 @@ static struct s3c2410fb_mach_info __initdata amlm5900_fb_info = {
>
> .gpccon = 0xaaaaaaaa,
> .gpccon_mask = 0xffffffff,
> + .gpccon_reg = S3C2410_GPCCON,
> .gpcup = 0x0000ffff,
> .gpcup_mask = 0xffffffff,
> + .gpcup_reg = S3C2410_GPCUP,
>
> .gpdcon = 0xaaaaaaaa,
> .gpdcon_mask = 0xffffffff,
> + .gpdcon_reg = S3C2410_GPDCON,
> .gpdup = 0x0000ffff,
> .gpdup_mask = 0xffffffff,
> + .gpdup_reg = S3C2410_GPDUP,
> };
> #endif
>
> diff --git a/arch/arm/mach-s3c24xx/mach-anubis.c b/arch/arm/mach-s3c24xx/mach-anubis.c
> index 072966dcad78..e1a73274e90b 100644
> --- a/arch/arm/mach-s3c24xx/mach-anubis.c
> +++ b/arch/arm/mach-s3c24xx/mach-anubis.c
> @@ -29,7 +29,6 @@
> #include <asm/mach-types.h>
>
> #include <mach/regs-gpio.h>
> -#include <mach/regs-lcd.h>
> #include <mach/gpio-samsung.h>
> #include <linux/platform_data/mtd-nand-s3c2410.h>
> #include <linux/platform_data/i2c-s3c2410.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-at2440evb.c b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> index b2199906e678..bfda6dd2a9d5 100644
> --- a/arch/arm/mach-s3c24xx/mach-at2440evb.c
> +++ b/arch/arm/mach-s3c24xx/mach-at2440evb.c
> @@ -25,12 +25,11 @@
> #include <asm/mach/irq.h>
>
> #include <mach/hardware.h>
> -#include <mach/fb.h>
> +#include <linux/platform_data/fb-s3c2410.h>
> #include <asm/irq.h>
> #include <asm/mach-types.h>
>
> #include <mach/regs-gpio.h>
> -#include <mach/regs-lcd.h>
> #include <mach/gpio-samsung.h>
> #include <linux/platform_data/mtd-nand-s3c2410.h>
> #include <linux/platform_data/i2c-s3c2410.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-bast.c b/arch/arm/mach-s3c24xx/mach-bast.c
> index a7c3955ae8f6..cc941b5030ea 100644
> --- a/arch/arm/mach-s3c24xx/mach-bast.c
> +++ b/arch/arm/mach-s3c24xx/mach-bast.c
> @@ -40,10 +40,9 @@
> #include <asm/mach/irq.h>
> #include <asm/mach-types.h>
>
> -#include <mach/fb.h>
> #include <mach/hardware.h>
> +#include <linux/platform_data/fb-s3c2410.h>
> #include <mach/regs-gpio.h>
> -#include <mach/regs-lcd.h>
> #include <mach/gpio-samsung.h>
>
> #include <plat/cpu.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c
> index 61b8c6badeb8..1e42782dbd30 100644
> --- a/arch/arm/mach-s3c24xx/mach-gta02.c
> +++ b/arch/arm/mach-s3c24xx/mach-gta02.c
> @@ -57,8 +57,8 @@
> #include <linux/platform_data/touchscreen-s3c2410.h>
> #include <linux/platform_data/usb-ohci-s3c2410.h>
> #include <linux/platform_data/usb-s3c2410_udc.h>
> +#include <linux/platform_data/fb-s3c2410.h>
>
> -#include <mach/fb.h>
> #include <mach/hardware.h>
> #include <mach/regs-gpio.h>
> #include <mach/regs-irq.h>
> diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
> index 446891e23511..d56e3befa459 100644
> --- a/arch/arm/mach-s3c24xx/mach-h1940.c
> +++ b/arch/arm/mach-s3c24xx/mach-h1940.c
> @@ -47,11 +47,10 @@
>
> #include <sound/uda1380.h>
>
> -#include <mach/fb.h>
> +#include <linux/platform_data/fb-s3c2410.h>
> #include <mach/hardware.h>
> #include <mach/regs-clock.h>
> #include <mach/regs-gpio.h>
> -#include <mach/regs-lcd.h>
> #include <mach/gpio-samsung.h>
>
> #include <plat/cpu.h>
> @@ -211,12 +210,16 @@ static struct s3c2410fb_mach_info h1940_fb_info __initdata = {
> .lpcsel = 0x02,
> .gpccon = 0xaa940659,
> .gpccon_mask = 0xffffc0f0,
> + .gpccon_reg = S3C2410_GPCCON,
> .gpcup = 0x0000ffff,
> .gpcup_mask = 0xffffffff,
> + .gpcup_reg = S3C2410_GPCUP,
> .gpdcon = 0xaa84aaa0,
> .gpdcon_mask = 0xffffffff,
> + .gpdcon_reg = S3C2410_GPDCON,
> .gpdup = 0x0000faff,
> .gpdup_mask = 0xffffffff,
> + .gpdup_reg = S3C2410_GPDUP,
> };
>
> static int power_supply_init(struct device *dev)
> diff --git a/arch/arm/mach-s3c24xx/mach-jive.c b/arch/arm/mach-s3c24xx/mach-jive.c
> index 885e8f12e4b9..3b33132b2334 100644
> --- a/arch/arm/mach-s3c24xx/mach-jive.c
> +++ b/arch/arm/mach-s3c24xx/mach-jive.c
> @@ -32,8 +32,7 @@
> #include <linux/platform_data/i2c-s3c2410.h>
>
> #include <mach/regs-gpio.h>
> -#include <mach/regs-lcd.h>
> -#include <mach/fb.h>
> +#include <linux/platform_data/fb-s3c2410.h>
> #include <mach/gpio-samsung.h>
>
> #include <asm/mach-types.h>
> @@ -321,6 +320,7 @@ static struct s3c2410fb_mach_info jive_lcd_config = {
> * data. */
>
> .gpcup = (0xf << 1) | (0x3f << 10),
> + .gpcup_reg = S3C2410_GPCUP,
Nits: indentation before/after '=' looks wrong. Tab should be
before '=', one space after.
Best regards,
Krzysztof
next prev parent reply other threads:[~2019-10-23 13:13 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 ` [PATCH 01/36] ARM: samsung: make S3C24XX_MISCCR access indirect Arnd Bergmann
2019-10-10 20:29 ` 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 [this message]
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=20191023131321.GH11048@pi3 \
--to=krzk@kernel.org \
--cc=arnd@arndb.de \
--cc=b.zolnierkie@samsung.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kgene@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.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: link
Be 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).