diff options
| author | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-07-18 11:31:37 -0400 |
| commit | 0de815356474912ef5bef9a69f0327a5a93bb2c2 (patch) | |
| tree | 92db8fda09396081f58a0c5fb182e72fbc3fdd50 /arch/arm/dts | |
| parent | 9a06eb800c1bdc68aa81fcad6d4f404e12dfff33 (diff) | |
| parent | bf88d2b023063a0c46d7617a4f6897d5d561662d (diff) | |
Merge branch '2019-07-17-master-imports'
- Various FS/disk related fixes with security implications.
- Proper fix for the pci_ep test.
- Assorted bugfixes
- Some MediaTek updates.
- 'env erase' support.
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/mt7629-rfb.dts | 1 | ||||
| -rw-r--r-- | arch/arm/dts/mt7629.dtsi | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/dts/mt7629-rfb.dts b/arch/arm/dts/mt7629-rfb.dts index 4612218a1e..08c3b59222 100644 --- a/arch/arm/dts/mt7629-rfb.dts +++ b/arch/arm/dts/mt7629-rfb.dts @@ -18,7 +18,6 @@ chosen { stdout-path = &uart0; - tick-timer = &timer0; }; }; diff --git a/arch/arm/dts/mt7629.dtsi b/arch/arm/dts/mt7629.dtsi index c87115e0fe..ecbd29d7ae 100644 --- a/arch/arm/dts/mt7629.dtsi +++ b/arch/arm/dts/mt7629.dtsi @@ -82,8 +82,8 @@ compatible = "mediatek,timer"; reg = <0x10004000 0x80>; interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_LOW>; - clocks = <&topckgen CLK_TOP_10M_SEL>, - <&topckgen CLK_TOP_CLKXTAL_D4>; + clocks = <&topckgen CLK_TOP_CLKXTAL_D4>, + <&topckgen CLK_TOP_10M_SEL>; clock-names = "mux", "src"; u-boot,dm-pre-reloc; }; |