[PATCH] platform: move da9063-reset driver to shareable code
Anup Patel
anup at brainfault.org
Tue Jul 12 03:18:15 PDT 2022
On Tue, Jul 12, 2022 at 2:33 PM Ben Dooks <ben.dooks at sifive.com> wrote:
>
> The da9063 reset code may be useful for other users, so move this
> out to a new file from the current sifive_fu740.c user. This can
> then be called from the relevant machines.
>
> Signed-off-by: Ben Dooks <ben.dooks at sifive.com>
Better to have da9063 reset code under lib/utils/reset and
include/sbi_utils/reset
Regards,
Anup
> ---
> platform/generic/da9063_reset.c | 229 ++++++++++++++++++++++++
> platform/generic/include/da9063_reset.h | 14 ++
> platform/generic/objects.mk | 3 +
> platform/generic/sifive/fu740.c | 197 +-------------------
> 4 files changed, 248 insertions(+), 195 deletions(-)
> create mode 100644 platform/generic/da9063_reset.c
> create mode 100644 platform/generic/include/da9063_reset.h
>
> diff --git a/platform/generic/da9063_reset.c b/platform/generic/da9063_reset.c
> new file mode 100644
> index 0000000..50c987d
> --- /dev/null
> +++ b/platform/generic/da9063_reset.c
> @@ -0,0 +1,229 @@
> +/*
> + * SPDX-License-Identifier: BSD-2-Clause
> + *
> + * Copyright (c) 2021 SiFive
> + * Copyright (c) 2021 YADRO
> + *
> + * Split from sifive_fu740.c
> + *
> + * Authors:
> + * David Abdurachmanov <david.abdurachmanov at sifive.com>
> + * Nikita Shubin <n.shubin at yadro.com>
> + */
> +
> +#include <platform_override.h>
> +#include <da9063_reset.h>
> +#include <libfdt.h>
> +#include <sbi/sbi_error.h>
> +#include <sbi/sbi_hart.h>
> +#include <sbi/sbi_system.h>
> +#include <sbi/sbi_console.h>
> +#include <sbi_utils/fdt/fdt_helper.h>
> +#include <sbi_utils/fdt/fdt_fixup.h>
> +#include <sbi_utils/reset/fdt_reset.h>
> +#include <sbi_utils/i2c/fdt_i2c.h>
> +
> +#define DA9063_REG_PAGE_CON 0x00
> +#define DA9063_REG_CONTROL_A 0x0e
> +#define DA9063_REG_CONTROL_D 0x11
> +#define DA9063_REG_CONTROL_F 0x13
> +#define DA9063_REG_DEVICE_ID 0x81
> +
> +#define DA9063_CONTROL_A_M_POWER1_EN (1 << 6)
> +#define DA9063_CONTROL_A_M_POWER_EN (1 << 5)
> +#define DA9063_CONTROL_A_STANDBY (1 << 3)
> +
> +#define DA9063_CONTROL_D_TWDSCALE_MASK 0x07
> +
> +#define DA9063_CONTROL_F_WAKEUP (1 << 2)
> +#define DA9063_CONTROL_F_SHUTDOWN (1 << 1)
> +
> +#define PMIC_CHIP_ID_DA9063 0x61
> +
> +static struct {
> + struct i2c_adapter *adapter;
> + uint32_t reg;
> +} da9063;
> +
> +static int da9063_system_reset_check(u32 type, u32 reason)
> +{
> + switch (type) {
> + case SBI_SRST_RESET_TYPE_SHUTDOWN:
> + return 1;
> + case SBI_SRST_RESET_TYPE_COLD_REBOOT:
> + case SBI_SRST_RESET_TYPE_WARM_REBOOT:
> + return 255;
> + }
> +
> + return 0;
> +}
> +
> +static inline int da9063_sanity_check(struct i2c_adapter *adap, uint32_t reg)
> +{
> + uint8_t val;
> + int rc = i2c_adapter_reg_write(adap, reg, DA9063_REG_PAGE_CON, 0x02);
> +
> + if (rc)
> + return rc;
> +
> + /* check set page*/
> + rc = i2c_adapter_reg_read(adap, reg, 0x0, &val);
> + if (rc)
> + return rc;
> +
> + if (val != 0x02)
> + return SBI_ENODEV;
> +
> + /* read and check device id */
> + rc = i2c_adapter_reg_read(adap, reg, DA9063_REG_DEVICE_ID, &val);
> + if (rc)
> + return rc;
> +
> + if (val != PMIC_CHIP_ID_DA9063)
> + return SBI_ENODEV;
> +
> + return 0;
> +}
> +
> +static inline int da9063_stop_watchdog(struct i2c_adapter *adap, uint32_t reg)
> +{
> + uint8_t val;
> + int rc = i2c_adapter_reg_write(adap, reg,
> + DA9063_REG_PAGE_CON, 0x00);
> +
> + if (rc)
> + return rc;
> +
> + rc = i2c_adapter_reg_read(adap, reg, DA9063_REG_CONTROL_D, &val);
> + if (rc)
> + return rc;
> +
> + if ((val & DA9063_CONTROL_D_TWDSCALE_MASK) == 0)
> + return 0;
> +
> + val &= ~DA9063_CONTROL_D_TWDSCALE_MASK;
> +
> + return i2c_adapter_reg_write(adap, reg, DA9063_REG_CONTROL_D, val);
> +}
> +
> +static inline int da9063_shutdown(struct i2c_adapter *adap, uint32_t reg)
> +{
> + int rc = i2c_adapter_reg_write(adap, reg,
> + DA9063_REG_PAGE_CON, 0x00);
> +
> + if (rc)
> + return rc;
> +
> + return i2c_adapter_reg_write(adap, reg,
> + DA9063_REG_CONTROL_F,
> + DA9063_CONTROL_F_SHUTDOWN);
> +}
> +
> +static inline int da9063_reset(struct i2c_adapter *adap, uint32_t reg)
> +{
> + int rc = i2c_adapter_reg_write(adap, reg,
> + DA9063_REG_PAGE_CON, 0x00);
> +
> + if (rc)
> + return rc;
> +
> + rc = i2c_adapter_reg_write(adap, reg,
> + DA9063_REG_CONTROL_F,
> + DA9063_CONTROL_F_WAKEUP);
> + if (rc)
> + return rc;
> +
> + return i2c_adapter_reg_write(adap, reg,
> + DA9063_REG_CONTROL_A,
> + DA9063_CONTROL_A_M_POWER1_EN |
> + DA9063_CONTROL_A_M_POWER_EN |
> + DA9063_CONTROL_A_STANDBY);
> +}
> +
> +static void da9063_system_reset(u32 type, u32 reason)
> +{
> + struct i2c_adapter *adap = da9063.adapter;
> + uint32_t reg = da9063.reg;
> + int rc;
> +
> + if (adap) {
> + /* sanity check */
> + rc = da9063_sanity_check(adap, reg);
> + if (rc) {
> + sbi_printf("%s: chip is not da9063 PMIC\n", __func__);
> + goto skip_reset;
> + }
> +
> + switch (type) {
> + case SBI_SRST_RESET_TYPE_SHUTDOWN:
> + da9063_shutdown(adap, reg);
> + break;
> + case SBI_SRST_RESET_TYPE_COLD_REBOOT:
> + case SBI_SRST_RESET_TYPE_WARM_REBOOT:
> + da9063_stop_watchdog(adap, reg);
> + da9063_reset(adap, reg);
> + break;
> + }
> + }
> +
> +skip_reset:
> + sbi_hart_hang();
> +}
> +
> +static struct sbi_system_reset_device da9063_reset_i2c = {
> + .name = "da9063-reset",
> + .system_reset_check = da9063_system_reset_check,
> + .system_reset = da9063_system_reset
> +};
> +
> +static int da9063_reset_init(void *fdt, int nodeoff,
> + const struct fdt_match *match)
> +{
> + int rc, i2c_bus;
> + struct i2c_adapter *adapter;
> + uint64_t addr;
> +
> + /* we are dlg,da9063 node */
> + rc = fdt_get_node_addr_size(fdt, nodeoff, 0, &addr, NULL);
> + if (rc)
> + return rc;
> +
> + da9063.reg = addr;
> +
> + /* find i2c bus parent node */
> + i2c_bus = fdt_parent_offset(fdt, nodeoff);
> + if (i2c_bus < 0)
> + return i2c_bus;
> +
> + /* i2c adapter get */
> + rc = fdt_i2c_adapter_get(fdt, i2c_bus, &adapter);
> + if (rc)
> + return rc;
> +
> + da9063.adapter = adapter;
> +
> + sbi_system_reset_add_device(&da9063_reset_i2c);
> +
> + return 0;
> +}
> +
> +static const struct fdt_match da9063_reset_match[] = {
> + { .compatible = "dlg,da9063", .data = (void *)TRUE },
> + { },
> +};
> +
> +static struct fdt_reset fdt_reset_da9063 = {
> + .match_table = da9063_reset_match,
> + .init = da9063_reset_init,
> +};
> +
> +int da9063_reset_bind(void *fdt)
> +{
> + int rc;
> +
> + rc = fdt_reset_driver_init(fdt, &fdt_reset_da9063);
> + if (rc)
> + sbi_printf("error: failed to find da9063 for reset\n");
> + return rc;
> +}
> +
> diff --git a/platform/generic/include/da9063_reset.h b/platform/generic/include/da9063_reset.h
> new file mode 100644
> index 0000000..3075c25
> --- /dev/null
> +++ b/platform/generic/include/da9063_reset.h
> @@ -0,0 +1,14 @@
> +/*
> + * SPDX-License-Identifier: BSD-2-Clause
> + *
> + * Copyright (c) 2021 SiFive
> + * Copyright (c) 2021 YADRO
> + *
> + * Split from sifive_fu740.c
> + *
> + * Authors:
> + * David Abdurachmanov <david.abdurachmanov at sifive.com>
> + * Nikita Shubin <n.shubin at yadro.com>
> + */
> +
Use "#ifndef" protection here.
Something like this:
#ifndef __DA9063_RESET__
#define __DA9063_RESET__
<snip>
#endif
> +extern int da9063_reset_bind(void *fdt);
> diff --git a/platform/generic/objects.mk b/platform/generic/objects.mk
> index 4907754..465a2f6 100644
> --- a/platform/generic/objects.mk
> +++ b/platform/generic/objects.mk
> @@ -9,3 +9,6 @@
>
> platform-objs-y += platform.o
> platform-objs-y += platform_override_modules.o
> +
> +platform-objs-y += da9063_reset.o
> +
> diff --git a/platform/generic/sifive/fu740.c b/platform/generic/sifive/fu740.c
> index f595c04..7ba4162 100644
> --- a/platform/generic/sifive/fu740.c
> +++ b/platform/generic/sifive/fu740.c
> @@ -10,6 +10,7 @@
> */
>
> #include <platform_override.h>
> +#include <da9063_reset.h>
> #include <libfdt.h>
> #include <sbi/sbi_error.h>
> #include <sbi/sbi_hart.h>
> @@ -20,200 +21,6 @@
> #include <sbi_utils/reset/fdt_reset.h>
> #include <sbi_utils/i2c/fdt_i2c.h>
>
> -#define DA9063_REG_PAGE_CON 0x00
> -#define DA9063_REG_CONTROL_A 0x0e
> -#define DA9063_REG_CONTROL_D 0x11
> -#define DA9063_REG_CONTROL_F 0x13
> -#define DA9063_REG_DEVICE_ID 0x81
> -
> -#define DA9063_CONTROL_A_M_POWER1_EN (1 << 6)
> -#define DA9063_CONTROL_A_M_POWER_EN (1 << 5)
> -#define DA9063_CONTROL_A_STANDBY (1 << 3)
> -
> -#define DA9063_CONTROL_D_TWDSCALE_MASK 0x07
> -
> -#define DA9063_CONTROL_F_WAKEUP (1 << 2)
> -#define DA9063_CONTROL_F_SHUTDOWN (1 << 1)
> -
> -#define PMIC_CHIP_ID_DA9063 0x61
> -
> -static struct {
> - struct i2c_adapter *adapter;
> - uint32_t reg;
> -} da9063;
> -
> -static int da9063_system_reset_check(u32 type, u32 reason)
> -{
> - switch (type) {
> - case SBI_SRST_RESET_TYPE_SHUTDOWN:
> - return 1;
> - case SBI_SRST_RESET_TYPE_COLD_REBOOT:
> - case SBI_SRST_RESET_TYPE_WARM_REBOOT:
> - return 255;
> - }
> -
> - return 0;
> -}
> -
> -static inline int da9063_sanity_check(struct i2c_adapter *adap, uint32_t reg)
> -{
> - uint8_t val;
> - int rc = i2c_adapter_reg_write(adap, reg, DA9063_REG_PAGE_CON, 0x02);
> -
> - if (rc)
> - return rc;
> -
> - /* check set page*/
> - rc = i2c_adapter_reg_read(adap, reg, 0x0, &val);
> - if (rc)
> - return rc;
> -
> - if (val != 0x02)
> - return SBI_ENODEV;
> -
> - /* read and check device id */
> - rc = i2c_adapter_reg_read(adap, reg, DA9063_REG_DEVICE_ID, &val);
> - if (rc)
> - return rc;
> -
> - if (val != PMIC_CHIP_ID_DA9063)
> - return SBI_ENODEV;
> -
> - return 0;
> -}
> -
> -static inline int da9063_stop_watchdog(struct i2c_adapter *adap, uint32_t reg)
> -{
> - uint8_t val;
> - int rc = i2c_adapter_reg_write(adap, reg,
> - DA9063_REG_PAGE_CON, 0x00);
> -
> - if (rc)
> - return rc;
> -
> - rc = i2c_adapter_reg_read(adap, reg, DA9063_REG_CONTROL_D, &val);
> - if (rc)
> - return rc;
> -
> - if ((val & DA9063_CONTROL_D_TWDSCALE_MASK) == 0)
> - return 0;
> -
> - val &= ~DA9063_CONTROL_D_TWDSCALE_MASK;
> -
> - return i2c_adapter_reg_write(adap, reg, DA9063_REG_CONTROL_D, val);
> -}
> -
> -static inline int da9063_shutdown(struct i2c_adapter *adap, uint32_t reg)
> -{
> - int rc = i2c_adapter_reg_write(adap, reg,
> - DA9063_REG_PAGE_CON, 0x00);
> -
> - if (rc)
> - return rc;
> -
> - return i2c_adapter_reg_write(adap, reg,
> - DA9063_REG_CONTROL_F,
> - DA9063_CONTROL_F_SHUTDOWN);
> -}
> -
> -static inline int da9063_reset(struct i2c_adapter *adap, uint32_t reg)
> -{
> - int rc = i2c_adapter_reg_write(adap, reg,
> - DA9063_REG_PAGE_CON, 0x00);
> -
> - if (rc)
> - return rc;
> -
> - rc = i2c_adapter_reg_write(adap, reg,
> - DA9063_REG_CONTROL_F,
> - DA9063_CONTROL_F_WAKEUP);
> - if (rc)
> - return rc;
> -
> - return i2c_adapter_reg_write(adap, reg,
> - DA9063_REG_CONTROL_A,
> - DA9063_CONTROL_A_M_POWER1_EN |
> - DA9063_CONTROL_A_M_POWER_EN |
> - DA9063_CONTROL_A_STANDBY);
> -}
> -
> -static void da9063_system_reset(u32 type, u32 reason)
> -{
> - struct i2c_adapter *adap = da9063.adapter;
> - uint32_t reg = da9063.reg;
> - int rc;
> -
> - if (adap) {
> - /* sanity check */
> - rc = da9063_sanity_check(adap, reg);
> - if (rc) {
> - sbi_printf("%s: chip is not da9063 PMIC\n", __func__);
> - goto skip_reset;
> - }
> -
> - switch (type) {
> - case SBI_SRST_RESET_TYPE_SHUTDOWN:
> - da9063_shutdown(adap, reg);
> - break;
> - case SBI_SRST_RESET_TYPE_COLD_REBOOT:
> - case SBI_SRST_RESET_TYPE_WARM_REBOOT:
> - da9063_stop_watchdog(adap, reg);
> - da9063_reset(adap, reg);
> - break;
> - }
> - }
> -
> -skip_reset:
> - sbi_hart_hang();
> -}
> -
> -static struct sbi_system_reset_device da9063_reset_i2c = {
> - .name = "da9063-reset",
> - .system_reset_check = da9063_system_reset_check,
> - .system_reset = da9063_system_reset
> -};
> -
> -static int da9063_reset_init(void *fdt, int nodeoff,
> - const struct fdt_match *match)
> -{
> - int rc, i2c_bus;
> - struct i2c_adapter *adapter;
> - uint64_t addr;
> -
> - /* we are dlg,da9063 node */
> - rc = fdt_get_node_addr_size(fdt, nodeoff, 0, &addr, NULL);
> - if (rc)
> - return rc;
> -
> - da9063.reg = addr;
> -
> - /* find i2c bus parent node */
> - i2c_bus = fdt_parent_offset(fdt, nodeoff);
> - if (i2c_bus < 0)
> - return i2c_bus;
> -
> - /* i2c adapter get */
> - rc = fdt_i2c_adapter_get(fdt, i2c_bus, &adapter);
> - if (rc)
> - return rc;
> -
> - da9063.adapter = adapter;
> -
> - sbi_system_reset_add_device(&da9063_reset_i2c);
> -
> - return 0;
> -}
> -
> -static const struct fdt_match da9063_reset_match[] = {
> - { .compatible = "dlg,da9063", .data = (void *)TRUE },
> - { },
> -};
> -
> -struct fdt_reset fdt_reset_da9063 = {
> - .match_table = da9063_reset_match,
> - .init = da9063_reset_init,
> -};
> -
> static u64 sifive_fu740_tlbr_flush_limit(const struct fdt_match *match)
> {
> /*
> @@ -233,7 +40,7 @@ static int sifive_fu740_final_init(bool cold_boot,
> void *fdt = fdt_get_address();
>
> if (cold_boot) {
> - rc = fdt_reset_driver_init(fdt, &fdt_reset_da9063);
> + rc = da9063_reset_bind(fdt);
> if (rc)
> sbi_printf("%s: failed to find da9063 for reset\n",
> __func__);
> --
> 2.35.1
>
>
> --
> opensbi mailing list
> opensbi at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi
Regards,
Anup
More information about the opensbi
mailing list