From: John Crispin <blogic@openwrt.org>
To: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>,
Henry Chen <henryc.chen@mediatek.com>,
Thierry Reding <treding@nvidia.com>,
Flora Fu <flora.fu@mediatek.com>,
Steven Liu <steven.liu@mediatek.com>,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
John Crispin <blogic@openwrt.org>
Subject: [PATCH V5 07/11] soc: mediatek: PMIC wrap: move wdt_src into the pmic_wrapper_type struct
Date: Sun, 7 Feb 2016 11:42:54 +0100 [thread overview]
Message-ID: <1454841778-35529-8-git-send-email-blogic@openwrt.org> (raw)
In-Reply-To: <1454841778-35529-1-git-send-email-blogic@openwrt.org>
Make the handling of wdt_src consitent with the rest of the code.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
drivers/soc/mediatek/mtk-pmic-wrap.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index 1653e64..7193d04 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -373,6 +373,7 @@ struct pmic_wrapper_type {
u32 arb_en_all;
u32 int_en_all;
u32 spi_w;
+ u32 wdt_src;
int (*init_reg_clock)(struct pmic_wrapper *wrp);
int (*init_special)(struct pmic_wrapper *wrp);
};
@@ -829,6 +830,7 @@ static struct pmic_wrapper_type pwrap_mt8135 = {
.arb_en_all = 0x1ff,
.int_en_all = ~(BIT(31) | BIT(1)),
.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
+ .wdt_src = PWRAP_WDT_SRC_MASK_ALL,
.init_reg_clock = pwrap_mt8135_init_reg_clock,
.init_special = pwrap_mt8135_init_special,
};
@@ -839,6 +841,7 @@ static struct pmic_wrapper_type pwrap_mt8173 = {
.arb_en_all = 0x3f,
.int_en_all = ~(BIT(31) | BIT(1)),
.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
+ .wdt_src = PWRAP_WDT_SRC_MASK_NO_STAUPD,
.init_reg_clock = pwrap_mt8173_init_reg_clock,
.init_special = pwrap_mt8173_init_special,
};
@@ -858,7 +861,7 @@ MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl);
static int pwrap_probe(struct platform_device *pdev)
{
- int ret, irq, wdt_src;
+ int ret, irq;
struct pmic_wrapper *wrp;
struct device_node *np = pdev->dev.of_node;
const struct of_device_id *of_id =
@@ -948,9 +951,7 @@ static int pwrap_probe(struct platform_device *pdev)
* Since STAUPD was not used on mt8173 platform,
* so STAUPD of WDT_SRC which should be turned off
*/
- wdt_src = pwrap_is_mt8173(wrp) ?
- PWRAP_WDT_SRC_MASK_NO_STAUPD : PWRAP_WDT_SRC_MASK_ALL;
- pwrap_writel(wrp, wdt_src, PWRAP_WDT_SRC_EN);
+ pwrap_writel(wrp, wrp->master->wdt_src, PWRAP_WDT_SRC_EN);
pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN);
pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN);
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: John Crispin <blogic@openwrt.org>
To: Matthias Brugger <matthias.bgg@gmail.com>
Cc: Steven Liu <steven.liu@mediatek.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
linux-kernel@vger.kernel.org,
Henry Chen <henryc.chen@mediatek.com>,
Flora Fu <flora.fu@mediatek.com>,
linux-mediatek@lists.infradead.org,
Thierry Reding <treding@nvidia.com>,
linux-arm-kernel@lists.infradead.org,
John Crispin <blogic@openwrt.org>
Subject: [PATCH V5 07/11] soc: mediatek: PMIC wrap: move wdt_src into the pmic_wrapper_type struct
Date: Sun, 7 Feb 2016 11:42:54 +0100 [thread overview]
Message-ID: <1454841778-35529-8-git-send-email-blogic@openwrt.org> (raw)
In-Reply-To: <1454841778-35529-1-git-send-email-blogic@openwrt.org>
Make the handling of wdt_src consitent with the rest of the code.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
drivers/soc/mediatek/mtk-pmic-wrap.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index 1653e64..7193d04 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -373,6 +373,7 @@ struct pmic_wrapper_type {
u32 arb_en_all;
u32 int_en_all;
u32 spi_w;
+ u32 wdt_src;
int (*init_reg_clock)(struct pmic_wrapper *wrp);
int (*init_special)(struct pmic_wrapper *wrp);
};
@@ -829,6 +830,7 @@ static struct pmic_wrapper_type pwrap_mt8135 = {
.arb_en_all = 0x1ff,
.int_en_all = ~(BIT(31) | BIT(1)),
.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
+ .wdt_src = PWRAP_WDT_SRC_MASK_ALL,
.init_reg_clock = pwrap_mt8135_init_reg_clock,
.init_special = pwrap_mt8135_init_special,
};
@@ -839,6 +841,7 @@ static struct pmic_wrapper_type pwrap_mt8173 = {
.arb_en_all = 0x3f,
.int_en_all = ~(BIT(31) | BIT(1)),
.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
+ .wdt_src = PWRAP_WDT_SRC_MASK_NO_STAUPD,
.init_reg_clock = pwrap_mt8173_init_reg_clock,
.init_special = pwrap_mt8173_init_special,
};
@@ -858,7 +861,7 @@ MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl);
static int pwrap_probe(struct platform_device *pdev)
{
- int ret, irq, wdt_src;
+ int ret, irq;
struct pmic_wrapper *wrp;
struct device_node *np = pdev->dev.of_node;
const struct of_device_id *of_id =
@@ -948,9 +951,7 @@ static int pwrap_probe(struct platform_device *pdev)
* Since STAUPD was not used on mt8173 platform,
* so STAUPD of WDT_SRC which should be turned off
*/
- wdt_src = pwrap_is_mt8173(wrp) ?
- PWRAP_WDT_SRC_MASK_NO_STAUPD : PWRAP_WDT_SRC_MASK_ALL;
- pwrap_writel(wrp, wdt_src, PWRAP_WDT_SRC_EN);
+ pwrap_writel(wrp, wrp->master->wdt_src, PWRAP_WDT_SRC_EN);
pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN);
pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN);
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: blogic@openwrt.org (John Crispin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V5 07/11] soc: mediatek: PMIC wrap: move wdt_src into the pmic_wrapper_type struct
Date: Sun, 7 Feb 2016 11:42:54 +0100 [thread overview]
Message-ID: <1454841778-35529-8-git-send-email-blogic@openwrt.org> (raw)
In-Reply-To: <1454841778-35529-1-git-send-email-blogic@openwrt.org>
Make the handling of wdt_src consitent with the rest of the code.
Signed-off-by: John Crispin <blogic@openwrt.org>
---
drivers/soc/mediatek/mtk-pmic-wrap.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/soc/mediatek/mtk-pmic-wrap.c b/drivers/soc/mediatek/mtk-pmic-wrap.c
index 1653e64..7193d04 100644
--- a/drivers/soc/mediatek/mtk-pmic-wrap.c
+++ b/drivers/soc/mediatek/mtk-pmic-wrap.c
@@ -373,6 +373,7 @@ struct pmic_wrapper_type {
u32 arb_en_all;
u32 int_en_all;
u32 spi_w;
+ u32 wdt_src;
int (*init_reg_clock)(struct pmic_wrapper *wrp);
int (*init_special)(struct pmic_wrapper *wrp);
};
@@ -829,6 +830,7 @@ static struct pmic_wrapper_type pwrap_mt8135 = {
.arb_en_all = 0x1ff,
.int_en_all = ~(BIT(31) | BIT(1)),
.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
+ .wdt_src = PWRAP_WDT_SRC_MASK_ALL,
.init_reg_clock = pwrap_mt8135_init_reg_clock,
.init_special = pwrap_mt8135_init_special,
};
@@ -839,6 +841,7 @@ static struct pmic_wrapper_type pwrap_mt8173 = {
.arb_en_all = 0x3f,
.int_en_all = ~(BIT(31) | BIT(1)),
.spi_w = PWRAP_MAN_CMD_SPI_WRITE,
+ .wdt_src = PWRAP_WDT_SRC_MASK_NO_STAUPD,
.init_reg_clock = pwrap_mt8173_init_reg_clock,
.init_special = pwrap_mt8173_init_special,
};
@@ -858,7 +861,7 @@ MODULE_DEVICE_TABLE(of, of_pwrap_match_tbl);
static int pwrap_probe(struct platform_device *pdev)
{
- int ret, irq, wdt_src;
+ int ret, irq;
struct pmic_wrapper *wrp;
struct device_node *np = pdev->dev.of_node;
const struct of_device_id *of_id =
@@ -948,9 +951,7 @@ static int pwrap_probe(struct platform_device *pdev)
* Since STAUPD was not used on mt8173 platform,
* so STAUPD of WDT_SRC which should be turned off
*/
- wdt_src = pwrap_is_mt8173(wrp) ?
- PWRAP_WDT_SRC_MASK_NO_STAUPD : PWRAP_WDT_SRC_MASK_ALL;
- pwrap_writel(wrp, wdt_src, PWRAP_WDT_SRC_EN);
+ pwrap_writel(wrp, wrp->master->wdt_src, PWRAP_WDT_SRC_EN);
pwrap_writel(wrp, 0x1, PWRAP_TIMER_EN);
pwrap_writel(wrp, wrp->master->int_en_all, PWRAP_INT_EN);
--
1.7.10.4
next prev parent reply other threads:[~2016-02-07 10:44 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-07 10:42 [PATCH V5 00/11] soc: mediatek: PMIC wrap: add MT6323/2701/7623 support John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` [PATCH V5 01/11] dt-bindings: ARM: Mediatek: add MT2701/7623 string to the PMIC wrapper doc John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` [PATCH V5 02/11] soc: mediatek: PMIC wrap: don't duplicate the wrapper data John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` [PATCH V5 03/11] soc: mediatek: PMIC wrap: add wrapper callbacks for init_reg_clock John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` [PATCH V5 04/11] soc: mediatek: PMIC wrap: split SoC specific init into callback John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-11 11:54 ` Matthias Brugger
2016-02-11 11:54 ` Matthias Brugger
2016-02-14 21:01 ` John Crispin
2016-02-14 21:01 ` John Crispin
2016-02-17 16:55 ` Matthias Brugger
2016-02-17 16:55 ` Matthias Brugger
2016-02-07 10:42 ` [PATCH V5 05/11] soc: mediatek: PMIC wrap: WRAP_INT_EN needs a different bitmask for MT2701/7623 John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` [PATCH V5 06/11] soc: mediatek: PMIC wrap: SPI_WRITE " John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-11 11:59 ` Matthias Brugger
2016-02-11 11:59 ` Matthias Brugger
2016-02-07 10:42 ` John Crispin [this message]
2016-02-07 10:42 ` [PATCH V5 07/11] soc: mediatek: PMIC wrap: move wdt_src into the pmic_wrapper_type struct John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-11 12:00 ` Matthias Brugger
2016-02-11 12:00 ` Matthias Brugger
2016-02-07 10:42 ` [PATCH V5 08/11] soc: mediatek: PMIC wrap: remove pwrap_is_mt8135() and pwrap_is_mt8173() John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-11 12:01 ` Matthias Brugger
2016-02-11 12:01 ` Matthias Brugger
2016-02-07 10:42 ` [PATCH V5 09/11] soc: mediatek: PMIC wrap: add a slave specific struct John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-11 11:25 ` Matthias Brugger
2016-02-11 11:25 ` Matthias Brugger
2016-02-07 10:42 ` [PATCH V5 10/11] soc: mediatek: PMIC wrap: add mt6323 slave support John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-11 11:27 ` Matthias Brugger
2016-02-11 11:27 ` Matthias Brugger
2016-02-07 10:42 ` [PATCH V5 11/11] soc: mediatek: PMIC wrap: add MT2701/7623 support John Crispin
2016-02-07 10:42 ` John Crispin
2016-02-11 11:41 ` Matthias Brugger
2016-02-11 11:41 ` Matthias Brugger
2016-02-11 11:46 ` [PATCH V5 00/11] soc: mediatek: PMIC wrap: add MT6323/2701/7623 support Matthias Brugger
2016-02-11 11:46 ` Matthias Brugger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454841778-35529-8-git-send-email-blogic@openwrt.org \
--to=blogic@openwrt.org \
--cc=flora.fu@mediatek.com \
--cc=henryc.chen@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=matthias.bgg@gmail.com \
--cc=s.hauer@pengutronix.de \
--cc=steven.liu@mediatek.com \
--cc=treding@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.