From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: Lee Jones <lee.jones@linaro.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>,
Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-rtc@vger.kernel.org
Cc: Marek Szyprowski <m.szyprowski@samsung.com>,
Sylwester Nawrocki <snawrocki@kernel.org>
Subject: [PATCH 5/9] mfd: sec: Enable wakeup from suspend via devicetree property
Date: Tue, 20 Apr 2021 19:02:40 +0200 [thread overview]
Message-ID: <20210420170244.13467-1-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210420170118.12788-1-krzysztof.kozlowski@canonical.com>
Set device wakeup capability from devicetree property (done by drivers
core), instead of always setting it to 0 (because value in platform data
is not assigned).
This should not have visible effect on actual resuming from suspend
because the child device - S5M RTC driver - is responsible for waking
up and sets device wakeup unconditionally.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
drivers/mfd/sec-core.c | 8 --------
include/linux/mfd/samsung/core.h | 3 ---
2 files changed, 11 deletions(-)
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index a9d4fbc51997..1fb29c45f5cf 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -298,12 +298,6 @@ sec_pmic_i2c_parse_dt_pdata(struct device *dev)
if (!pd)
return ERR_PTR(-ENOMEM);
- /*
- * ToDo: the 'wakeup' member in the platform data is more of a linux
- * specfic information. Hence, there is no binding for that yet and
- * not parsed here.
- */
-
pd->manual_poweroff = of_property_read_bool(dev->of_node,
"samsung,s2mps11-acokb-ground");
pd->disable_wrstbi = of_property_read_bool(dev->of_node,
@@ -337,7 +331,6 @@ static int sec_pmic_probe(struct i2c_client *i2c,
}
sec_pmic->device_type = (unsigned long)of_device_get_match_data(sec_pmic->dev);
- sec_pmic->wakeup = pdata->wakeup;
sec_pmic->pdata = pdata;
switch (sec_pmic->device_type) {
@@ -429,7 +422,6 @@ static int sec_pmic_probe(struct i2c_client *i2c,
if (ret)
return ret;
- device_init_wakeup(sec_pmic->dev, sec_pmic->wakeup);
sec_pmic_configure(sec_pmic);
sec_pmic_dump_rev(sec_pmic);
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index 9864f13b7814..b0d049a56d16 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -69,8 +69,6 @@ struct sec_pmic_dev {
unsigned long device_type;
int irq;
struct regmap_irq_chip_data *irq_data;
-
- bool wakeup;
};
int sec_irq_init(struct sec_pmic_dev *sec_pmic);
@@ -82,7 +80,6 @@ struct sec_platform_data {
struct sec_opmode_data *opmode;
int num_regulators;
- bool wakeup;
bool buck_voltage_lock;
int buck_gpios[3];
--
2.25.1
next prev parent reply other threads:[~2021-04-20 17:02 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-20 17:01 [PATCH 0/9] mfd/rtc/regulator: Drop board file support for Samsung PMIC Krzysztof Kozlowski
2021-04-20 17:01 ` [PATCH 1/9] mfd: sec: Drop support for board files and require devicetree Krzysztof Kozlowski
2021-04-20 17:01 ` [PATCH 2/9] mfd: sec: Remove unused cfg_pmic_irq in platform data Krzysztof Kozlowski
2021-04-20 17:01 ` [PATCH 3/9] mfd: sec: Remove unused device_type " Krzysztof Kozlowski
2021-04-20 17:01 ` [PATCH 4/9] mfd: sec: Remove unused irq_base " Krzysztof Kozlowski
2021-04-20 17:02 ` Krzysztof Kozlowski [this message]
2021-04-20 17:02 ` [PATCH 6/9] mfd: sec: Remove unused platform data members Krzysztof Kozlowski
2021-04-20 17:02 ` [PATCH 7/9] rtc: s5m: Remove reference to parent's device pdata Krzysztof Kozlowski
2021-04-20 17:02 ` [PATCH 8/9] regulator: s2mpa01: Drop initialization via platform data Krzysztof Kozlowski
2021-04-20 17:02 ` [PATCH 9/9] regulator: s2mps11: " Krzysztof Kozlowski
2021-04-21 19:03 ` (subset) [PATCH 0/9] mfd/rtc/regulator: Drop board file support for Samsung PMIC Mark Brown
2021-04-29 21:29 ` Alexandre Belloni
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=20210420170244.13467-1-krzysztof.kozlowski@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=b.zolnierkie@samsung.com \
--cc=broonie@kernel.org \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=snawrocki@kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).