tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

i2c: designware: Remove not-going-to-be-supported code for Baikal SoC

As noticed in the discussion [1] the Baikal SoC and platforms
are not going to be finalized, hence remove stale code.

Link: https://lore.kernel.org/lkml/22b92ddf-6321-41b5-8073-f9c7064d3432@infradead.org/ [1]
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
Link: https://lore.kernel.org/r/20260114081954.252160-2-andriy.shevchenko@linux.intel.com

authored by

Andy Shevchenko and committed by
Andi Shyti d70f60ad 7b5073f9

-70
-1
drivers/i2c/busses/Kconfig
··· 579 579 config I2C_DESIGNWARE_PLATFORM 580 580 tristate "Synopsys DesignWare Platform driver" 581 581 depends on (ACPI && COMMON_CLK) || !ACPI 582 - select MFD_SYSCON if MIPS_BAIKAL_T1 583 582 default I2C_DESIGNWARE_CORE 584 583 help 585 584 If you say yes to this option, support will be included for the
-1
drivers/i2c/busses/i2c-designware-core.h
··· 314 314 #define ACCESS_POLLING BIT(3) 315 315 316 316 #define MODEL_MSCC_OCELOT BIT(8) 317 - #define MODEL_BAIKAL_BT1 BIT(9) 318 317 #define MODEL_AMD_NAVI_GPU BIT(10) 319 318 #define MODEL_WANGXUN_SP BIT(11) 320 319 #define MODEL_MASK GENMASK(11, 8)
-68
drivers/i2c/busses/i2c-designware-platdrv.c
··· 37 37 return clk_get_rate(dev->clk) / HZ_PER_KHZ; 38 38 } 39 39 40 - #ifdef CONFIG_OF 41 - #define BT1_I2C_CTL 0x100 42 - #define BT1_I2C_CTL_ADDR_MASK GENMASK(7, 0) 43 - #define BT1_I2C_CTL_WR BIT(8) 44 - #define BT1_I2C_CTL_GO BIT(31) 45 - #define BT1_I2C_DI 0x104 46 - #define BT1_I2C_DO 0x108 47 - 48 - static int bt1_i2c_read(void *context, unsigned int reg, unsigned int *val) 49 - { 50 - struct dw_i2c_dev *dev = context; 51 - int ret; 52 - 53 - /* 54 - * Note these methods shouldn't ever fail because the system controller 55 - * registers are memory mapped. We check the return value just in case. 56 - */ 57 - ret = regmap_write(dev->sysmap, BT1_I2C_CTL, 58 - BT1_I2C_CTL_GO | (reg & BT1_I2C_CTL_ADDR_MASK)); 59 - if (ret) 60 - return ret; 61 - 62 - return regmap_read(dev->sysmap, BT1_I2C_DO, val); 63 - } 64 - 65 - static int bt1_i2c_write(void *context, unsigned int reg, unsigned int val) 66 - { 67 - struct dw_i2c_dev *dev = context; 68 - int ret; 69 - 70 - ret = regmap_write(dev->sysmap, BT1_I2C_DI, val); 71 - if (ret) 72 - return ret; 73 - 74 - return regmap_write(dev->sysmap, BT1_I2C_CTL, 75 - BT1_I2C_CTL_GO | BT1_I2C_CTL_WR | (reg & BT1_I2C_CTL_ADDR_MASK)); 76 - } 77 - 78 - static const struct regmap_config bt1_i2c_cfg = { 79 - .reg_bits = 32, 80 - .val_bits = 32, 81 - .reg_stride = 4, 82 - .fast_io = true, 83 - .reg_read = bt1_i2c_read, 84 - .reg_write = bt1_i2c_write, 85 - .max_register = DW_IC_COMP_TYPE, 86 - }; 87 - 88 - static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) 89 - { 90 - dev->sysmap = syscon_node_to_regmap(dev->dev->of_node->parent); 91 - if (IS_ERR(dev->sysmap)) 92 - return PTR_ERR(dev->sysmap); 93 - 94 - dev->map = devm_regmap_init(dev->dev, NULL, dev, &bt1_i2c_cfg); 95 - return PTR_ERR_OR_ZERO(dev->map); 96 - } 97 - #else 98 - static int bt1_i2c_request_regs(struct dw_i2c_dev *dev) 99 - { 100 - return -ENODEV; 101 - } 102 - #endif 103 - 104 40 static int dw_i2c_get_parent_regmap(struct dw_i2c_dev *dev) 105 41 { 106 42 dev->map = dev_get_regmap(dev->dev->parent, NULL); ··· 63 127 return dw_i2c_get_parent_regmap(dev); 64 128 65 129 switch (dev->flags & MODEL_MASK) { 66 - case MODEL_BAIKAL_BT1: 67 - ret = bt1_i2c_request_regs(dev); 68 - break; 69 130 case MODEL_WANGXUN_SP: 70 131 ret = dw_i2c_get_parent_regmap(dev); 71 132 break; ··· 267 334 } 268 335 269 336 static const struct of_device_id dw_i2c_of_match[] = { 270 - { .compatible = "baikal,bt1-sys-i2c", .data = (void *)MODEL_BAIKAL_BT1 }, 271 337 { .compatible = "mscc,ocelot-i2c", .data = (void *)MODEL_MSCC_OCELOT }, 272 338 { .compatible = "snps,designware-i2c" }, 273 339 {}