fbdev changes for 3.13
Nothing particularly stands out in this pull request. The biggest part of the changes are cleanups. Maybe one fix to mention is the "fb: reorder the lock sequence to fix potential dead lock" which hopefully fixes the fb locking issues reported by multiple persons. There are also a few commits that have changes to arch/arm/mach-at91 and arch/avr32, which have been acked by the maintainers. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJSg2oCAAoJEPo9qoy8lh71vXsP/2AjkzOlcKBPutMG/W30QMHT tkKfr/RL8C3oXcimkE6ch3ksbFj2t5corxa/DLTdESdTpeFAgxj72pcdhN3X4+Xs 7IokExM2W5s6p4pP66PTr2A5XhEyAHtEMp+2JbHPRzwZitblzBLZvuPUJljwJDpj Z9+sD00xv/MZrXDCsEN8k2xdJ3rFn6JgX267y1qajlsocZoseTF2ed94IN/YnIM7 B2hra1B4E21FPYLzRDOJRmZa0YGomLTymezPnPg33hLBhnJU/aG4HLDHKUZWhduz /6UwACH63ja7I2z/8AZHQ1ACdbGheRtHbjwV9LLYlbaAvPmUqNTZ4b6UeQOb/EZ0 3SPCYbwD6+RMhSx/j/XhySvw82RY0i1aTlTDyjgOggfrfdi4x1Wk54bUWp5l9O3D SX1vSpNLGSh4GKXRzJjf3jouG/LcOzlpDlVZXzgsPzkyirluUv6QdMTopJwFwIGx rFgtsbkvhEsFvaNhhVIqQXKfwZ69r42U5JC+fDM5u7VX0mqyJ1usUNGvNSeifcDg EwUAI6RGnOXCO6crj2BZYpRTdc61tnY9b4CGLHDCeQkEXokEsEJ7Mz+8YfSwFo7X wqh+dAPQaixeHtUFZ8GhHXeAsjoQRSBXygf3NSNmCeP3WsmuozbauuujSrrTHITp LOXFPhU9uxHu4mDd6wrq =59+j -----END PGP SIGNATURE----- Merge tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux Pull fbdev changes from Tomi Valkeinen: "Nothing particularly stands out in this pull request. The biggest part of the changes are cleanups. Maybe one fix to mention is the "fb: reorder the lock sequence to fix potential dead lock" which hopefully fixes the fb locking issues reported by multiple persons. There are also a few commits that have changes to arch/arm/mach-at91 and arch/avr32, which have been acked by the maintainers" * tag 'fbdev-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux: (143 commits) fb: reorder the lock sequence to fix potential dead lock fbdev: shmobile-lcdcfb: Convert to clk_prepare/unprepare fbdev: shmobile-hdmi: Convert to clk_prepare/unprepare omapdss: Add new panel driver for Topolly td028ttec1 LCD. video: exynos_mipi_dsi: Unlock the mutex before returning video: da8xx-fb: remove unwanted define video: Remove unnecessary semicolons simplefb: use write-combined remapping simplefb: fix unmapping fb during destruction OMAPDSS: connector-dvi: fix releasing i2c_adapter OMAPDSS: DSI: fix perf measuring ifdefs framebuffer: Use fb_<level> framebuffer: Add fb_<level> convenience logging macros efifb: prevent null-deref when iterating dmi_list fbdev: fix error return code in metronomefb_probe() video: xilinxfb: Fix for "Use standard variable name convention" OMAPDSS: Fix de_level in videomode_to_omap_video_timings() video: xilinxfb: Simplify error path video: xilinxfb: Use devm_kzalloc instead of kzalloc video: xilinxfb: Use standard variable name convention ...
This commit is contained in:
commit
f0d55cc1a6
176 changed files with 3948 additions and 3104 deletions
75
Documentation/devicetree/bindings/video/atmel,lcdc.txt
Normal file
75
Documentation/devicetree/bindings/video/atmel,lcdc.txt
Normal file
|
@ -0,0 +1,75 @@
|
|||
Atmel LCDC Framebuffer
|
||||
-----------------------------------------------------
|
||||
|
||||
Required properties:
|
||||
- compatible :
|
||||
"atmel,at91sam9261-lcdc" ,
|
||||
"atmel,at91sam9263-lcdc" ,
|
||||
"atmel,at91sam9g10-lcdc" ,
|
||||
"atmel,at91sam9g45-lcdc" ,
|
||||
"atmel,at91sam9g45es-lcdc" ,
|
||||
"atmel,at91sam9rl-lcdc" ,
|
||||
"atmel,at32ap-lcdc"
|
||||
- reg : Should contain 1 register ranges(address and length)
|
||||
- interrupts : framebuffer controller interrupt
|
||||
- display: a phandle pointing to the display node
|
||||
|
||||
Required nodes:
|
||||
- display: a display node is required to initialize the lcd panel
|
||||
This should be in the board dts.
|
||||
- default-mode: a videomode within the display with timing parameters
|
||||
as specified below.
|
||||
|
||||
Example:
|
||||
|
||||
fb0: fb@0x00500000 {
|
||||
compatible = "atmel,at91sam9g45-lcdc";
|
||||
reg = <0x00500000 0x1000>;
|
||||
interrupts = <23 3 0>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_fb>;
|
||||
display = <&display0>;
|
||||
status = "okay";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
};
|
||||
|
||||
Atmel LCDC Display
|
||||
-----------------------------------------------------
|
||||
Required properties (as per of_videomode_helper):
|
||||
|
||||
- atmel,dmacon: dma controler configuration
|
||||
- atmel,lcdcon2: lcd controler configuration
|
||||
- atmel,guard-time: lcd guard time (Delay in frame periods)
|
||||
- bits-per-pixel: lcd panel bit-depth.
|
||||
|
||||
Optional properties (as per of_videomode_helper):
|
||||
- atmel,lcdcon-backlight: enable backlight
|
||||
- atmel,lcd-wiring-mode: lcd wiring mode "RGB" or "BRG"
|
||||
- atmel,power-control-gpio: gpio to power on or off the LCD (as many as needed)
|
||||
|
||||
Example:
|
||||
display0: display {
|
||||
bits-per-pixel = <32>;
|
||||
atmel,lcdcon-backlight;
|
||||
atmel,dmacon = <0x1>;
|
||||
atmel,lcdcon2 = <0x80008002>;
|
||||
atmel,guard-time = <9>;
|
||||
atmel,lcd-wiring-mode = <1>;
|
||||
|
||||
display-timings {
|
||||
native-mode = <&timing0>;
|
||||
timing0: timing0 {
|
||||
clock-frequency = <9000000>;
|
||||
hactive = <480>;
|
||||
vactive = <272>;
|
||||
hback-porch = <1>;
|
||||
hfront-porch = <1>;
|
||||
vback-porch = <40>;
|
||||
vfront-porch = <1>;
|
||||
hsync-len = <45>;
|
||||
vsync-len = <1>;
|
||||
};
|
||||
};
|
||||
};
|
|
@ -465,7 +465,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices)
|
|||
|
||||
#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
|
||||
static u64 lcdc_dmamask = DMA_BIT_MASK(32);
|
||||
static struct atmel_lcdfb_info lcdc_data;
|
||||
static struct atmel_lcdfb_pdata lcdc_data;
|
||||
|
||||
static struct resource lcdc_resources[] = {
|
||||
[0] = {
|
||||
|
@ -498,7 +498,7 @@ static struct platform_device at91_lcdc_device = {
|
|||
.num_resources = ARRAY_SIZE(lcdc_resources),
|
||||
};
|
||||
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data)
|
||||
{
|
||||
if (!data) {
|
||||
return;
|
||||
|
@ -559,7 +559,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
|
|||
platform_device_register(&at91_lcdc_device);
|
||||
}
|
||||
#else
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {}
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -832,7 +832,7 @@ void __init at91_add_device_can(struct at91_can_data *data) {}
|
|||
|
||||
#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
|
||||
static u64 lcdc_dmamask = DMA_BIT_MASK(32);
|
||||
static struct atmel_lcdfb_info lcdc_data;
|
||||
static struct atmel_lcdfb_pdata lcdc_data;
|
||||
|
||||
static struct resource lcdc_resources[] = {
|
||||
[0] = {
|
||||
|
@ -859,7 +859,7 @@ static struct platform_device at91_lcdc_device = {
|
|||
.num_resources = ARRAY_SIZE(lcdc_resources),
|
||||
};
|
||||
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data)
|
||||
{
|
||||
if (!data)
|
||||
return;
|
||||
|
@ -891,7 +891,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
|
|||
platform_device_register(&at91_lcdc_device);
|
||||
}
|
||||
#else
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {}
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -965,7 +965,7 @@ void __init at91_add_device_isi(struct isi_platform_data *data,
|
|||
|
||||
#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
|
||||
static u64 lcdc_dmamask = DMA_BIT_MASK(32);
|
||||
static struct atmel_lcdfb_info lcdc_data;
|
||||
static struct atmel_lcdfb_pdata lcdc_data;
|
||||
|
||||
static struct resource lcdc_resources[] = {
|
||||
[0] = {
|
||||
|
@ -991,7 +991,7 @@ static struct platform_device at91_lcdc_device = {
|
|||
.num_resources = ARRAY_SIZE(lcdc_resources),
|
||||
};
|
||||
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data)
|
||||
{
|
||||
if (!data)
|
||||
return;
|
||||
|
@ -1037,7 +1037,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
|
|||
platform_device_register(&at91_lcdc_device);
|
||||
}
|
||||
#else
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {}
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -498,7 +498,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data) {}
|
|||
|
||||
#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
|
||||
static u64 lcdc_dmamask = DMA_BIT_MASK(32);
|
||||
static struct atmel_lcdfb_info lcdc_data;
|
||||
static struct atmel_lcdfb_pdata lcdc_data;
|
||||
|
||||
static struct resource lcdc_resources[] = {
|
||||
[0] = {
|
||||
|
@ -525,7 +525,7 @@ static struct platform_device at91_lcdc_device = {
|
|||
.num_resources = ARRAY_SIZE(lcdc_resources),
|
||||
};
|
||||
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data)
|
||||
{
|
||||
if (!data) {
|
||||
return;
|
||||
|
@ -557,7 +557,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
|
|||
platform_device_register(&at91_lcdc_device);
|
||||
}
|
||||
#else
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}
|
||||
void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {}
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -389,7 +389,7 @@ static struct fb_monspecs at91fb_default_stn_monspecs = {
|
|||
| ATMEL_LCDC_IFWIDTH_4 \
|
||||
| ATMEL_LCDC_SCANMOD_SINGLE)
|
||||
|
||||
static void at91_lcdc_stn_power_control(int on)
|
||||
static void at91_lcdc_stn_power_control(struct atmel_lcdfb_pdata *pdata, int on)
|
||||
{
|
||||
/* backlight */
|
||||
if (on) { /* power up */
|
||||
|
@ -401,7 +401,7 @@ static void at91_lcdc_stn_power_control(int on)
|
|||
}
|
||||
}
|
||||
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {
|
||||
.default_bpp = 1,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN,
|
||||
.default_lcdcon2 = AT91SAM9261_DEFAULT_STN_LCDCON2,
|
||||
|
@ -445,7 +445,7 @@ static struct fb_monspecs at91fb_default_tft_monspecs = {
|
|||
| ATMEL_LCDC_DISTYPE_TFT \
|
||||
| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
|
||||
|
||||
static void at91_lcdc_tft_power_control(int on)
|
||||
static void at91_lcdc_tft_power_control(struct atmel_lcdfb_pdata *pdata, int on)
|
||||
{
|
||||
if (on)
|
||||
at91_set_gpio_value(AT91_PIN_PA12, 0); /* power up */
|
||||
|
@ -453,7 +453,7 @@ static void at91_lcdc_tft_power_control(int on)
|
|||
at91_set_gpio_value(AT91_PIN_PA12, 1); /* power down */
|
||||
}
|
||||
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {
|
||||
.lcdcon_is_backlight = true,
|
||||
.default_bpp = 16,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN,
|
||||
|
@ -465,7 +465,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
|||
#endif
|
||||
|
||||
#else
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data;
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data;
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -275,13 +275,13 @@ static struct fb_monspecs at91fb_default_monspecs = {
|
|||
| ATMEL_LCDC_DISTYPE_TFT \
|
||||
| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
|
||||
|
||||
static void at91_lcdc_power_control(int on)
|
||||
static void at91_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)
|
||||
{
|
||||
at91_set_gpio_value(AT91_PIN_PA30, on);
|
||||
}
|
||||
|
||||
/* Driver datas */
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {
|
||||
.lcdcon_is_backlight = true,
|
||||
.default_bpp = 16,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN,
|
||||
|
@ -292,7 +292,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
|||
};
|
||||
|
||||
#else
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data;
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data;
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -284,7 +284,7 @@ static struct fb_monspecs at91fb_default_monspecs = {
|
|||
| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
|
||||
|
||||
/* Driver datas */
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {
|
||||
.lcdcon_is_backlight = true,
|
||||
.default_bpp = 32,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN,
|
||||
|
@ -295,7 +295,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
|||
};
|
||||
|
||||
#else
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data;
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data;
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -170,7 +170,7 @@ static struct fb_monspecs at91fb_default_monspecs = {
|
|||
| ATMEL_LCDC_DISTYPE_TFT \
|
||||
| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
|
||||
|
||||
static void at91_lcdc_power_control(int on)
|
||||
static void at91_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)
|
||||
{
|
||||
if (on)
|
||||
at91_set_gpio_value(AT91_PIN_PC1, 0); /* power up */
|
||||
|
@ -179,7 +179,7 @@ static void at91_lcdc_power_control(int on)
|
|||
}
|
||||
|
||||
/* Driver datas */
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {
|
||||
.lcdcon_is_backlight = true,
|
||||
.default_bpp = 16,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN,
|
||||
|
@ -191,7 +191,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = {
|
|||
};
|
||||
|
||||
#else
|
||||
static struct atmel_lcdfb_info __initdata ek_lcdc_data;
|
||||
static struct atmel_lcdfb_pdata __initdata ek_lcdc_data;
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -107,8 +107,8 @@ extern void __init at91_add_device_pwm(u32 mask);
|
|||
extern void __init at91_add_device_ssc(unsigned id, unsigned pins);
|
||||
|
||||
/* LCD Controller */
|
||||
struct atmel_lcdfb_info;
|
||||
extern void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data);
|
||||
struct atmel_lcdfb_pdata;
|
||||
extern void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data);
|
||||
|
||||
/* AC97 */
|
||||
extern void __init at91_add_device_ac97(struct ac97c_platform_data *data);
|
||||
|
|
|
@ -191,7 +191,6 @@ static struct pxa3xx_nand_platform_data dkb_nand_info = {
|
|||
#define SCLK_SOURCE_SELECT(x) (x << 30) /* 0x0 ~ 0x3 */
|
||||
/* link config */
|
||||
#define CFG_DUMBMODE(mode) (mode << 28) /* 0x0 ~ 0x6*/
|
||||
#define CFG_GRA_SWAPRB(x) (x << 0) /* 1: rbswap enabled */
|
||||
static struct mmp_mach_path_config dkb_disp_config[] = {
|
||||
[0] = {
|
||||
.name = "mmp-parallel",
|
||||
|
@ -199,8 +198,7 @@ static struct mmp_mach_path_config dkb_disp_config[] = {
|
|||
.output_type = PATH_OUT_PARALLEL,
|
||||
.path_config = CFG_IOPADMODE(0x1)
|
||||
| SCLK_SOURCE_SELECT(0x1),
|
||||
.link_config = CFG_DUMBMODE(0x2)
|
||||
| CFG_GRA_SWAPRB(0x1),
|
||||
.link_config = CFG_DUMBMODE(0x2),
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
|
|||
.dclkmax = 28330000,
|
||||
};
|
||||
|
||||
static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
|
||||
.default_bpp = 16,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
@ -96,7 +96,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
|
|||
.dclkmax = 7000000,
|
||||
};
|
||||
|
||||
static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
|
||||
.default_bpp = 16,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
@ -134,7 +134,7 @@ static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
|
|||
.dclkmax = 6400000,
|
||||
};
|
||||
|
||||
static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
|
||||
.default_bpp = 16,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
@ -145,7 +145,7 @@ static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
|
|||
};
|
||||
#endif
|
||||
|
||||
static void atevklcd10x_lcdc_power_control(int on)
|
||||
static void atevklcd10x_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)
|
||||
{
|
||||
gpio_set_value(GPIO_PIN_PB(15), on);
|
||||
}
|
||||
|
|
|
@ -83,7 +83,7 @@ static struct fb_monspecs __initdata lcd_fb_default_monspecs = {
|
|||
.dclkmax = 9260000,
|
||||
};
|
||||
|
||||
static struct atmel_lcdfb_info __initdata rmt_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata rmt_lcdc_data = {
|
||||
.default_bpp = 24,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
@ -126,7 +126,7 @@ static struct fb_monspecs __initdata lcd_fb_default_monspecs = {
|
|||
.dclkmax = 9260000,
|
||||
};
|
||||
|
||||
static struct atmel_lcdfb_info __initdata rmt_lcdc_data = {
|
||||
static struct atmel_lcdfb_pdata __initdata rmt_lcdc_data = {
|
||||
.default_bpp = 24,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#ifndef __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H
|
||||
#define __ARCH_AVR32_BOARDS_ATSTK1000_ATSTK1000_H
|
||||
|
||||
extern struct atmel_lcdfb_info atstk1000_lcdc_data;
|
||||
extern struct atmel_lcdfb_pdata atstk1000_lcdc_data;
|
||||
|
||||
void atstk1000_setup_j2_leds(void);
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ static struct fb_monspecs __initdata atstk1000_default_monspecs = {
|
|||
.dclkmax = 30000000,
|
||||
};
|
||||
|
||||
struct atmel_lcdfb_info __initdata atstk1000_lcdc_data = {
|
||||
struct atmel_lcdfb_pdata __initdata atstk1000_lcdc_data = {
|
||||
.default_bpp = 24,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
|
|
@ -125,7 +125,7 @@ static struct fb_monspecs __initdata favr32_default_monspecs = {
|
|||
.dclkmax = 28000000,
|
||||
};
|
||||
|
||||
struct atmel_lcdfb_info __initdata favr32_lcdc_data = {
|
||||
struct atmel_lcdfb_pdata __initdata favr32_lcdc_data = {
|
||||
.default_bpp = 16,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
|
|
@ -77,7 +77,7 @@ static struct fb_monspecs __initdata hammerhead_hda350t_monspecs = {
|
|||
.dclkmax = 10000000,
|
||||
};
|
||||
|
||||
struct atmel_lcdfb_info __initdata hammerhead_lcdc_data = {
|
||||
struct atmel_lcdfb_pdata __initdata hammerhead_lcdc_data = {
|
||||
.default_bpp = 24,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
|
|
@ -45,7 +45,7 @@ static struct fb_monspecs merisc_fb_monspecs = {
|
|||
.dclkmax = 30000000,
|
||||
};
|
||||
|
||||
struct atmel_lcdfb_info merisc_lcdc_data = {
|
||||
struct atmel_lcdfb_pdata merisc_lcdc_data = {
|
||||
.default_bpp = 24,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
* published by the Free Software Foundation.
|
||||
*/
|
||||
|
||||
extern struct atmel_lcdfb_info mimc200_lcdc_data;
|
||||
extern struct atmel_lcdfb_pdata mimc200_lcdc_data;
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/etherdevice.h>
|
||||
|
@ -71,7 +71,7 @@ static struct fb_monspecs __initdata mimc200_default_monspecs = {
|
|||
.dclkmax = 25200000,
|
||||
};
|
||||
|
||||
struct atmel_lcdfb_info __initdata mimc200_lcdc_data = {
|
||||
struct atmel_lcdfb_pdata __initdata mimc200_lcdc_data = {
|
||||
.default_bpp = 16,
|
||||
.default_dmacon = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
|
||||
.default_lcdcon2 = (ATMEL_LCDC_DISTYPE_TFT
|
||||
|
|
|
@ -1439,7 +1439,7 @@ fail:
|
|||
* LCDC
|
||||
* -------------------------------------------------------------------- */
|
||||
#if defined(CONFIG_CPU_AT32AP7000) || defined(CONFIG_CPU_AT32AP7002)
|
||||
static struct atmel_lcdfb_info atmel_lcdfb0_data;
|
||||
static struct atmel_lcdfb_pdata atmel_lcdfb0_data;
|
||||
static struct resource atmel_lcdfb0_resource[] = {
|
||||
{
|
||||
.start = 0xff000000,
|
||||
|
@ -1467,12 +1467,12 @@ static struct clk atmel_lcdfb0_pixclk = {
|
|||
};
|
||||
|
||||
struct platform_device *__init
|
||||
at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,
|
||||
at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_pdata *data,
|
||||
unsigned long fbmem_start, unsigned long fbmem_len,
|
||||
u64 pin_mask)
|
||||
{
|
||||
struct platform_device *pdev;
|
||||
struct atmel_lcdfb_info *info;
|
||||
struct atmel_lcdfb_pdata *info;
|
||||
struct fb_monspecs *monspecs;
|
||||
struct fb_videomode *modedb;
|
||||
unsigned int modedb_size;
|
||||
|
@ -1529,7 +1529,7 @@ at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,
|
|||
}
|
||||
|
||||
info = pdev->dev.platform_data;
|
||||
memcpy(info, data, sizeof(struct atmel_lcdfb_info));
|
||||
memcpy(info, data, sizeof(struct atmel_lcdfb_pdata));
|
||||
info->default_monspecs = monspecs;
|
||||
|
||||
pdev->name = "at32ap-lcdfb";
|
||||
|
|
|
@ -44,9 +44,9 @@ struct platform_device *
|
|||
at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n);
|
||||
void at32_spi_setup_slaves(unsigned int bus_num, struct spi_board_info *b, unsigned int n);
|
||||
|
||||
struct atmel_lcdfb_info;
|
||||
struct atmel_lcdfb_pdata;
|
||||
struct platform_device *
|
||||
at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,
|
||||
at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_pdata *data,
|
||||
unsigned long fbmem_start, unsigned long fbmem_len,
|
||||
u64 pin_mask);
|
||||
|
||||
|
|
|
@ -102,8 +102,7 @@ static int cfag12864bfb_probe(struct platform_device *device)
|
|||
|
||||
platform_set_drvdata(device, info);
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
|
||||
info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -478,11 +478,10 @@ int __init mc68x328fb_init(void)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
printk(KERN_INFO
|
||||
"fb%d: %s frame buffer device\n", fb_info.node, fb_info.fix.id);
|
||||
printk(KERN_INFO
|
||||
"fb%d: %dx%dx%d at 0x%08lx\n", fb_info.node,
|
||||
mc68x328fb_default.xres_virtual, mc68x328fb_default.yres_virtual,
|
||||
fb_info(&fb_info, "%s frame buffer device\n", fb_info.fix.id);
|
||||
fb_info(&fb_info, "%dx%dx%d at 0x%08lx\n",
|
||||
mc68x328fb_default.xres_virtual,
|
||||
mc68x328fb_default.yres_virtual,
|
||||
1 << mc68x328fb_default.bits_per_pixel, videomemory);
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -996,6 +996,8 @@ config FB_ATMEL
|
|||
select FB_CFB_FILLRECT
|
||||
select FB_CFB_COPYAREA
|
||||
select FB_CFB_IMAGEBLIT
|
||||
select FB_MODE_HELPERS
|
||||
select VIDEOMODE_HELPERS
|
||||
help
|
||||
This enables support for the AT91/AT32 LCD Controller.
|
||||
|
||||
|
|
|
@ -545,7 +545,7 @@ static int clcdfb_register(struct clcd_fb *fb)
|
|||
|
||||
static int clcdfb_probe(struct amba_device *dev, const struct amba_id *id)
|
||||
{
|
||||
struct clcd_board *board = dev->dev.platform_data;
|
||||
struct clcd_board *board = dev_get_platdata(&dev->dev);
|
||||
struct clcd_fb *fb;
|
||||
int ret;
|
||||
|
||||
|
@ -599,8 +599,6 @@ static int clcdfb_remove(struct amba_device *dev)
|
|||
{
|
||||
struct clcd_fb *fb = amba_get_drvdata(dev);
|
||||
|
||||
amba_set_drvdata(dev, NULL);
|
||||
|
||||
clcdfb_disable(fb);
|
||||
unregister_framebuffer(&fb->fb);
|
||||
if (fb->fb.cmap.len)
|
||||
|
|
|
@ -3742,13 +3742,12 @@ default_chipset:
|
|||
if (err)
|
||||
goto unset_drvdata;
|
||||
|
||||
printk("fb%d: %s frame buffer device, using %dK of video memory\n",
|
||||
info->node, info->fix.id, info->fix.smem_len>>10);
|
||||
fb_info(info, "%s frame buffer device, using %dK of video memory\n",
|
||||
info->fix.id, info->fix.smem_len>>10);
|
||||
|
||||
return 0;
|
||||
|
||||
unset_drvdata:
|
||||
dev_set_drvdata(&pdev->dev, NULL);
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
free_irq:
|
||||
free_irq(IRQ_AMIGA_COPPER, info->par);
|
||||
|
@ -3768,7 +3767,6 @@ static int __exit amifb_remove(struct platform_device *pdev)
|
|||
struct fb_info *info = dev_get_drvdata(&pdev->dev);
|
||||
|
||||
unregister_framebuffer(info);
|
||||
dev_set_drvdata(&pdev->dev, NULL);
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
free_irq(IRQ_AMIGA_COPPER, info->par);
|
||||
custom.dmacon = DMAF_ALL | DMAF_MASTER;
|
||||
|
|
|
@ -556,9 +556,8 @@ static int arcfb_probe(struct platform_device *dev)
|
|||
goto err1;
|
||||
}
|
||||
}
|
||||
printk(KERN_INFO
|
||||
"fb%d: Arc frame buffer device, using %dK of video memory\n",
|
||||
info->node, videomemorysize >> 10);
|
||||
fb_info(info, "Arc frame buffer device, using %dK of video memory\n",
|
||||
videomemorysize >> 10);
|
||||
|
||||
/* this inits the lcd but doesn't clear dirty pixels */
|
||||
for (i = 0; i < num_cols * num_rows; i++) {
|
||||
|
@ -572,8 +571,7 @@ static int arcfb_probe(struct platform_device *dev)
|
|||
/* if we were told to splash the screen, we just clear it */
|
||||
if (!nosplash) {
|
||||
for (i = 0; i < num_cols * num_rows; i++) {
|
||||
printk(KERN_INFO "fb%d: splashing lcd %d\n",
|
||||
info->node, i);
|
||||
fb_info(info, "splashing lcd %d\n", i);
|
||||
ks108_set_start_line(par, i, 0);
|
||||
ks108_clear_lcd(par, i);
|
||||
}
|
||||
|
|
|
@ -137,8 +137,7 @@ static void arkfb_settile(struct fb_info *info, struct fb_tilemap *map)
|
|||
|
||||
if ((map->width != 8) || (map->height != 16) ||
|
||||
(map->depth != 1) || (map->length != 256)) {
|
||||
printk(KERN_ERR "fb%d: unsupported font parameters: width %d, "
|
||||
"height %d, depth %d, length %d\n", info->node,
|
||||
fb_err(info, "unsupported font parameters: width %d, height %d, depth %d, length %d\n",
|
||||
map->width, map->height, map->depth, map->length);
|
||||
return;
|
||||
}
|
||||
|
@ -517,7 +516,7 @@ static void ark_set_pixclock(struct fb_info *info, u32 pixclock)
|
|||
|
||||
int rv = dac_set_freq(par->dac, 0, 1000000000 / pixclock);
|
||||
if (rv < 0) {
|
||||
printk(KERN_ERR "fb%d: cannot set requested pixclock, keeping old value\n", info->node);
|
||||
fb_err(info, "cannot set requested pixclock, keeping old value\n");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -584,7 +583,7 @@ static int arkfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
|||
rv = svga_match_format (arkfb_formats, var, NULL);
|
||||
if (rv < 0)
|
||||
{
|
||||
printk(KERN_ERR "fb%d: unsupported mode requested\n", info->node);
|
||||
fb_err(info, "unsupported mode requested\n");
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
@ -604,14 +603,15 @@ static int arkfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
|||
mem = ((var->bits_per_pixel * var->xres_virtual) >> 3) * var->yres_virtual;
|
||||
if (mem > info->screen_size)
|
||||
{
|
||||
printk(KERN_ERR "fb%d: not enough framebuffer memory (%d kB requested , %d kB available)\n", info->node, mem >> 10, (unsigned int) (info->screen_size >> 10));
|
||||
fb_err(info, "not enough framebuffer memory (%d kB requested, %d kB available)\n",
|
||||
mem >> 10, (unsigned int) (info->screen_size >> 10));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
rv = svga_check_timings (&ark_timing_regs, var, info->node);
|
||||
if (rv < 0)
|
||||
{
|
||||
printk(KERN_ERR "fb%d: invalid timings requested\n", info->node);
|
||||
fb_err(info, "invalid timings requested\n");
|
||||
return rv;
|
||||
}
|
||||
|
||||
|
@ -693,7 +693,7 @@ static int arkfb_set_par(struct fb_info *info)
|
|||
vga_wseq(par->state.vgabase, 0x18, regval);
|
||||
|
||||
/* Set the offset register */
|
||||
pr_debug("fb%d: offset register : %d\n", info->node, offset_value);
|
||||
fb_dbg(info, "offset register : %d\n", offset_value);
|
||||
svga_wcrt_multi(par->state.vgabase, ark_offset_regs, offset_value);
|
||||
|
||||
/* fix for hi-res textmode */
|
||||
|
@ -716,7 +716,7 @@ static int arkfb_set_par(struct fb_info *info)
|
|||
/* Set mode-specific register values */
|
||||
switch (mode) {
|
||||
case 0:
|
||||
pr_debug("fb%d: text mode\n", info->node);
|
||||
fb_dbg(info, "text mode\n");
|
||||
svga_set_textmode_vga_regs(par->state.vgabase);
|
||||
|
||||
vga_wseq(par->state.vgabase, 0x11, 0x10); /* basic VGA mode */
|
||||
|
@ -725,7 +725,7 @@ static int arkfb_set_par(struct fb_info *info)
|
|||
|
||||
break;
|
||||
case 1:
|
||||
pr_debug("fb%d: 4 bit pseudocolor\n", info->node);
|
||||
fb_dbg(info, "4 bit pseudocolor\n");
|
||||
vga_wgfx(par->state.vgabase, VGA_GFX_MODE, 0x40);
|
||||
|
||||
vga_wseq(par->state.vgabase, 0x11, 0x10); /* basic VGA mode */
|
||||
|
@ -733,44 +733,44 @@ static int arkfb_set_par(struct fb_info *info)
|
|||
dac_set_mode(par->dac, DAC_PSEUDO8_8);
|
||||
break;
|
||||
case 2:
|
||||
pr_debug("fb%d: 4 bit pseudocolor, planar\n", info->node);
|
||||
fb_dbg(info, "4 bit pseudocolor, planar\n");
|
||||
|
||||
vga_wseq(par->state.vgabase, 0x11, 0x10); /* basic VGA mode */
|
||||
svga_wcrt_mask(par->state.vgabase, 0x46, 0x00, 0x04); /* 8bit pixel path */
|
||||
dac_set_mode(par->dac, DAC_PSEUDO8_8);
|
||||
break;
|
||||
case 3:
|
||||
pr_debug("fb%d: 8 bit pseudocolor\n", info->node);
|
||||
fb_dbg(info, "8 bit pseudocolor\n");
|
||||
|
||||
vga_wseq(par->state.vgabase, 0x11, 0x16); /* 8bpp accel mode */
|
||||
|
||||
if (info->var.pixclock > 20000) {
|
||||
pr_debug("fb%d: not using multiplex\n", info->node);
|
||||
fb_dbg(info, "not using multiplex\n");
|
||||
svga_wcrt_mask(par->state.vgabase, 0x46, 0x00, 0x04); /* 8bit pixel path */
|
||||
dac_set_mode(par->dac, DAC_PSEUDO8_8);
|
||||
} else {
|
||||
pr_debug("fb%d: using multiplex\n", info->node);
|
||||
fb_dbg(info, "using multiplex\n");
|
||||
svga_wcrt_mask(par->state.vgabase, 0x46, 0x04, 0x04); /* 16bit pixel path */
|
||||
dac_set_mode(par->dac, DAC_PSEUDO8_16);
|
||||
hdiv = 2;
|
||||
}
|
||||
break;
|
||||
case 4:
|
||||
pr_debug("fb%d: 5/5/5 truecolor\n", info->node);
|
||||
fb_dbg(info, "5/5/5 truecolor\n");
|
||||
|
||||
vga_wseq(par->state.vgabase, 0x11, 0x1A); /* 16bpp accel mode */
|
||||
svga_wcrt_mask(par->state.vgabase, 0x46, 0x04, 0x04); /* 16bit pixel path */
|
||||
dac_set_mode(par->dac, DAC_RGB1555_16);
|
||||
break;
|
||||
case 5:
|
||||
pr_debug("fb%d: 5/6/5 truecolor\n", info->node);
|
||||
fb_dbg(info, "5/6/5 truecolor\n");
|
||||
|
||||
vga_wseq(par->state.vgabase, 0x11, 0x1A); /* 16bpp accel mode */
|
||||
svga_wcrt_mask(par->state.vgabase, 0x46, 0x04, 0x04); /* 16bit pixel path */
|
||||
dac_set_mode(par->dac, DAC_RGB0565_16);
|
||||
break;
|
||||
case 6:
|
||||
pr_debug("fb%d: 8/8/8 truecolor\n", info->node);
|
||||
fb_dbg(info, "8/8/8 truecolor\n");
|
||||
|
||||
vga_wseq(par->state.vgabase, 0x11, 0x16); /* 8bpp accel mode ??? */
|
||||
svga_wcrt_mask(par->state.vgabase, 0x46, 0x04, 0x04); /* 16bit pixel path */
|
||||
|
@ -779,7 +779,7 @@ static int arkfb_set_par(struct fb_info *info)
|
|||
hdiv = 2;
|
||||
break;
|
||||
case 7:
|
||||
pr_debug("fb%d: 8/8/8/8 truecolor\n", info->node);
|
||||
fb_dbg(info, "8/8/8/8 truecolor\n");
|
||||
|
||||
vga_wseq(par->state.vgabase, 0x11, 0x1E); /* 32bpp accel mode */
|
||||
svga_wcrt_mask(par->state.vgabase, 0x46, 0x04, 0x04); /* 16bit pixel path */
|
||||
|
@ -787,7 +787,7 @@ static int arkfb_set_par(struct fb_info *info)
|
|||
hmul = 2;
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "fb%d: unsupported mode - bug\n", info->node);
|
||||
fb_err(info, "unsupported mode - bug\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -879,19 +879,19 @@ static int arkfb_blank(int blank_mode, struct fb_info *info)
|
|||
|
||||
switch (blank_mode) {
|
||||
case FB_BLANK_UNBLANK:
|
||||
pr_debug("fb%d: unblank\n", info->node);
|
||||
fb_dbg(info, "unblank\n");
|
||||
svga_wseq_mask(par->state.vgabase, 0x01, 0x00, 0x20);
|
||||
svga_wcrt_mask(par->state.vgabase, 0x17, 0x80, 0x80);
|
||||
break;
|
||||
case FB_BLANK_NORMAL:
|
||||
pr_debug("fb%d: blank\n", info->node);
|
||||
fb_dbg(info, "blank\n");
|
||||
svga_wseq_mask(par->state.vgabase, 0x01, 0x20, 0x20);
|
||||
svga_wcrt_mask(par->state.vgabase, 0x17, 0x80, 0x80);
|
||||
break;
|
||||
case FB_BLANK_POWERDOWN:
|
||||
case FB_BLANK_HSYNC_SUSPEND:
|
||||
case FB_BLANK_VSYNC_SUSPEND:
|
||||
pr_debug("fb%d: sync down\n", info->node);
|
||||
fb_dbg(info, "sync down\n");
|
||||
svga_wseq_mask(par->state.vgabase, 0x01, 0x20, 0x20);
|
||||
svga_wcrt_mask(par->state.vgabase, 0x17, 0x00, 0x80);
|
||||
break;
|
||||
|
@ -1048,12 +1048,12 @@ static int ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||
|
||||
rc = register_framebuffer(info);
|
||||
if (rc < 0) {
|
||||
dev_err(info->device, "cannot register framebugger\n");
|
||||
dev_err(info->device, "cannot register framebuffer\n");
|
||||
goto err_reg_fb;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "fb%d: %s on %s, %d MB RAM\n", info->node, info->fix.id,
|
||||
pci_name(dev), info->fix.smem_len >> 20);
|
||||
fb_info(info, "%s on %s, %d MB RAM\n",
|
||||
info->fix.id, pci_name(dev), info->fix.smem_len >> 20);
|
||||
|
||||
/* Record a reference to the driver data */
|
||||
pci_set_drvdata(dev, info);
|
||||
|
@ -1108,7 +1108,6 @@ static void ark_pci_remove(struct pci_dev *dev)
|
|||
pci_release_regions(dev);
|
||||
/* pci_disable_device(dev); */
|
||||
|
||||
pci_set_drvdata(dev, NULL);
|
||||
framebuffer_release(info);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -527,8 +527,8 @@ static int init_asiliant(struct fb_info *p, unsigned long addr)
|
|||
return err;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "fb%d: Asiliant 69000 frame buffer (%dK RAM detected)\n",
|
||||
p->node, p->fix.smem_len / 1024);
|
||||
fb_info(p, "Asiliant 69000 frame buffer (%dK RAM detected)\n",
|
||||
p->fix.smem_len / 1024);
|
||||
|
||||
writeb(0xff, mmio_base + 0x78c);
|
||||
chips_hw_init(p);
|
||||
|
|
|
@ -3246,11 +3246,8 @@ int __init atafb_init(void)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
// FIXME: mode needs setting!
|
||||
//printk("fb%d: %s frame buffer device, using %dK of video memory\n",
|
||||
// fb_info.node, fb_info.mode->name, screen_len>>10);
|
||||
printk("fb%d: frame buffer device, using %dK of video memory\n",
|
||||
fb_info.node, screen_len >> 10);
|
||||
fb_info(&fb_info, "frame buffer device, using %dK of video memory\n",
|
||||
screen_len >> 10);
|
||||
|
||||
/* TODO: This driver cannot be unloaded yet */
|
||||
return 0;
|
||||
|
|
|
@ -20,12 +20,55 @@
|
|||
#include <linux/gfp.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/platform_data/atmel.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_gpio.h>
|
||||
#include <video/of_display_timing.h>
|
||||
#include <video/videomode.h>
|
||||
|
||||
#include <mach/cpu.h>
|
||||
#include <asm/gpio.h>
|
||||
|
||||
#include <video/atmel_lcdc.h>
|
||||
|
||||
struct atmel_lcdfb_config {
|
||||
bool have_alt_pixclock;
|
||||
bool have_hozval;
|
||||
bool have_intensity_bit;
|
||||
};
|
||||
|
||||
/* LCD Controller info data structure, stored in device platform_data */
|
||||
struct atmel_lcdfb_info {
|
||||
spinlock_t lock;
|
||||
struct fb_info *info;
|
||||
void __iomem *mmio;
|
||||
int irq_base;
|
||||
struct work_struct task;
|
||||
|
||||
unsigned int smem_len;
|
||||
struct platform_device *pdev;
|
||||
struct clk *bus_clk;
|
||||
struct clk *lcdc_clk;
|
||||
|
||||
struct backlight_device *backlight;
|
||||
u8 bl_power;
|
||||
u8 saved_lcdcon;
|
||||
|
||||
u32 pseudo_palette[16];
|
||||
bool have_intensity_bit;
|
||||
|
||||
struct atmel_lcdfb_pdata pdata;
|
||||
|
||||
struct atmel_lcdfb_config *config;
|
||||
};
|
||||
|
||||
struct atmel_lcdfb_power_ctrl_gpio {
|
||||
int gpio;
|
||||
int active_low;
|
||||
|
||||
struct list_head list;
|
||||
};
|
||||
|
||||
#define lcdc_readl(sinfo, reg) __raw_readl((sinfo)->mmio+(reg))
|
||||
#define lcdc_writel(sinfo, reg, val) __raw_writel((val), (sinfo)->mmio+(reg))
|
||||
|
||||
|
@ -34,12 +77,6 @@
|
|||
#define ATMEL_LCDC_DMA_BURST_LEN 8 /* words */
|
||||
#define ATMEL_LCDC_FIFO_SIZE 512 /* words */
|
||||
|
||||
struct atmel_lcdfb_config {
|
||||
bool have_alt_pixclock;
|
||||
bool have_hozval;
|
||||
bool have_intensity_bit;
|
||||
};
|
||||
|
||||
static struct atmel_lcdfb_config at91sam9261_config = {
|
||||
.have_hozval = true,
|
||||
.have_intensity_bit = true,
|
||||
|
@ -248,18 +285,27 @@ static void exit_backlight(struct atmel_lcdfb_info *sinfo)
|
|||
|
||||
static void init_contrast(struct atmel_lcdfb_info *sinfo)
|
||||
{
|
||||
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
|
||||
|
||||
/* contrast pwm can be 'inverted' */
|
||||
if (sinfo->lcdcon_pol_negative)
|
||||
if (pdata->lcdcon_pol_negative)
|
||||
contrast_ctr &= ~(ATMEL_LCDC_POL_POSITIVE);
|
||||
|
||||
/* have some default contrast/backlight settings */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, contrast_ctr);
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, ATMEL_LCDC_CVAL_DEFAULT);
|
||||
|
||||
if (sinfo->lcdcon_is_backlight)
|
||||
if (pdata->lcdcon_is_backlight)
|
||||
init_backlight(sinfo);
|
||||
}
|
||||
|
||||
static inline void atmel_lcdfb_power_control(struct atmel_lcdfb_info *sinfo, int on)
|
||||
{
|
||||
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
|
||||
|
||||
if (pdata->atmel_lcdfb_power_control)
|
||||
pdata->atmel_lcdfb_power_control(pdata, on);
|
||||
}
|
||||
|
||||
static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = {
|
||||
.type = FB_TYPE_PACKED_PIXELS,
|
||||
|
@ -299,9 +345,11 @@ static unsigned long compute_hozval(struct atmel_lcdfb_info *sinfo,
|
|||
|
||||
static void atmel_lcdfb_stop_nowait(struct atmel_lcdfb_info *sinfo)
|
||||
{
|
||||
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
|
||||
|
||||
/* Turn off the LCD controller and the DMA controller */
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
|
||||
sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
|
||||
pdata->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
|
||||
|
||||
/* Wait for the LCDC core to become idle */
|
||||
while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
|
||||
|
@ -321,9 +369,11 @@ static void atmel_lcdfb_stop(struct atmel_lcdfb_info *sinfo)
|
|||
|
||||
static void atmel_lcdfb_start(struct atmel_lcdfb_info *sinfo)
|
||||
{
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
|
||||
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
|
||||
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_DMACON, pdata->default_dmacon);
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
|
||||
(sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET)
|
||||
(pdata->guard_time << ATMEL_LCDC_GUARDT_OFFSET)
|
||||
| ATMEL_LCDC_PWR);
|
||||
}
|
||||
|
||||
|
@ -424,6 +474,7 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
|
|||
{
|
||||
struct device *dev = info->device;
|
||||
struct atmel_lcdfb_info *sinfo = info->par;
|
||||
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
|
||||
unsigned long clk_value_khz;
|
||||
|
||||
clk_value_khz = clk_get_rate(sinfo->lcdc_clk) / 1000;
|
||||
|
@ -510,7 +561,7 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
|
|||
else
|
||||
var->green.length = 6;
|
||||
|
||||
if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
|
||||
if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
|
||||
/* RGB:5X5 mode */
|
||||
var->red.offset = var->green.length + 5;
|
||||
var->blue.offset = 0;
|
||||
|
@ -527,7 +578,7 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
|
|||
var->transp.length = 8;
|
||||
/* fall through */
|
||||
case 24:
|
||||
if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
|
||||
if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
|
||||
/* RGB:888 mode */
|
||||
var->red.offset = 16;
|
||||
var->blue.offset = 0;
|
||||
|
@ -576,6 +627,7 @@ static void atmel_lcdfb_reset(struct atmel_lcdfb_info *sinfo)
|
|||
static int atmel_lcdfb_set_par(struct fb_info *info)
|
||||
{
|
||||
struct atmel_lcdfb_info *sinfo = info->par;
|
||||
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
|
||||
unsigned long hozval_linesz;
|
||||
unsigned long value;
|
||||
unsigned long clk_value_khz;
|
||||
|
@ -637,7 +689,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
|
|||
|
||||
|
||||
/* Initialize control register 2 */
|
||||
value = sinfo->default_lcdcon2;
|
||||
value = pdata->default_lcdcon2;
|
||||
|
||||
if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT))
|
||||
value |= ATMEL_LCDC_INVLINE_INVERTED;
|
||||
|
@ -741,6 +793,7 @@ static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red,
|
|||
unsigned int transp, struct fb_info *info)
|
||||
{
|
||||
struct atmel_lcdfb_info *sinfo = info->par;
|
||||
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
|
||||
unsigned int val;
|
||||
u32 *pal;
|
||||
int ret = 1;
|
||||
|
@ -777,8 +830,7 @@ static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red,
|
|||
*/
|
||||
} else {
|
||||
/* new style BGR:565 / RGB:565 */
|
||||
if (sinfo->lcd_wiring_mode ==
|
||||
ATMEL_LCDC_WIRING_RGB) {
|
||||
if (pdata->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
|
||||
val = ((blue >> 11) & 0x001f);
|
||||
val |= ((red >> 0) & 0xf800);
|
||||
} else {
|
||||
|
@ -912,16 +964,187 @@ static void atmel_lcdfb_stop_clock(struct atmel_lcdfb_info *sinfo)
|
|||
clk_disable_unprepare(sinfo->lcdc_clk);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id atmel_lcdfb_dt_ids[] = {
|
||||
{ .compatible = "atmel,at91sam9261-lcdc" , .data = &at91sam9261_config, },
|
||||
{ .compatible = "atmel,at91sam9263-lcdc" , .data = &at91sam9263_config, },
|
||||
{ .compatible = "atmel,at91sam9g10-lcdc" , .data = &at91sam9g10_config, },
|
||||
{ .compatible = "atmel,at91sam9g45-lcdc" , .data = &at91sam9g45_config, },
|
||||
{ .compatible = "atmel,at91sam9g45es-lcdc" , .data = &at91sam9g45es_config, },
|
||||
{ .compatible = "atmel,at91sam9rl-lcdc" , .data = &at91sam9rl_config, },
|
||||
{ .compatible = "atmel,at32ap-lcdc" , .data = &at32ap_config, },
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(of, atmel_lcdfb_dt_ids);
|
||||
|
||||
static const char *atmel_lcdfb_wiring_modes[] = {
|
||||
[ATMEL_LCDC_WIRING_BGR] = "BRG",
|
||||
[ATMEL_LCDC_WIRING_RGB] = "RGB",
|
||||
};
|
||||
|
||||
const int atmel_lcdfb_get_of_wiring_modes(struct device_node *np)
|
||||
{
|
||||
const char *mode;
|
||||
int err, i;
|
||||
|
||||
err = of_property_read_string(np, "atmel,lcd-wiring-mode", &mode);
|
||||
if (err < 0)
|
||||
return ATMEL_LCDC_WIRING_BGR;
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(atmel_lcdfb_wiring_modes); i++)
|
||||
if (!strcasecmp(mode, atmel_lcdfb_wiring_modes[i]))
|
||||
return i;
|
||||
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
static void atmel_lcdfb_power_control_gpio(struct atmel_lcdfb_pdata *pdata, int on)
|
||||
{
|
||||
struct atmel_lcdfb_power_ctrl_gpio *og;
|
||||
|
||||
list_for_each_entry(og, &pdata->pwr_gpios, list)
|
||||
gpio_set_value(og->gpio, on);
|
||||
}
|
||||
|
||||
static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
|
||||
{
|
||||
struct fb_info *info = sinfo->info;
|
||||
struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
|
||||
struct fb_var_screeninfo *var = &info->var;
|
||||
struct device *dev = &sinfo->pdev->dev;
|
||||
struct device_node *np =dev->of_node;
|
||||
struct device_node *display_np;
|
||||
struct device_node *timings_np;
|
||||
struct display_timings *timings;
|
||||
enum of_gpio_flags flags;
|
||||
struct atmel_lcdfb_power_ctrl_gpio *og;
|
||||
bool is_gpio_power = false;
|
||||
int ret = -ENOENT;
|
||||
int i, gpio;
|
||||
|
||||
sinfo->config = (struct atmel_lcdfb_config*)
|
||||
of_match_device(atmel_lcdfb_dt_ids, dev)->data;
|
||||
|
||||
display_np = of_parse_phandle(np, "display", 0);
|
||||
if (!display_np) {
|
||||
dev_err(dev, "failed to find display phandle\n");
|
||||
return -ENOENT;
|
||||
}
|
||||
|
||||
ret = of_property_read_u32(display_np, "bits-per-pixel", &var->bits_per_pixel);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to get property bits-per-pixel\n");
|
||||
goto put_display_node;
|
||||
}
|
||||
|
||||
ret = of_property_read_u32(display_np, "atmel,guard-time", &pdata->guard_time);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to get property atmel,guard-time\n");
|
||||
goto put_display_node;
|
||||
}
|
||||
|
||||
ret = of_property_read_u32(display_np, "atmel,lcdcon2", &pdata->default_lcdcon2);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to get property atmel,lcdcon2\n");
|
||||
goto put_display_node;
|
||||
}
|
||||
|
||||
ret = of_property_read_u32(display_np, "atmel,dmacon", &pdata->default_dmacon);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "failed to get property bits-per-pixel\n");
|
||||
goto put_display_node;
|
||||
}
|
||||
|
||||
ret = -ENOMEM;
|
||||
for (i = 0; i < of_gpio_named_count(display_np, "atmel,power-control-gpio"); i++) {
|
||||
gpio = of_get_named_gpio_flags(display_np, "atmel,power-control-gpio",
|
||||
i, &flags);
|
||||
if (gpio < 0)
|
||||
continue;
|
||||
|
||||
og = devm_kzalloc(dev, sizeof(*og), GFP_KERNEL);
|
||||
if (!og)
|
||||
goto put_display_node;
|
||||
|
||||
og->gpio = gpio;
|
||||
og->active_low = flags & OF_GPIO_ACTIVE_LOW;
|
||||
is_gpio_power = true;
|
||||
ret = devm_gpio_request(dev, gpio, "lcd-power-control-gpio");
|
||||
if (ret) {
|
||||
dev_err(dev, "request gpio %d failed\n", gpio);
|
||||
goto put_display_node;
|
||||
}
|
||||
|
||||
ret = gpio_direction_output(gpio, og->active_low);
|
||||
if (ret) {
|
||||
dev_err(dev, "set direction output gpio %d failed\n", gpio);
|
||||
goto put_display_node;
|
||||
}
|
||||
}
|
||||
|
||||
if (is_gpio_power)
|
||||
pdata->atmel_lcdfb_power_control = atmel_lcdfb_power_control_gpio;
|
||||
|
||||
ret = atmel_lcdfb_get_of_wiring_modes(display_np);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "invalid atmel,lcd-wiring-mode\n");
|
||||
goto put_display_node;
|
||||
}
|
||||
pdata->lcd_wiring_mode = ret;
|
||||
|
||||
pdata->lcdcon_is_backlight = of_property_read_bool(display_np, "atmel,lcdcon-backlight");
|
||||
|
||||
timings = of_get_display_timings(display_np);
|
||||
if (!timings) {
|
||||
dev_err(dev, "failed to get display timings\n");
|
||||
goto put_display_node;
|
||||
}
|
||||
|
||||
timings_np = of_find_node_by_name(display_np, "display-timings");
|
||||
if (!timings_np) {
|
||||
dev_err(dev, "failed to find display-timings node\n");
|
||||
goto put_display_node;
|
||||
}
|
||||
|
||||
for (i = 0; i < of_get_child_count(timings_np); i++) {
|
||||
struct videomode vm;
|
||||
struct fb_videomode fb_vm;
|
||||
|
||||
ret = videomode_from_timings(timings, &vm, i);
|
||||
if (ret < 0)
|
||||
goto put_timings_node;
|
||||
ret = fb_videomode_from_videomode(&vm, &fb_vm);
|
||||
if (ret < 0)
|
||||
goto put_timings_node;
|
||||
|
||||
fb_add_videomode(&fb_vm, &info->modelist);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
put_timings_node:
|
||||
of_node_put(timings_np);
|
||||
put_display_node:
|
||||
of_node_put(display_np);
|
||||
return ret;
|
||||
}
|
||||
#else
|
||||
static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static int __init atmel_lcdfb_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct fb_info *info;
|
||||
struct atmel_lcdfb_info *sinfo;
|
||||
struct atmel_lcdfb_info *pdata_sinfo;
|
||||
struct fb_videomode fbmode;
|
||||
struct atmel_lcdfb_pdata *pdata = NULL;
|
||||
struct resource *regs = NULL;
|
||||
struct resource *map = NULL;
|
||||
struct fb_modelist *modelist;
|
||||
int ret;
|
||||
|
||||
dev_dbg(dev, "%s BEGIN\n", __func__);
|
||||
|
@ -934,26 +1157,35 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
sinfo = info->par;
|
||||
sinfo->pdev = pdev;
|
||||
sinfo->info = info;
|
||||
|
||||
if (dev->platform_data) {
|
||||
pdata_sinfo = (struct atmel_lcdfb_info *)dev->platform_data;
|
||||
sinfo->default_bpp = pdata_sinfo->default_bpp;
|
||||
sinfo->default_dmacon = pdata_sinfo->default_dmacon;
|
||||
sinfo->default_lcdcon2 = pdata_sinfo->default_lcdcon2;
|
||||
sinfo->default_monspecs = pdata_sinfo->default_monspecs;
|
||||
sinfo->atmel_lcdfb_power_control = pdata_sinfo->atmel_lcdfb_power_control;
|
||||
sinfo->guard_time = pdata_sinfo->guard_time;
|
||||
sinfo->smem_len = pdata_sinfo->smem_len;
|
||||
sinfo->lcdcon_is_backlight = pdata_sinfo->lcdcon_is_backlight;
|
||||
sinfo->lcdcon_pol_negative = pdata_sinfo->lcdcon_pol_negative;
|
||||
sinfo->lcd_wiring_mode = pdata_sinfo->lcd_wiring_mode;
|
||||
INIT_LIST_HEAD(&info->modelist);
|
||||
|
||||
if (pdev->dev.of_node) {
|
||||
ret = atmel_lcdfb_of_init(sinfo);
|
||||
if (ret)
|
||||
goto free_info;
|
||||
} else if (dev_get_platdata(dev)) {
|
||||
struct fb_monspecs *monspecs;
|
||||
int i;
|
||||
|
||||
pdata = dev_get_platdata(dev);
|
||||
monspecs = pdata->default_monspecs;
|
||||
sinfo->pdata = *pdata;
|
||||
|
||||
for (i = 0; i < monspecs->modedb_len; i++)
|
||||
fb_add_videomode(&monspecs->modedb[i], &info->modelist);
|
||||
|
||||
sinfo->config = atmel_lcdfb_get_config(pdev);
|
||||
|
||||
info->var.bits_per_pixel = pdata->default_bpp ? pdata->default_bpp : 16;
|
||||
memcpy(&info->monspecs, pdata->default_monspecs, sizeof(info->monspecs));
|
||||
} else {
|
||||
dev_err(dev, "cannot get default configuration\n");
|
||||
goto free_info;
|
||||
}
|
||||
sinfo->info = info;
|
||||
sinfo->pdev = pdev;
|
||||
sinfo->config = atmel_lcdfb_get_config(pdev);
|
||||
|
||||
if (!sinfo->config)
|
||||
goto free_info;
|
||||
|
||||
|
@ -962,7 +1194,6 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
|
|||
info->pseudo_palette = sinfo->pseudo_palette;
|
||||
info->fbops = &atmel_lcdfb_ops;
|
||||
|
||||
memcpy(&info->monspecs, sinfo->default_monspecs, sizeof(info->monspecs));
|
||||
info->fix = atmel_lcdfb_fix;
|
||||
|
||||
/* Enable LCDC Clocks */
|
||||
|
@ -978,14 +1209,11 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
|
|||
}
|
||||
atmel_lcdfb_start_clock(sinfo);
|
||||
|
||||
ret = fb_find_mode(&info->var, info, NULL, info->monspecs.modedb,
|
||||
info->monspecs.modedb_len, info->monspecs.modedb,
|
||||
sinfo->default_bpp);
|
||||
if (!ret) {
|
||||
dev_err(dev, "no suitable video mode found\n");
|
||||
goto stop_clk;
|
||||
}
|
||||
modelist = list_first_entry(&info->modelist,
|
||||
struct fb_modelist, list);
|
||||
fb_videomode_to_var(&info->var, &modelist->mode);
|
||||
|
||||
atmel_lcdfb_check_var(&info->var, info);
|
||||
|
||||
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
if (!regs) {
|
||||
|
@ -1069,18 +1297,6 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
|
|||
goto unregister_irqs;
|
||||
}
|
||||
|
||||
/*
|
||||
* This makes sure that our colour bitfield
|
||||
* descriptors are correctly initialised.
|
||||
*/
|
||||
atmel_lcdfb_check_var(&info->var, info);
|
||||
|
||||
ret = fb_set_var(info, &info->var);
|
||||
if (ret) {
|
||||
dev_warn(dev, "unable to set display parameters\n");
|
||||
goto free_cmap;
|
||||
}
|
||||
|
||||
dev_set_drvdata(dev, info);
|
||||
|
||||
/*
|
||||
|
@ -1092,13 +1308,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
|
|||
goto reset_drvdata;
|
||||
}
|
||||
|
||||
/* add selected videomode to modelist */
|
||||
fb_var_to_videomode(&fbmode, &info->var);
|
||||
fb_add_videomode(&fbmode, &info->modelist);
|
||||
|
||||
/* Power up the LCDC screen */
|
||||
if (sinfo->atmel_lcdfb_power_control)
|
||||
sinfo->atmel_lcdfb_power_control(1);
|
||||
atmel_lcdfb_power_control(sinfo, 1);
|
||||
|
||||
dev_info(dev, "fb%d: Atmel LCDC at 0x%08lx (mapped at %p), irq %d\n",
|
||||
info->node, info->fix.mmio_start, sinfo->mmio, sinfo->irq_base);
|
||||
|
@ -1107,7 +1318,6 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
|
|||
|
||||
reset_drvdata:
|
||||
dev_set_drvdata(dev, NULL);
|
||||
free_cmap:
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
unregister_irqs:
|
||||
cancel_work_sync(&sinfo->task);
|
||||
|
@ -1143,15 +1353,16 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
|
|||
struct device *dev = &pdev->dev;
|
||||
struct fb_info *info = dev_get_drvdata(dev);
|
||||
struct atmel_lcdfb_info *sinfo;
|
||||
struct atmel_lcdfb_pdata *pdata;
|
||||
|
||||
if (!info || !info->par)
|
||||
return 0;
|
||||
sinfo = info->par;
|
||||
pdata = &sinfo->pdata;
|
||||
|
||||
cancel_work_sync(&sinfo->task);
|
||||
exit_backlight(sinfo);
|
||||
if (sinfo->atmel_lcdfb_power_control)
|
||||
sinfo->atmel_lcdfb_power_control(0);
|
||||
atmel_lcdfb_power_control(sinfo, 0);
|
||||
unregister_framebuffer(info);
|
||||
atmel_lcdfb_stop_clock(sinfo);
|
||||
clk_put(sinfo->lcdc_clk);
|
||||
|
@ -1167,7 +1378,6 @@ static int __exit atmel_lcdfb_remove(struct platform_device *pdev)
|
|||
atmel_lcdfb_free_video_memory(sinfo);
|
||||
}
|
||||
|
||||
dev_set_drvdata(dev, NULL);
|
||||
framebuffer_release(info);
|
||||
|
||||
return 0;
|
||||
|
@ -1188,9 +1398,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
|
|||
|
||||
sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR);
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
|
||||
if (sinfo->atmel_lcdfb_power_control)
|
||||
sinfo->atmel_lcdfb_power_control(0);
|
||||
|
||||
atmel_lcdfb_power_control(sinfo, 0);
|
||||
atmel_lcdfb_stop(sinfo);
|
||||
atmel_lcdfb_stop_clock(sinfo);
|
||||
|
||||
|
@ -1204,8 +1412,7 @@ static int atmel_lcdfb_resume(struct platform_device *pdev)
|
|||
|
||||
atmel_lcdfb_start_clock(sinfo);
|
||||
atmel_lcdfb_start(sinfo);
|
||||
if (sinfo->atmel_lcdfb_power_control)
|
||||
sinfo->atmel_lcdfb_power_control(1);
|
||||
atmel_lcdfb_power_control(sinfo, 1);
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, sinfo->saved_lcdcon);
|
||||
|
||||
/* Enable FIFO & DMA errors */
|
||||
|
@ -1228,6 +1435,7 @@ static struct platform_driver atmel_lcdfb_driver = {
|
|||
.driver = {
|
||||
.name = "atmel_lcdfb",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = of_match_ptr(atmel_lcdfb_dt_ids),
|
||||
},
|
||||
};
|
||||
|
||||
|
|
|
@ -413,7 +413,6 @@ struct aty128fb_par {
|
|||
int blitter_may_be_busy;
|
||||
int fifo_slots; /* free slots in FIFO (64 max) */
|
||||
|
||||
int pm_reg;
|
||||
int crt_on, lcd_on;
|
||||
struct pci_dev *pdev;
|
||||
struct fb_info *next;
|
||||
|
@ -2016,7 +2015,6 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
|
||||
aty128_init_engine(par);
|
||||
|
||||
par->pm_reg = pdev->pm_cap;
|
||||
par->pdev = pdev;
|
||||
par->asleep = 0;
|
||||
par->lock_blank = 0;
|
||||
|
@ -2029,8 +2027,8 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
if (register_framebuffer(info) < 0)
|
||||
return 0;
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device on %s\n",
|
||||
info->node, info->fix.id, video_card);
|
||||
fb_info(info, "%s frame buffer device on %s\n",
|
||||
info->fix.id, video_card);
|
||||
|
||||
return 1; /* success! */
|
||||
}
|
||||
|
@ -2397,7 +2395,7 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
|
|||
u32 pmgt;
|
||||
struct pci_dev *pdev = par->pdev;
|
||||
|
||||
if (!par->pm_reg)
|
||||
if (!par->pdev->pm_cap)
|
||||
return;
|
||||
|
||||
/* Set the chip into the appropriate suspend mode (we use D2,
|
||||
|
|
|
@ -1848,7 +1848,6 @@ static int atyfb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
|
|||
|
||||
return aty_waitforvblank(par, crtc);
|
||||
}
|
||||
break;
|
||||
|
||||
#if defined(DEBUG) && defined(CONFIG_FB_ATY_CT)
|
||||
case ATYIO_CLKR:
|
||||
|
|
|
@ -819,11 +819,6 @@ static int radeonfb_check_var (struct fb_var_screeninfo *var, struct fb_info *in
|
|||
if (v.xres_virtual < v.xres)
|
||||
v.xres = v.xres_virtual;
|
||||
|
||||
if (v.xoffset < 0)
|
||||
v.xoffset = 0;
|
||||
if (v.yoffset < 0)
|
||||
v.yoffset = 0;
|
||||
|
||||
if (v.xoffset > v.xres_virtual - v.xres)
|
||||
v.xoffset = v.xres_virtual - v.xres - 1;
|
||||
|
||||
|
|
|
@ -1427,6 +1427,8 @@ static void radeon_pm_full_reset_sdram(struct radeonfb_info *rinfo)
|
|||
mdelay( 15);
|
||||
}
|
||||
|
||||
#if defined(CONFIG_PM)
|
||||
#if defined(CONFIG_X86) || defined(CONFIG_PPC_PMAC)
|
||||
static void radeon_pm_reset_pad_ctlr_strength(struct radeonfb_info *rinfo)
|
||||
{
|
||||
u32 tmp, tmp2;
|
||||
|
@ -1939,9 +1941,10 @@ static void radeon_reinitialize_M10(struct radeonfb_info *rinfo)
|
|||
*/
|
||||
radeon_pm_m10_enable_lvds_spread_spectrum(rinfo);
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PPC_OF
|
||||
|
||||
#ifdef CONFIG_PPC_PMAC
|
||||
static void radeon_pm_m9p_reconfigure_mc(struct radeonfb_info *rinfo)
|
||||
{
|
||||
OUTREG(MC_CNTL, rinfo->save_regs[46]);
|
||||
|
@ -2202,6 +2205,8 @@ static void radeon_reinitialize_M9P(struct radeonfb_info *rinfo)
|
|||
radeon_pm_restore_pixel_pll(rinfo);
|
||||
radeon_pm_m10_enable_lvds_spread_spectrum(rinfo);
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if 0 /* Not ready yet */
|
||||
static void radeon_reinitialize_QW(struct radeonfb_info *rinfo)
|
||||
|
@ -2515,13 +2520,13 @@ static void radeonfb_whack_power_state(struct radeonfb_info *rinfo, pci_power_t
|
|||
|
||||
for (;;) {
|
||||
pci_read_config_word(rinfo->pdev,
|
||||
rinfo->pm_reg+PCI_PM_CTRL,
|
||||
rinfo->pdev->pm_cap + PCI_PM_CTRL,
|
||||
&pwr_cmd);
|
||||
if (pwr_cmd & 2)
|
||||
if (pwr_cmd & state)
|
||||
break;
|
||||
pwr_cmd = (pwr_cmd & ~PCI_PM_CTRL_STATE_MASK) | 2;
|
||||
pwr_cmd = (pwr_cmd & ~PCI_PM_CTRL_STATE_MASK) | state;
|
||||
pci_write_config_word(rinfo->pdev,
|
||||
rinfo->pm_reg+PCI_PM_CTRL,
|
||||
rinfo->pdev->pm_cap + PCI_PM_CTRL,
|
||||
pwr_cmd);
|
||||
msleep(500);
|
||||
}
|
||||
|
@ -2532,7 +2537,7 @@ static void radeon_set_suspend(struct radeonfb_info *rinfo, int suspend)
|
|||
{
|
||||
u32 tmp;
|
||||
|
||||
if (!rinfo->pm_reg)
|
||||
if (!rinfo->pdev->pm_cap)
|
||||
return;
|
||||
|
||||
/* Set the chip into appropriate suspend mode (we use D2,
|
||||
|
@ -2804,9 +2809,6 @@ static void radeonfb_early_resume(void *data)
|
|||
|
||||
void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlist, int force_sleep)
|
||||
{
|
||||
/* Find PM registers in config space if any*/
|
||||
rinfo->pm_reg = rinfo->pdev->pm_cap;
|
||||
|
||||
/* Enable/Disable dynamic clocks: TODO add sysfs access */
|
||||
if (rinfo->family == CHIP_FAMILY_RS480)
|
||||
rinfo->dynclk = -1;
|
||||
|
@ -2830,7 +2832,7 @@ void radeonfb_pm_init(struct radeonfb_info *rinfo, int dynclk, int ignore_devlis
|
|||
* reason. --BenH
|
||||
*/
|
||||
if (machine_is(powermac) && rinfo->of_node) {
|
||||
if (rinfo->is_mobility && rinfo->pm_reg &&
|
||||
if (rinfo->is_mobility && rinfo->pdev->pm_cap &&
|
||||
rinfo->family <= CHIP_FAMILY_RV250)
|
||||
rinfo->pm_mode |= radeon_pm_d2;
|
||||
|
||||
|
|
|
@ -342,7 +342,6 @@ struct radeonfb_info {
|
|||
|
||||
int mtrr_hdl;
|
||||
|
||||
int pm_reg;
|
||||
u32 save_regs[100];
|
||||
int asleep;
|
||||
int lock_blank;
|
||||
|
|
|
@ -564,7 +564,7 @@ int au1100fb_drv_remove(struct platform_device *dev)
|
|||
if (!dev)
|
||||
return -ENODEV;
|
||||
|
||||
fbdev = (struct au1100fb_device *) platform_get_drvdata(dev);
|
||||
fbdev = platform_get_drvdata(dev);
|
||||
|
||||
#if !defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_LOGO)
|
||||
au1100fb_fb_blank(VESA_POWERDOWN, &fbdev->info);
|
||||
|
@ -636,19 +636,7 @@ static struct platform_driver au1100fb_driver = {
|
|||
.suspend = au1100fb_drv_suspend,
|
||||
.resume = au1100fb_drv_resume,
|
||||
};
|
||||
|
||||
static int __init au1100fb_load(void)
|
||||
{
|
||||
return platform_driver_register(&au1100fb_driver);
|
||||
}
|
||||
|
||||
static void __exit au1100fb_unload(void)
|
||||
{
|
||||
platform_driver_unregister(&au1100fb_driver);
|
||||
}
|
||||
|
||||
module_init(au1100fb_load);
|
||||
module_exit(au1100fb_unload);
|
||||
module_platform_driver(au1100fb_driver);
|
||||
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
@ -1853,21 +1853,7 @@ static struct platform_driver au1200fb_driver = {
|
|||
.probe = au1200fb_drv_probe,
|
||||
.remove = au1200fb_drv_remove,
|
||||
};
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
||||
static int __init au1200fb_init(void)
|
||||
{
|
||||
return platform_driver_register(&au1200fb_driver);
|
||||
}
|
||||
|
||||
static void __exit au1200fb_cleanup(void)
|
||||
{
|
||||
platform_driver_unregister(&au1200fb_driver);
|
||||
}
|
||||
|
||||
module_init(au1200fb_init);
|
||||
module_exit(au1200fb_cleanup);
|
||||
module_platform_driver(au1200fb_driver);
|
||||
|
||||
MODULE_DESCRIPTION(DRIVER_DESC);
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
@ -244,7 +244,6 @@ static int l4f00242t03_remove(struct spi_device *spi)
|
|||
|
||||
l4f00242t03_lcd_power_set(priv->ld, FB_BLANK_POWERDOWN);
|
||||
lcd_device_unregister(priv->ld);
|
||||
spi_set_drvdata(spi, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -198,7 +198,7 @@ static int tosa_lcd_probe(struct spi_device *spi)
|
|||
ret = devm_gpio_request_one(&spi->dev, TOSA_GPIO_TG_ON,
|
||||
GPIOF_OUT_INIT_LOW, "tg #pwr");
|
||||
if (ret < 0)
|
||||
goto err_gpio_tg;
|
||||
return ret;
|
||||
|
||||
mdelay(60);
|
||||
|
||||
|
@ -219,8 +219,6 @@ static int tosa_lcd_probe(struct spi_device *spi)
|
|||
|
||||
err_register:
|
||||
tosa_lcd_tg_off(data);
|
||||
err_gpio_tg:
|
||||
spi_set_drvdata(spi, NULL);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -235,8 +233,6 @@ static int tosa_lcd_remove(struct spi_device *spi)
|
|||
|
||||
tosa_lcd_tg_off(data);
|
||||
|
||||
spi_set_drvdata(spi, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -761,19 +761,7 @@ static struct platform_driver bfin_bf54x_driver = {
|
|||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init bfin_bf54x_driver_init(void)
|
||||
{
|
||||
return platform_driver_register(&bfin_bf54x_driver);
|
||||
}
|
||||
|
||||
static void __exit bfin_bf54x_driver_cleanup(void)
|
||||
{
|
||||
platform_driver_unregister(&bfin_bf54x_driver);
|
||||
}
|
||||
module_platform_driver(bfin_bf54x_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Blackfin BF54x TFT LCD Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
module_init(bfin_bf54x_driver_init);
|
||||
module_exit(bfin_bf54x_driver_cleanup);
|
||||
|
|
|
@ -664,19 +664,7 @@ static struct platform_driver bfin_t350mcqb_driver = {
|
|||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init bfin_t350mcqb_driver_init(void)
|
||||
{
|
||||
return platform_driver_register(&bfin_t350mcqb_driver);
|
||||
}
|
||||
|
||||
static void __exit bfin_t350mcqb_driver_cleanup(void)
|
||||
{
|
||||
platform_driver_unregister(&bfin_t350mcqb_driver);
|
||||
}
|
||||
module_platform_driver(bfin_t350mcqb_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Blackfin TFT LCD Driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
module_init(bfin_t350mcqb_driver_init);
|
||||
module_exit(bfin_t350mcqb_driver_cleanup);
|
||||
|
|
|
@ -1167,9 +1167,8 @@ static int broadsheetfb_probe(struct platform_device *dev)
|
|||
if (retval < 0)
|
||||
goto err_unreg_fb;
|
||||
|
||||
printk(KERN_INFO
|
||||
"fb%d: Broadsheet frame buffer, using %dK of video memory\n",
|
||||
info->node, videomemorysize >> 10);
|
||||
fb_info(info, "Broadsheet frame buffer, using %dK of video memory\n",
|
||||
videomemorysize >> 10);
|
||||
|
||||
|
||||
return 0;
|
||||
|
@ -1217,19 +1216,7 @@ static struct platform_driver broadsheetfb_driver = {
|
|||
.name = "broadsheetfb",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init broadsheetfb_init(void)
|
||||
{
|
||||
return platform_driver_register(&broadsheetfb_driver);
|
||||
}
|
||||
|
||||
static void __exit broadsheetfb_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&broadsheetfb_driver);
|
||||
}
|
||||
|
||||
module_init(broadsheetfb_init);
|
||||
module_exit(broadsheetfb_exit);
|
||||
module_platform_driver(broadsheetfb_driver);
|
||||
|
||||
MODULE_DESCRIPTION("fbdev driver for Broadsheet controller");
|
||||
MODULE_AUTHOR("Jaya Kumar");
|
||||
|
|
|
@ -363,8 +363,6 @@ static int bw2_remove(struct platform_device *op)
|
|||
|
||||
framebuffer_release(info);
|
||||
|
||||
dev_set_drvdata(&op->dev, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -585,8 +585,7 @@ static int alloc_carmine_fb(void __iomem *regs, void __iomem *smem_base,
|
|||
if (ret < 0)
|
||||
goto err_dealloc_cmap;
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node,
|
||||
info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
|
||||
*rinfo = info;
|
||||
return 0;
|
||||
|
@ -746,7 +745,6 @@ static void carminefb_remove(struct pci_dev *dev)
|
|||
iounmap(hw->v_regs);
|
||||
release_mem_region(fix.mmio_start, fix.mmio_len);
|
||||
|
||||
pci_set_drvdata(dev, NULL);
|
||||
pci_disable_device(dev);
|
||||
kfree(hw);
|
||||
}
|
||||
|
|
|
@ -181,7 +181,7 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info *
|
|||
}
|
||||
shift += bpp;
|
||||
shift &= (32 - 1);
|
||||
if (!l) { l = 8; s++; };
|
||||
if (!l) { l = 8; s++; }
|
||||
}
|
||||
|
||||
/* write trailing bits */
|
||||
|
|
|
@ -330,7 +330,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
|
|||
default:
|
||||
ret = -ENOSYS;
|
||||
break;
|
||||
};
|
||||
}
|
||||
if (!ret) {
|
||||
sbus_writeb(cur_mode, ®s->mcr);
|
||||
par->mode = mode;
|
||||
|
@ -343,7 +343,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
|
|||
FBTYPE_MDICOLOR, 8,
|
||||
info->fix.smem_len);
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
@ -583,8 +583,6 @@ static int cg14_remove(struct platform_device *op)
|
|||
|
||||
framebuffer_release(info);
|
||||
|
||||
dev_set_drvdata(&op->dev, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -446,8 +446,6 @@ static int cg3_remove(struct platform_device *op)
|
|||
|
||||
framebuffer_release(info);
|
||||
|
||||
dev_set_drvdata(&op->dev, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -624,7 +624,7 @@ static void cg6_init_fix(struct fb_info *info, int linebytes)
|
|||
default:
|
||||
cg6_cpu_name = "i386";
|
||||
break;
|
||||
};
|
||||
}
|
||||
if (((conf >> CG6_FHC_REV_SHIFT) & CG6_FHC_REV_MASK) >= 11) {
|
||||
if (info->fix.smem_len <= 0x100000)
|
||||
cg6_card_name = "TGX";
|
||||
|
@ -839,8 +839,6 @@ static int cg6_remove(struct platform_device *op)
|
|||
|
||||
framebuffer_release(info);
|
||||
|
||||
dev_set_drvdata(&op->dev, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -595,11 +595,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (var->xoffset < 0)
|
||||
var->xoffset = 0;
|
||||
if (var->yoffset < 0)
|
||||
var->yoffset = 0;
|
||||
|
||||
/* truncate xoffset and yoffset to maximum if too high */
|
||||
if (var->xoffset > var->xres_virtual - var->xres)
|
||||
var->xoffset = var->xres_virtual - var->xres - 1;
|
||||
|
@ -2159,7 +2154,6 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
|
|||
if (!ret)
|
||||
return 0;
|
||||
|
||||
pci_set_drvdata(pdev, NULL);
|
||||
iounmap(info->screen_base);
|
||||
err_release_legacy:
|
||||
if (release_io_ports)
|
||||
|
|
|
@ -368,8 +368,7 @@ static int cobalt_lcdfb_probe(struct platform_device *dev)
|
|||
|
||||
lcd_clear(info);
|
||||
|
||||
printk(KERN_INFO "fb%d: Cobalt server LCD frame buffer device\n",
|
||||
info->node);
|
||||
fb_info(info, "Cobalt server LCD frame buffer device\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -395,19 +394,7 @@ static struct platform_driver cobalt_lcdfb_driver = {
|
|||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init cobalt_lcdfb_init(void)
|
||||
{
|
||||
return platform_driver_register(&cobalt_lcdfb_driver);
|
||||
}
|
||||
|
||||
static void __exit cobalt_lcdfb_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&cobalt_lcdfb_driver);
|
||||
}
|
||||
|
||||
module_init(cobalt_lcdfb_init);
|
||||
module_exit(cobalt_lcdfb_exit);
|
||||
module_platform_driver(cobalt_lcdfb_driver);
|
||||
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_AUTHOR("Yoichi Yuasa");
|
||||
|
|
|
@ -471,8 +471,8 @@ try_again:
|
|||
/* Register with fbdev layer */
|
||||
if (register_framebuffer(&p->info) < 0)
|
||||
return -ENXIO;
|
||||
|
||||
printk(KERN_INFO "fb%d: control display adapter\n", p->info.node);
|
||||
|
||||
fb_info(&p->info, "control display adapter\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -1810,11 +1810,6 @@ static void cyberpro_pci_remove(struct pci_dev *dev)
|
|||
iounmap(cfb->region);
|
||||
cyberpro_free_fb_info(cfb);
|
||||
|
||||
/*
|
||||
* Ensure that the driver data is no longer
|
||||
* valid.
|
||||
*/
|
||||
pci_set_drvdata(dev, NULL);
|
||||
if (cfb == int_cfb_info)
|
||||
int_cfb_info = NULL;
|
||||
|
||||
|
|
|
@ -129,7 +129,6 @@
|
|||
|
||||
#define LCD_NUM_BUFFERS 2
|
||||
|
||||
#define WSI_TIMEOUT 50
|
||||
#define PALETTE_SIZE 256
|
||||
|
||||
#define CLK_MIN_DIV 2
|
||||
|
@ -1314,7 +1313,7 @@ static struct fb_ops da8xx_fb_ops = {
|
|||
|
||||
static struct fb_videomode *da8xx_fb_get_videomode(struct platform_device *dev)
|
||||
{
|
||||
struct da8xx_lcdc_platform_data *fb_pdata = dev->dev.platform_data;
|
||||
struct da8xx_lcdc_platform_data *fb_pdata = dev_get_platdata(&dev->dev);
|
||||
struct fb_videomode *lcdc_info;
|
||||
int i;
|
||||
|
||||
|
@ -1336,7 +1335,7 @@ static struct fb_videomode *da8xx_fb_get_videomode(struct platform_device *dev)
|
|||
static int fb_probe(struct platform_device *device)
|
||||
{
|
||||
struct da8xx_lcdc_platform_data *fb_pdata =
|
||||
device->dev.platform_data;
|
||||
dev_get_platdata(&device->dev);
|
||||
static struct resource *lcdc_regs;
|
||||
struct lcd_ctrl_config *lcd_cfg;
|
||||
struct fb_videomode *lcdc_info;
|
||||
|
@ -1548,7 +1547,7 @@ err_pm_runtime_disable:
|
|||
}
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
struct lcdc_context {
|
||||
static struct lcdc_context {
|
||||
u32 clk_enable;
|
||||
u32 ctrl;
|
||||
u32 dma_ctrl;
|
||||
|
@ -1663,19 +1662,7 @@ static struct platform_driver da8xx_fb_driver = {
|
|||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init da8xx_fb_init(void)
|
||||
{
|
||||
return platform_driver_register(&da8xx_fb_driver);
|
||||
}
|
||||
|
||||
static void __exit da8xx_fb_cleanup(void)
|
||||
{
|
||||
platform_driver_unregister(&da8xx_fb_driver);
|
||||
}
|
||||
|
||||
module_init(da8xx_fb_init);
|
||||
module_exit(da8xx_fb_cleanup);
|
||||
module_platform_driver(da8xx_fb_driver);
|
||||
|
||||
MODULE_DESCRIPTION("Framebuffer driver for TI da8xx/omap-l1xx");
|
||||
MODULE_AUTHOR("Texas Instruments");
|
||||
|
|
|
@ -108,8 +108,8 @@ static int efifb_setup(char *options)
|
|||
if (!*this_opt) continue;
|
||||
|
||||
for (i = 0; i < M_UNKNOWN; i++) {
|
||||
if (!strcmp(this_opt, efifb_dmi_list[i].optname) &&
|
||||
efifb_dmi_list[i].base != 0) {
|
||||
if (efifb_dmi_list[i].base != 0 &&
|
||||
!strcmp(this_opt, efifb_dmi_list[i].optname)) {
|
||||
screen_info.lfb_base = efifb_dmi_list[i].base;
|
||||
screen_info.lfb_linelength = efifb_dmi_list[i].stride;
|
||||
screen_info.lfb_width = efifb_dmi_list[i].width;
|
||||
|
@ -322,8 +322,7 @@ static int efifb_probe(struct platform_device *dev)
|
|||
printk(KERN_ERR "efifb: cannot register framebuffer\n");
|
||||
goto err_fb_dealoc;
|
||||
}
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
return 0;
|
||||
|
||||
err_fb_dealoc:
|
||||
|
|
|
@ -487,7 +487,7 @@ static void ep93xxfb_dealloc_videomem(struct fb_info *info)
|
|||
|
||||
static int ep93xxfb_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct ep93xxfb_mach_info *mach_info = pdev->dev.platform_data;
|
||||
struct ep93xxfb_mach_info *mach_info = dev_get_platdata(&pdev->dev);
|
||||
struct fb_info *info;
|
||||
struct ep93xx_fbi *fbi;
|
||||
struct resource *res;
|
||||
|
|
|
@ -376,6 +376,7 @@ int exynos_mipi_dsi_rd_data(struct mipi_dsim_device *dsim, unsigned int data_id,
|
|||
"data id %x is not supported current DSI spec.\n",
|
||||
data_id);
|
||||
|
||||
mutex_unlock(&dsim->lock);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
@ -667,7 +668,7 @@ int exynos_mipi_dsi_init_dsim(struct mipi_dsim_device *dsim)
|
|||
default:
|
||||
dev_info(dsim->dev, "data lane is invalid.\n");
|
||||
return -EINVAL;
|
||||
};
|
||||
}
|
||||
|
||||
exynos_mipi_dsi_sw_reset(dsim);
|
||||
exynos_mipi_dsi_func_reset(dsim);
|
||||
|
|
|
@ -713,9 +713,8 @@ static int unifb_probe(struct platform_device *dev)
|
|||
platform_set_drvdata(dev, info);
|
||||
platform_device_add_data(dev, unifb_regs, sizeof(u32) * UNIFB_REGS_NUM);
|
||||
|
||||
printk(KERN_INFO
|
||||
"fb%d: Virtual frame buffer device, using %dM of video memory\n",
|
||||
info->node, UNIFB_MEMSIZE >> 20);
|
||||
fb_info(info, "Virtual frame buffer device, using %dM of video memory\n",
|
||||
UNIFB_MEMSIZE >> 20);
|
||||
return 0;
|
||||
err2:
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
|
|
|
@ -1108,14 +1108,16 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
|
|||
case FBIOPUT_VSCREENINFO:
|
||||
if (copy_from_user(&var, argp, sizeof(var)))
|
||||
return -EFAULT;
|
||||
if (!lock_fb_info(info))
|
||||
return -ENODEV;
|
||||
console_lock();
|
||||
if (!lock_fb_info(info)) {
|
||||
console_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
info->flags |= FBINFO_MISC_USEREVENT;
|
||||
ret = fb_set_var(info, &var);
|
||||
info->flags &= ~FBINFO_MISC_USEREVENT;
|
||||
console_unlock();
|
||||
unlock_fb_info(info);
|
||||
console_unlock();
|
||||
if (!ret && copy_to_user(argp, &var, sizeof(var)))
|
||||
ret = -EFAULT;
|
||||
break;
|
||||
|
@ -1144,12 +1146,14 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
|
|||
case FBIOPAN_DISPLAY:
|
||||
if (copy_from_user(&var, argp, sizeof(var)))
|
||||
return -EFAULT;
|
||||
if (!lock_fb_info(info))
|
||||
return -ENODEV;
|
||||
console_lock();
|
||||
if (!lock_fb_info(info)) {
|
||||
console_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
ret = fb_pan_display(info, &var);
|
||||
console_unlock();
|
||||
unlock_fb_info(info);
|
||||
console_unlock();
|
||||
if (ret == 0 && copy_to_user(argp, &var, sizeof(var)))
|
||||
return -EFAULT;
|
||||
break;
|
||||
|
@ -1184,23 +1188,27 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
|
|||
break;
|
||||
}
|
||||
event.data = &con2fb;
|
||||
if (!lock_fb_info(info))
|
||||
return -ENODEV;
|
||||
console_lock();
|
||||
if (!lock_fb_info(info)) {
|
||||
console_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
event.info = info;
|
||||
ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
|
||||
console_unlock();
|
||||
unlock_fb_info(info);
|
||||
console_unlock();
|
||||
break;
|
||||
case FBIOBLANK:
|
||||
if (!lock_fb_info(info))
|
||||
return -ENODEV;
|
||||
console_lock();
|
||||
if (!lock_fb_info(info)) {
|
||||
console_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
info->flags |= FBINFO_MISC_USEREVENT;
|
||||
ret = fb_blank(info, arg);
|
||||
info->flags &= ~FBINFO_MISC_USEREVENT;
|
||||
console_unlock();
|
||||
unlock_fb_info(info);
|
||||
console_unlock();
|
||||
break;
|
||||
default:
|
||||
if (!lock_fb_info(info))
|
||||
|
@ -1660,12 +1668,15 @@ static int do_register_framebuffer(struct fb_info *fb_info)
|
|||
registered_fb[i] = fb_info;
|
||||
|
||||
event.info = fb_info;
|
||||
if (!lock_fb_info(fb_info))
|
||||
return -ENODEV;
|
||||
console_lock();
|
||||
if (!lock_fb_info(fb_info)) {
|
||||
console_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
|
||||
console_unlock();
|
||||
unlock_fb_info(fb_info);
|
||||
console_unlock();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -1678,13 +1689,16 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)
|
|||
if (i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)
|
||||
return -EINVAL;
|
||||
|
||||
if (!lock_fb_info(fb_info))
|
||||
return -ENODEV;
|
||||
console_lock();
|
||||
if (!lock_fb_info(fb_info)) {
|
||||
console_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
event.info = fb_info;
|
||||
ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
|
||||
console_unlock();
|
||||
unlock_fb_info(fb_info);
|
||||
console_unlock();
|
||||
|
||||
if (ret)
|
||||
return -EINVAL;
|
||||
|
|
|
@ -177,9 +177,12 @@ static ssize_t store_modes(struct device *device,
|
|||
if (i * sizeof(struct fb_videomode) != count)
|
||||
return -EINVAL;
|
||||
|
||||
if (!lock_fb_info(fb_info))
|
||||
return -ENODEV;
|
||||
console_lock();
|
||||
if (!lock_fb_info(fb_info)) {
|
||||
console_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
list_splice(&fb_info->modelist, &old_list);
|
||||
fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
|
||||
&fb_info->modelist);
|
||||
|
@ -189,8 +192,8 @@ static ssize_t store_modes(struct device *device,
|
|||
} else
|
||||
fb_destroy_modelist(&old_list);
|
||||
|
||||
console_unlock();
|
||||
unlock_fb_info(fb_info);
|
||||
console_unlock();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -404,12 +407,16 @@ static ssize_t store_fbstate(struct device *device,
|
|||
|
||||
state = simple_strtoul(buf, &last, 0);
|
||||
|
||||
if (!lock_fb_info(fb_info))
|
||||
return -ENODEV;
|
||||
console_lock();
|
||||
if (!lock_fb_info(fb_info)) {
|
||||
console_unlock();
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
fb_set_suspend(fb_info, (int)state);
|
||||
console_unlock();
|
||||
|
||||
unlock_fb_info(fb_info);
|
||||
console_unlock();
|
||||
|
||||
return count;
|
||||
}
|
||||
|
|
|
@ -1035,8 +1035,6 @@ static int ffb_remove(struct platform_device *op)
|
|||
|
||||
framebuffer_release(info);
|
||||
|
||||
dev_set_drvdata(&op->dev, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -289,7 +289,7 @@ static int fm2fb_probe(struct zorro_dev *z, const struct zorro_device_id *id)
|
|||
zorro_release_device(z);
|
||||
return -EINVAL;
|
||||
}
|
||||
printk("fb%d: %s frame buffer device\n", info->node, fb_fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", fb_fix.id);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -1104,7 +1104,7 @@ static int fsl_diu_cursor(struct fb_info *info, struct fb_cursor *cursor)
|
|||
|
||||
fsl_diu_load_cursor_image(info, image, bg, fg,
|
||||
cursor->image.width, cursor->image.height);
|
||||
};
|
||||
}
|
||||
|
||||
/*
|
||||
* Show or hide the cursor. The cursor data is always stored in the
|
||||
|
|
|
@ -1236,9 +1236,9 @@ static int gbefb_probe(struct platform_device *p_dev)
|
|||
platform_set_drvdata(p_dev, info);
|
||||
gbefb_create_sysfs(&p_dev->dev);
|
||||
|
||||
printk(KERN_INFO "fb%d: %s rev %d @ 0x%08x using %dkB memory\n",
|
||||
info->node, info->fix.id, gbe_revision, (unsigned) GBE_BASE,
|
||||
gbe_mem_size >> 10);
|
||||
fb_info(info, "%s rev %d @ 0x%08x using %dkB memory\n",
|
||||
info->fix.id, gbe_revision, (unsigned)GBE_BASE,
|
||||
gbe_mem_size >> 10);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -357,7 +357,7 @@ static int gx1fb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
goto err;
|
||||
}
|
||||
pci_set_drvdata(pdev, info);
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
return 0;
|
||||
|
||||
err:
|
||||
|
@ -399,7 +399,6 @@ static void gx1fb_remove(struct pci_dev *pdev)
|
|||
release_mem_region(gx1_gx_base() + 0x8300, 0x100);
|
||||
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
pci_set_drvdata(pdev, NULL);
|
||||
|
||||
framebuffer_release(info);
|
||||
}
|
||||
|
|
|
@ -423,7 +423,7 @@ static int gxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
goto err;
|
||||
}
|
||||
pci_set_drvdata(pdev, info);
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
return 0;
|
||||
|
||||
err:
|
||||
|
@ -471,7 +471,6 @@ static void gxfb_remove(struct pci_dev *pdev)
|
|||
pci_release_region(pdev, 1);
|
||||
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
pci_set_drvdata(pdev, NULL);
|
||||
|
||||
framebuffer_release(info);
|
||||
}
|
||||
|
|
|
@ -555,8 +555,7 @@ static int lxfb_probe(struct pci_dev *pdev, const struct pci_device_id *id)
|
|||
goto err;
|
||||
}
|
||||
pci_set_drvdata(pdev, info);
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
|
||||
return 0;
|
||||
|
||||
|
@ -606,7 +605,6 @@ static void lxfb_remove(struct pci_dev *pdev)
|
|||
pci_release_region(pdev, 3);
|
||||
|
||||
fb_dealloc_cmap(&info->cmap);
|
||||
pci_set_drvdata(pdev, NULL);
|
||||
framebuffer_release(info);
|
||||
}
|
||||
|
||||
|
|
|
@ -496,7 +496,6 @@ static int grvga_probe(struct platform_device *dev)
|
|||
return 0;
|
||||
|
||||
free_mem:
|
||||
dev_set_drvdata(&dev->dev, NULL);
|
||||
if (grvga_fix_addr)
|
||||
iounmap((void *)virtual_start);
|
||||
else
|
||||
|
@ -530,7 +529,6 @@ static int grvga_remove(struct platform_device *device)
|
|||
kfree((void *)info->screen_base);
|
||||
|
||||
framebuffer_release(info);
|
||||
dev_set_drvdata(&device->dev, NULL);
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -557,19 +555,7 @@ static struct platform_driver grvga_driver = {
|
|||
.remove = grvga_remove,
|
||||
};
|
||||
|
||||
|
||||
static int __init grvga_init(void)
|
||||
{
|
||||
return platform_driver_register(&grvga_driver);
|
||||
}
|
||||
|
||||
static void __exit grvga_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&grvga_driver);
|
||||
}
|
||||
|
||||
module_init(grvga_init);
|
||||
module_exit(grvga_exit);
|
||||
module_platform_driver(grvga_driver);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Aeroflex Gaisler");
|
||||
|
|
|
@ -698,8 +698,7 @@ static int gxt4500_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
dev_err(&pdev->dev, "gxt4500: cannot register framebuffer\n");
|
||||
goto err_free_cmap;
|
||||
}
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -261,9 +261,8 @@ static int hecubafb_probe(struct platform_device *dev)
|
|||
goto err_fbreg;
|
||||
platform_set_drvdata(dev, info);
|
||||
|
||||
printk(KERN_INFO
|
||||
"fb%d: Hecuba frame buffer device, using %dK of video memory\n",
|
||||
info->node, videomemorysize >> 10);
|
||||
fb_info(info, "Hecuba frame buffer device, using %dK of video memory\n",
|
||||
videomemorysize >> 10);
|
||||
|
||||
/* this inits the dpy */
|
||||
retval = par->board->init(par);
|
||||
|
@ -305,19 +304,7 @@ static struct platform_driver hecubafb_driver = {
|
|||
.name = "hecubafb",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init hecubafb_init(void)
|
||||
{
|
||||
return platform_driver_register(&hecubafb_driver);
|
||||
}
|
||||
|
||||
static void __exit hecubafb_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&hecubafb_driver);
|
||||
}
|
||||
|
||||
module_init(hecubafb_init);
|
||||
module_exit(hecubafb_exit);
|
||||
module_platform_driver(hecubafb_driver);
|
||||
|
||||
MODULE_DESCRIPTION("fbdev driver for Hecuba/Apollo controller");
|
||||
MODULE_AUTHOR("Jaya Kumar");
|
||||
|
|
|
@ -586,8 +586,7 @@ static int hgafb_probe(struct platform_device *pdev)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
platform_set_drvdata(pdev, info);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -405,8 +405,7 @@ static int hitfb_probe(struct platform_device *dev)
|
|||
|
||||
platform_set_drvdata(dev, info);
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -298,8 +298,7 @@ static int hpfb_init_one(unsigned long phys_base, unsigned long virt_base)
|
|||
if (ret < 0)
|
||||
goto dealloc_cmap;
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
fb_info.node, fb_info.fix.id);
|
||||
fb_info(&fb_info, "%s frame buffer device\n", fb_info.fix.id);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -575,6 +575,10 @@ static int hvfb_setcolreg(unsigned regno, unsigned red, unsigned green,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int hvfb_blank(int blank, struct fb_info *info)
|
||||
{
|
||||
return 1; /* get fb_blank to set the colormap to all black */
|
||||
}
|
||||
|
||||
static struct fb_ops hvfb_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
|
@ -584,6 +588,7 @@ static struct fb_ops hvfb_ops = {
|
|||
.fb_fillrect = cfb_fillrect,
|
||||
.fb_copyarea = cfb_copyarea,
|
||||
.fb_imageblit = cfb_imageblit,
|
||||
.fb_blank = hvfb_blank,
|
||||
};
|
||||
|
||||
|
||||
|
@ -795,12 +800,21 @@ static int hvfb_remove(struct hv_device *hdev)
|
|||
}
|
||||
|
||||
|
||||
static DEFINE_PCI_DEVICE_TABLE(pci_stub_id_table) = {
|
||||
{
|
||||
.vendor = PCI_VENDOR_ID_MICROSOFT,
|
||||
.device = PCI_DEVICE_ID_HYPERV_VIDEO,
|
||||
},
|
||||
{ /* end of list */ }
|
||||
};
|
||||
|
||||
static const struct hv_vmbus_device_id id_table[] = {
|
||||
/* Synthetic Video Device GUID */
|
||||
{HV_SYNTHVID_GUID},
|
||||
{}
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(pci, pci_stub_id_table);
|
||||
MODULE_DEVICE_TABLE(vmbus, id_table);
|
||||
|
||||
static struct hv_driver hvfb_drv = {
|
||||
|
@ -810,14 +824,43 @@ static struct hv_driver hvfb_drv = {
|
|||
.remove = hvfb_remove,
|
||||
};
|
||||
|
||||
static int hvfb_pci_stub_probe(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void hvfb_pci_stub_remove(struct pci_dev *pdev)
|
||||
{
|
||||
}
|
||||
|
||||
static struct pci_driver hvfb_pci_stub_driver = {
|
||||
.name = KBUILD_MODNAME,
|
||||
.id_table = pci_stub_id_table,
|
||||
.probe = hvfb_pci_stub_probe,
|
||||
.remove = hvfb_pci_stub_remove,
|
||||
};
|
||||
|
||||
static int __init hvfb_drv_init(void)
|
||||
{
|
||||
return vmbus_driver_register(&hvfb_drv);
|
||||
int ret;
|
||||
|
||||
ret = vmbus_driver_register(&hvfb_drv);
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
ret = pci_register_driver(&hvfb_pci_stub_driver);
|
||||
if (ret != 0) {
|
||||
vmbus_driver_unregister(&hvfb_drv);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit hvfb_drv_exit(void)
|
||||
{
|
||||
pci_unregister_driver(&hvfb_pci_stub_driver);
|
||||
vmbus_driver_unregister(&hvfb_drv);
|
||||
}
|
||||
|
||||
|
|
|
@ -203,8 +203,7 @@ static int i740fb_release(struct fb_info *info, int user)
|
|||
|
||||
mutex_lock(&(par->open_lock));
|
||||
if (par->ref_count == 0) {
|
||||
printk(KERN_ERR "fb%d: release called with zero refcount\n",
|
||||
info->node);
|
||||
fb_err(info, "release called with zero refcount\n");
|
||||
mutex_unlock(&(par->open_lock));
|
||||
return -EINVAL;
|
||||
}
|
||||
|
@ -1067,7 +1066,7 @@ static int i740fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
|
|||
par->has_sgram = !((tmp & DRAM_RAS_TIMING) ||
|
||||
(tmp & DRAM_RAS_PRECHARGE));
|
||||
|
||||
printk(KERN_INFO "fb%d: Intel740 on %s, %ld KB %s\n", info->node,
|
||||
fb_info(info, "Intel740 on %s, %ld KB %s\n",
|
||||
pci_name(dev), info->screen_size >> 10,
|
||||
par->has_sgram ? "SGRAM" : "SDRAM");
|
||||
|
||||
|
@ -1143,8 +1142,7 @@ static int i740fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
|
|||
goto err_reg_framebuffer;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
pci_set_drvdata(dev, info);
|
||||
#ifdef CONFIG_MTRR
|
||||
if (mtrr) {
|
||||
|
@ -1194,7 +1192,6 @@ static void i740fb_remove(struct pci_dev *dev)
|
|||
pci_iounmap(dev, info->screen_base);
|
||||
pci_release_regions(dev);
|
||||
/* pci_disable_device(dev); */
|
||||
pci_set_drvdata(dev, NULL);
|
||||
framebuffer_release(info);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2129,7 +2129,6 @@ static void __exit i810fb_remove_pci(struct pci_dev *dev)
|
|||
|
||||
unregister_framebuffer(info);
|
||||
i810fb_release_resource(info, par);
|
||||
pci_set_drvdata(dev, NULL);
|
||||
printk("cleanup_module: unloaded i810 framebuffer device\n");
|
||||
}
|
||||
|
||||
|
|
|
@ -360,9 +360,8 @@ static int __init iga_init(struct fb_info *info, struct iga_par *par)
|
|||
if (register_framebuffer(info) < 0)
|
||||
return 0;
|
||||
|
||||
printk("fb%d: %s frame buffer device at 0x%08lx [%dMB VRAM]\n",
|
||||
info->node, info->fix.id,
|
||||
par->frame_buffer_phys, info->fix.smem_len >> 20);
|
||||
fb_info(info, "%s frame buffer device at 0x%08lx [%dMB VRAM]\n",
|
||||
info->fix.id, par->frame_buffer_phys, info->fix.smem_len >> 20);
|
||||
|
||||
iga_blank_border(par);
|
||||
return 1;
|
||||
|
|
|
@ -1461,8 +1461,8 @@ static void init_imstt(struct fb_info *info)
|
|||
}
|
||||
|
||||
tmp = (read_reg_le32(par->dc_regs, SSTATUS) & 0x0f00) >> 8;
|
||||
printk("fb%u: %s frame buffer; %uMB vram; chip version %u\n",
|
||||
info->node, info->fix.id, info->fix.smem_len >> 20, tmp);
|
||||
fb_info(info, "%s frame buffer; %uMB vram; chip version %u\n",
|
||||
info->fix.id, info->fix.smem_len >> 20, tmp);
|
||||
}
|
||||
|
||||
static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
||||
|
|
|
@ -755,7 +755,7 @@ static int imxfb_resume(struct platform_device *dev)
|
|||
|
||||
static int imxfb_init_fbinfo(struct platform_device *pdev)
|
||||
{
|
||||
struct imx_fb_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct imx_fb_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
||||
struct fb_info *info = dev_get_drvdata(&pdev->dev);
|
||||
struct imxfb_info *fbi = info->par;
|
||||
struct device_node *np;
|
||||
|
@ -877,7 +877,7 @@ static int imxfb_probe(struct platform_device *pdev)
|
|||
if (!res)
|
||||
return -ENODEV;
|
||||
|
||||
pdata = pdev->dev.platform_data;
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
|
||||
info = framebuffer_alloc(sizeof(struct imxfb_info), &pdev->dev);
|
||||
if (!info)
|
||||
|
@ -1066,7 +1066,7 @@ static int imxfb_remove(struct platform_device *pdev)
|
|||
#endif
|
||||
unregister_framebuffer(info);
|
||||
|
||||
pdata = pdev->dev.platform_data;
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
if (pdata && pdata->exit)
|
||||
pdata->exit(fbi->pdev);
|
||||
|
||||
|
|
|
@ -931,8 +931,6 @@ static void intelfb_pci_unregister(struct pci_dev *pdev)
|
|||
return;
|
||||
|
||||
cleanup(dinfo);
|
||||
|
||||
pci_set_drvdata(pdev, NULL);
|
||||
}
|
||||
|
||||
/***************************************************************
|
||||
|
|
|
@ -99,9 +99,9 @@
|
|||
#define JZ_LCD_CTRL_BPP_15_16 0x4
|
||||
#define JZ_LCD_CTRL_BPP_18_24 0x5
|
||||
|
||||
#define JZ_LCD_CMD_SOF_IRQ BIT(15)
|
||||
#define JZ_LCD_CMD_EOF_IRQ BIT(16)
|
||||
#define JZ_LCD_CMD_ENABLE_PAL BIT(12)
|
||||
#define JZ_LCD_CMD_SOF_IRQ BIT(31)
|
||||
#define JZ_LCD_CMD_EOF_IRQ BIT(30)
|
||||
#define JZ_LCD_CMD_ENABLE_PAL BIT(28)
|
||||
|
||||
#define JZ_LCD_SYNC_MASK 0x3ff
|
||||
|
||||
|
@ -471,7 +471,7 @@ static int jzfb_set_par(struct fb_info *info)
|
|||
writel(ctrl, jzfb->base + JZ_REG_LCD_CTRL);
|
||||
|
||||
if (!jzfb->is_enabled)
|
||||
clk_disable(jzfb->ldclk);
|
||||
clk_disable_unprepare(jzfb->ldclk);
|
||||
|
||||
mutex_unlock(&jzfb->lock);
|
||||
|
||||
|
@ -485,7 +485,7 @@ static void jzfb_enable(struct jzfb *jzfb)
|
|||
{
|
||||
uint32_t ctrl;
|
||||
|
||||
clk_enable(jzfb->ldclk);
|
||||
clk_prepare_enable(jzfb->ldclk);
|
||||
|
||||
jz_gpio_bulk_resume(jz_lcd_ctrl_pins, jzfb_num_ctrl_pins(jzfb));
|
||||
jz_gpio_bulk_resume(jz_lcd_data_pins, jzfb_num_data_pins(jzfb));
|
||||
|
@ -514,7 +514,7 @@ static void jzfb_disable(struct jzfb *jzfb)
|
|||
jz_gpio_bulk_suspend(jz_lcd_ctrl_pins, jzfb_num_ctrl_pins(jzfb));
|
||||
jz_gpio_bulk_suspend(jz_lcd_data_pins, jzfb_num_data_pins(jzfb));
|
||||
|
||||
clk_disable(jzfb->ldclk);
|
||||
clk_disable_unprepare(jzfb->ldclk);
|
||||
}
|
||||
|
||||
static int jzfb_blank(int blank_mode, struct fb_info *info)
|
||||
|
@ -693,7 +693,7 @@ static int jzfb_probe(struct platform_device *pdev)
|
|||
|
||||
fb_alloc_cmap(&fb->cmap, 256, 0);
|
||||
|
||||
clk_enable(jzfb->ldclk);
|
||||
clk_prepare_enable(jzfb->ldclk);
|
||||
jzfb->is_enabled = 1;
|
||||
|
||||
writel(jzfb->framedesc->next, jzfb->base + JZ_REG_LCD_DA0);
|
||||
|
@ -763,7 +763,7 @@ static int jzfb_suspend(struct device *dev)
|
|||
static int jzfb_resume(struct device *dev)
|
||||
{
|
||||
struct jzfb *jzfb = dev_get_drvdata(dev);
|
||||
clk_enable(jzfb->ldclk);
|
||||
clk_prepare_enable(jzfb->ldclk);
|
||||
|
||||
mutex_lock(&jzfb->lock);
|
||||
if (jzfb->is_enabled)
|
||||
|
@ -798,18 +798,7 @@ static struct platform_driver jzfb_driver = {
|
|||
.pm = JZFB_PM_OPS,
|
||||
},
|
||||
};
|
||||
|
||||
static int __init jzfb_init(void)
|
||||
{
|
||||
return platform_driver_register(&jzfb_driver);
|
||||
}
|
||||
module_init(jzfb_init);
|
||||
|
||||
static void __exit jzfb_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&jzfb_driver);
|
||||
}
|
||||
module_exit(jzfb_exit);
|
||||
module_platform_driver(jzfb_driver);
|
||||
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>");
|
||||
|
|
|
@ -623,7 +623,6 @@ static int kyrofb_ioctl(struct fb_info *info,
|
|||
"command instead.\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
break;
|
||||
case KYRO_IOCTL_UVSTRIDE:
|
||||
if (copy_to_user(argp, &deviceInfo.ulOverlayUVStride, sizeof(unsigned long)))
|
||||
return -EFAULT;
|
||||
|
@ -736,10 +735,10 @@ static int kyrofb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
if (register_framebuffer(info) < 0)
|
||||
goto out_unmap;
|
||||
|
||||
printk("fb%d: %s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n",
|
||||
info->node, info->fix.id, info->var.xres,
|
||||
info->var.yres, info->var.bits_per_pixel, size >> 10,
|
||||
(unsigned long)info->fix.smem_len >> 10);
|
||||
fb_info(info, "%s frame buffer device, at %dx%d@%d using %ldk/%ldk of VRAM\n",
|
||||
info->fix.id,
|
||||
info->var.xres, info->var.yres, info->var.bits_per_pixel,
|
||||
size >> 10, (unsigned long)info->fix.smem_len >> 10);
|
||||
|
||||
pci_set_drvdata(pdev, info);
|
||||
|
||||
|
@ -779,7 +778,6 @@ static void kyrofb_remove(struct pci_dev *pdev)
|
|||
#endif
|
||||
|
||||
unregister_framebuffer(info);
|
||||
pci_set_drvdata(pdev, NULL);
|
||||
framebuffer_release(info);
|
||||
}
|
||||
|
||||
|
|
|
@ -469,7 +469,7 @@ static void leo_wid_put(struct fb_info *info, struct fb_wid_list *wl)
|
|||
|
||||
default:
|
||||
continue;
|
||||
};
|
||||
}
|
||||
sbus_writel(0x5800 + j, &lx_krn->krn_type);
|
||||
sbus_writel(wi->wi_values[0], &lx_krn->krn_value);
|
||||
}
|
||||
|
@ -648,8 +648,6 @@ static int leo_remove(struct platform_device *op)
|
|||
|
||||
framebuffer_release(info);
|
||||
|
||||
dev_set_drvdata(&op->dev, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -913,8 +913,7 @@ static int __init macfb_init(void)
|
|||
if (err)
|
||||
goto fail_dealloc;
|
||||
|
||||
pr_info("fb%d: %s frame buffer device\n",
|
||||
fb_info.node, fb_info.fix.id);
|
||||
fb_info(&fb_info, "%s frame buffer device\n", fb_info.fix.id);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -494,7 +494,7 @@ static int m1064_compute(void* out, struct my_timming* m) {
|
|||
if (inDAC1064(minfo, M1064_XPIXPLLSTAT) & 0x40)
|
||||
break;
|
||||
udelay(10);
|
||||
};
|
||||
}
|
||||
|
||||
CRITEND
|
||||
|
||||
|
@ -639,7 +639,7 @@ static void MGAG100_progPixClock(const struct matrox_fb_info *minfo, int flags,
|
|||
if (inDAC1064(minfo, M1064_XPIXPLLSTAT) & 0x40)
|
||||
break;
|
||||
udelay(10);
|
||||
};
|
||||
}
|
||||
if (!clk)
|
||||
printk(KERN_ERR "matroxfb: Pixel PLL%c not locked after usual time\n", (reg-M1064_XPIXPLLAM-2)/4 + 'A');
|
||||
selClk = inDAC1064(minfo, M1064_XPIXCLKCTRL) & ~M1064_XPIXCLKCTRL_SRC_MASK;
|
||||
|
|
|
@ -473,7 +473,7 @@ static void ti3026_setMCLK(struct matrox_fb_info *minfo, int fout)
|
|||
if (inTi3026(minfo, TVP3026_XPIXPLLDATA) & 0x40)
|
||||
break;
|
||||
udelay(10);
|
||||
};
|
||||
}
|
||||
if (!tmout)
|
||||
printk(KERN_ERR "matroxfb: Temporary pixel PLL not locked after 5 secs\n");
|
||||
|
||||
|
|
|
@ -1893,14 +1893,12 @@ static int initMatrox2(struct matrox_fb_info *minfo, struct board *b)
|
|||
if (register_framebuffer(&minfo->fbcon) < 0) {
|
||||
goto failVideoIO;
|
||||
}
|
||||
printk("fb%d: %s frame buffer device\n",
|
||||
minfo->fbcon.node, minfo->fbcon.fix.id);
|
||||
fb_info(&minfo->fbcon, "%s frame buffer device\n", minfo->fbcon.fix.id);
|
||||
|
||||
/* there is no console on this fb... but we have to initialize hardware
|
||||
* until someone tells me what is proper thing to do */
|
||||
if (!minfo->initialized) {
|
||||
printk(KERN_INFO "fb%d: initializing hardware\n",
|
||||
minfo->fbcon.node);
|
||||
fb_info(&minfo->fbcon, "initializing hardware\n");
|
||||
/* We have to use FB_ACTIVATE_FORCE, as we had to put vesafb_defined to the fbcon.var
|
||||
* already before, so register_framebuffer works correctly. */
|
||||
vesafb_defined.activate |= FB_ACTIVATE_FORCE;
|
||||
|
|
|
@ -1295,19 +1295,7 @@ static struct i2c_driver maven_driver={
|
|||
.id_table = maven_id,
|
||||
};
|
||||
|
||||
static int __init matroxfb_maven_init(void)
|
||||
{
|
||||
return i2c_add_driver(&maven_driver);
|
||||
}
|
||||
|
||||
static void __exit matroxfb_maven_exit(void)
|
||||
{
|
||||
i2c_del_driver(&maven_driver);
|
||||
}
|
||||
|
||||
module_i2c_driver(maven_driver);
|
||||
MODULE_AUTHOR("(c) 1999-2002 Petr Vandrovec <vandrove@vc.cvut.cz>");
|
||||
MODULE_DESCRIPTION("Matrox G200/G400 Matrox MGA-TVO driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
module_init(matroxfb_maven_init);
|
||||
module_exit(matroxfb_maven_exit);
|
||||
/* we do not have __setup() yet */
|
||||
|
|
|
@ -781,7 +781,6 @@ rel_reg:
|
|||
irqdisp:
|
||||
irq_dispose_mapping(par->irq);
|
||||
fbrel:
|
||||
dev_set_drvdata(dev, NULL);
|
||||
framebuffer_release(info);
|
||||
return ret;
|
||||
}
|
||||
|
@ -814,7 +813,6 @@ static int of_platform_mb862xx_remove(struct platform_device *ofdev)
|
|||
iounmap(par->mmio_base);
|
||||
iounmap(par->fb_base);
|
||||
|
||||
dev_set_drvdata(&ofdev->dev, NULL);
|
||||
release_mem_region(par->res->start, res_size);
|
||||
framebuffer_release(fbi);
|
||||
return 0;
|
||||
|
@ -1157,7 +1155,6 @@ static void mb862xx_pci_remove(struct pci_dev *pdev)
|
|||
|
||||
device_remove_file(&pdev->dev, &dev_attr_dispregs);
|
||||
|
||||
pci_set_drvdata(pdev, NULL);
|
||||
unregister_framebuffer(fbi);
|
||||
fb_dealloc_cmap(&fbi->cmap);
|
||||
|
||||
|
|
|
@ -890,7 +890,7 @@ static int mbxfb_probe(struct platform_device *dev)
|
|||
|
||||
dev_dbg(&dev->dev, "mbxfb_probe\n");
|
||||
|
||||
pdata = dev->dev.platform_data;
|
||||
pdata = dev_get_platdata(&dev->dev);
|
||||
if (!pdata) {
|
||||
dev_err(&dev->dev, "platform data is required\n");
|
||||
return -EINVAL;
|
||||
|
@ -976,7 +976,7 @@ static int mbxfb_probe(struct platform_device *dev)
|
|||
|
||||
platform_set_drvdata(dev, fbi);
|
||||
|
||||
printk(KERN_INFO "fb%d: mbx frame buffer device\n", fbi->node);
|
||||
fb_info(fbi, "mbx frame buffer device\n");
|
||||
|
||||
if (mfbi->platform_probe)
|
||||
mfbi->platform_probe(fbi);
|
||||
|
|
|
@ -690,7 +690,8 @@ static int metronomefb_probe(struct platform_device *dev)
|
|||
goto err_csum_table;
|
||||
}
|
||||
|
||||
if (board->setup_irq(info))
|
||||
retval = board->setup_irq(info);
|
||||
if (retval)
|
||||
goto err_csum_table;
|
||||
|
||||
retval = metronome_init_regs(par);
|
||||
|
@ -769,23 +770,11 @@ static struct platform_driver metronomefb_driver = {
|
|||
.name = "metronomefb",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init metronomefb_init(void)
|
||||
{
|
||||
return platform_driver_register(&metronomefb_driver);
|
||||
}
|
||||
|
||||
static void __exit metronomefb_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&metronomefb_driver);
|
||||
}
|
||||
module_platform_driver(metronomefb_driver);
|
||||
|
||||
module_param(user_wfm_size, uint, 0);
|
||||
MODULE_PARM_DESC(user_wfm_size, "Set custom waveform size");
|
||||
|
||||
module_init(metronomefb_init);
|
||||
module_exit(metronomefb_exit);
|
||||
|
||||
MODULE_DESCRIPTION("fbdev driver for Metronome controller");
|
||||
MODULE_AUTHOR("Jaya Kumar");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
|
|
@ -392,12 +392,29 @@ static int var_update(struct fb_info *info)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void mmpfb_set_win(struct fb_info *info)
|
||||
{
|
||||
struct mmpfb_info *fbi = info->par;
|
||||
struct fb_var_screeninfo *var = &info->var;
|
||||
struct mmp_win win;
|
||||
u32 stride;
|
||||
|
||||
memset(&win, 0, sizeof(win));
|
||||
win.xsrc = win.xdst = fbi->mode.xres;
|
||||
win.ysrc = win.ydst = fbi->mode.yres;
|
||||
win.pix_fmt = fbi->pix_fmt;
|
||||
stride = pixfmt_to_stride(win.pix_fmt);
|
||||
win.pitch[0] = var->xres_virtual * stride;
|
||||
win.pitch[1] = win.pitch[2] =
|
||||
(stride == 1) ? (var->xres_virtual >> 1) : 0;
|
||||
mmp_overlay_set_win(fbi->overlay, &win);
|
||||
}
|
||||
|
||||
static int mmpfb_set_par(struct fb_info *info)
|
||||
{
|
||||
struct mmpfb_info *fbi = info->par;
|
||||
struct fb_var_screeninfo *var = &info->var;
|
||||
struct mmp_addr addr;
|
||||
struct mmp_win win;
|
||||
struct mmp_mode mode;
|
||||
int ret;
|
||||
|
||||
|
@ -409,11 +426,8 @@ static int mmpfb_set_par(struct fb_info *info)
|
|||
fbmode_to_mmpmode(&mode, &fbi->mode, fbi->output_fmt);
|
||||
mmp_path_set_mode(fbi->path, &mode);
|
||||
|
||||
memset(&win, 0, sizeof(win));
|
||||
win.xsrc = win.xdst = fbi->mode.xres;
|
||||
win.ysrc = win.ydst = fbi->mode.yres;
|
||||
win.pix_fmt = fbi->pix_fmt;
|
||||
mmp_overlay_set_win(fbi->overlay, &win);
|
||||
/* set window related info */
|
||||
mmpfb_set_win(info);
|
||||
|
||||
/* set address always */
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
|
@ -427,16 +441,12 @@ static int mmpfb_set_par(struct fb_info *info)
|
|||
static void mmpfb_power(struct mmpfb_info *fbi, int power)
|
||||
{
|
||||
struct mmp_addr addr;
|
||||
struct mmp_win win;
|
||||
struct fb_var_screeninfo *var = &fbi->fb_info->var;
|
||||
|
||||
/* for power on, always set address/window again */
|
||||
if (power) {
|
||||
memset(&win, 0, sizeof(win));
|
||||
win.xsrc = win.xdst = fbi->mode.xres;
|
||||
win.ysrc = win.ydst = fbi->mode.yres;
|
||||
win.pix_fmt = fbi->pix_fmt;
|
||||
mmp_overlay_set_win(fbi->overlay, &win);
|
||||
/* set window related info */
|
||||
mmpfb_set_win(fbi->fb_info);
|
||||
|
||||
/* set address always */
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
|
|
|
@ -53,15 +53,14 @@ static irqreturn_t ctrl_handle_irq(int irq, void *dev_id)
|
|||
tmp = readl_relaxed(ctrl->reg_base + SPU_IRQ_ISR);
|
||||
if (tmp & isr)
|
||||
writel_relaxed(~isr, ctrl->reg_base + SPU_IRQ_ISR);
|
||||
} while ((isr = readl(ctrl->reg_base + SPU_IRQ_ISR)) & imask);
|
||||
} while ((isr = readl_relaxed(ctrl->reg_base + SPU_IRQ_ISR)) & imask);
|
||||
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
static u32 fmt_to_reg(struct mmp_overlay *overlay, int pix_fmt)
|
||||
{
|
||||
u32 link_config = path_to_path_plat(overlay->path)->link_config;
|
||||
u32 rbswap, uvswap = 0, yuvswap = 0,
|
||||
u32 rbswap = 0, uvswap = 0, yuvswap = 0,
|
||||
csc_en = 0, val = 0,
|
||||
vid = overlay_is_vid(overlay);
|
||||
|
||||
|
@ -71,27 +70,23 @@ static u32 fmt_to_reg(struct mmp_overlay *overlay, int pix_fmt)
|
|||
case PIXFMT_RGB888PACK:
|
||||
case PIXFMT_RGB888UNPACK:
|
||||
case PIXFMT_RGBA888:
|
||||
rbswap = !(link_config & 0x1);
|
||||
rbswap = 1;
|
||||
break;
|
||||
case PIXFMT_VYUY:
|
||||
case PIXFMT_YVU422P:
|
||||
case PIXFMT_YVU420P:
|
||||
rbswap = link_config & 0x1;
|
||||
uvswap = 1;
|
||||
break;
|
||||
case PIXFMT_YUYV:
|
||||
rbswap = link_config & 0x1;
|
||||
yuvswap = 1;
|
||||
break;
|
||||
default:
|
||||
rbswap = link_config & 0x1;
|
||||
break;
|
||||
}
|
||||
|
||||
switch (pix_fmt) {
|
||||
case PIXFMT_RGB565:
|
||||
case PIXFMT_BGR565:
|
||||
val = 0;
|
||||
break;
|
||||
case PIXFMT_RGB1555:
|
||||
case PIXFMT_BGR1555:
|
||||
|
@ -147,17 +142,27 @@ static void dmafetch_set_fmt(struct mmp_overlay *overlay)
|
|||
static void overlay_set_win(struct mmp_overlay *overlay, struct mmp_win *win)
|
||||
{
|
||||
struct lcd_regs *regs = path_regs(overlay->path);
|
||||
u32 pitch;
|
||||
|
||||
/* assert win supported */
|
||||
memcpy(&overlay->win, win, sizeof(struct mmp_win));
|
||||
|
||||
mutex_lock(&overlay->access_ok);
|
||||
pitch = win->xsrc * pixfmt_to_stride(win->pix_fmt);
|
||||
writel_relaxed(pitch, ®s->g_pitch);
|
||||
writel_relaxed((win->ysrc << 16) | win->xsrc, ®s->g_size);
|
||||
writel_relaxed((win->ydst << 16) | win->xdst, ®s->g_size_z);
|
||||
writel_relaxed(0, ®s->g_start);
|
||||
|
||||
if (overlay_is_vid(overlay)) {
|
||||
writel_relaxed(win->pitch[0], ®s->v_pitch_yc);
|
||||
writel_relaxed(win->pitch[2] << 16 |
|
||||
win->pitch[1], ®s->v_pitch_uv);
|
||||
|
||||
writel_relaxed((win->ysrc << 16) | win->xsrc, ®s->v_size);
|
||||
writel_relaxed((win->ydst << 16) | win->xdst, ®s->v_size_z);
|
||||
writel_relaxed(win->ypos << 16 | win->xpos, ®s->v_start);
|
||||
} else {
|
||||
writel_relaxed(win->pitch[0], ®s->g_pitch);
|
||||
|
||||
writel_relaxed((win->ysrc << 16) | win->xsrc, ®s->g_size);
|
||||
writel_relaxed((win->ydst << 16) | win->xdst, ®s->g_size_z);
|
||||
writel_relaxed(win->ypos << 16 | win->xpos, ®s->g_start);
|
||||
}
|
||||
|
||||
dmafetch_set_fmt(overlay);
|
||||
mutex_unlock(&overlay->access_ok);
|
||||
|
@ -239,7 +244,13 @@ static int overlay_set_addr(struct mmp_overlay *overlay, struct mmp_addr *addr)
|
|||
|
||||
/* FIXME: assert addr supported */
|
||||
memcpy(&overlay->addr, addr, sizeof(struct mmp_addr));
|
||||
writel(addr->phys[0], ®s->g_0);
|
||||
|
||||
if (overlay_is_vid(overlay)) {
|
||||
writel_relaxed(addr->phys[0], ®s->v_y0);
|
||||
writel_relaxed(addr->phys[1], ®s->v_u0);
|
||||
writel_relaxed(addr->phys[2], ®s->v_v0);
|
||||
} else
|
||||
writel_relaxed(addr->phys[0], ®s->g_0);
|
||||
|
||||
return overlay->addr.phys[0];
|
||||
}
|
||||
|
@ -248,7 +259,8 @@ static void path_set_mode(struct mmp_path *path, struct mmp_mode *mode)
|
|||
{
|
||||
struct lcd_regs *regs = path_regs(path);
|
||||
u32 total_x, total_y, vsync_ctrl, tmp, sclk_src, sclk_div,
|
||||
link_config = path_to_path_plat(path)->link_config;
|
||||
link_config = path_to_path_plat(path)->link_config,
|
||||
dsi_rbswap = path_to_path_plat(path)->link_config;
|
||||
|
||||
/* FIXME: assert videomode supported */
|
||||
memcpy(&path->mode, mode, sizeof(struct mmp_mode));
|
||||
|
@ -263,6 +275,12 @@ static void path_set_mode(struct mmp_path *path, struct mmp_mode *mode)
|
|||
tmp |= CFG_DUMB_ENA(1);
|
||||
writel_relaxed(tmp, ctrl_regs(path) + intf_ctrl(path->id));
|
||||
|
||||
/* interface rb_swap setting */
|
||||
tmp = readl_relaxed(ctrl_regs(path) + intf_rbswap_ctrl(path->id)) &
|
||||
(~(CFG_INTFRBSWAP_MASK));
|
||||
tmp |= dsi_rbswap & CFG_INTFRBSWAP_MASK;
|
||||
writel_relaxed(tmp, ctrl_regs(path) + intf_rbswap_ctrl(path->id));
|
||||
|
||||
writel_relaxed((mode->yres << 16) | mode->xres, ®s->screen_active);
|
||||
writel_relaxed((mode->left_margin << 16) | mode->right_margin,
|
||||
®s->screen_h_porch);
|
||||
|
@ -370,20 +388,12 @@ static void path_set_default(struct mmp_path *path)
|
|||
* bus arbiter for faster read if not tv path;
|
||||
* 2.enable horizontal smooth filter;
|
||||
*/
|
||||
if (PATH_PN == path->id) {
|
||||
mask = CFG_GRA_HSMOOTH_MASK | CFG_DMA_HSMOOTH_MASK
|
||||
| CFG_ARBFAST_ENA(1);
|
||||
tmp = readl_relaxed(ctrl_regs(path) + dma_ctrl(0, path->id));
|
||||
tmp |= mask;
|
||||
writel_relaxed(tmp, ctrl_regs(path) + dma_ctrl(0, path->id));
|
||||
} else if (PATH_TV == path->id) {
|
||||
mask = CFG_GRA_HSMOOTH_MASK | CFG_DMA_HSMOOTH_MASK
|
||||
| CFG_ARBFAST_ENA(1);
|
||||
tmp = readl_relaxed(ctrl_regs(path) + dma_ctrl(0, path->id));
|
||||
tmp &= ~mask;
|
||||
tmp |= CFG_GRA_HSMOOTH_MASK | CFG_DMA_HSMOOTH_MASK;
|
||||
writel_relaxed(tmp, ctrl_regs(path) + dma_ctrl(0, path->id));
|
||||
}
|
||||
mask = CFG_GRA_HSMOOTH_MASK | CFG_DMA_HSMOOTH_MASK | CFG_ARBFAST_ENA(1);
|
||||
tmp = readl_relaxed(ctrl_regs(path) + dma_ctrl(0, path->id));
|
||||
tmp |= mask;
|
||||
if (PATH_TV == path->id)
|
||||
tmp &= ~CFG_ARBFAST_ENA(1);
|
||||
writel_relaxed(tmp, ctrl_regs(path) + dma_ctrl(0, path->id));
|
||||
}
|
||||
|
||||
static int path_init(struct mmphw_path_plat *path_plat,
|
||||
|
@ -419,6 +429,7 @@ static int path_init(struct mmphw_path_plat *path_plat,
|
|||
path_plat->path = path;
|
||||
path_plat->path_config = config->path_config;
|
||||
path_plat->link_config = config->link_config;
|
||||
path_plat->dsi_rbswap = config->dsi_rbswap;
|
||||
path_set_default(path);
|
||||
|
||||
kfree(path_info);
|
||||
|
|
|
@ -163,6 +163,8 @@ struct lcd_regs {
|
|||
|
||||
#define LCD_SCLK(path) ((PATH_PN == path->id) ? LCD_CFG_SCLK_DIV :\
|
||||
((PATH_TV == path->id) ? LCD_TCLK_DIV : LCD_PN2_SCLK_DIV))
|
||||
#define intf_rbswap_ctrl(id) ((id) ? (((id) & 1) ? LCD_TVIF_CTRL : \
|
||||
PN2_IOPAD_CONTROL) : LCD_TOP_CTRL)
|
||||
|
||||
/* dither configure */
|
||||
#ifdef CONFIG_CPU_PXA988
|
||||
|
@ -615,6 +617,8 @@ struct lcd_regs {
|
|||
#define LCD_SPU_DUMB_CTRL 0x01B8
|
||||
#define CFG_DUMBMODE(mode) ((mode)<<28)
|
||||
#define CFG_DUMBMODE_MASK 0xF0000000
|
||||
#define CFG_INTFRBSWAP(mode) ((mode)<<24)
|
||||
#define CFG_INTFRBSWAP_MASK 0x0F000000
|
||||
#define CFG_LCDGPIO_O(data) ((data)<<20)
|
||||
#define CFG_LCDGPIO_O_MASK 0x0FF00000
|
||||
#define CFG_LCDGPIO_ENA(gpio) ((gpio)<<12)
|
||||
|
@ -1427,6 +1431,7 @@ struct mmphw_path_plat {
|
|||
struct mmp_path *path;
|
||||
u32 path_config;
|
||||
u32 link_config;
|
||||
u32 dsi_rbswap;
|
||||
};
|
||||
|
||||
/* mmp ctrl describes mmp controller related info */
|
||||
|
|
|
@ -1354,7 +1354,7 @@ static struct fb_info *mx3fb_init_fbinfo(struct device *dev, struct fb_ops *ops)
|
|||
static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan)
|
||||
{
|
||||
struct device *dev = mx3fb->dev;
|
||||
struct mx3fb_platform_data *mx3fb_pdata = dev->platform_data;
|
||||
struct mx3fb_platform_data *mx3fb_pdata = dev_get_platdata(dev);
|
||||
const char *name = mx3fb_pdata->name;
|
||||
unsigned int irq;
|
||||
struct fb_info *fbi;
|
||||
|
@ -1462,7 +1462,7 @@ static bool chan_filter(struct dma_chan *chan, void *arg)
|
|||
return false;
|
||||
|
||||
dev = rq->mx3fb->dev;
|
||||
mx3fb_pdata = dev->platform_data;
|
||||
mx3fb_pdata = dev_get_platdata(dev);
|
||||
|
||||
return rq->id == chan->chan_id &&
|
||||
mx3fb_pdata->dma_dev == chan->device->dev;
|
||||
|
|
|
@ -2106,8 +2106,7 @@ static int neofb_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||
if (err < 0)
|
||||
goto err_reg_fb;
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
info->node, info->fix.id);
|
||||
fb_info(info, "%s frame buffer device\n", info->fix.id);
|
||||
|
||||
/*
|
||||
* Our driver data
|
||||
|
@ -2148,12 +2147,6 @@ static void neofb_remove(struct pci_dev *dev)
|
|||
fb_destroy_modedb(info->monspecs.modedb);
|
||||
neo_unmap_mmio(info);
|
||||
neo_free_fb_info(info);
|
||||
|
||||
/*
|
||||
* Ensure that the driver data is no longer
|
||||
* valid.
|
||||
*/
|
||||
pci_set_drvdata(dev, NULL);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -91,7 +91,7 @@ static int nuc900fb_check_var(struct fb_var_screeninfo *var,
|
|||
struct fb_info *info)
|
||||
{
|
||||
struct nuc900fb_info *fbi = info->par;
|
||||
struct nuc900fb_mach_info *mach_info = fbi->dev->platform_data;
|
||||
struct nuc900fb_mach_info *mach_info = dev_get_platdata(fbi->dev);
|
||||
struct nuc900fb_display *display = NULL;
|
||||
struct nuc900fb_display *default_display = mach_info->displays +
|
||||
mach_info->default_display;
|
||||
|
@ -358,7 +358,7 @@ static inline void modify_gpio(void __iomem *reg,
|
|||
static int nuc900fb_init_registers(struct fb_info *info)
|
||||
{
|
||||
struct nuc900fb_info *fbi = info->par;
|
||||
struct nuc900fb_mach_info *mach_info = fbi->dev->platform_data;
|
||||
struct nuc900fb_mach_info *mach_info = dev_get_platdata(fbi->dev);
|
||||
void __iomem *regs = fbi->io;
|
||||
|
||||
/*reset the display engine*/
|
||||
|
@ -512,7 +512,7 @@ static int nuc900fb_probe(struct platform_device *pdev)
|
|||
int size;
|
||||
|
||||
dev_dbg(&pdev->dev, "devinit\n");
|
||||
mach_info = pdev->dev.platform_data;
|
||||
mach_info = dev_get_platdata(&pdev->dev);
|
||||
if (mach_info == NULL) {
|
||||
dev_err(&pdev->dev,
|
||||
"no platform data for lcd, cannot attach\n");
|
||||
|
@ -647,8 +647,7 @@ static int nuc900fb_probe(struct platform_device *pdev)
|
|||
goto free_cpufreq;
|
||||
}
|
||||
|
||||
printk(KERN_INFO "fb%d: %s frame buffer device\n",
|
||||
fbinfo->node, fbinfo->fix.id);
|
||||
fb_info(fbinfo, "%s frame buffer device\n", fbinfo->fix.id);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -1300,7 +1300,7 @@ void NVLoadStateExt(struct nvidia_par *par, RIVA_HW_STATE * state)
|
|||
break;
|
||||
default:
|
||||
break;
|
||||
};
|
||||
}
|
||||
|
||||
NV_WR32(par->PGRAPH, 0x0b38, 0x2ffff800);
|
||||
NV_WR32(par->PGRAPH, 0x0b3c, 0x00006000);
|
||||
|
|
|
@ -515,8 +515,7 @@ static void __init offb_init_fb(const char *name, const char *full_name,
|
|||
if (register_framebuffer(info) < 0)
|
||||
goto out_err;
|
||||
|
||||
printk(KERN_INFO "fb%d: Open Firmware frame buffer device on %s\n",
|
||||
info->node, full_name);
|
||||
fb_info(info, "Open Firmware frame buffer device on %s\n", full_name);
|
||||
return;
|
||||
|
||||
out_err:
|
||||
|
|
|
@ -947,7 +947,7 @@ static int hwa742_init(struct omapfb_device *fbdev, int ext_mode,
|
|||
hwa742.extif = fbdev->ext_if;
|
||||
hwa742.int_ctrl = fbdev->int_ctrl;
|
||||
|
||||
omapfb_conf = fbdev->dev->platform_data;
|
||||
omapfb_conf = dev_get_platdata(fbdev->dev);
|
||||
|
||||
hwa742.sys_ck = clk_get(NULL, "hwa_sys_ck");
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue