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 'for-linus-5.3-2' of git://github.com/cminyard/linux-ipmi
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
imx6ull-colibri.dtsi
diff --git
a/arch/arm/boot/dts/imx6ull-colibri.dtsi
b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index 9ad1da15976835cc57294ae0ac93df37098748f9..d56728f03c35fb7ed377e41c6b481bbd35595674 100644
(file)
--- a/
arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/
arch/arm/boot/dts/imx6ull-colibri.dtsi
@@
-545,6
+545,12
@@
>;
};
+ pinctrl_snvs_usdhc1_sleep_cd: snvs-usdhc1-cd-grp-slp {
+ fsl,pins = <
+ MX6ULL_PAD_SNVS_TAMPER0__GPIO5_IO00 0x0
+ >;
+ };
+
pinctrl_snvs_wifi_pdn: snvs-wifi-pdn-grp {
fsl,pins = <
MX6ULL_PAD_BOOT_MODE1__GPIO5_IO11 0x14