Remove I2C support from radeon driver. Same support is available from

    radeonfb.

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index 40a5f5a..bced069 100644 (file)
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -18,7 +18,7 @@ mga-objs    := mga_drv.o mga_dma.o mga_state.o mga_warp.o mga_irq.o
 i810-objs   := i810_drv.o i810_dma.o
 i830-objs   := i830_drv.o i830_dma.o i830_irq.o
 i915-objs   := i915_drv.o i915_dma.o i915_irq.o i915_mem.o i915_pm.o
-radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o radeon_i2c.o
+radeon-objs := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o
 sis-objs    := sis_drv.o sis_ds.o sis_mm.o
 ffb-objs    := ffb_drv.o ffb_context.o
 savage-objs := savage_drv.o savage_bci.o savage_state.o

diff --git a/linux-core/radeon_i2c.c b/linux-core/radeon_i2c.c
deleted file mode 100644 (file)
index e19ea18..0000000
--- a/linux-core/radeon_i2c.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * linux/radeon_i2c.c
- *
- * Original author probably Benjamin Herrenschmidt <benh@kernel.crashing.org>
- * or Kronos <kronos@kronoz.cjb.net>
- * Based on Xfree sources
- * (C) Copyright 2004 Jon Smirl <jonsmirl@gmail.com>
- *
- * This is a GPL licensed file from the Linux kernel, don't add it to the BSD build
- *
- * Radeon I2C support routines
- *
- */
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/delay.h>
-#include <linux/pci.h>
-#include <linux/fb.h>
-#include <linux/version.h>
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
-
-#include <asm/io.h>
-#include <video/radeon.h>
-
-#include "drmP.h"
-#include "drm.h"
-#include "radeon_drm.h"
-#include "radeon_drv.h"
-
-static void gpio_setscl(void *data, int state)
-{
-       struct radeon_i2c_chan *chan = data;
-       drm_radeon_private_t *dev_priv = chan->dev->dev_private;
-       u32 val;
-
-       val = RADEON_READ(chan->ddc_reg) & ~(VGA_DDC_CLK_OUT_EN);
-       if (!state)
-               val |= VGA_DDC_CLK_OUT_EN;
-
-       RADEON_WRITE(chan->ddc_reg, val);
-       (void)RADEON_READ(chan->ddc_reg);
-}
-
-static void gpio_setsda(void *data, int state)
-{
-       struct radeon_i2c_chan *chan = data;
-       drm_radeon_private_t *dev_priv = chan->dev->dev_private;
-       u32 val;
-
-       val = RADEON_READ(chan->ddc_reg) & ~(VGA_DDC_DATA_OUT_EN);
-       if (!state)
-               val |= VGA_DDC_DATA_OUT_EN;
-
-       RADEON_WRITE(chan->ddc_reg, val);
-       (void)RADEON_READ(chan->ddc_reg);
-}
-
-static int gpio_getscl(void *data)
-{
-       struct radeon_i2c_chan *chan = data;
-       drm_radeon_private_t *dev_priv = chan->dev->dev_private;
-       u32 val;
-
-       val = RADEON_READ(chan->ddc_reg);
-
-       return (val & VGA_DDC_CLK_INPUT) ? 1 : 0;
-}
-
-static int gpio_getsda(void *data)
-{
-       struct radeon_i2c_chan *chan = data;
-       drm_radeon_private_t *dev_priv = chan->dev->dev_private;
-       u32 val;
-
-       val = RADEON_READ(chan->ddc_reg);
-
-       return (val & VGA_DDC_DATA_INPUT) ? 1 : 0;
-}
-
-static int setup_i2c_bus(drm_device_t * dev, struct radeon_i2c_chan *chan, const char *name)
-{
-       int rc;
-
-       chan->dev = dev;
-       strcpy(chan->adapter.name, name);
-       chan->adapter.owner             = THIS_MODULE;
-       chan->adapter.id                = I2C_ALGO_ATI;
-       chan->adapter.algo_data         = &chan->algo;
-       chan->adapter.dev.parent        = &chan->dev->pdev->dev;
-       chan->algo.setsda               = gpio_setsda;
-       chan->algo.setscl               = gpio_setscl;
-       chan->algo.getsda               = gpio_getsda;
-       chan->algo.getscl               = gpio_getscl;
-       chan->algo.udelay               = 40;
-       chan->algo.timeout              = 20;
-       chan->algo.data                 = chan;
-
-       i2c_set_adapdata(&chan->adapter, chan);
-
-       /* Raise SCL and SDA */
-       gpio_setsda(chan, 1);
-       gpio_setscl(chan, 1);
-       udelay(20);
-
-       if ((rc = i2c_bit_add_bus(&chan->adapter))) {
-               i2c_set_adapdata(&chan->adapter, NULL);
-               chan->dev = NULL;
-               DRM_ERROR("Failed to register I2C bus %s.\n", name);
-               return rc;
-       }
-       DRM_DEBUG("I2C bus %s registered.\n", name);
-       return 0;
-}
-
-int radeon_create_i2c_busses(drm_device_t * dev)
-{
-       drm_radeon_private_t *dev_priv = dev->dev_private;
-
-       dev_priv->i2c[0].ddc_reg = GPIO_MONID;
-       /* Don't return the error from setup. It is not fatal */
-       /* if the bus can not be initialized */
-       setup_i2c_bus(dev, &dev_priv->i2c[0], "monid");
-
-       dev_priv->i2c[1].ddc_reg = GPIO_DVI_DDC;
-       setup_i2c_bus(dev, &dev_priv->i2c[1], "dvi");
-
-       dev_priv->i2c[2].ddc_reg = GPIO_VGA_DDC;
-       setup_i2c_bus(dev, &dev_priv->i2c[2], "vga");
-
-       dev_priv->i2c[3].ddc_reg = GPIO_CRT2_DDC;
-       setup_i2c_bus(dev, &dev_priv->i2c[3], "crt2");
-
-       request_module("eeprom");
-
-       return 0;
-}
-
-void radeon_delete_i2c_busses(drm_device_t * dev)
-{
-       drm_radeon_private_t *dev_priv = dev->dev_private;
-       int i, ret;
-
-       for (i = 0; i < 4; i++) {
-               if (dev_priv->i2c[i].dev) {
-                       ret = i2c_bit_del_bus(&dev_priv->i2c[i].adapter);
-                       dev_priv->i2c[i].dev = NULL;
-               }
-       }
-}
-
-#endif

