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 tag 'imx-fixes-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6-logicpd-baseboard.dtsi
diff --git
a/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
b/arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
index 2a6ce87071f9eec7709de4f39b3d571dc6201edf..9e027b9a5f91f76c1de66fc2638a3abbdb49f029 100644
(file)
--- a/
arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
+++ b/
arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi
@@
-328,6
+328,10
@@
pinctrl-0 = <&pinctrl_pwm3>;
};
+&snvs_pwrkey {
+ status = "okay";
+};
+
&ssi2 {
status = "okay";
};