diff options
| author | Nam Cao <[email protected]> | 2024-02-22 09:16:16 +0100 |
|---|---|---|
| committer | Anup Patel <[email protected]> | 2024-02-22 18:07:49 +0530 |
| commit | 5335340d97a1fb6f7dfcad9f3ad602491b69ece1 (patch) | |
| tree | 2c1fc7e449da99179a5c32b7a09972b3983babb6 | |
| parent | 4d8569df7bd73238d8a02bb5ec850ed3c3c97093 (diff) | |
platform: starfive: remove redundant compatibility check in pmic_ops
pmic_ops() is only called if a compatible device is found in device
tree. It is redundant for this function to check the compability again.
Remove this check.
Signed-off-by: Nam Cao <[email protected]>
Tested-by: Minda Chen <[email protected]>
Reviewed-by: Anup Patel <[email protected]>
| -rw-r--r-- | platform/generic/starfive/jh7110.c | 36 |
1 files changed, 14 insertions, 22 deletions
diff --git a/platform/generic/starfive/jh7110.c b/platform/generic/starfive/jh7110.c index efa4029f..0e37d564 100644 --- a/platform/generic/starfive/jh7110.c +++ b/platform/generic/starfive/jh7110.c @@ -23,7 +23,6 @@ struct pmic { struct i2c_adapter *adapter; u32 dev_addr; - const char *compatible; }; struct jh7110 { @@ -129,32 +128,26 @@ static void pmic_ops(struct pmic *pmic, int type) u8 val; ret = shutdown_device_power_domain(); - if (ret) return; - if (!sbi_strcmp("stf,axp15060-regulator", pmic->compatible)) { - ret = i2c_adapter_reg_read(pmic->adapter, pmic->dev_addr, - AXP15060_POWER_REG, &val); - - if (ret) { - sbi_printf("%s: cannot read pmic power register\n", - __func__); - return; - } + ret = i2c_adapter_reg_read(pmic->adapter, pmic->dev_addr, + AXP15060_POWER_REG, &val); + if (ret) { + sbi_printf("%s: cannot read pmic power register\n", __func__); + return; + } + val |= AXP15060_POWER_OFF_BIT; + if (type == SBI_SRST_RESET_TYPE_SHUTDOWN) val |= AXP15060_POWER_OFF_BIT; - if (type == SBI_SRST_RESET_TYPE_SHUTDOWN) - val |= AXP15060_POWER_OFF_BIT; - else - val |= AXP15060_RESET_BIT; + else + val |= AXP15060_RESET_BIT; - ret = i2c_adapter_reg_write(pmic->adapter, pmic->dev_addr, - AXP15060_POWER_REG, val); - if (ret) - sbi_printf("%s: cannot write pmic power register\n", - __func__); - } + ret = i2c_adapter_reg_write(pmic->adapter, pmic->dev_addr, + AXP15060_POWER_REG, val); + if (ret) + sbi_printf("%s: cannot write pmic power register\n", __func__); } static void pmic_i2c_clk_enable(void) @@ -206,7 +199,6 @@ static int pm_reset_init(void *fdt, int nodeoff, return rc; pmic_inst.dev_addr = addr; - pmic_inst.compatible = match->compatible; i2c_bus = fdt_parent_offset(fdt, nodeoff); if (i2c_bus < 0) |