[PATCH RESEND] mfd: cros_ec: Check DT node for usbpd-notify add

[PATCH RESEND] mfd: cros_ec: Check DT node for usbpd-notify add

[Prashant Malani]

Add a check to ensure there is indeed an EC device tree entry before
adding the cros-usbpd-notify device. This covers configs where both
CONFIG_ACPI and CONFIG_OF are defined, but the EC device is defined
using device tree and not in ACPI.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Tested-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Fixes: 4602dce0361e ("mfd: cros_ec: Add cros-usbpd-notify subdevice")
---

This patch was originally part 3/4 of a series for the Chrome OS EC
USBPD notify driver:
 https://patchwork.kernel.org/patch/11351271/

Resending this patch since the dependent components have been merged
into the upstream master tree or an immutable staging branch:
- Patches 1/4 and 4/4 of the original series have been included in
  the platform/chrome maintainer's immutable staging branch:
      https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git/log/?h=ib-chrome-platform-power-supply-cros-usbpd-notify
- Patch 2/4 has been merged to the mainline kernel as
  commit 4602dce0361ebc67b9bfbed9338eee588e3c7e7e.


Changes in RESEND:
- No changes.

Changes in v8:
- Patch first introduced in v8 of the series.

 drivers/mfd/cros_ec_dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c
index 39e61169505362..32c2b912b58b25 100644
--- a/drivers/mfd/cros_ec_dev.c
+++ b/drivers/mfd/cros_ec_dev.c
@@ -211,7 +211,7 @@ static int ec_device_probe(struct platform_device *pdev)
 	 * explicitly added on platforms that don't have the PD notifier ACPI
 	 * device entry defined.
 	 */
-	if (IS_ENABLED(CONFIG_OF)) {
+	if (IS_ENABLED(CONFIG_OF) && ec->ec_dev->dev->of_node) {
 		if (cros_ec_check_features(ec, EC_FEATURE_USB_PD)) {
 			retval = mfd_add_hotplug_devices(ec->dev,
 					cros_usbpd_notify_cells,
-- 
2.25.0.341.g760bfbb309-goog

Re: [PATCH RESEND] mfd: cros_ec: Check DT node for usbpd-notify add

[Lee Jones]

On Mon, 10 Feb 2020, Prashant Malani wrote:

> Add a check to ensure there is indeed an EC device tree entry before
> adding the cros-usbpd-notify device. This covers configs where both
> CONFIG_ACPI and CONFIG_OF are defined, but the EC device is defined
> using device tree and not in ACPI.
> 
> Signed-off-by: Prashant Malani <pmalani@chromium.org>
> Tested-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
> Fixes: 4602dce0361e ("mfd: cros_ec: Add cros-usbpd-notify subdevice")
> ---
> 
> This patch was originally part 3/4 of a series for the Chrome OS EC
> USBPD notify driver:
>  https://patchwork.kernel.org/patch/11351271/
> 
> Resending this patch since the dependent components have been merged
> into the upstream master tree or an immutable staging branch:
> - Patches 1/4 and 4/4 of the original series have been included in
>   the platform/chrome maintainer's immutable staging branch:
>       https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git/log/?h=ib-chrome-platform-power-supply-cros-usbpd-notify
> - Patch 2/4 has been merged to the mainline kernel as
>   commit 4602dce0361ebc67b9bfbed9338eee588e3c7e7e.
> 
> Changes in RESEND:
> - No changes.
> 
> Changes in v8:
> - Patch first introduced in v8 of the series.
> 
>  drivers/mfd/cros_ec_dev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog