aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2016-06-03 22:29:26 +0200
committerRobert Jarzmik <robert.jarzmik@free.fr>2016-08-09 08:16:58 +0200
commit976e509c2ddf9691e8186a823f14df158dd92153 (patch)
tree9887beb8f9d8d3dc8a1531ccb96f7ce41c08a86b
parentLinux 4.8-rc1 (diff)
downloadlinux-dev-976e509c2ddf9691e8186a823f14df158dd92153.tar.xz
linux-dev-976e509c2ddf9691e8186a823f14df158dd92153.zip
ARM: pxa: remove devicetree boards from pxa_defconfig
If both legacy and device-tree machines are mixed in the same defconfig, the legacy boards don't boot up anymore with gpio request deferral errors. This is seen when attempting to run akita, borzoi, spitz, terrier, or tosa in qemu with pxa_defconfig. The real reason behind is that gpio handling for pxa in its current state cannot be built for _both_ a devicetree machine (ie. pxa-dt.c) and a non devicetree machine (ie. corgi, tosa, ...). This is turn is because for devicetree a pinctrl is enforced for the machine, and a pinctrl driver is required. If it's not available, pxa_gpio_request() fails on pinctrl_request_gpio() and returns -EPROBE_DEFER. It was introduced by commit f806dac5938b ("ARM: pxa: activate pinctrl for device-tree machines"). Now the true chicken and egg problem is than machine files, ie. arch/arm/mach-pxa/xxx.c are using gpio before the drivers are probed, in the init_machine() function, and that's why pinctrl/gpio for legacy machine files is a bit difficult. As for now, to keep the compilation coverage and testing of legacy machines, this patch removes the 2 devicetree machines from pxa_defconfig. Reported-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Tested-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to '')
-rw-r--r--arch/arm/configs/pxa_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index dc5517eaf09f..a016ecc0084b 100644
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -26,8 +26,6 @@ CONFIG_PARTITION_ADVANCED=y
CONFIG_LDM_PARTITION=y
CONFIG_CMDLINE_PARTITION=y
CONFIG_ARCH_PXA=y
-CONFIG_MACH_PXA27X_DT=y
-CONFIG_MACH_PXA3XX_DT=y
CONFIG_ARCH_LUBBOCK=y
CONFIG_MACH_MAINSTONE=y
CONFIG_MACH_ZYLONITE300=y