Commit 81994e0f authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Krzysztof Kozlowski
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20200806182059.2431-33-krzk@kernel.org


Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parent 704b1825

arch/arm/mach-s3c24xx/include/mach/fb.h

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#include <plat/fb-s3c2410.h>

arch/arm/mach-s3c24xx/mach-amlm5900.c

+5 −2
Original line number Diff line number Diff line
@@ -29,9 +29,8 @@ 


#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>
@@ -191,13 +190,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

arch/arm/mach-s3c24xx/mach-anubis.c

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,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>

arch/arm/mach-s3c24xx/mach-at2440evb.c

+1 −2
Original line number Diff line number Diff line
@@ -24,12 +24,11 @@ 
#include <asm/mach/map.h>

#include <asm/mach/irq.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>

arch/arm/mach-s3c24xx/mach-bast.c

+1 −2
Original line number Diff line number Diff line
@@ -40,9 +40,8 @@ 
#include <asm/mach/irq.h>

#include <asm/mach-types.h>



#include <mach/fb.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>

CRA Git | Maintained and supported by SUSTech CRA and CCSE