git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branches 'asoc/topic/rockchip', 'asoc/topic/rt5514', 'asoc...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6sx-udoo-neo.dtsi
diff --git
a/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
b/arch/arm/boot/dts/imx6sx-udoo-neo.dtsi
index 49f466fe0b1dc2eecdaca3e6638dd80a12029bcd..dcfc9759143375decd12bea87ad5e7547837f3bd 100644
(file)
--- 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>;