diff --git a/linux-core/radeon_i2c.h b/linux-core/radeon_i2c.h
deleted file mode 100644 (file)
index 6fc1519..0000000
--- a/linux-core/radeon_i2c.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * linux/radeon_i2c.h
- *
- * Original author probably Benjamin Herrenschmidt <benh@kernel.crashing.org>
- * or Kronos <kronos@kronoz.cjb.net>
- * Based on Xfree sources
- * (C) Copyright 2004 Jon Smirl <jonsmirl@gmail.com>
- *
- * This is a GPL licensed file from the Linux kernel, don't add it to the BSD build
- *
- * Radeon I2C support routines
- *
- */
-
-#include <linux/i2c.h>
-#include <linux/i2c-id.h>
-#include <linux/i2c-algo-bit.h>
-
-struct radeon_i2c_chan {
-       drm_device_t *dev;
-       u32 ddc_reg;
-       struct i2c_adapter adapter;
-       struct i2c_algo_bit_data algo;
-};
-
-extern int radeon_create_i2c_busses(drm_device_t * dev);
-extern void radeon_delete_i2c_busses(drm_device_t * dev);

diff --git a/shared-core/radeon_cp.c b/shared-core/radeon_cp.c
index 611385c..f9ff830 100644 (file)
--- a/shared-core/radeon_cp.c
+++ b/shared-core/radeon_cp.c
@@ -2061,8 +2061,6 @@ int radeon_preinit(struct drm_device *dev, unsigned long flags)
            (dev_priv->mmio =
             drm_core_findmap(dev, pci_resource_start(dev->pdev, 2))))
                return DRM_ERR(ENOMEM);
-
-       ret = radeon_create_i2c_busses(dev);
 #endif
        return ret;
 }
@@ -2072,9 +2070,6 @@ int radeon_postcleanup(struct drm_device *dev)
        drm_radeon_private_t *dev_priv = dev->dev_private;
 
        DRM_DEBUG("\n");
-#if defined(__linux__)
-       radeon_delete_i2c_busses(dev);
-#endif
        drm_free(dev_priv, sizeof(*dev_priv), DRM_MEM_DRIVER);
 
        dev->dev_private = NULL;

diff --git a/shared-core/radeon_drv.h b/shared-core/radeon_drv.h
index 3c42354..242f3cf 100644 (file)
--- a/shared-core/radeon_drv.h
+++ b/shared-core/radeon_drv.h
@@ -31,10 +31,6 @@
 #ifndef __RADEON_DRV_H__
 #define __RADEON_DRV_H__
 
-#ifdef __linux__
-#include "radeon_i2c.h"
-#endif /* __linux__ */
-
 /* General customization:
  */
 
@@ -268,9 +264,6 @@ typedef struct drm_radeon_private {
        /* starting from here on, data is preserved accross an open */
        uint32_t flags;         /* see radeon_chip_flags */
 
-#ifdef __linux__
-       struct radeon_i2c_chan i2c[4];
-#endif /* __linux__ */
 } drm_radeon_private_t;
 
 typedef struct drm_radeon_buf_priv {