From d7965d03e29384eaf4a5a578b0c7a721036c988b Mon Sep 17 00:00:00 2001 From: Joseph Chen Date: Thu, 26 Nov 2020 10:39:23 +0800 Subject: [PATCH] pinctrl: rockchip: add SPL support CONFIG_OF_LIVE is always available in SPL and U-Boot. Use CONFIG_IS_ENABLED(OF_LIVE) to unwind as CONFIG_OF_LIVE in U-Boot and CONFIG_SPL_OF_LIVE in SPL. Signed-off-by: Joseph Chen Change-Id: I980579d54850ca7655b464688ba9e6bd35f24250 --- drivers/pinctrl/rockchip/pinctrl-rockchip-core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c index 07a4edd9a5..f1bfee2bb4 100644 --- a/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c +++ b/drivers/pinctrl/rockchip/pinctrl-rockchip-core.c @@ -428,7 +428,7 @@ static int rockchip_pinctrl_set_state(struct udevice *dev, int prop_len, param; const u32 *data; ofnode node; -#ifdef CONFIG_OF_LIVE +#if CONFIG_IS_ENABLED(OF_LIVE) const struct device_node *np; struct property *pp; #else @@ -468,7 +468,7 @@ static int rockchip_pinctrl_set_state(struct udevice *dev, node = ofnode_get_by_phandle(conf); if (!ofnode_valid(node)) return -ENODEV; -#ifdef CONFIG_OF_LIVE +#if CONFIG_IS_ENABLED(OF_LIVE) np = ofnode_to_np(node); for (pp = np->properties; pp; pp = pp->next) { prop_name = pp->name;