diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-08 11:51:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-08 11:51:28 +0200 |
| commit | 946e0f6ffcaa614012d646f4cf84efdd62628c8b (patch) | |
| tree | 37d31fd748f98ec4fb7897997a2745228bf0c2da /arch/arm/boot/dts/vf610-colibri.dtsi | |
| parent | x86/extable: Ensure entries are swapped completely when sorting (diff) | |
| parent | Linux 4.7-rc6 (diff) | |
| download | linux-946e0f6ffcaa614012d646f4cf84efdd62628c8b.tar.xz linux-946e0f6ffcaa614012d646f4cf84efdd62628c8b.zip | |
Merge tag 'v4.7-rc6' into x86/mm, to merge fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/vf610-colibri.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/vf610-colibri.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vf610-colibri.dtsi b/arch/arm/boot/dts/vf610-colibri.dtsi index ab4a29f95593..9ec9e337f5a8 100644 --- a/arch/arm/boot/dts/vf610-colibri.dtsi +++ b/arch/arm/boot/dts/vf610-colibri.dtsi @@ -50,3 +50,8 @@ reg = <0x80000000 0x10000000>; }; }; + +&nfc { + assigned-clocks = <&clks VF610_CLK_NFC>; + assigned-clock-rates = <50000000>; +}; |