diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2017-08-22 15:37:31 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2017-08-22 15:37:31 -0700 |
| commit | 4db26f83a7a1f8b844e4543cd82a87bee1d224e2 (patch) | |
| tree | 260f68e5671b902344f8b568a45bd6df645b5bcb /arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | |
| parent | b16c71c9f6ff50d4e4398cefd9113d82ee2fe8e6 (diff) | |
| parent | aae4e7a8bc44722fe70d58920a36916b1043195e (diff) | |
Merge tag 'v4.13-rc4' into v4.14/dt64
Linux 4.13-rc4
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 |
1 files changed, 2 insertions, 2 deletions
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 a7cf54da4806..edc512ad0bac 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -172,8 +172,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 { |