|
@@ -250,7 +250,7 @@ static irqreturn_t tmiofb_irq(int irq, void *__info)
|
|
*/
|
|
*/
|
|
static int tmiofb_hw_stop(struct platform_device *dev)
|
|
static int tmiofb_hw_stop(struct platform_device *dev)
|
|
{
|
|
{
|
|
- struct tmio_fb_data *data = mfd_get_data(dev);
|
|
|
|
|
|
+ struct tmio_fb_data *data = dev->dev.platform_data;
|
|
struct fb_info *info = platform_get_drvdata(dev);
|
|
struct fb_info *info = platform_get_drvdata(dev);
|
|
struct tmiofb_par *par = info->par;
|
|
struct tmiofb_par *par = info->par;
|
|
|
|
|
|
@@ -311,7 +311,7 @@ static int tmiofb_hw_init(struct platform_device *dev)
|
|
*/
|
|
*/
|
|
static void tmiofb_hw_mode(struct platform_device *dev)
|
|
static void tmiofb_hw_mode(struct platform_device *dev)
|
|
{
|
|
{
|
|
- struct tmio_fb_data *data = mfd_get_data(dev);
|
|
|
|
|
|
+ struct tmio_fb_data *data = dev->dev.platform_data;
|
|
struct fb_info *info = platform_get_drvdata(dev);
|
|
struct fb_info *info = platform_get_drvdata(dev);
|
|
struct fb_videomode *mode = info->mode;
|
|
struct fb_videomode *mode = info->mode;
|
|
struct tmiofb_par *par = info->par;
|
|
struct tmiofb_par *par = info->par;
|
|
@@ -557,8 +557,7 @@ static int tmiofb_ioctl(struct fb_info *fbi,
|
|
static struct fb_videomode *
|
|
static struct fb_videomode *
|
|
tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)
|
|
tmiofb_find_mode(struct fb_info *info, struct fb_var_screeninfo *var)
|
|
{
|
|
{
|
|
- struct tmio_fb_data *data =
|
|
|
|
- mfd_get_data(to_platform_device(info->device));
|
|
|
|
|
|
+ struct tmio_fb_data *data = info->device->platform_data;
|
|
struct fb_videomode *best = NULL;
|
|
struct fb_videomode *best = NULL;
|
|
int i;
|
|
int i;
|
|
|
|
|
|
@@ -578,8 +577,7 @@ static int tmiofb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
|
|
{
|
|
{
|
|
|
|
|
|
struct fb_videomode *mode;
|
|
struct fb_videomode *mode;
|
|
- struct tmio_fb_data *data =
|
|
|
|
- mfd_get_data(to_platform_device(info->device));
|
|
|
|
|
|
+ struct tmio_fb_data *data = info->device->platform_data;
|
|
|
|
|
|
mode = tmiofb_find_mode(info, var);
|
|
mode = tmiofb_find_mode(info, var);
|
|
if (!mode || var->bits_per_pixel > 16)
|
|
if (!mode || var->bits_per_pixel > 16)
|
|
@@ -680,7 +678,7 @@ static struct fb_ops tmiofb_ops = {
|
|
static int __devinit tmiofb_probe(struct platform_device *dev)
|
|
static int __devinit tmiofb_probe(struct platform_device *dev)
|
|
{
|
|
{
|
|
const struct mfd_cell *cell = mfd_get_cell(dev);
|
|
const struct mfd_cell *cell = mfd_get_cell(dev);
|
|
- struct tmio_fb_data *data = mfd_get_data(dev);
|
|
|
|
|
|
+ struct tmio_fb_data *data = dev->dev.platform_data;
|
|
struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
|
|
struct resource *ccr = platform_get_resource(dev, IORESOURCE_MEM, 1);
|
|
struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
|
struct resource *lcr = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
|
struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2);
|
|
struct resource *vram = platform_get_resource(dev, IORESOURCE_MEM, 2);
|