Message ID | 20190905075501.11225-2-lukma@denx.de |
---|---|
State | Accepted |
Commit | f1e323a0a58e6d6b60456bf8e8565f628f33b88c |
Delegated to: | Stefano Babic |
Headers | show |
Series | imx: mxs: Fixes and DM/DTS conversion code for several i.MX28 drivers | expand |
diff --git a/arch/arm/dts/imx28-u-boot.dtsi b/arch/arm/dts/imx28-u-boot.dtsi index d545b402a7..9db72a6be3 100644 --- a/arch/arm/dts/imx28-u-boot.dtsi +++ b/arch/arm/dts/imx28-u-boot.dtsi @@ -5,7 +5,6 @@ * * SPDX-License-Identifier: GPL-2.0+ or X11 */ -#include "imx28.dtsi" &gpio0 { gpio-ranges = <&pinctrl 0 0 29>;
After this change it is possible to use imx28-<board>-u-boot.dtsi with the imx28-u-boot.dtsi explicitly included without breaking setup from imx28-<board>.dts file. The problem is that the imx28.dtsi included in a wrong place overrides the changes made in imx28-<board>.dts. As a result some devices are "disabled" in the final DTB. Signed-off-by: Lukasz Majewski <lukma@denx.de> --- Changes in v3: None Changes in v2: None arch/arm/dts/imx28-u-boot.dtsi | 1 - 1 file changed, 1 deletion(-)