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 'linux-kselftest-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm64
/
boot
/
dts
/
amlogic
/
meson-gxl-s905x-khadas-vim.dts
diff --git
a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
index edc512ad0bac3d5794d669dc0d21da6e266afda5..71a6e1ce7ad58d7827b90daff97724c9307ed770 100644
(file)
--- a/
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
+++ b/
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts
@@
-122,7
+122,9
@@
"J9 Header Pin33",
"IR In",
"HDMI CEC",
"J9 Header Pin33",
"IR In",
"HDMI CEC",
- "SYS LED";
+ "SYS LED",
+ /* GPIO_TEST_N */
+ "";
};
&pinctrl_periphs {
};
&pinctrl_periphs {
@@
-163,9
+165,7
@@
"WIFI 32K", "Bluetooth Enable",
"Bluetooth WAKE HOST",
/* Bank GPIOCLK */
"WIFI 32K", "Bluetooth Enable",
"Bluetooth WAKE HOST",
/* Bank GPIOCLK */
- "", "J9 Header Pin39",
- /* GPIO_TEST_N */
- "";
+ "", "J9 Header Pin39";
};
&pwm_AO_ab {
};
&pwm_AO_ab {