diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-09-02 22:33:24 +0200 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzk@kernel.org> | 2020-08-20 17:48:12 +0200 |
| commit | 81994e0ffc373e67ace4c98797c35f8213f07753 (patch) | |
| tree | a334fff5750b53b644ab9f96a8cdea8b0c4a4c14 /arch/arm/mach-s3c24xx/mach-rx1950.c | |
| parent | 704b18250f59094f444d2728acccf52c185ac290 (diff) | |
| download | linux-81994e0ffc373e67ace4c98797c35f8213f07753.tar.gz linux-81994e0ffc373e67ace4c98797c35f8213f07753.tar.bz2 linux-81994e0ffc373e67ace4c98797c35f8213f07753.zip | |
fbdev: s3c2410fb: remove mach header dependency
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>
Link: https://lore.kernel.org/r/20200806182059.2431-33-krzk@kernel.org
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-rx1950.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx1950.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index aa91785a95b5..2513ce7fa026 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -42,12 +42,11 @@ #include <linux/platform_data/mtd-nand-s3c2410.h> #include <linux/platform_data/touchscreen-s3c2410.h> #include <linux/platform_data/usb-s3c2410_udc.h> +#include <linux/platform_data/fb-s3c2410.h> #include <sound/uda1380.h> -#include <mach/fb.h> #include <mach/regs-gpio.h> -#include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> #include <plat/cpu.h> @@ -360,14 +359,17 @@ static struct s3c2410fb_mach_info rx1950_lcd_cfg = { .lpcsel = 0x02, .gpccon = 0xaa9556a9, .gpccon_mask = 0xffc003fc, + .gpccon_reg = S3C2410_GPCCON, .gpcup = 0x0000ffff, .gpcup_mask = 0xffffffff, + .gpcup_reg = S3C2410_GPCUP, .gpdcon = 0xaa90aaa1, .gpdcon_mask = 0xffc0fff0, + .gpdcon_reg = S3C2410_GPDCON, .gpdup = 0x0000fcfd, .gpdup_mask = 0xffffffff, - + .gpdup_reg = S3C2410_GPDUP, }; static struct pwm_lookup rx1950_pwm_lookup[] = { |