diff options
author | Pawel Osciak <p.osciak@samsung.com> | 2009-11-17 02:41:19 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-11-30 20:33:16 -0500 |
commit | edd6e3f89d7fe245149669400bd213140c16d6e4 (patch) | |
tree | fd738a20b916fbe90e341a260b791601278a4f57 | |
parent | d7ab33a0b3511e3d738a7b52f20ee83daede4465 (diff) |
ARM: S5PC1xx: add platform helpers for s3c-fb device
Samsung S5PC100 has LCD-controller compatible with the one known from
previous SoCs series. Add required platform setup and support code that
it can be used with s3c-fb driver.
Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/irqs.h | 5 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/regs-fb.h | 139 | ||||
-rw-r--r-- | arch/arm/plat-s3c/include/plat/fb.h | 7 | ||||
-rw-r--r-- | arch/arm/plat-s5pc1xx/Kconfig | 5 | ||||
-rw-r--r-- | arch/arm/plat-s5pc1xx/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/plat-s5pc1xx/setup-fb-24bpp.c | 49 |
6 files changed, 206 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h index 622720dba289..b53fa48a52c6 100644 --- a/arch/arm/mach-s5pc100/include/mach/irqs.h +++ b/arch/arm/mach-s5pc100/include/mach/irqs.h | |||
@@ -11,4 +11,9 @@ | |||
11 | 11 | ||
12 | #include <plat/irqs.h> | 12 | #include <plat/irqs.h> |
13 | 13 | ||
14 | /* LCD */ | ||
15 | #define IRQ_LCD_FIFO IRQ_LCD0 | ||
16 | #define IRQ_LCD_VSYNC IRQ_LCD1 | ||
17 | #define IRQ_LCD_SYSTEM IRQ_LCD2 | ||
18 | |||
14 | #endif /* __ASM_ARCH_IRQ_H */ | 19 | #endif /* __ASM_ARCH_IRQ_H */ |
diff --git a/arch/arm/mach-s5pc100/include/mach/regs-fb.h b/arch/arm/mach-s5pc100/include/mach/regs-fb.h new file mode 100644 index 000000000000..1732cd28c765 --- /dev/null +++ b/arch/arm/mach-s5pc100/include/mach/regs-fb.h | |||
@@ -0,0 +1,139 @@ | |||
1 | /* arch/arm/mach-s5pc100/include/mach/regs-fb.h | ||
2 | * | ||
3 | * Copyright 2009 Samsung Electronics Co. | ||
4 | * Pawel Osciak <p.osciak@samsung.com> | ||
5 | * | ||
6 | * Framebuffer register definitions for Samsung S5PC100. | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #ifndef __ASM_ARCH_REGS_FB_H | ||
14 | #define __ASM_ARCH_REGS_FB_H __FILE__ | ||
15 | |||
16 | #include <plat/regs-fb-v4.h> | ||
17 | |||
18 | /* VP1 interface timing control */ | ||
19 | #define VP1CON0 (0x118) | ||
20 | #define VP1_RATECON_EN (1 << 31) | ||
21 | #define VP1_CLKRATE_MASK (0xff) | ||
22 | |||
23 | #define VP1CON1 (0x11c) | ||
24 | #define VP1_VTREGCON_EN (1 << 31) | ||
25 | #define VP1_VBPD_MASK (0xfff) | ||
26 | #define VP1_VBPD_SHIFT (16) | ||
27 | |||
28 | |||
29 | #define WPALCON_H (0x19c) | ||
30 | #define WPALCON_L (0x1a0) | ||
31 | |||
32 | /* Pallete contro for WPAL0 and WPAL1 is the same as in S3C64xx, but | ||
33 | * different for WPAL2-4 | ||
34 | */ | ||
35 | /* In WPALCON_L (aka WPALCON) */ | ||
36 | #define WPALCON_W1PAL_32BPP_A888 (0x7 << 3) | ||
37 | #define WPALCON_W0PAL_32BPP_A888 (0x7 << 0) | ||
38 | |||
39 | /* To set W2PAL-W4PAL consist of one bit from WPALCON_L and two from WPALCON_H, | ||
40 | * e.g. W2PAL[2..0] is made of (WPALCON_H[10..9], WPALCON_L[6]). | ||
41 | */ | ||
42 | #define WPALCON_L_WxPAL_L_MASK (0x1) | ||
43 | #define WPALCON_L_W2PAL_L_SHIFT (6) | ||
44 | #define WPALCON_L_W3PAL_L_SHIFT (7) | ||
45 | #define WPALCON_L_W4PAL_L_SHIFT (8) | ||
46 | |||
47 | #define WPALCON_L_WxPAL_H_MASK (0x3) | ||
48 | #define WPALCON_H_W2PAL_H_SHIFT (9) | ||
49 | #define WPALCON_H_W3PAL_H_SHIFT (13) | ||
50 | #define WPALCON_H_W4PAL_H_SHIFT (17) | ||
51 | |||
52 | /* Per-window alpha value registers */ | ||
53 | /* For window 0 8-bit alpha values are in VIDW0ALPHAx, | ||
54 | * for windows 1-4 alpha values consist of two parts, the 4 low bits are | ||
55 | * taken from VIDWxALPHAx and 4 high bits are from VIDOSDxC, | ||
56 | * e.g. WIN1_ALPHA0_B[7..0] = (VIDOSD1C[3..0], VIDW1ALPHA0[3..0]) | ||
57 | */ | ||
58 | #define VIDWxALPHA0(_win) (0x200 + (_win * 8)) | ||
59 | #define VIDWxALPHA1(_win) (0x204 + (_win * 8)) | ||
60 | |||
61 | /* Only for window 0 in VIDW0ALPHAx. */ | ||
62 | #define VIDW0ALPHAx_R(_x) ((_x) << 16) | ||
63 | #define VIDW0ALPHAx_R_MASK (0xff << 16) | ||
64 | #define VIDW0ALPHAx_R_SHIFT (16) | ||
65 | #define VIDW0ALPHAx_G(_x) ((_x) << 8) | ||
66 | #define VIDW0ALPHAx_G_MASK (0xff << 8) | ||
67 | #define VIDW0ALPHAx_G_SHIFT (8) | ||
68 | #define VIDW0ALPHAx_B(_x) ((_x) << 0) | ||
69 | #define VIDW0ALPHAx_B_MASK (0xff << 0) | ||
70 | #define VIDW0ALPHAx_B_SHIFT (0) | ||
71 | |||
72 | /* Low 4 bits of alpha0-1 for windows 1-4 */ | ||
73 | #define VIDW14ALPHAx_R_L(_x) ((_x) << 16) | ||
74 | #define VIDW14ALPHAx_R_L_MASK (0xf << 16) | ||
75 | #define VIDW14ALPHAx_R_L_SHIFT (16) | ||
76 | #define VIDW14ALPHAx_G_L(_x) ((_x) << 8) | ||
77 | #define VIDW14ALPHAx_G_L_MASK (0xf << 8) | ||
78 | #define VIDW14ALPHAx_G_L_SHIFT (8) | ||
79 | #define VIDW14ALPHAx_B_L(_x) ((_x) << 0) | ||
80 | #define VIDW14ALPHAx_B_L_MASK (0xf << 0) | ||
81 | #define VIDW14ALPHAx_B_L_SHIFT (0) | ||
82 | |||
83 | |||
84 | /* Per-window blending equation control registers */ | ||
85 | #define BLENDEQx(_win) (0x244 + ((_win) * 4)) | ||
86 | #define BLENDEQ1 (0x244) | ||
87 | #define BLENDEQ2 (0x248) | ||
88 | #define BLENDEQ3 (0x24c) | ||
89 | #define BLENDEQ4 (0x250) | ||
90 | |||
91 | #define BLENDEQx_Q_FUNC(_x) ((_x) << 18) | ||
92 | #define BLENDEQx_Q_FUNC_MASK (0xf << 18) | ||
93 | #define BLENDEQx_P_FUNC(_x) ((_x) << 12) | ||
94 | #define BLENDEQx_P_FUNC_MASK (0xf << 12) | ||
95 | #define BLENDEQx_B_FUNC(_x) ((_x) << 6) | ||
96 | #define BLENDEQx_B_FUNC_MASK (0xf << 6) | ||
97 | #define BLENDEQx_A_FUNC(_x) ((_x) << 0) | ||
98 | #define BLENDEQx_A_FUNC_MASK (0xf << 0) | ||
99 | |||
100 | #define BLENDCON (0x260) | ||
101 | #define BLENDCON_8BIT_ALPHA (1 << 0) | ||
102 | |||
103 | /* Per-window palette base addresses (start of palette memory). | ||
104 | * Each window palette area consists of 256 32-bit entries. | ||
105 | * START is the first address (entry 0th), END is the address of 255th entry. | ||
106 | */ | ||
107 | #define WIN0_PAL_BASE (0x2400) | ||
108 | #define WIN0_PAL_END (0x27fc) | ||
109 | #define WIN1_PAL_BASE (0x2800) | ||
110 | #define WIN1_PAL_END (0x2bfc) | ||
111 | #define WIN2_PAL_BASE (0x2c00) | ||
112 | #define WIN2_PAL_END (0x2ffc) | ||
113 | #define WIN3_PAL_BASE (0x3000) | ||
114 | #define WIN3_PAL_END (0x33fc) | ||
115 | #define WIN4_PAL_BASE (0x3400) | ||
116 | #define WIN4_PAL_END (0x37fc) | ||
117 | |||
118 | #define WIN0_PAL(_entry) (WIN0_PAL_BASE + ((_entry) * 4)) | ||
119 | #define WIN1_PAL(_entry) (WIN1_PAL_BASE + ((_entry) * 4)) | ||
120 | #define WIN2_PAL(_entry) (WIN2_PAL_BASE + ((_entry) * 4)) | ||
121 | #define WIN3_PAL(_entry) (WIN3_PAL_BASE + ((_entry) * 4)) | ||
122 | #define WIN4_PAL(_entry) (WIN4_PAL_BASE + ((_entry) * 4)) | ||
123 | |||
124 | static inline unsigned int s3c_fb_pal_reg(unsigned int window, int reg) | ||
125 | { | ||
126 | switch (window) { | ||
127 | case 0: return WIN0_PAL(reg); | ||
128 | case 1: return WIN1_PAL(reg); | ||
129 | case 2: return WIN2_PAL(reg); | ||
130 | case 3: return WIN3_PAL(reg); | ||
131 | case 4: return WIN4_PAL(reg); | ||
132 | } | ||
133 | |||
134 | BUG(); | ||
135 | } | ||
136 | |||
137 | |||
138 | #endif /* __ASM_ARCH_REGS_FB_H */ | ||
139 | |||
diff --git a/arch/arm/plat-s3c/include/plat/fb.h b/arch/arm/plat-s3c/include/plat/fb.h index 214ff561b0dd..f8db87930f8b 100644 --- a/arch/arm/plat-s3c/include/plat/fb.h +++ b/arch/arm/plat-s3c/include/plat/fb.h | |||
@@ -70,4 +70,11 @@ extern void s3c_fb_set_platdata(struct s3c_fb_platdata *pd); | |||
70 | */ | 70 | */ |
71 | extern void s3c64xx_fb_gpio_setup_24bpp(void); | 71 | extern void s3c64xx_fb_gpio_setup_24bpp(void); |
72 | 72 | ||
73 | /** | ||
74 | * s5pc100_fb_gpio_setup_24bpp() - S5PC100 setup function for 24bpp LCD | ||
75 | * | ||
76 | * Initialise the GPIO for an 24bpp LCD display on the RGB interface. | ||
77 | */ | ||
78 | extern void s5pc100_fb_gpio_setup_24bpp(void); | ||
79 | |||
73 | #endif /* __PLAT_S3C_FB_H */ | 80 | #endif /* __PLAT_S3C_FB_H */ |
diff --git a/arch/arm/plat-s5pc1xx/Kconfig b/arch/arm/plat-s5pc1xx/Kconfig index 86edd27c7f24..6ac48a6fba78 100644 --- a/arch/arm/plat-s5pc1xx/Kconfig +++ b/arch/arm/plat-s5pc1xx/Kconfig | |||
@@ -37,6 +37,11 @@ config CPU_S5PC100_CLOCK | |||
37 | 37 | ||
38 | # platform specific device setup | 38 | # platform specific device setup |
39 | 39 | ||
40 | config S5PC1XX_SETUP_FB_24BPP | ||
41 | bool | ||
42 | help | ||
43 | Common setup code for S5PC1XX with an 24bpp RGB display helper. | ||
44 | |||
40 | config S5PC100_SETUP_I2C0 | 45 | config S5PC100_SETUP_I2C0 |
41 | bool | 46 | bool |
42 | default y | 47 | default y |
diff --git a/arch/arm/plat-s5pc1xx/Makefile b/arch/arm/plat-s5pc1xx/Makefile index e860813cb8de..3d2ac7150b15 100644 --- a/arch/arm/plat-s5pc1xx/Makefile +++ b/arch/arm/plat-s5pc1xx/Makefile | |||
@@ -25,5 +25,6 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o | |||
25 | # Device setup | 25 | # Device setup |
26 | 26 | ||
27 | obj-$(CONFIG_S5P_GPIO_CFG_S5PC1XX) += gpio-config.o | 27 | obj-$(CONFIG_S5P_GPIO_CFG_S5PC1XX) += gpio-config.o |
28 | obj-$(CONFIG_S5PC1XX_SETUP_FB_24BPP) += setup-fb-24bpp.o | ||
28 | obj-$(CONFIG_S5PC100_SETUP_I2C0) += setup-i2c0.o | 29 | obj-$(CONFIG_S5PC100_SETUP_I2C0) += setup-i2c0.o |
29 | obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o | 30 | obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o |
diff --git a/arch/arm/plat-s5pc1xx/setup-fb-24bpp.c b/arch/arm/plat-s5pc1xx/setup-fb-24bpp.c new file mode 100644 index 000000000000..1a63768a9a2e --- /dev/null +++ b/arch/arm/plat-s5pc1xx/setup-fb-24bpp.c | |||
@@ -0,0 +1,49 @@ | |||
1 | /* | ||
2 | * linux/arch/arm/plat-s5pc100/setup-fb-24bpp.c | ||
3 | * | ||
4 | * Copyright 2009 Samsung Electronics | ||
5 | * | ||
6 | * Base S5PC1XX setup information for 24bpp LCD framebuffer | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | |||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/types.h> | ||
15 | #include <linux/fb.h> | ||
16 | #include <linux/gpio.h> | ||
17 | |||
18 | #include <mach/regs-fb.h> | ||
19 | #include <mach/map.h> | ||
20 | #include <plat/fb.h> | ||
21 | #include <plat/gpio-cfg.h> | ||
22 | #include <plat/gpio-cfg-s5pc1xx.h> | ||
23 | |||
24 | #define DISR_OFFSET 0x7008 | ||
25 | |||
26 | void s5pc100_fb_gpio_setup_24bpp(void) | ||
27 | { | ||
28 | unsigned int gpio = 0; | ||
29 | |||
30 | for (gpio = S5PC100_GPF0(0); gpio <= S5PC100_GPF0(7); gpio++) { | ||
31 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
32 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
33 | } | ||
34 | |||
35 | for (gpio = S5PC100_GPF1(0); gpio <= S5PC100_GPF1(7); gpio++) { | ||
36 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
37 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
38 | } | ||
39 | |||
40 | for (gpio = S5PC100_GPF2(0); gpio <= S5PC100_GPF2(7); gpio++) { | ||
41 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
42 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
43 | } | ||
44 | |||
45 | for (gpio = S5PC100_GPF3(0); gpio <= S5PC100_GPF3(3); gpio++) { | ||
46 | s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); | ||
47 | s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); | ||
48 | } | ||
49 | } | ||