diff options
| author | Olof Johansson <olof@lixom.net> | 2017-03-21 17:29:50 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-03-21 17:29:50 -0700 |
| commit | fe64ccb2f539defc662523b61eae69fd184afde0 (patch) | |
| tree | aab552757d10e57d33979e891ccd592554feca89 | |
| parent | 42d5d460ada7d59e96d5f65497166ff3662eb7ea (diff) | |
| parent | 12aff99723901bcc0e2a6a34343a4f62c371fdd9 (diff) | |
| download | vfio-ccw-fe64ccb2f539defc662523b61eae69fd184afde0.tar.gz | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi index 49f466fe0b1dc2..dcfc9759143375 100644 --- a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi +++ b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi @@ -121,11 +121,6 @@ }; }; -&cpu0 { - arm-supply = <&sw1a_reg>; - soc-supply = <&sw1c_reg>; -}; - &fec1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1>; |