From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Chen Meng J Date: Tue, 4 Jun 2019 19:19:49 +0800 Subject: [PATCH] media: intel-ipu4: rename I2C_WA to readable I2C_DYNAMIC rename I2C_WA to more readable I2C_DYNAMIC. Change-Id: I8c34fd2acfbe1b9c57953730781879bfa9af7dbf Tracked-On: PKT-2588 Tracked-On: #H1507238979 Signed-off-by: Chen Meng J Signed-off-by: Meng Wei --- drivers/media/pci/intel/ici/Makefile | 2 +- drivers/media/pci/intel/ici/ici-isys.c | 2 +- drivers/media/pci/intel/ipu-buttress.c | 12 ++++++------ drivers/media/pci/intel/ipu-buttress.h | 4 ++-- drivers/media/pci/intel/ipu-isys.c | 2 +- drivers/media/pci/intel/ipu4/Makefile | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/media/pci/intel/ici/Makefile b/drivers/media/pci/intel/ici/Makefile index 9e8a406041b4..2ba5949900a6 100644 --- a/drivers/media/pci/intel/ici/Makefile +++ b/drivers/media/pci/intel/ici/Makefile @@ -6,7 +6,7 @@ srcpath := $(srctree) endif ifdef CONFIG_VIDEO_INTEL_ICI -ccflags-y += -DHAS_DUAL_CMD_CTX_SUPPORT=0 -DIPU_VC_SUPPORT -DIPU_HAS_ISA -DIPU_PSYS_LEGACY -DI2C_WA -Wframe-larger-than=4096 +ccflags-y += -DHAS_DUAL_CMD_CTX_SUPPORT=0 -DIPU_VC_SUPPORT -DIPU_HAS_ISA -DIPU_PSYS_LEGACY -DI2C_DYNAMIC -Wframe-larger-than=4096 # work-around to re-use ipu4-css and libintel-ipu4_ici.c together when diff --git a/drivers/media/pci/intel/ici/ici-isys.c b/drivers/media/pci/intel/ici/ici-isys.c index 917d5ed62eb8..deec9df2322e 100644 --- a/drivers/media/pci/intel/ici/ici-isys.c +++ b/drivers/media/pci/intel/ici/ici-isys.c @@ -312,7 +312,7 @@ static int isys_register_ext_subdev(struct ici_isys *isys, int rval; int bus; -#ifdef I2C_WA +#ifdef I2C_DYNAMIC bus = ipu_get_i2c_bus_id(sd_info->i2c.i2c_adapter_id); if (bus < 0) { dev_err(&isys->adev->dev, "Failed to find adapter!"); diff --git a/drivers/media/pci/intel/ipu-buttress.c b/drivers/media/pci/intel/ipu-buttress.c index 947414be9fcd..757aa75a7108 100644 --- a/drivers/media/pci/intel/ipu-buttress.c +++ b/drivers/media/pci/intel/ipu-buttress.c @@ -1266,7 +1266,7 @@ static void ipu_buttress_read_psys_fused_freqs(struct ipu_device *isp) fused_freq->efficient_freq = efficient_ratio * BUTTRESS_PS_FREQ_STEP; } -#ifdef I2C_WA +#ifdef I2C_DYNAMIC static struct ipu_isys_clk_mapping *clkmap_dynamic; @@ -1397,7 +1397,7 @@ static int ipu_buttress_clk_init(struct ipu_device *isp) if (!clkmap) return 0; -#ifdef I2C_WA +#ifdef I2C_DYNAMIC clkmap_dynamic = devm_kzalloc(&isp->pdev->dev, ipu_clk_mapping_num(clkmap) * sizeof(*clkmap_dynamic), GFP_KERNEL); @@ -1412,7 +1412,7 @@ static int ipu_buttress_clk_init(struct ipu_device *isp) #endif while (clkmap->clkdev_data.dev_id) { -#ifdef I2C_WA +#ifdef I2C_DYNAMIC char *dev_id = kstrdup(clkmap->clkdev_data.dev_id, GFP_KERNEL); int adapter_id = clkmap->clkdev_data.dev_id[0] - '0'; char *addr = strpbrk(clkmap->clkdev_data.dev_id, "-"); @@ -1429,7 +1429,7 @@ static int ipu_buttress_clk_init(struct ipu_device *isp) if (!strcmp(clkmap->platform_clock_name, clk_data[i].name)) { clkmap->clkdev_data.clk = b->clk_sensor[i]; -#ifdef I2C_WA +#ifdef I2C_DYNAMIC clkmap->clkdev_data.dev_id = dev_id; #endif clkdev_add(&clkmap->clkdev_data); @@ -1456,7 +1456,7 @@ static void ipu_buttress_clk_exit(struct ipu_device *isp) { struct ipu_buttress *b = &isp->buttress; int i; -#ifdef I2C_WA +#ifdef I2C_DYNAMIC struct ipu_isys_clk_mapping *clkmap; #endif @@ -1467,7 +1467,7 @@ static void ipu_buttress_clk_exit(struct ipu_device *isp) for (i = 0; i < ARRAY_SIZE(ipu_buttress_sensor_pll_data); i++) clk_unregister(b->pll_sensor[i]); -#ifdef I2C_WA +#ifdef I2C_DYNAMIC if (!clkmap_dynamic) return; diff --git a/drivers/media/pci/intel/ipu-buttress.h b/drivers/media/pci/intel/ipu-buttress.h index 2c5e93af6d54..f798881dc7cd 100644 --- a/drivers/media/pci/intel/ipu-buttress.h +++ b/drivers/media/pci/intel/ipu-buttress.h @@ -132,7 +132,7 @@ ipu_buttress_ipc_send_bulk(struct ipu_device *isp, struct ipu_ipc_buttress_bulk_msg *msgs, u32 size); int ipu_buttress_psys_freq_get(void *data, u64 *val); int ipu_buttress_isys_freq_get(void *data, u64 *val); -#ifdef I2C_WA +#ifdef I2C_DYNAMIC int ipu_get_i2c_bus_id(int adapter_id); -#endif /* I2C_WA */ +#endif /* I2C_DYNAMIC */ #endif /* IPU_BUTTRESS_H */ diff --git a/drivers/media/pci/intel/ipu-isys.c b/drivers/media/pci/intel/ipu-isys.c index aa8dec010872..6c2745ac2f64 100644 --- a/drivers/media/pci/intel/ipu-isys.c +++ b/drivers/media/pci/intel/ipu-isys.c @@ -377,7 +377,7 @@ static int isys_register_ext_subdev(struct ipu_isys *isys, int rval; int bus; -#ifdef I2C_WA +#ifdef I2C_DYNAMIC bus = ipu_get_i2c_bus_id(sd_info->i2c.i2c_adapter_id); if (bus < 0) { dev_err(&isys->adev->dev, "Failed to find adapter!"); diff --git a/drivers/media/pci/intel/ipu4/Makefile b/drivers/media/pci/intel/ipu4/Makefile index dae16f35e7f2..d253c0a78dbc 100644 --- a/drivers/media/pci/intel/ipu4/Makefile +++ b/drivers/media/pci/intel/ipu4/Makefile @@ -7,7 +7,7 @@ endif ifdef CONFIG_VIDEO_INTEL_IPU4 ccflags-y += -DHAS_DUAL_CMD_CTX_SUPPORT=0 -DIPU_VC_SUPPORT -DIPU_HAS_ISA -DIPU_PSYS_LEGACY -ccflags-y += -DIPU_META_DATA_SUPPORT -DI2C_WA +ccflags-y += -DIPU_META_DATA_SUPPORT -DI2C_DYNAMIC intel-ipu4-objs += ../ipu.o \ ../ipu-bus.o \ -- https://clearlinux.org