Skip to content

Commit 67d6c76

Browse files
Min Lilag-linaro
Min Li
authored and
lag-linaro
committed
mfd: rsmu: Support 32-bit address space
We used to assume 0x2010xxxx address. Now that we need to access 0x2011xxxx address, we need to support read/write the whole 32-bit address space. Also defined RSMU_MAX_WRITE_COUNT and RSMU_MAX_READ_COUNT for readability Signed-off-by: Min Li <min.li.xe@renesas.com> Signed-off-by: Lee Jones <lee@kernel.org> Link: https://lore.kernel.org/r/MW5PR03MB693295AF31ABCAF6AE52EE74A08B9@MW5PR03MB6932.namprd03.prod.outlook.com
1 parent fb9d496 commit 67d6c76

4 files changed

Lines changed: 174 additions & 56 deletions

File tree

‎drivers/mfd/rsmu.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#include <linux/mfd/rsmu.h>
1212

13+
#define RSMU_CM_SCSR_BASE 0x20100000
14+
1315
int rsmu_core_init(struct rsmu_ddata *rsmu);
1416
void rsmu_core_exit(struct rsmu_ddata *rsmu);
1517

‎drivers/mfd/rsmu_i2c.c‎

Lines changed: 135 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
#include "rsmu.h"
1919

2020
/*
21-
* 16-bit register address: the lower 8 bits of the register address come
22-
* from the offset addr byte and the upper 8 bits come from the page register.
21+
* 32-bit register address: the lower 8 bits of the register address come
22+
* from the offset addr byte and the upper 24 bits come from the page register.
2323
*/
24-
#define RSMU_CM_PAGE_ADDR 0xFD
25-
#define RSMU_CM_PAGE_WINDOW 256
24+
#define RSMU_CM_PAGE_ADDR 0xFC
25+
#define RSMU_CM_PAGE_MASK 0xFFFFFF00
26+
#define RSMU_CM_ADDRESS_MASK 0x000000FF
2627

