On Fri, 29 Jan 2021, Hsin-Hsiung Wang wrote:
> This adds support for the MediaTek MT6359 PMIC. This is a
> multifunction device with the following sub modules:
>
> - Codec
> - Interrupt
> - Regulator
> - RTC
>
> It is interfaced to the host controller using SPI interface
> by a proprietary hardware called PMIC wrapper or pwrap.
> MT6359 MFD is a child device of the pwrap.
>
> Signed-off-by: Hsin-Hsiung Wang <hsin-hsiung.wang@xxxxxxxxxxxx>
> ---
> changes since v4:
> - remove unused compatible name in the mt6359 mfd cells.
> ---
> drivers/mfd/mt6358-irq.c | 24 ++
> drivers/mfd/mt6397-core.c | 26 ++
> include/linux/mfd/mt6359/core.h | 133 +++++++
> include/linux/mfd/mt6359/registers.h | 529 +++++++++++++++++++++++++++
> include/linux/mfd/mt6397/core.h | 1 +
> 5 files changed, 713 insertions(+)
> create mode 100644 include/linux/mfd/mt6359/core.h
> create mode 100644 include/linux/mfd/mt6359/registers.h
>
> diff --git a/drivers/mfd/mt6358-irq.c b/drivers/mfd/mt6358-irq.c
> index 4b094e5e51cc..83f3ffbdbb4c 100644
> --- a/drivers/mfd/mt6358-irq.c
> +++ b/drivers/mfd/mt6358-irq.c
> @@ -5,6 +5,8 @@
> #include <linux/interrupt.h>
> #include <linux/mfd/mt6358/core.h>
> #include <linux/mfd/mt6358/registers.h>
> +#include <linux/mfd/mt6359/core.h>
> +#include <linux/mfd/mt6359/registers.h>
> #include <linux/mfd/mt6397/core.h>
> #include <linux/module.h>
> #include <linux/of.h>
> @@ -26,6 +28,17 @@ static const struct irq_top_t mt6358_ints[] = {
> MT6358_TOP_GEN(MISC),
> };
>
> +static const struct irq_top_t mt6359_ints[] = {
> + MT6359_TOP_GEN(BUCK),
> + MT6359_TOP_GEN(LDO),
> + MT6359_TOP_GEN(PSC),
> + MT6359_TOP_GEN(SCK),
> + MT6359_TOP_GEN(BM),
> + MT6359_TOP_GEN(HK),
> + MT6359_TOP_GEN(AUD),
> + MT6359_TOP_GEN(MISC),
> +};
> +
> static struct pmic_irq_data mt6358_irqd = {
> .num_top = ARRAY_SIZE(mt6358_ints),
> .num_pmic_irqs = MT6358_IRQ_NR,
> @@ -33,6 +46,13 @@ static struct pmic_irq_data mt6358_irqd = {
> .pmic_ints = mt6358_ints,
> };
>
> +static struct pmic_irq_data mt6359_irqd = {
> + .num_top = ARRAY_SIZE(mt6359_ints),
> + .num_pmic_irqs = MT6359_IRQ_NR,
> + .top_int_status_reg = MT6359_TOP_INT_STATUS0,
> + .pmic_ints = mt6359_ints,
> +};
> +
> static void pmic_irq_enable(struct irq_data *data)
> {
> unsigned int hwirq = irqd_to_hwirq(data);
> @@ -195,6 +215,10 @@ int mt6358_irq_init(struct mt6397_chip *chip)
> chip->irq_data = &mt6358_irqd;
> break;
>
> + case MT6359_CHIP_ID:
> + chip->irq_data = &mt6359_irqd;
> + break;
> +
> default:
> dev_err(chip->dev, "unsupported chip: 0x%x\n", chip->chip_id);
> return -ENODEV;
> diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
> index 7518d74c3b4c..617e4e4d5de0 100644
> --- a/drivers/mfd/mt6397-core.c
> +++ b/drivers/mfd/mt6397-core.c
> @@ -13,9 +13,11 @@
> #include <linux/mfd/core.h>
> #include <linux/mfd/mt6323/core.h>
> #include <linux/mfd/mt6358/core.h>
> +#include <linux/mfd/mt6359/core.h>
> #include <linux/mfd/mt6397/core.h>
> #include <linux/mfd/mt6323/registers.h>
> #include <linux/mfd/mt6358/registers.h>
> +#include <linux/mfd/mt6359/registers.h>
> #include <linux/mfd/mt6397/registers.h>
>
> #define MT6323_RTC_BASE 0x8000
> @@ -99,6 +101,19 @@ static const struct mfd_cell mt6358_devs[] = {
> },
> };
>
> +static const struct mfd_cell mt6359_devs[] = {
> + {
> + .name = "mt6359-regulator",
> + }, {
> + .name = "mt6359-rtc",
> + .num_resources = ARRAY_SIZE(mt6358_rtc_resources),
> + .resources = mt6358_rtc_resources,
> + .of_compatible = "mediatek,mt6358-rtc",
> + }, {
> + .name = "mt6359-sound",
> + },
> +};
Nit: Please put the single-line entries on one line.
Like this:
{ .name = "mt6359-sound" },
> static const struct mfd_cell mt6397_devs[] = {
> {
> .name = "mt6397-rtc",
> @@ -149,6 +164,14 @@ static const struct chip_data mt6358_core = {
> .irq_init = mt6358_irq_init,
> };
>
> +static const struct chip_data mt6359_core = {
> + .cid_addr = MT6359_SWCID,
> + .cid_shift = 8,
> + .cells = mt6359_devs,
> + .cell_size = ARRAY_SIZE(mt6359_devs),
> + .irq_init = mt6358_irq_init,
> +};
> +
> static const struct chip_data mt6397_core = {
> .cid_addr = MT6397_CID,
> .cid_shift = 0,
> @@ -218,6 +241,9 @@ static const struct of_device_id mt6397_of_match[] = {
> }, {
> .compatible = "mediatek,mt6358",
> .data = &mt6358_core,
> + }, {
> + .compatible = "mediatek,mt6359",
> + .data = &mt6359_core,
> }, {
> .compatible = "mediatek,mt6397",
> .data = &mt6397_core,
> diff --git a/include/linux/mfd/mt6359/core.h b/include/linux/mfd/mt6359/core.h
> new file mode 100644
> index 000000000000..61872f1ecbe4
> --- /dev/null
> +++ b/include/linux/mfd/mt6359/core.h
> @@ -0,0 +1,133 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (c) 2020 MediaTek Inc.
This is out of date.
> + */
> +
> +#ifndef __MFD_MT6359_CORE_H__
> +#define __MFD_MT6359_CORE_H__
[...]
> +#endif /* __MFD_MT6359_CORE_H__ */
> diff --git a/include/linux/mfd/mt6359/registers.h b/include/linux/mfd/mt6359/registers.h
> new file mode 100644
> index 000000000000..4d72f0a7f2b0
> --- /dev/null
> +++ b/include/linux/mfd/mt6359/registers.h
> @@ -0,0 +1,529 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Copyright (c) 2020 MediaTek Inc.
This too.
> + */
> +
> +#ifndef __MFD_MT6359_REGISTERS_H__
> +#define __MFD_MT6359_REGISTERS_H__
[...]
> +#endif /* __MFD_MT6359_REGISTERS_H__ */
> diff --git a/include/linux/mfd/mt6397/core.h b/include/linux/mfd/mt6397/core.h
> index 949268581b36..56f210eebc54 100644
> --- a/include/linux/mfd/mt6397/core.h
> +++ b/include/linux/mfd/mt6397/core.h
> @@ -13,6 +13,7 @@
> enum chip_id {
> MT6323_CHIP_ID = 0x23,
> MT6358_CHIP_ID = 0x58,
> + MT6359_CHIP_ID = 0x59,
> MT6391_CHIP_ID = 0x91,
> MT6397_CHIP_ID = 0x97,
> };
Once you fixed those issues, feel free to add my:
For my own reference (apply this as-is to your sign-off block):
Acked-for-MFD-by: Lee Jones <lee.jones@xxxxxxxxxx>
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
