mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 21:58:04 +00:00
9dfc2b3ca4
MediaTek published their current U-Boot patchset on github: https://github.com/mtk-openwrt/u-boot/commits/mtksoc Import the platform patches from there (`00-mtk-*.patch`), arrange, them nicely, drop no longer needed local patches and rebase on top of U-Boot 2021.04-rc3. Tested and works well on Linksys E8450 (snand-1ddr) as well as Bananapi BPi-R64 (sdmmc-2ddr, emmc-2ddr). Signed-off-by: Daniel Golle <daniel@makrotopia.org>
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From d3fbbef13853a695cdea75a980a3d6bd150a68c1 Mon Sep 17 00:00:00 2001
|
|
From: Weijie Gao <weijie.gao@mediatek.com>
|
|
Date: Mon, 11 Jan 2021 10:17:15 +0800
|
|
Subject: [PATCH 05/21] pinctrl: mediatek: do not probe gpio driver if not
|
|
enabled
|
|
|
|
The mtk pinctrl driver is a combination driver with support for both
|
|
pinctrl and gpio. When this driver is used in SPL, gpio support may not be
|
|
enabled, and this will result in a compilation error.
|
|
|
|
To fix this, macros are added to make sure gpio related code will only be
|
|
compiled when gpio support is enabled.
|
|
|
|
Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
|
|
---
|
|
drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
|
|
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
|
|
@@ -540,6 +540,8 @@ const struct pinctrl_ops mtk_pinctrl_ops
|
|
.set_state = pinctrl_generic_set_state,
|
|
};
|
|
|
|
+#if CONFIG_IS_ENABLED(DM_GPIO) || \
|
|
+ (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_GPIO_SUPPORT))
|
|
static int mtk_gpio_get(struct udevice *dev, unsigned int off)
|
|
{
|
|
int val, err;
|
|
@@ -647,12 +649,13 @@ static int mtk_gpiochip_register(struct
|
|
|
|
return 0;
|
|
}
|
|
+#endif
|
|
|
|
int mtk_pinctrl_common_probe(struct udevice *dev,
|
|
struct mtk_pinctrl_soc *soc)
|
|
{
|
|
struct mtk_pinctrl_priv *priv = dev_get_priv(dev);
|
|
- int ret;
|
|
+ int ret = 0;
|
|
|
|
priv->base = dev_read_addr_ptr(dev);
|
|
if (!priv->base)
|
|
@@ -660,9 +663,10 @@ int mtk_pinctrl_common_probe(struct udev
|
|
|
|
priv->soc = soc;
|
|
|
|
+#if CONFIG_IS_ENABLED(DM_GPIO) || \
|
|
+ (defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_GPIO_SUPPORT))
|
|
ret = mtk_gpiochip_register(dev);
|
|
- if (ret)
|
|
- return ret;
|
|
+#endif
|
|
|
|
- return 0;
|
|
+ return ret;
|
|
}
|