2728
/*
2829
* 15-bit register address: the lower 7 bits of the register address come
@@ -31,18 +32,6 @@
3132
#define RSMU_SABRE_PAGE_ADDR 0x7F
3233
#define RSMU_SABRE_PAGE_WINDOW 128
3334

34-
static const struct regmap_range_cfg rsmu_cm_range_cfg[] = {
35-
{
36-
.range_min = 0,
37-
.range_max = 0xD000,
38-
.selector_reg = RSMU_CM_PAGE_ADDR,
39-
.selector_mask = 0xFF,
40-
.selector_shift = 0,
41-
.window_start = 0,
42-
.window_len = RSMU_CM_PAGE_WINDOW,
43-
}
44-
};
45-
4635
static const struct regmap_range_cfg rsmu_sabre_range_cfg[] = {
4736
{
4837
.range_min = 0,
@@ -55,35 +44,141 @@ static const struct regmap_range_cfg rsmu_sabre_range_cfg[] = {
5544
}
5645
};
5746

58-
static bool rsmu_cm_volatile_reg(struct device *dev, unsigned int reg)
47+
static bool rsmu_sabre_volatile_reg(struct device *dev, unsigned int reg)
5948
{
6049
switch (reg) {
61-
case RSMU_CM_PAGE_ADDR:
50+
case RSMU_SABRE_PAGE_ADDR:
6251
return false;
6352
default:
6453
return true;
6554
}
6655
}
6756

68-
static bool rsmu_sabre_volatile_reg(struct device *dev, unsigned int reg)
57+
static int rsmu_read_device(struct rsmu_ddata *rsmu, u8 reg, u8 *buf, u16 bytes)
6958
{
70-
switch (reg) {
71-
case RSMU_SABRE_PAGE_ADDR:
72-
return false;
73-
default:
74-
return true;
59+
struct i2c_client *client = to_i2c_client(rsmu->dev);
60+
struct i2c_msg msg[2];
61+
int cnt;
62+
63+
msg[0].addr = client->addr;
64+
msg[0].flags = 0;
65+
msg[0].len = 1;
66+
msg[0].buf = &reg;
67+
68+
msg[1].addr = client->addr;
69+
msg[1].flags = I2C_M_RD;
70+
msg[1].len = bytes;
71+
msg[1].buf = buf;
72+
73+
cnt = i2c_transfer(client->adapter, msg, 2);
74+
75+
if (cnt < 0) {
76+
dev_err(rsmu->dev, "i2c_transfer failed at addr: %04x!", reg);
77+
return cnt;
78+
} else if (cnt != 2) {
79+
dev_err(rsmu->dev,
80+
"i2c_transfer sent only %d of 2 messages", cnt);
81+
return -EIO;
82+
}
83+
84+
return 0;
85+
}
86+
87+
static int rsmu_write_device(struct rsmu_ddata *rsmu, u8 reg, u8 *buf, u16 bytes)
88+
{
89+
struct i2c_client *client = to_i2c_client(rsmu->dev);
90+
u8 msg[RSMU_MAX_WRITE_COUNT + 1]; /* 1 Byte added for the device register */
91+
int cnt;
92+
93+
if (bytes > RSMU_MAX_WRITE_COUNT)
94+
return -EINVAL;
95+
96+
msg[0] = reg;
97+
memcpy(&msg[1], buf, bytes);
98+
99+
cnt = i2c_master_send(client, msg, bytes + 1);
100+
101+
if (cnt < 0) {
102+
dev_err(&client->dev,
103+
"i2c_master_send failed at addr: %04x!", reg);
104+
return cnt;
75105
}
106+
107+
return 0;
108+
}
109+
110+
static int rsmu_write_page_register(struct rsmu_ddata *rsmu, u32 reg)
111+
{
112+
u32 page = reg & RSMU_CM_PAGE_MASK;
113+
u8 buf[4];
114+
int err;
115+
116+
/* Do not modify offset register for none-scsr registers */
117+
if (reg < RSMU_CM_SCSR_BASE)
118+
return 0;
119+
120+
/* Simply return if we are on the same page */
121+
if (rsmu->page == page)
122+
return 0;
123+
124+
buf[0] = 0x0;
125+
buf[1] = (u8)((page >> 8) & 0xFF);
126+
buf[2] = (u8)((page >> 16) & 0xFF);
127+
buf[3] = (u8)((page >> 24) & 0xFF);
128+
129+
err = rsmu_write_device(rsmu, RSMU_CM_PAGE_ADDR, buf, sizeof(buf));
130+
if (err)
131+
dev_err(rsmu->dev, "Failed to set page offset 0x%x\n", page);
132+
else
133+
/* Remember the last page */
134+
rsmu->page = page;
135+
136+
return err;
137+
}
138+
139+
static int rsmu_reg_read(void *context, unsigned int reg, unsigned int *val)
140+
{
141+
struct rsmu_ddata *rsmu = i2c_get_clientdata((struct i2c_client *)context);
142+
u8 addr = (u8)(reg & RSMU_CM_ADDRESS_MASK);
143+
int err;
144+
145+
err = rsmu_write_page_register(rsmu, reg);
146+
if (err)
147+
return err;
148+
149+
err = rsmu_read_device(rsmu, addr, (u8 *)val, 1);
150+
if (err)
151+
dev_err(rsmu->dev, "Failed to read offset address 0x%x\n", addr);
152+
153+
return err;
154+
}
155+
156+
static int rsmu_reg_write(void *context, unsigned int reg, unsigned int val)
157+
{
158+
struct rsmu_ddata *rsmu = i2c_get_clientdata((struct i2c_client *)context);
159+
u8 addr = (u8)(reg & RSMU_CM_ADDRESS_MASK);
160+
u8 data = (u8)val;
161+
int err;
162+
163+
err = rsmu_write_page_register(rsmu, reg);
164+
if (err)
165+
return err;
166+
167+
err = rsmu_write_device(rsmu, addr, &data, 1);
168+
if (err)
169+
dev_err(rsmu->dev,
170+
"Failed to write offset address 0x%x\n", addr);
171+
172+
return err;
76173
}
77174

78175
static const struct regmap_config rsmu_cm_regmap_config = {
79-
.reg_bits = 8,
176+
.reg_bits = 32,
80177
.val_bits = 8,
81-
.max_register = 0xD000,
82-
.ranges = rsmu_cm_range_cfg,
83-
.num_ranges = ARRAY_SIZE(rsmu_cm_range_cfg),
84-
.volatile_reg = rsmu_cm_volatile_reg,
85-
.cache_type = REGCACHE_RBTREE,
86-
.can_multi_write = true,
178+
.max_register = 0x20120000,
179+
.reg_read = rsmu_reg_read,
180+
.reg_write = rsmu_reg_write,
181+
.cache_type = REGCACHE_NONE,
87182
};
88183

