Message ID | 1502071065-6745-6-git-send-email-chen.zhong@mediatek.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, 07 Aug 2017, Chen Zhong wrote: > This patch adds compatible strings and interrupts for pmic keys > which serves as child device of MFD. > > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> > --- > drivers/mfd/mt6397-core.c | 36 +++++++++++++++++++++++++++++++++++- > 1 file changed, 35 insertions(+), 1 deletion(-) > > diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c > index 6546d7f..3c6a765 100644 > --- a/drivers/mfd/mt6397-core.c > +++ b/drivers/mfd/mt6397-core.c > @@ -43,6 +43,30 @@ > }, > }; > > +static const struct resource mt6323_keys_resources[] = { > + { > + .start = MT6323_IRQ_STATUS_PWRKEY, > + .end = MT6323_IRQ_STATUS_PWRKEY, > + .flags = IORESOURCE_IRQ, > + }, { > + .start = MT6323_IRQ_STATUS_FCHRKEY, > + .end = MT6323_IRQ_STATUS_FCHRKEY, > + .flags = IORESOURCE_IRQ, > + }, > +}; > + > +static const struct resource mt6397_keys_resources[] = { > + { > + .start = MT6397_IRQ_PWRKEY, > + .end = MT6397_IRQ_PWRKEY, > + .flags = IORESOURCE_IRQ, > + }, { > + .start = MT6397_IRQ_HOMEKEY, > + .end = MT6397_IRQ_HOMEKEY, > + .flags = IORESOURCE_IRQ, > + }, > +}; We have better ways to define these now. Please grep for "DEFINE_RES_" > static const struct mfd_cell mt6323_devs[] = { > { > .name = "mt6323-regulator", > @@ -50,6 +74,11 @@ > }, { > .name = "mt6323-led", > .of_compatible = "mediatek,mt6323-led" > + }, { > + .name = "mtk-pmic-keys", > + .num_resources = ARRAY_SIZE(mt6323_keys_resources), > + .resources = mt6323_keys_resources, > + .of_compatible = "mediatek,mt6323-keys" > }, > }; > > @@ -71,7 +100,12 @@ > }, { > .name = "mt6397-pinctrl", > .of_compatible = "mediatek,mt6397-pinctrl", > - }, > + }, { > + .name = "mtk-pmic-keys", > + .num_resources = ARRAY_SIZE(mt6397_keys_resources), > + .resources = mt6397_keys_resources, > + .of_compatible = "mediatek,mt6397-keys" > + } > }; > > static void mt6397_irq_lock(struct irq_data *data)
On Tue, 2017-08-08 at 12:15 +0100, Lee Jones wrote: > On Mon, 07 Aug 2017, Chen Zhong wrote: > > > This patch adds compatible strings and interrupts for pmic keys > > which serves as child device of MFD. > > > > Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> > > --- > > drivers/mfd/mt6397-core.c | 36 +++++++++++++++++++++++++++++++++++- > > 1 file changed, 35 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c > > index 6546d7f..3c6a765 100644 > > --- a/drivers/mfd/mt6397-core.c > > +++ b/drivers/mfd/mt6397-core.c > > @@ -43,6 +43,30 @@ > > }, > > }; > > > > +static const struct resource mt6323_keys_resources[] = { > > + { > > + .start = MT6323_IRQ_STATUS_PWRKEY, > > + .end = MT6323_IRQ_STATUS_PWRKEY, > > + .flags = IORESOURCE_IRQ, > > + }, { > > + .start = MT6323_IRQ_STATUS_FCHRKEY, > > + .end = MT6323_IRQ_STATUS_FCHRKEY, > > + .flags = IORESOURCE_IRQ, > > + }, > > +}; > > + > > +static const struct resource mt6397_keys_resources[] = { > > + { > > + .start = MT6397_IRQ_PWRKEY, > > + .end = MT6397_IRQ_PWRKEY, > > + .flags = IORESOURCE_IRQ, > > + }, { > > + .start = MT6397_IRQ_HOMEKEY, > > + .end = MT6397_IRQ_HOMEKEY, > > + .flags = IORESOURCE_IRQ, > > + }, > > +}; > > We have better ways to define these now. > > Please grep for "DEFINE_RES_" I'll define these with "DEFINE_RES_IRQ" here, Thank you for your suggestion. > > > static const struct mfd_cell mt6323_devs[] = { > > { > > .name = "mt6323-regulator", > > @@ -50,6 +74,11 @@ > > }, { > > .name = "mt6323-led", > > .of_compatible = "mediatek,mt6323-led" > > + }, { > > + .name = "mtk-pmic-keys", > > + .num_resources = ARRAY_SIZE(mt6323_keys_resources), > > + .resources = mt6323_keys_resources, > > + .of_compatible = "mediatek,mt6323-keys" > > }, > > }; > > > > @@ -71,7 +100,12 @@ > > }, { > > .name = "mt6397-pinctrl", > > .of_compatible = "mediatek,mt6397-pinctrl", > > - }, > > + }, { > > + .name = "mtk-pmic-keys", > > + .num_resources = ARRAY_SIZE(mt6397_keys_resources), > > + .resources = mt6397_keys_resources, > > + .of_compatible = "mediatek,mt6397-keys" > > + } > > }; > > > > static void mt6397_irq_lock(struct irq_data *data) > -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index 6546d7f..3c6a765 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -43,6 +43,30 @@ }, }; +static const struct resource mt6323_keys_resources[] = { + { + .start = MT6323_IRQ_STATUS_PWRKEY, + .end = MT6323_IRQ_STATUS_PWRKEY, + .flags = IORESOURCE_IRQ, + }, { + .start = MT6323_IRQ_STATUS_FCHRKEY, + .end = MT6323_IRQ_STATUS_FCHRKEY, + .flags = IORESOURCE_IRQ, + }, +}; + +static const struct resource mt6397_keys_resources[] = { + { + .start = MT6397_IRQ_PWRKEY, + .end = MT6397_IRQ_PWRKEY, + .flags = IORESOURCE_IRQ, + }, { + .start = MT6397_IRQ_HOMEKEY, + .end = MT6397_IRQ_HOMEKEY, + .flags = IORESOURCE_IRQ, + }, +}; + static const struct mfd_cell mt6323_devs[] = { { .name = "mt6323-regulator", @@ -50,6 +74,11 @@ }, { .name = "mt6323-led", .of_compatible = "mediatek,mt6323-led" + }, { + .name = "mtk-pmic-keys", + .num_resources = ARRAY_SIZE(mt6323_keys_resources), + .resources = mt6323_keys_resources, + .of_compatible = "mediatek,mt6323-keys" }, }; @@ -71,7 +100,12 @@ }, { .name = "mt6397-pinctrl", .of_compatible = "mediatek,mt6397-pinctrl", - }, + }, { + .name = "mtk-pmic-keys", + .num_resources = ARRAY_SIZE(mt6397_keys_resources), + .resources = mt6397_keys_resources, + .of_compatible = "mediatek,mt6397-keys" + } }; static void mt6397_irq_lock(struct irq_data *data)
This patch adds compatible strings and interrupts for pmic keys which serves as child device of MFD. Signed-off-by: Chen Zhong <chen.zhong@mediatek.com> --- drivers/mfd/mt6397-core.c | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-)