Skip to content

Commit e942661

Browse files
committed
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
2 parents 6f92120 + 1c08036 commit e942661

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

arch/arm/boot/dts/mt7623.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
7373
<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>,
7474
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
75+
clock-frequency = <13000000>;
76+
arm,cpu-registers-not-fw-configured;
7577
};
7678

7779
watchdog: watchdog@10007000 {

arch/arm64/boot/dts/mediatek/mt8173-evb.dts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,9 @@
134134
bus-width = <8>;
135135
max-frequency = <50000000>;
136136
cap-mmc-highspeed;
137+
mediatek,hs200-cmd-int-delay=<26>;
138+
mediatek,hs400-cmd-int-delay=<14>;
139+
mediatek,hs400-cmd-resp-sel-rising;
137140
vmmc-supply = <&mt6397_vemc_3v3_reg>;
138141
vqmmc-supply = <&mt6397_vio18_reg>;
139142
non-removable;

0 commit comments

Comments
 (0)