| Message ID | 20200129210602.14521-3-offougajoris@gmail.com |
|---|---|
| State | Accepted |
| Commit | b3ebcc76872829c11a505738ca63e0b44f653404 |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [V2,1/4] warp7: Fix the pmic_get() parameter in the DM case | expand |
On Wed, Jan 29, 2020 at 6:06 PM Joris Offouga <offougajoris@gmail.com> wrote: > > These nodes are not in upstream kernel, so move these in u-boot.dtsi > > Signed-off-by: Joris Offouga <offougajoris@gmail.com> Reviewed-by: Fabio Estevam <festevam@gmail.com>
> These nodes are not in upstream kernel, so move these in u-boot.dtsi > Signed-off-by: Joris Offouga <offougajoris@gmail.com> > Reviewed-by: Fabio Estevam <festevam@gmail.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi b/arch/arm/dts/imx7s-warp-u-boot.dtsi new file mode 100644 index 0000000000..6319840b1c --- /dev/null +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -0,0 +1,10 @@ +/ { + aliases { + mmc0 = &usdhc3; + usb0 = &usbotg1; + }; + + chosen { + stdout-path = &uart1; + }; +}; diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts index db5ef67eb1..f7ba2c0a24 100644 --- a/arch/arm/dts/imx7s-warp.dts +++ b/arch/arm/dts/imx7s-warp.dts @@ -17,15 +17,6 @@ reg = <0x80000000 0x20000000>; }; - aliases { - mmc0 = &usdhc3; - usb0 = &usbotg1; - }; - - chosen { - stdout-path = &uart1; - }; - gpio-keys { compatible = "gpio-keys"; pinctrl-0 = <&pinctrl_gpio>;
These nodes are not in upstream kernel, so move these in u-boot.dtsi Signed-off-by: Joris Offouga <offougajoris@gmail.com> --- changes v1->v2: fix stdoutpath in to stdout-path add commit log arch/arm/dts/imx7s-warp-u-boot.dtsi | 10 ++++++++++ arch/arm/dts/imx7s-warp.dts | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 arch/arm/dts/imx7s-warp-u-boot.dtsi