Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe64ccb2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-4.11' of... 

Merge tag 'imx-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.11:
 - A fix to reboot hang seen on imx6sx-udoo-neo board, by removing
   arm-supply and soc-supply and using LDO enabled mode.

* tag 'imx-fixes-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: imx6sx-udoo-neo: Fix reboot hang

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 42d5d460 12aff997

arch/arm/boot/dts/imx6sx-udoo-neo.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -121,11 +121,6 @@ 
	};

};



&cpu0 {

	arm-supply = <&sw1a_reg>;

	soc-supply = <&sw1c_reg>;

};



&fec1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_enet1>;