diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-02-13 15:31:38 +0200 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2014-04-17 08:10:19 +0300 |
commit | f7018c21350204c4cf628462f229d44d03545254 (patch) | |
tree | 408787177164cf51cc06f7aabdb04fcff8d2b6aa /drivers/video/aty/radeon_i2c.c | |
parent | c26ef3eb3c11274bad1b64498d0a134f85755250 (diff) | |
download | op-kernel-dev-f7018c21350204c4cf628462f229d44d03545254.zip op-kernel-dev-f7018c21350204c4cf628462f229d44d03545254.tar.gz |
video: move fbdev to drivers/video/fbdev
The drivers/video directory is a mess. It contains generic video related
files, directories for backlight, console, linux logo, lots of fbdev
device drivers, fbdev framework files.
Make some order into the chaos by creating drivers/video/fbdev
directory, and move all fbdev related files there.
No functionality is changed, although I guess it is possible that some
subtle Makefile build order related issue could be created by this
patch.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/video/aty/radeon_i2c.c')
-rw-r--r-- | drivers/video/aty/radeon_i2c.c | 167 |
1 files changed, 0 insertions, 167 deletions
diff --git a/drivers/video/aty/radeon_i2c.c b/drivers/video/aty/radeon_i2c.c deleted file mode 100644 index ab1d0fd..0000000 --- a/drivers/video/aty/radeon_i2c.c +++ /dev/null @@ -1,167 +0,0 @@ -#include "radeonfb.h" - -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/delay.h> -#include <linux/fb.h> - - -#include <linux/i2c.h> -#include <linux/i2c-algo-bit.h> - -#include <asm/io.h> - -#include <video/radeon.h> -#include "../edid.h" - -static void radeon_gpio_setscl(void* data, int state) -{ - struct radeon_i2c_chan *chan = data; - struct radeonfb_info *rinfo = chan->rinfo; - u32 val; - - val = INREG(chan->ddc_reg) & ~(VGA_DDC_CLK_OUT_EN); - if (!state) - val |= VGA_DDC_CLK_OUT_EN; - - OUTREG(chan->ddc_reg, val); - (void)INREG(chan->ddc_reg); -} - -static void radeon_gpio_setsda(void* data, int state) -{ - struct radeon_i2c_chan *chan = data; - struct radeonfb_info *rinfo = chan->rinfo; - u32 val; - - val = INREG(chan->ddc_reg) & ~(VGA_DDC_DATA_OUT_EN); - if (!state) - val |= VGA_DDC_DATA_OUT_EN; - - OUTREG(chan->ddc_reg, val); - (void)INREG(chan->ddc_reg); -} - -static int radeon_gpio_getscl(void* data) -{ - struct radeon_i2c_chan *chan = data; - struct radeonfb_info *rinfo = chan->rinfo; - u32 val; - - val = INREG(chan->ddc_reg); - - return (val & VGA_DDC_CLK_INPUT) ? 1 : 0; -} - -static int radeon_gpio_getsda(void* data) -{ - struct radeon_i2c_chan *chan = data; - struct radeonfb_info *rinfo = chan->rinfo; - u32 val; - - val = INREG(chan->ddc_reg); - - return (val & VGA_DDC_DATA_INPUT) ? 1 : 0; -} - -static int radeon_setup_i2c_bus(struct radeon_i2c_chan *chan, const char *name) -{ - int rc; - - snprintf(chan->adapter.name, sizeof(chan->adapter.name), - "radeonfb %s", name); - chan->adapter.owner = THIS_MODULE; - chan->adapter.algo_data = &chan->algo; - chan->adapter.dev.parent = &chan->rinfo->pdev->dev; - chan->algo.setsda = radeon_gpio_setsda; - chan->algo.setscl = radeon_gpio_setscl; - chan->algo.getsda = radeon_gpio_getsda; - chan->algo.getscl = radeon_gpio_getscl; - chan->algo.udelay = 10; - chan->algo.timeout = 20; - chan->algo.data = chan; - - i2c_set_adapdata(&chan->adapter, chan); - - /* Raise SCL and SDA */ - radeon_gpio_setsda(chan, 1); - radeon_gpio_setscl(chan, 1); - udelay(20); - - rc = i2c_bit_add_bus(&chan->adapter); - if (rc == 0) - dev_dbg(&chan->rinfo->pdev->dev, "I2C bus %s registered.\n", name); - else - dev_warn(&chan->rinfo->pdev->dev, "Failed to register I2C bus %s.\n", name); - return rc; -} - -void radeon_create_i2c_busses(struct radeonfb_info *rinfo) -{ - rinfo->i2c[0].rinfo = rinfo; - rinfo->i2c[0].ddc_reg = GPIO_MONID; -#ifndef CONFIG_PPC - rinfo->i2c[0].adapter.class = I2C_CLASS_HWMON; -#endif - radeon_setup_i2c_bus(&rinfo->i2c[0], "monid"); - - rinfo->i2c[1].rinfo = rinfo; - rinfo->i2c[1].ddc_reg = GPIO_DVI_DDC; - radeon_setup_i2c_bus(&rinfo->i2c[1], "dvi"); - - rinfo->i2c[2].rinfo = rinfo; - rinfo->i2c[2].ddc_reg = GPIO_VGA_DDC; - radeon_setup_i2c_bus(&rinfo->i2c[2], "vga"); - - rinfo->i2c[3].rinfo = rinfo; - rinfo->i2c[3].ddc_reg = GPIO_CRT2_DDC; - radeon_setup_i2c_bus(&rinfo->i2c[3], "crt2"); -} - -void radeon_delete_i2c_busses(struct radeonfb_info *rinfo) -{ - if (rinfo->i2c[0].rinfo) - i2c_del_adapter(&rinfo->i2c[0].adapter); - rinfo->i2c[0].rinfo = NULL; - - if (rinfo->i2c[1].rinfo) - i2c_del_adapter(&rinfo->i2c[1].adapter); - rinfo->i2c[1].rinfo = NULL; - - if (rinfo->i2c[2].rinfo) - i2c_del_adapter(&rinfo->i2c[2].adapter); - rinfo->i2c[2].rinfo = NULL; - - if (rinfo->i2c[3].rinfo) - i2c_del_adapter(&rinfo->i2c[3].adapter); - rinfo->i2c[3].rinfo = NULL; -} - -int radeon_probe_i2c_connector(struct radeonfb_info *rinfo, int conn, - u8 **out_edid) -{ - u8 *edid; - - edid = fb_ddc_read(&rinfo->i2c[conn-1].adapter); - - if (out_edid) - *out_edid = edid; - if (!edid) { - pr_debug("radeonfb: I2C (port %d) ... not found\n", conn); - return MT_NONE; - } - if (edid[0x14] & 0x80) { - /* Fix detection using BIOS tables */ - if (rinfo->is_mobility /*&& conn == ddc_dvi*/ && - (INREG(LVDS_GEN_CNTL) & LVDS_ON)) { - pr_debug("radeonfb: I2C (port %d) ... found LVDS panel\n", conn); - return MT_LCD; - } else { - pr_debug("radeonfb: I2C (port %d) ... found TMDS panel\n", conn); - return MT_DFP; - } - } - pr_debug("radeonfb: I2C (port %d) ... found CRT display\n", conn); - return MT_CRT; -} - |