aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Zabel <p.zabel@pengutronix.de>2014-08-05 06:47:38 -0400
committerPhilipp Zabel <p.zabel@pengutronix.de>2015-11-24 05:30:16 -0500
commit99ae78c37391ec308250e32dd64ad875f799808a (patch)
tree00c8a6f30d459d2f709adec7ad9d2b2db28cca02
parentc3ede03c881ca8ad618ad52c82b44ecb72c6e408 (diff)
gpu: ipu-v3: Remove reg_offset field
This is not used, so remove it. Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
-rw-r--r--drivers/gpu/ipu-v3/ipu-common.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c
index ba47b30d28fa..97a36e37eded 100644
--- a/drivers/gpu/ipu-v3/ipu-common.c
+++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -993,7 +993,6 @@ static void platform_device_unregister_children(struct platform_device *pdev)
993struct ipu_platform_reg { 993struct ipu_platform_reg {
994 struct ipu_client_platformdata pdata; 994 struct ipu_client_platformdata pdata;
995 const char *name; 995 const char *name;
996 int reg_offset;
997}; 996};
998 997
999static const struct ipu_platform_reg client_reg[] = { 998static const struct ipu_platform_reg client_reg[] = {
@@ -1021,7 +1020,6 @@ static const struct ipu_platform_reg client_reg[] = {
1021 .dma[0] = IPUV3_CHANNEL_CSI0, 1020 .dma[0] = IPUV3_CHANNEL_CSI0,
1022 .dma[1] = -EINVAL, 1021 .dma[1] = -EINVAL,
1023 }, 1022 },
1024 .reg_offset = IPU_CM_CSI0_REG_OFS,
1025 .name = "imx-ipuv3-camera", 1023 .name = "imx-ipuv3-camera",
1026 }, { 1024 }, {
1027 .pdata = { 1025 .pdata = {
@@ -1029,7 +1027,6 @@ static const struct ipu_platform_reg client_reg[] = {
1029 .dma[0] = IPUV3_CHANNEL_CSI1, 1027 .dma[0] = IPUV3_CHANNEL_CSI1,
1030 .dma[1] = -EINVAL, 1028 .dma[1] = -EINVAL,
1031 }, 1029 },
1032 .reg_offset = IPU_CM_CSI1_REG_OFS,
1033 .name = "imx-ipuv3-camera", 1030 .name = "imx-ipuv3-camera",
1034 }, 1031 },
1035}; 1032};
@@ -1051,19 +1048,9 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base)
1051 for (i = 0; i < ARRAY_SIZE(client_reg); i++) { 1048 for (i = 0; i < ARRAY_SIZE(client_reg); i++) {
1052 const struct ipu_platform_reg *reg = &client_reg[i]; 1049 const struct ipu_platform_reg *reg = &client_reg[i];
1053 struct platform_device *pdev; 1050 struct platform_device *pdev;
1054 struct resource res; 1051
1055 1052 pdev = platform_device_register_data(dev, reg->name,
1056 if (reg->reg_offset) { 1053 id++, &reg->pdata, sizeof(reg->pdata));
1057 memset(&res, 0, sizeof(res));
1058 res.flags = IORESOURCE_MEM;
1059 res.start = ipu_base + ipu->devtype->cm_ofs + reg->reg_offset;
1060 res.end = res.start + PAGE_SIZE - 1;
1061 pdev = platform_device_register_resndata(dev, reg->name,
1062 id++, &res, 1, &reg->pdata, sizeof(reg->pdata));
1063 } else {
1064 pdev = platform_device_register_data(dev, reg->name,
1065 id++, &reg->pdata, sizeof(reg->pdata));
1066 }
1067 1054
1068 if (IS_ERR(pdev)) { 1055 if (IS_ERR(pdev)) {
1069 ret = PTR_ERR(pdev); 1056 ret = PTR_ERR(pdev);