diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-10 16:51:17 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-09-10 16:51:17 +0200 |
commit | 8146856b0a2693d5f7334f720c9b39a987f7571d (patch) | |
tree | e51fd6831162103d32e8a2ad83bf4077768a51b2 /arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | |
parent | 16cfacc8085782dab8e365979356ce1ca87fd6cc (diff) | |
parent | ff42df49e75f053a8a6b4c2533100cdcc23afe69 (diff) |
Merge tag 'kvm-ppc-next-5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc into HEAD
PPC KVM update for 5.4
- Some prep for extending the uses of the rmap array
- Various minor fixes
- Commits from the powerpc topic/ppc-kvm branch, which fix a problem
with interrupts arriving after free_irq, causing host hangs and crashes.
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-14x14-evk.dtsi')
-rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi index cbe61b61a212..c2a9dd57e56a 100644 --- a/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi +++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dtsi @@ -112,7 +112,7 @@ }; &i2c2 { - clock_frequency = <100000>; + clock-frequency = <100000>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; |