diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-05-09 21:14:47 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-05-09 21:14:47 +0200 |
| commit | e942661130e7221d4aeac9804ff100e7516470f3 (patch) | |
| tree | 66d057c526f932e2f46defdd37f30bdcd3bdf5e8 /arch/arm/boot | |
| parent | 6f92120892d94ef6c551da5aa2cf7bc9401c9903 (diff) | |
| parent | 1c0803652d82b9a62980886e019c9f70576028a5 (diff) | |
| download | linux-e942661130e7221d4aeac9804ff100e7516470f3.tar.gz linux-e942661130e7221d4aeac9804ff100e7516470f3.tar.bz2 linux-e942661130e7221d4aeac9804ff100e7516470f3.zip | |
Merge tag 'v4.11-next-fixes' of https://github.com/mbgg/linux-mediatek into fixes
Pull "DTS fixes" from Matthias Brugger:
- mt8173: fix mmc parameters
- set timer frequency explicitly and force the driver to set it
* tag 'v4.11-next-fixes' of https://github.com/mbgg/linux-mediatek:
ARM64: dts: mediatek: configure some fixed mmc parameters
arm: dts: mt7623: add clock-frequency to the a7 timer node to mt7623.dtsi
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/mt7623.dtsi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi index 402579ab70d2..3a9e9b6aea68 100644 --- a/arch/arm/boot/dts/mt7623.dtsi +++ b/arch/arm/boot/dts/mt7623.dtsi @@ -72,6 +72,8 @@ <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>, <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; + clock-frequency = <13000000>; + arm,cpu-registers-not-fw-configured; }; watchdog: watchdog@10007000 { |