From 9821636b641cbbeed1b6c89641d0649d386650db Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Thu, 25 Jan 2018 12:05:56 +0100 Subject: [PATCH] bcm2835_pinctrl: Probe pre-reloc The serial drivers now depend on the pinctrl driver to determine whether they are enabled. That means if a serial device wants to be used pre-reloc, we also need the pinctrl device pre-reloc. Adapt the pinctrl driver as well as dts overlay accordingly. Signed-off-by: Alexander Graf --- arch/arm/dts/bcm283x-uboot.dtsi | 4 ++++ drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/bcm283x-uboot.dtsi b/arch/arm/dts/bcm283x-uboot.dtsi index 8e4231a..21d038a 100644 --- a/arch/arm/dts/bcm283x-uboot.dtsi +++ b/arch/arm/dts/bcm283x-uboot.dtsi @@ -20,3 +20,7 @@ skip-init; u-boot,dm-pre-reloc; }; + +&gpio { + u-boot,dm-pre-reloc; +}; diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 83dde23..6fbd6ef 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c @@ -148,5 +148,6 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = { .of_match = of_match_ptr(bcm2835_pinctrl_id), .priv_auto_alloc_size = sizeof(struct bcm283x_pinctrl_priv), .ops = &bcm283x_pinctrl_ops, - .probe = bcm283x_pinctl_probe + .probe = bcm283x_pinctl_probe, + .flags = DM_FLAG_PRE_RELOC, }; -- 2.7.4