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.

mfd: rt5033: Fix chip revision readout

After reading the data from the DEVICE_ID register, mask 0x0f needs to be
applied to extract the revision of the chip [1].

The other part of the DEVICE_ID register, mask 0xf0, is a vendor identification
code. That's how it is set up at similar products of Richtek, e.g. RT9455 [2]
page 21 top.

[1] https://github.com/msm8916-mainline/linux-downstream/blob/GT-I9195I/drivers/mfd/rt5033_core.c#L484
[2] https://www.richtek.com/assets/product_file/RT9455/DS9455-00.pdf

Signed-off-by: Jakob Hauser <jahau@rocketmail.com>
Signed-off-by: Lee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/9a98521ffdf76851d5d344afa6ce65f692ecc024.1684182964.git.jahau@rocketmail.com

authored by

Jakob Hauser and committed by
Lee Jones c4747d7c 43db1344

+7 -2
+3 -2
drivers/mfd/rt5033.c
··· 55 55 static int rt5033_i2c_probe(struct i2c_client *i2c) 56 56 { 57 57 struct rt5033_dev *rt5033; 58 - unsigned int dev_id; 58 + unsigned int dev_id, chip_rev; 59 59 int ret; 60 60 61 61 rt5033 = devm_kzalloc(&i2c->dev, sizeof(*rt5033), GFP_KERNEL); ··· 78 78 dev_err(&i2c->dev, "Device not found\n"); 79 79 return -ENODEV; 80 80 } 81 - dev_info(&i2c->dev, "Device found Device ID: %04x\n", dev_id); 81 + chip_rev = dev_id & RT5033_CHIP_REV_MASK; 82 + dev_info(&i2c->dev, "Device found (rev. %d)\n", chip_rev); 82 83 83 84 ret = regmap_add_irq_chip(rt5033->regmap, rt5033->irq, 84 85 IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+4
include/linux/mfd/rt5033-private.h
··· 71 71 /* RT5033 CHGCTRL2 register */ 72 72 #define RT5033_CHGCTRL2_CV_MASK 0xfc 73 73 74 + /* RT5033 DEVICE_ID register */ 75 + #define RT5033_VENDOR_ID_MASK 0xf0 76 + #define RT5033_CHIP_REV_MASK 0x0f 77 + 74 78 /* RT5033 CHGCTRL3 register */ 75 79 #define RT5033_CHGCTRL3_CFO_EN_MASK 0x40 76 80 #define RT5033_CHGCTRL3_TIMER_MASK 0x38