projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: remove the fifo cfg overrides for the ap91 ethernet code - these values have...
[openwrt.git]
/
target
/
linux
/
s3c24xx
/
files-2.6.30
/
drivers
/
mfd
/
glamo
/
glamo-fb.c
diff --git
a/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
b/target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
index
90a6541
..
7bb2201
100644
(file)
--- a/
target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
+++ b/
target/linux/s3c24xx/files-2.6.30/drivers/mfd/glamo/glamo-fb.c
@@
-22,23
+22,15
@@
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kernel.h>
-#include <linux/errno.h>
#include <linux/string.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/mm.h>
-#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/init.h>
-#include <linux/vmalloc.h>
-#include <linux/dma-mapping.h>
-#include <linux/interrupt.h>
-#include <linux/workqueue.h>
-#include <linux/wait.h>
#include <linux/platform_device.h>
#include <linux/platform_device.h>
-#include <linux/clk.h>
#include <linux/spinlock.h>
#include <linux/io.h>
#include <linux/spinlock.h>
#include <linux/io.h>
-#include <linux/
uaccess
.h>
+#include <linux/
mfd/glamo
.h>
#include <asm/div64.h>
#include <asm/div64.h>
@@
-51,25
+43,16
@@
#include "glamo-regs.h"
#include "glamo-core.h"
#include "glamo-regs.h"
#include "glamo-core.h"
-#ifndef DEBUG
-#define GLAMO_LOG(...)
-#else
-#define GLAMO_LOG(...) \
-do { \
- printk(KERN_DEBUG "in %s:%s:%d", __FILE__, __func__, __LINE__); \
- printk(KERN_DEBUG __VA_ARGS__); \
-} while (0);
-#endif
-
static void glamofb_program_mode(struct glamofb_handle* glamo);
struct glamofb_handle {
static void glamofb_program_mode(struct glamofb_handle* glamo);
struct glamofb_handle {
+ struct glamo_core *core;
struct fb_info *fb;
struct device *dev;
struct resource *reg;
struct resource *fb_res;
char __iomem *base;
struct fb_info *fb;
struct device *dev;
struct resource *reg;
struct resource *fb_res;
char __iomem *base;
- struct glamofb_platform_data *mach_info;
+ struct glamo
_
fb_platform_data *mach_info;
char __iomem *cursor_addr;
int cursor_on;
u_int32_t pseudo_pal[16];
char __iomem *cursor_addr;
int cursor_on;
u_int32_t pseudo_pal[16];
@@
-80,7
+63,7
@@
struct glamofb_handle {
};
static void glamo_output_enable(struct glamofb_handle *gfb) {
};
static void glamo_output_enable(struct glamofb_handle *gfb) {
-
struct glamo_core *gcore = gfb->mach_info->glamo
;
+
struct glamo_core *gcore = gfb->core
;
if (gfb->output_enabled)
return;
if (gfb->output_enabled)
return;
@@
-97,7
+80,7
@@
static void glamo_output_enable(struct glamofb_handle *gfb) {
}
static void glamo_output_disable(struct glamofb_handle *gfb) {
}
static void glamo_output_disable(struct glamofb_handle *gfb) {
- struct glamo_core *gcore = gfb->
mach_info->glamo
;
+ struct glamo_core *gcore = gfb->
core
;
if (!gfb->output_enabled)
return;
if (!gfb->output_enabled)
return;
@@
-166,8
+149,8
@@
static int glamofb_run_script(struct glamofb_handle *glamo,
{
int i;
{
int i;
- if (glamo->
mach_info->glamo
->suspending) {
- dev_err(&glamo->
mach_info->glamo
->pdev->dev,
+ if (glamo->
core
->suspending) {
+ dev_err(&glamo->
core
->pdev->dev,
"IGNORING glamofb_run_script while "
"suspended\n");
return -EBUSY;
"IGNORING glamofb_run_script while "
"suspended\n");
return -EBUSY;
@@
-192,8
+175,8
@@
static int glamofb_check_var(struct fb_var_screeninfo *var,
{
struct glamofb_handle *glamo = info->par;
{
struct glamofb_handle *glamo = info->par;
- if (glamo->
mach_info->glamo
->suspending) {
- dev_err(&glamo->
mach_info->glamo
->pdev->dev,
+ if (glamo->
core
->suspending) {
+ dev_err(&glamo->
core
->pdev->dev,
"IGNORING glamofb_check_var while "
"suspended\n");
return -EBUSY;
"IGNORING glamofb_check_var while "
"suspended\n");
return -EBUSY;
@@
-280,8
+263,8
@@
static void __rotate_lcd(struct glamofb_handle *glamo, __u32 rotation)
{
int glamo_rot;
{
int glamo_rot;
- if (glamo->
mach_info->glamo
->suspending) {
- dev_err(&glamo->
mach_info->glamo
->pdev->dev,
+ if (glamo->
core
->suspending) {
+ dev_err(&glamo->
core
->pdev->dev,
"IGNORING rotate_lcd while "
"suspended\n");
return;
"IGNORING rotate_lcd while "
"suspended\n");
return;
@@
-316,7
+299,7
@@
static void __rotate_lcd(struct glamofb_handle *glamo, __u32 rotation)
static void glamofb_program_mode(struct glamofb_handle* gfb) {
int sync, bp, disp, fp, total;
unsigned long flags;
static void glamofb_program_mode(struct glamofb_handle* gfb) {
int sync, bp, disp, fp, total;
unsigned long flags;
- struct glamo_core *gcore = gfb->
mach_info->glamo
;
+ struct glamo_core *gcore = gfb->
core
;
struct fb_var_screeninfo *var = &gfb->fb->var;
dev_dbg(&gcore->pdev->dev,
struct fb_var_screeninfo *var = &gfb->fb->var;
dev_dbg(&gcore->pdev->dev,
@@
-329,7
+312,7
@@
static void glamofb_program_mode(struct glamofb_handle* gfb) {
if (var->pixclock)
glamo_engine_reclock(gcore,
GLAMO_ENGINE_LCD,
if (var->pixclock)
glamo_engine_reclock(gcore,
GLAMO_ENGINE_LCD,
-
gfb->fb->var.pixclock
);
+
(1000000000UL / gfb->fb->var.pixclock) * 1000
);
reg_set_bit_mask(gfb,
GLAMO_REG_LCD_WIDTH,
reg_set_bit_mask(gfb,
GLAMO_REG_LCD_WIDTH,
@@
-402,7
+385,7
@@
static int glamofb_pan_display(struct fb_var_screeninfo *var,
static struct fb_videomode *glamofb_find_mode(struct fb_info *info,
struct fb_var_screeninfo *var) {
struct glamofb_handle *glamo = info->par;
static struct fb_videomode *glamofb_find_mode(struct fb_info *info,
struct fb_var_screeninfo *var) {
struct glamofb_handle *glamo = info->par;
- struct glamofb_platform_data *mach_info = glamo->mach_info;
+ struct glamo
_
fb_platform_data *mach_info = glamo->mach_info;
struct fb_videomode *mode;
int i;
struct fb_videomode *mode;
int i;
@@
-421,8
+404,8
@@
static int glamofb_set_par(struct fb_info *info)
struct fb_var_screeninfo *var = &info->var;
struct fb_videomode *mode;
struct fb_var_screeninfo *var = &info->var;
struct fb_videomode *mode;
- if (glamo->
mach_info->glamo
->suspending) {
- dev_err(&glamo->
mach_info->glamo
->pdev->dev,
+ if (glamo->
core
->suspending) {
+ dev_err(&glamo->
core
->pdev->dev,
"IGNORING glamofb_set_par while "
"suspended\n");
return -EBUSY;
"IGNORING glamofb_set_par while "
"suspended\n");
return -EBUSY;
@@
-501,8
+484,8
@@
static int glamofb_setcolreg(unsigned regno,
struct glamofb_handle *glamo = info->par;
unsigned int val;
struct glamofb_handle *glamo = info->par;
unsigned int val;
- if (glamo->
mach_info->glamo
->suspending) {
- dev_err(&glamo->
mach_info->glamo
->pdev->dev,
+ if (glamo->
core
->suspending) {
+ dev_err(&glamo->
core
->pdev->dev,
"IGNORING glamofb_set_par while "
"suspended\n");
return -EBUSY;
"IGNORING glamofb_set_par while "
"suspended\n");
return -EBUSY;
@@
-533,7
+516,7
@@
static int glamofb_setcolreg(unsigned regno,
static int glamofb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg) {
struct glamofb_handle *gfb = (struct glamofb_handle*)info->par;
static int glamofb_ioctl(struct fb_info *info, unsigned int cmd,
unsigned long arg) {
struct glamofb_handle *gfb = (struct glamofb_handle*)info->par;
- struct glamo_core *gcore = gfb->
mach_info->glamo
;
+ struct glamo_core *gcore = gfb->
core
;
int retval = -ENOTTY;
switch (cmd) {
int retval = -ENOTTY;
switch (cmd) {
@@
-695,8
+678,8
@@
int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
{
int timeout = 2000000;
{
int timeout = 2000000;
- if (gfb->
mach_info->glamo
->suspending) {
- dev_err(&gfb->
mach_info->glamo
->pdev->dev,
+ if (gfb->
core
->suspending) {
+ dev_err(&gfb->
core
->pdev->dev,
"IGNORING glamofb_cmd_mode while "
"suspended\n");
return -EBUSY;
"IGNORING glamofb_cmd_mode while "
"suspended\n");
return -EBUSY;
@@
-707,7
+690,7
@@
int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
__func__);
while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
dev_dbg(gfb->dev, "%s: waiting for cmdq empty: ",
__func__);
while ((!glamofb_cmdq_empty(gfb)) && (timeout--))
-
yield
();
+
cpu_relax
();
if (timeout < 0) {
printk(KERN_ERR"*************"
"glamofb cmd_queue never got empty"
if (timeout < 0) {
printk(KERN_ERR"*************"
"glamofb cmd_queue never got empty"
@@
-726,7
+709,7
@@
int glamofb_cmd_mode(struct glamofb_handle *gfb, int on)
timeout = 2000000;
while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
(timeout--))
timeout = 2000000;
while ((!reg_read(gfb, GLAMO_REG_LCD_STATUS2) & (1 << 12)) &&
(timeout--))
-
/* yield() */
;
+
cpu_relax()
;
if (timeout < 0) {
printk(KERN_ERR"*************"
"glamofb lcd never idle"
if (timeout < 0) {
printk(KERN_ERR"*************"
"glamofb lcd never idle"
@@
-759,8
+742,8
@@
int glamofb_cmd_write(struct glamofb_handle *gfb, u_int16_t val)
{
int timeout = 200000;
{
int timeout = 200000;
- if (gfb->
mach_info->glamo
->suspending) {
- dev_err(&gfb->
mach_info->glamo
->pdev->dev,
+ if (gfb->
core
->suspending) {
+ dev_err(&gfb->
core
->pdev->dev,
"IGNORING glamofb_cmd_write while "
"suspended\n");
return -EBUSY;
"IGNORING glamofb_cmd_write while "
"suspended\n");
return -EBUSY;
@@
-815,15
+798,21
@@
static int __init glamofb_probe(struct platform_device *pdev)
int rc = -EIO;
struct fb_info *fbinfo;
struct glamofb_handle *glamofb;
int rc = -EIO;
struct fb_info *fbinfo;
struct glamofb_handle *glamofb;
- struct glamofb_platform_data *mach_info = pdev->dev.platform_data;
+ struct glamo_core *core = dev_get_drvdata(pdev->dev.parent);
+ struct glamo_fb_platform_data *mach_info;
printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
"Openmoko, Inc.\n");
printk(KERN_INFO "SMEDIA Glamo frame buffer driver (C) 2007 "
"Openmoko, Inc.\n");
+ if (!core->pdata || !core->pdata->fb_data)
+ return -ENOENT;
+
+
fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
if (!fbinfo)
return -ENOMEM;
fbinfo = framebuffer_alloc(sizeof(struct glamofb_handle), &pdev->dev);
if (!fbinfo)
return -ENOMEM;
+
glamofb = fbinfo->par;
glamofb->fb = fbinfo;
glamofb->dev = &pdev->dev;
glamofb = fbinfo->par;
glamofb->fb = fbinfo;
glamofb->dev = &pdev->dev;
@@
-884,7
+873,9
@@
static int __init glamofb_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, glamofb);
platform_set_drvdata(pdev, glamofb);
- glamofb->mach_info = pdev->dev.platform_data;
+ mach_info = core->pdata->fb_data;
+ glamofb->core = core;
+ glamofb->mach_info = mach_info;
fbinfo->fix.visual = FB_VISUAL_TRUECOLOR;
fbinfo->fix.type = FB_TYPE_PACKED_PIXELS;
fbinfo->fix.visual = FB_VISUAL_TRUECOLOR;
fbinfo->fix.type = FB_TYPE_PACKED_PIXELS;
@@
-909,8
+900,8
@@
static int __init glamofb_probe(struct platform_device *pdev)
fbinfo->var.accel_flags = 0;
fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
fbinfo->var.accel_flags = 0;
fbinfo->var.vmode = FB_VMODE_NONINTERLACED;
- glamo_engine_enable(
mach_info->glamo
, GLAMO_ENGINE_LCD);
- glamo_engine_reset(
mach_info->glamo
, GLAMO_ENGINE_LCD);
+ glamo_engine_enable(
core
, GLAMO_ENGINE_LCD);
+ glamo_engine_reset(
core
, GLAMO_ENGINE_LCD);
glamofb->output_enabled = 1;
glamofb->mode_set = 1;
glamofb->output_enabled = 1;
glamofb->mode_set = 1;
@@
-961,9
+952,9
@@
static int glamofb_remove(struct platform_device *pdev)
#ifdef CONFIG_PM
#ifdef CONFIG_PM
-static int glamofb_suspend(struct
platform_device *pdev, pm_message_t state
)
+static int glamofb_suspend(struct
device *dev
)
{
{
- struct glamofb_handle *gfb =
platform_get_drvdata(p
dev);
+ struct glamofb_handle *gfb =
dev_get_drvdata(
dev);
/* we need to stop anything touching our framebuffer */
fb_set_suspend(gfb->fb, 1);
/* we need to stop anything touching our framebuffer */
fb_set_suspend(gfb->fb, 1);
@@
-976,19
+967,16
@@
static int glamofb_suspend(struct platform_device *pdev, pm_message_t state)
return 0;
}
return 0;
}
-static int glamofb_resume(struct
platform_device *p
dev)
+static int glamofb_resume(struct
device *
dev)
{
{
- struct glamofb_handle *gfb = platform_get_drvdata(pdev);
- struct glamofb_platform_data *mach_info = pdev->dev.platform_data;
+ struct glamofb_handle *gfb = dev_get_drvdata(dev);
/* OK let's allow framebuffer ops again */
/* gfb->fb->screen_base = ioremap(gfb->fb_res->start,
resource_size(gfb->fb_res)); */
/* OK let's allow framebuffer ops again */
/* gfb->fb->screen_base = ioremap(gfb->fb_res->start,
resource_size(gfb->fb_res)); */
- glamo_engine_enable(
mach_info->glamo
, GLAMO_ENGINE_LCD);
- glamo_engine_reset(
mach_info->glamo
, GLAMO_ENGINE_LCD);
+ glamo_engine_enable(
gfb->core
, GLAMO_ENGINE_LCD);
+ glamo_engine_reset(
gfb->core
, GLAMO_ENGINE_LCD);
- printk(KERN_ERR"spin_lock_init\n");
- spin_lock_init(&gfb->lock_cmd);
glamofb_init_regs(gfb);
#ifdef CONFIG_MFD_GLAMO_HWACCEL
glamofb_cursor_onoff(gfb, 1);
glamofb_init_regs(gfb);
#ifdef CONFIG_MFD_GLAMO_HWACCEL
glamofb_cursor_onoff(gfb, 1);
@@
-998,19
+986,25
@@
static int glamofb_resume(struct platform_device *pdev)
return 0;
}
return 0;
}
+
+static struct dev_pm_ops glamofb_pm_ops = {
+ .suspend = glamofb_suspend,
+ .resume = glamofb_resume,
+};
+
+#define GLAMOFB_PM_OPS (&glamofb_pm_ops)
+
#else
#else
-#define glamofb_suspend NULL
-#define glamofb_resume NULL
+#define GLAMOFB_PM_OPS NULL
#endif
static struct platform_driver glamofb_driver = {
.probe = glamofb_probe,
.remove = glamofb_remove,
#endif
static struct platform_driver glamofb_driver = {
.probe = glamofb_probe,
.remove = glamofb_remove,
- .suspend = glamofb_suspend,
- .resume = glamofb_resume,
.driver = {
.name = "glamo-fb",
.owner = THIS_MODULE,
.driver = {
.name = "glamo-fb",
.owner = THIS_MODULE,
+ .pm = GLAMOFB_PM_OPS
},
};
},
};
This page took
0.037353 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff