TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: rk860x: fix the chip id error

Browse Source 
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I86d6c6f3fdd2f105561aa31a7590ef0723bcc88a
This commit is contained in:
shengfei Xu
2021-11-16 03:00:14 +00:00
committed by Tao Huang
parent 59c8a80eb3
commit 58461615ac
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm64/boot/dts/rockchip/rk806-single.dtsi
+3 -12
View File
@@ -66,12 +66,9 @@
status = "okay";
vdd_cpu_big0_s0: vdd_cpu_big0_mem_s0: rk8602@42 {
compatible = "rockchip,rk860x";
compatible = "rockchip,rk8602";
reg = <0x42>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&rk860_en_gpio>;
en-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
regulator-compatible = "rk860x-reg";
regulator-name = "vdd_cpu_big0_s0";
regulator-min-microvolt = <550000>;
@@ -86,12 +83,9 @@
};
vdd_cpu_big1_s0: vdd_cpu_big1_mem_s0: rk8603@43 {
compatible = "rockchip,rk860x";
compatible = "rockchip,rk8603";
reg = <0x43>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&rk860_en_gpio>;
en-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
regulator-compatible = "rk860x-reg";
regulator-name = "vdd_cpu_big1_s0";
regulator-min-microvolt = <550000>;
@@ -110,12 +104,9 @@
status = "okay";
vdd_npu_s0: vdd_npu_mem_s0: rk8602@42 {
compatible = "rockchip,rk860x";
compatible = "rockchip,rk8602";
reg = <0x42>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&rk860_en_gpio>;
en-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
regulator-compatible = "rk860x-reg";
regulator-name = "vdd_npu_s0";
regulator-min-microvolt = <550000>;
drivers/regulator/fan53555.c
-12
View File
@@ -677,12 +677,6 @@ static const struct of_device_id __maybe_unused fan53555_dt_ids[] = {
.compatible = "fcs,fan53555",
.data = (void *)FAN53555_VENDOR_FAIRCHILD
}, {
.compatible = "rockchip,rk8603",
.data = (void *)FAN53555_VENDOR_RK,
}, {
.compatible = "rockchip,rk8604",
.data = (void *)FAN53555_VENDOR_RK,
}, {
.compatible = "silergy,syr827",
.data = (void *)FAN53555_VENDOR_SILERGY,
}, {
@@ -831,12 +825,6 @@ static const struct i2c_device_id fan53555_id[] = {
}, {
.name = "fan53555",
.driver_data = FAN53555_VENDOR_FAIRCHILD
}, {
.name = "rk8603",
.driver_data = FAN53555_VENDOR_RK
}, {
.name = "rk8604",
.driver_data = FAN53555_VENDOR_RK
}, {
.name = "syr827",
.driver_data = FAN53555_VENDOR_SILERGY
drivers/regulator/rk860x-regulator.c
+15 -1
View File
@@ -446,8 +446,22 @@ rk860x_parse_dt(struct device *dev, struct device_node *np,
static const struct of_device_id rk860x_dt_ids[] = {
{
.compatible = "rockchip,rk860x",
.compatible = "rockchip,rk8600",
.data = (void *)RK860X_CHIP_ID_00
},
{
.compatible = "rockchip,rk8601",
.data = (void *)RK860X_CHIP_ID_01
},
{
.compatible = "rockchip,rk8602",
.data = (void *)RK860X_CHIP_ID_02
},
{
.compatible = "rockchip,rk8603",
.data = (void *)RK860X_CHIP_ID_03
},
{ }
};
MODULE_DEVICE_TABLE(of, rk860x_dt_ids);