From: Thomas Zimmermann Date: Mon, 13 May 2024 12:51:12 +0000 (+0200) Subject: drm/mgag200: Rename mgag200_i2c.c to mgag200_ddc.c X-Git-Tag: v6.11-rc1~33^2~31^2~109 X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=ddadc87f14986886d0d9934219644a07409ac313;p=linux%2F.git drm/mgag200: Rename mgag200_i2c.c to mgag200_ddc.c Rename the source file according to its content. No functional changes. Signed-off-by: Thomas Zimmermann Reviewed-by: Jocelyn Falempe Link: https://patchwork.freedesktop.org/patch/msgid/20240513125620.6337-8-tzimmermann@suse.de --- diff --git a/drivers/gpu/drm/mgag200/Makefile b/drivers/gpu/drm/mgag200/Makefile index 182e224c460d..0b919352046e 100644 --- a/drivers/gpu/drm/mgag200/Makefile +++ b/drivers/gpu/drm/mgag200/Makefile @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-only mgag200-y := \ mgag200_bmc.o \ + mgag200_ddc.o \ mgag200_drv.o \ mgag200_g200.o \ mgag200_g200eh.o \ @@ -10,7 +11,6 @@ mgag200-y := \ mgag200_g200ew3.o \ mgag200_g200se.o \ mgag200_g200wb.o \ - mgag200_i2c.o \ mgag200_mode.o obj-$(CONFIG_DRM_MGAG200) += mgag200.o diff --git a/drivers/gpu/drm/mgag200/mgag200_ddc.c b/drivers/gpu/drm/mgag200/mgag200_ddc.c new file mode 100644 index 000000000000..73ff94c91ca3 --- /dev/null +++ b/drivers/gpu/drm/mgag200/mgag200_ddc.c @@ -0,0 +1,155 @@ +/* + * Copyright 2012 Red Hat Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, + * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE + * USE OR OTHER DEALINGS IN THE SOFTWARE. + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + */ +/* + * Authors: Dave Airlie + */ + +#include +#include +#include +#include + +#include + +#include "mgag200_ddc.h" +#include "mgag200_drv.h" + +struct mgag200_ddc { + struct mga_device *mdev; + + int data; + int clock; + + struct i2c_algo_bit_data bit; + struct i2c_adapter adapter; +}; + +static int mga_i2c_read_gpio(struct mga_device *mdev) +{ + WREG8(DAC_INDEX, MGA1064_GEN_IO_DATA); + return RREG8(DAC_DATA); +} + +static void mga_i2c_set_gpio(struct mga_device *mdev, int mask, int val) +{ + int tmp; + + WREG8(DAC_INDEX, MGA1064_GEN_IO_CTL); + tmp = (RREG8(DAC_DATA) & mask) | val; + WREG_DAC(MGA1064_GEN_IO_CTL, tmp); + WREG_DAC(MGA1064_GEN_IO_DATA, 0); +} + +static inline void mga_i2c_set(struct mga_device *mdev, int mask, int state) +{ + if (state) + state = 0; + else + state = mask; + mga_i2c_set_gpio(mdev, ~mask, state); +} + +static void mga_gpio_setsda(void *data, int state) +{ + struct mgag200_ddc *ddc = data; + + mga_i2c_set(ddc->mdev, ddc->data, state); +} + +static void mga_gpio_setscl(void *data, int state) +{ + struct mgag200_ddc *ddc = data; + + mga_i2c_set(ddc->mdev, ddc->clock, state); +} + +static int mga_gpio_getsda(void *data) +{ + struct mgag200_ddc *ddc = data; + + return (mga_i2c_read_gpio(ddc->mdev) & ddc->data) ? 1 : 0; +} + +static int mga_gpio_getscl(void *data) +{ + struct mgag200_ddc *ddc = data; + + return (mga_i2c_read_gpio(ddc->mdev) & ddc->clock) ? 1 : 0; +} + +static void mgag200_ddc_release(struct drm_device *dev, void *res) +{ + struct mgag200_ddc *ddc = res; + + i2c_del_adapter(&ddc->adapter); +} + +struct i2c_adapter *mgag200_ddc_create(struct mga_device *mdev) +{ + struct drm_device *dev = &mdev->base; + const struct mgag200_device_info *info = mdev->info; + struct mgag200_ddc *ddc; + struct i2c_algo_bit_data *bit; + struct i2c_adapter *adapter; + int ret; + + ddc = drmm_kzalloc(dev, sizeof(*ddc), GFP_KERNEL); + if (!ddc) + return ERR_PTR(-ENOMEM); + + WREG_DAC(MGA1064_GEN_IO_CTL2, 1); + WREG_DAC(MGA1064_GEN_IO_DATA, 0xff); + WREG_DAC(MGA1064_GEN_IO_CTL, 0); + + ddc->mdev = mdev; + ddc->data = BIT(info->i2c.data_bit); + ddc->clock = BIT(info->i2c.clock_bit); + + bit = &ddc->bit; + bit->data = ddc; + bit->setsda = mga_gpio_setsda; + bit->setscl = mga_gpio_setscl; + bit->getsda = mga_gpio_getsda; + bit->getscl = mga_gpio_getscl; + bit->udelay = 10; + bit->timeout = usecs_to_jiffies(2200); + + adapter = &ddc->adapter; + adapter->owner = THIS_MODULE; + adapter->algo_data = bit; + adapter->dev.parent = dev->dev; + snprintf(adapter->name, sizeof(adapter->name), "Matrox DDC bus"); + i2c_set_adapdata(adapter, ddc); + + ret = i2c_bit_add_bus(adapter); + if (ret) + return ERR_PTR(ret); + + ret = drmm_add_action_or_reset(dev, mgag200_ddc_release, ddc); + if (ret) + return ERR_PTR(ret); + + return adapter; +} diff --git a/drivers/gpu/drm/mgag200/mgag200_i2c.c b/drivers/gpu/drm/mgag200/mgag200_i2c.c deleted file mode 100644 index 73ff94c91ca3..000000000000 --- a/drivers/gpu/drm/mgag200/mgag200_i2c.c +++ /dev/null @@ -1,155 +0,0 @@ -/* - * Copyright 2012 Red Hat Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - */ -/* - * Authors: Dave Airlie - */ - -#include -#include -#include -#include - -#include - -#include "mgag200_ddc.h" -#include "mgag200_drv.h" - -struct mgag200_ddc { - struct mga_device *mdev; - - int data; - int clock; - - struct i2c_algo_bit_data bit; - struct i2c_adapter adapter; -}; - -static int mga_i2c_read_gpio(struct mga_device *mdev) -{ - WREG8(DAC_INDEX, MGA1064_GEN_IO_DATA); - return RREG8(DAC_DATA); -} - -static void mga_i2c_set_gpio(struct mga_device *mdev, int mask, int val) -{ - int tmp; - - WREG8(DAC_INDEX, MGA1064_GEN_IO_CTL); - tmp = (RREG8(DAC_DATA) & mask) | val; - WREG_DAC(MGA1064_GEN_IO_CTL, tmp); - WREG_DAC(MGA1064_GEN_IO_DATA, 0); -} - -static inline void mga_i2c_set(struct mga_device *mdev, int mask, int state) -{ - if (state) - state = 0; - else - state = mask; - mga_i2c_set_gpio(mdev, ~mask, state); -} - -static void mga_gpio_setsda(void *data, int state) -{ - struct mgag200_ddc *ddc = data; - - mga_i2c_set(ddc->mdev, ddc->data, state); -} - -static void mga_gpio_setscl(void *data, int state) -{ - struct mgag200_ddc *ddc = data; - - mga_i2c_set(ddc->mdev, ddc->clock, state); -} - -static int mga_gpio_getsda(void *data) -{ - struct mgag200_ddc *ddc = data; - - return (mga_i2c_read_gpio(ddc->mdev) & ddc->data) ? 1 : 0; -} - -static int mga_gpio_getscl(void *data) -{ - struct mgag200_ddc *ddc = data; - - return (mga_i2c_read_gpio(ddc->mdev) & ddc->clock) ? 1 : 0; -} - -static void mgag200_ddc_release(struct drm_device *dev, void *res) -{ - struct mgag200_ddc *ddc = res; - - i2c_del_adapter(&ddc->adapter); -} - -struct i2c_adapter *mgag200_ddc_create(struct mga_device *mdev) -{ - struct drm_device *dev = &mdev->base; - const struct mgag200_device_info *info = mdev->info; - struct mgag200_ddc *ddc; - struct i2c_algo_bit_data *bit; - struct i2c_adapter *adapter; - int ret; - - ddc = drmm_kzalloc(dev, sizeof(*ddc), GFP_KERNEL); - if (!ddc) - return ERR_PTR(-ENOMEM); - - WREG_DAC(MGA1064_GEN_IO_CTL2, 1); - WREG_DAC(MGA1064_GEN_IO_DATA, 0xff); - WREG_DAC(MGA1064_GEN_IO_CTL, 0); - - ddc->mdev = mdev; - ddc->data = BIT(info->i2c.data_bit); - ddc->clock = BIT(info->i2c.clock_bit); - - bit = &ddc->bit; - bit->data = ddc; - bit->setsda = mga_gpio_setsda; - bit->setscl = mga_gpio_setscl; - bit->getsda = mga_gpio_getsda; - bit->getscl = mga_gpio_getscl; - bit->udelay = 10; - bit->timeout = usecs_to_jiffies(2200); - - adapter = &ddc->adapter; - adapter->owner = THIS_MODULE; - adapter->algo_data = bit; - adapter->dev.parent = dev->dev; - snprintf(adapter->name, sizeof(adapter->name), "Matrox DDC bus"); - i2c_set_adapdata(adapter, ddc); - - ret = i2c_bit_add_bus(adapter); - if (ret) - return ERR_PTR(ret); - - ret = drmm_add_action_or_reset(dev, mgag200_ddc_release, ddc); - if (ret) - return ERR_PTR(ret); - - return adapter; -}