89184
static const struct regmap_config rsmu_sabre_regmap_config = {
@@ -101,14 +196,14 @@ static const struct regmap_config rsmu_sl_regmap_config = {
101196
.reg_bits = 16,
102197
.val_bits = 8,
103198
.reg_format_endian = REGMAP_ENDIAN_BIG,
104-
.max_register = 0x339,
199+
.max_register = 0x340,
105200
.cache_type = REGCACHE_NONE,
106201
.can_multi_write = true,
107202
};
108203

109-
static int rsmu_i2c_probe(struct i2c_client *client)
204+
static int rsmu_i2c_probe(struct i2c_client *client,
205+
const struct i2c_device_id *id)
110206
{
111-
const struct i2c_device_id *id = i2c_client_get_device_id(client);
112207
const struct regmap_config *cfg;
113208
struct rsmu_ddata *rsmu;
114209
int ret;
@@ -136,7 +231,11 @@ static int rsmu_i2c_probe(struct i2c_client *client)
136231
dev_err(rsmu->dev, "Unsupported RSMU device type: %d\n", rsmu->type);
137232
return -ENODEV;
138233
}
139-
rsmu->regmap = devm_regmap_init_i2c(client, cfg);
234+
235+
if (rsmu->type == RSMU_CM)
236+
rsmu->regmap = devm_regmap_init(&client->dev, NULL, client, cfg);
237+
else
238+
rsmu->regmap = devm_regmap_init_i2c(client, cfg);
140239
if (IS_ERR(rsmu->regmap)) {
141240
ret = PTR_ERR(rsmu->regmap);
142241
dev_err(rsmu->dev, "Failed to allocate register map: %d\n", ret);
@@ -180,7 +279,7 @@ static struct i2c_driver rsmu_i2c_driver = {
180279
.name = "rsmu-i2c",
181280
.of_match_table = of_match_ptr(rsmu_i2c_of_match),
182281
},
183-
.probe_new = rsmu_i2c_probe,
282+
.probe = rsmu_i2c_probe,
184283
.remove = rsmu_i2c_remove,
185284
.id_table = rsmu_i2c_id,
186285
};

‎drivers/mfd/rsmu_spi.c‎

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,21 @@
1919

2020
#define RSMU_CM_PAGE_ADDR 0x7C
2121
#define RSMU_SABRE_PAGE_ADDR 0x7F
22-
#define RSMU_HIGHER_ADDR_MASK 0xFF80
23-
#define RSMU_HIGHER_ADDR_SHIFT 7
24-
#define RSMU_LOWER_ADDR_MASK 0x7F
22+
#define RSMU_PAGE_MASK 0xFFFFFF80
23+
#define RSMU_ADDR_MASK 0x7F
2524

2625
static int rsmu_read_device(struct rsmu_ddata *rsmu, u8 reg, u8 *buf, u16 bytes)
2726
{
2827
struct spi_device *client = to_spi_device(rsmu->dev);
2928
struct spi_transfer xfer = {0};
3029
struct spi_message msg;
31-
u8 cmd[256] = {0};
32-
u8 rsp[256] = {0};
30+
u8 cmd[RSMU_MAX_READ_COUNT + 1] = {0};
31+
u8 rsp[RSMU_MAX_READ_COUNT + 1] = {0};
3332
int ret;
3433

34+
if (bytes > RSMU_MAX_READ_COUNT)
35+
return -EINVAL;
36+
3537
cmd[0] = reg | 0x80;
3638
xfer.rx_buf = rsp;
3739
xfer.len = bytes + 1;
@@ -66,7 +68,10 @@ static int rsmu_write_device(struct rsmu_ddata *rsmu, u8 reg, u8 *buf, u16 bytes
6668
struct spi_device *client = to_spi_device(rsmu->dev);
6769
struct spi_transfer xfer = {0};
6870
struct spi_message msg;
69-
u8 cmd[256] = {0};
71+
u8 cmd[RSMU_MAX_WRITE_COUNT + 1] = {0};
72+
73+
if (bytes > RSMU_MAX_WRITE_COUNT)
74+
return -EINVAL;
7075

7176
cmd[0] = reg;
7277
memcpy(&cmd[1], buf, bytes);
@@ -86,26 +91,35 @@ static int rsmu_write_device(struct rsmu_ddata *rsmu, u8 reg, u8 *buf, u16 bytes
8691
* 16-bit register address: the lower 7 bits of the register address come
8792
* from the offset addr byte and the upper 9 bits come from the page register.
8893
*/
89-
static int rsmu_write_page_register(struct rsmu_ddata *rsmu, u16 reg)
94+
static int rsmu_write_page_register(struct rsmu_ddata *rsmu, u32 reg)
9095
{
9196
u8 page_reg;
92-
u8 buf[2];
97+
u8 buf[4];
9398
u16 bytes;
94-
u16 page;
99+
u32 page;
95100
int err;
96101

97102
switch (rsmu->type) {
98103
case RSMU_CM:
104+
/* Do not modify page register for none-scsr registers */
105+
if (reg < RSMU_CM_SCSR_BASE)
106+
return 0;
99107
page_reg = RSMU_CM_PAGE_ADDR;
100-
page = reg & RSMU_HIGHER_ADDR_MASK;
108+
page = reg & RSMU_PAGE_MASK;
101109
buf[0] = (u8)(page & 0xff);
102110
buf[1] = (u8)((page >> 8) & 0xff);
103-
bytes = 2;
111+
buf[2] = (u8)((page >> 16) & 0xff);
112+
buf[3] = (u8)((page >> 24) & 0xff);
113+
bytes = 4;
104114
break;
105115
case RSMU_SABRE:
116+
/* Do not modify page register if reg is page register itself */
117+
if ((reg & RSMU_ADDR_MASK) == RSMU_ADDR_MASK)
118+
return 0;
106119
page_reg = RSMU_SABRE_PAGE_ADDR;
107-
page = reg >> RSMU_HIGHER_ADDR_SHIFT;
108-
buf[0] = (u8)(page & 0xff);
120+
page = reg & RSMU_PAGE_MASK;
121+
/* The three page bits are located in the single Page Register */
122+
buf[0] = (u8)((page >> 7) & 0x7);
109123
bytes = 1;
110124
break;
111125
default:
@@ -129,8 +143,8 @@ static int rsmu_write_page_register(struct rsmu_ddata *rsmu, u16 reg)
129143

130144
static int rsmu_reg_read(void *context, unsigned int reg, unsigned int *val)
131145
{
132-
struct rsmu_ddata *rsmu = spi_get_drvdata(context);
133-
u8 addr = (u8)(reg & RSMU_LOWER_ADDR_MASK);
146+
struct rsmu_ddata *rsmu = spi_get_drvdata((struct spi_device *)context);
147+
u8 addr = (u8)(reg & RSMU_ADDR_MASK);
134148
int err;
135149

136150
err = rsmu_write_page_register(rsmu, reg);
@@ -146,8 +160,8 @@ static int rsmu_reg_read(void *context, unsigned int reg, unsigned int *val)
146160

147161
static int rsmu_reg_write(void *context, unsigned int reg, unsigned int val)
148162
{
149-
struct rsmu_ddata *rsmu = spi_get_drvdata(context);
150-
u8 addr = (u8)(reg & RSMU_LOWER_ADDR_MASK);
163+
struct rsmu_ddata *rsmu = spi_get_drvdata((struct spi_device *)context);
164+
u8 addr = (u8)(reg & RSMU_ADDR_MASK);
151165
u8 data = (u8)val;
152166
int err;
153167

@@ -164,9 +178,9 @@ static int rsmu_reg_write(void *context, unsigned int reg, unsigned int val)
164178
}
165179

166180
static const struct regmap_config rsmu_cm_regmap_config = {
167-
.reg_bits = 16,
181+
.reg_bits = 32,
168182
.val_bits = 8,
169-
.max_register = 0xD000,
183+
.max_register = 0x20120000,
170184
.reg_read = rsmu_reg_read,
171185
.reg_write = rsmu_reg_write,
172186
.cache_type = REGCACHE_NONE,

‎include/linux/mfd/rsmu.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
#ifndef __LINUX_MFD_RSMU_H
99
#define __LINUX_MFD_RSMU_H
1010

11+
#define RSMU_MAX_WRITE_COUNT (255)
12+
#define RSMU_MAX_READ_COUNT (255)
13+
1114
/* The supported devices are ClockMatrix, Sabre and SnowLotus */
1215
enum rsmu_type {
1316
RSMU_CM = 0x34000,
@@ -31,6 +34,6 @@ struct rsmu_ddata {
3134
struct regmap *regmap;
3235
struct mutex lock;
3336
enum rsmu_type type;
34-
u16 page;
37+
u32 page;
3538
};
3639
#endif /* __LINUX_MFD_RSMU_H */

0 commit comments

Comments
 (0)