Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

platform: starfive: remove redundant compatibility check in pmic_ops

Browse Source 
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 <namcao@linutronix.de>
Tested-by: Minda Chen <minda.chen@starfivetech.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
This commit is contained in:
Nam Cao
2024-02-22 09:16:16 +01:00
committed by Anup Patel
parent 4d8569df7b
commit 5335340d97
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
platform/generic/starfive/jh7110.c
View File

@@ -23,7 +23,6 @@
struct pmic { struct pmic {
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
u32 dev_addr; u32 dev_addr;
const char *compatible;
}; };
struct jh7110 { struct jh7110 {
@@ -129,32 +128,26 @@ static void pmic_ops(struct pmic *pmic, int type)
u8 val; u8 val;
ret = shutdown_device_power_domain(); ret = shutdown_device_power_domain();
if (ret) if (ret)
return; return;
if (!sbi_strcmp("stf,axp15060-regulator", pmic->compatible)) { ret = i2c_adapter_reg_read(pmic->adapter, pmic->dev_addr,
ret = i2c_adapter_reg_read(pmic->adapter, pmic->dev_addr, AXP15060_POWER_REG, &val);
AXP15060_POWER_REG, &val); if (ret) {
sbi_printf("%s: cannot read pmic power register\n", __func__);
if (ret) { return;
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;
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__);
} }
val |= AXP15060_POWER_OFF_BIT;
if (type == SBI_SRST_RESET_TYPE_SHUTDOWN)
val |= AXP15060_POWER_OFF_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__);
} }
static void pmic_i2c_clk_enable(void) static void pmic_i2c_clk_enable(void)
@@ -206,7 +199,6 @@ static int pm_reset_init(void *fdt, int nodeoff,
return rc; return rc;
pmic_inst.dev_addr = addr; pmic_inst.dev_addr = addr;
pmic_inst.compatible = match->compatible;
i2c_bus = fdt_parent_offset(fdt, nodeoff); i2c_bus = fdt_parent_offset(fdt, nodeoff);
if (i2c_bus < 0) if (i2c_bus < 0)