Unverified Commit 261a910d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.14-next-dts64' of... 

Merge tag 'v5.14-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt

MT8173:
- Add regulator for MFG_ASYNC power domain
- Use alias for MMC to get fixed numbers

MT8183:
- Use alia for MMC to get fixed numbers
- Add optional event number for Global Comman Engine

* tag 'v5.14-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  dt-bindings: mediatek: Add optional mediatek,gce-events property
  arm64: dts: mt8183: add mediatek,gce-events in mutex
  arm64: dts: mediatek: mt8173: Add domain supply for mfg_async
  arm64: dts: mt8173: elm: Use aliases to mmc nodes
  arm64: dts: mt8183: kukui: Use aliases to mmc nodes

Link: https://lore.kernel.org/r/26c4026a-9f26-d5a3-c30f-439120a4eaa0@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents eaf05c1f ce5db043

Documentation/devicetree/bindings/mailbox/mtk-gce.txt

+15 −0
Original line number Diff line number Diff line
@@ -35,6 +35,10 @@ Optional properties for a client device: 
  start_offset: the start offset of register address that GCE can access.

  size: the total size of register address that GCE can access.



Optional properties for a client mutex node:

- mediatek,gce-events: GCE events used by clients. The event numbers are

  defined in 'dt-bindings/gce/<chip>-gce.h'.



Some vaules of properties are defined in 'dt-bindings/gce/mt8173-gce.h',

'dt-binding/gce/mt8183-gce.h' or 'dt-bindings/gce/mt6779-gce.h'. Such as

sub-system ids, thread priority, event ids.
@@ -62,3 +66,14 @@ Example for a client device: 
					  <&gce SUBSYS_1401XXXX 0x2000 0x100>;

		...

	};



Example for a client mutex node:

	mutex: mutex@14020000 {

		compatible = "mediatek,mt8173-disp-mutex";

		reg = <0 0x14020000 0 0x1000>;

		interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_LOW>;

		power-domains = <&scpsys MT8173_POWER_DOMAIN_MM>;

		clocks = <&mmsys CLK_MM_MUTEX_32K>;

		mediatek,gce-events = <CMDQ_EVENT_MUTEX0_STREAM_EOF>,

				      <CMDQ_EVENT_MUTEX1_STREAM_EOF>;

	};

arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi

+10 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ 
#include "mt8173.dtsi"



/ {

	aliases {

		mmc0 = &mmc0;

		mmc1 = &mmc1;

		mmc2 = &mmc3;

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x80000000>;
@@ -157,6 +163,10 @@ 
	};

};



&mfg_async {

	domain-supply = <&da9211_vgpu_reg>;

};



&cec {

	status = "okay";

};

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

+4 −0
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ 
	};

};



&mfg_async {

	domain-supply = <&da9211_vgpu_reg>;

};



&cec {

	status = "okay";

};

arch/arm64/boot/dts/mediatek/mt8173.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ 
					reg = <MT8173_POWER_DOMAIN_USB>;

					#power-domain-cells = <0>;

				};

				power-domain@MT8173_POWER_DOMAIN_MFG_ASYNC {

				mfg_async: power-domain@MT8173_POWER_DOMAIN_MFG_ASYNC {

					reg = <MT8173_POWER_DOMAIN_MFG_ASYNC>;

					clocks = <&clk26m>;

					clock-names = "mfg";

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
/ {

	aliases {

		serial0 = &uart0;

		mmc0 = &mmc0;

		mmc1 = &mmc1;

	};



	chosen {