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 'davinci-fixes-for-v4.13' 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 72c5a9f64ca8499fe83a11bdbb17c1c95c4206c6..94567eb178759c18162c276baa4ba481f903c064 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
@@
-109,8
+109,8
@@
status = "okay";
pinctrl-0 = <&pwm_ao_a_3_pins>, <&pwm_ao_b_pins>;
pinctrl-names = "default";
- clocks = <&
clkc CLKID_FCLK_DIV4
>;
- clock-names = "clkin0";
+ clocks = <&
xtal> , <&xtal
>;
+ clock-names = "clkin0"
, "clkin1"
;
};
&pwm_ef {