Skip to content

Commit aed7dbb

Browse files
committed
Merge tag 'ti-driver-soc-for-v6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/drivers
TI SoC driver updates for v6.15 - ti-sci: Default set to ARCH_K3 for the ti sci driver in preperation for the driver to be default set as module in defconfig. - k3-socinfo: Explicitly build up regmap instead of depending on syscon helper * tag 'ti-driver-soc-for-v6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: firmware: config: ti-sci: Default set to ARCH_K3 for the ti sci driver soc: ti: k3-socinfo: Do not use syscon helper to build regmap Link: https://lore.kernel.org/r/20250312113826.ka63nijuftgs6h52@mocker Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 2ae1f5f + 9a9b7cd commit aed7dbb

2 files changed

Lines changed: 13 additions & 1 deletion

File tree

drivers/firmware/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ config SYSFB_SIMPLEFB
215215
config TI_SCI_PROTOCOL
216216
tristate "TI System Control Interface (TISCI) Message Protocol"
217217
depends on TI_MESSAGE_MANAGER
218+
default ARCH_K3
218219
help
219220
TI System Control Interface (TISCI) Message Protocol is used to manage
220221
compute systems such as ARM, DSP etc with the system controller in

drivers/soc/ti/k3-socinfo.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,20 +105,31 @@ k3_chipinfo_variant_to_sr(unsigned int partno, unsigned int variant,
105105
return -ENODEV;
106106
}
107107

108+
static const struct regmap_config k3_chipinfo_regmap_cfg = {
109+
.reg_bits = 32,
110+
.val_bits = 32,
111+
.reg_stride = 4,
112+
};
113+
108114
static int k3_chipinfo_probe(struct platform_device *pdev)
109115
{
110116
struct device_node *node = pdev->dev.of_node;
111117
struct soc_device_attribute *soc_dev_attr;
112118
struct device *dev = &pdev->dev;
113119
struct soc_device *soc_dev;
114120
struct regmap *regmap;
121+
void __iomem *base;
115122
u32 partno_id;
116123
u32 variant;
117124
u32 jtag_id;
118125
u32 mfg;
119126
int ret;
120127

121-
regmap = device_node_to_regmap(node);
128+
base = devm_platform_ioremap_resource(pdev, 0);
129+
if (IS_ERR(base))
130+
return PTR_ERR(base);
131+
132+
regmap = regmap_init_mmio(dev, base, &k3_chipinfo_regmap_cfg);
122133
if (IS_ERR(regmap))
123134
return PTR_ERR(regmap);
124135

0 commit comments

Comments
 (0)