diff options
author | 2017-08-10 12:02:26 +0200 | |
---|---|---|
committer | 2017-08-10 12:02:26 +0200 | |
commit | 1ccb2f4e8e435a53bb378e8b092087f091754aa6 (patch) | |
tree | ba120509947138915e06ad39cca5f065bd99f42f /arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | |
parent | Merge tag 'perf-core-for-mingo-4.14-20170728' of git://git.kernel.org/pub/scm... (diff) | |
parent | perf/core: Fix time on IOC_ENABLE (diff) | |
download | linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.tar.gz linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.tar.bz2 linux-1ccb2f4e8e435a53bb378e8b092087f091754aa6.zip |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 72c5a9f64ca8..94567eb17875 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 @@ -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 { |