Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9426611 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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
parents 6f921208 1c080365

arch/arm/boot/dts/mt7623.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -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 {

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

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,9 @@ 
	bus-width = <8>;

	max-frequency = <50000000>;

	cap-mmc-highspeed;

	mediatek,hs200-cmd-int-delay=<26>;

	mediatek,hs400-cmd-int-delay=<14>;

	mediatek,hs400-cmd-resp-sel-rising;

	vmmc-supply = <&mt6397_vemc_3v3_reg>;

	vqmmc-supply = <&mt6397_vio18_reg>;

	non-removable;