Commit 12ecf068 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

mt2712:
- add real time clock node

mt8173:
- mark arch timer invalid in suspend

mt8183:
- add CPU idle states
- add watchdog node
- add dynamic power coefficient and cooling cells for all CPUs

mt8516:
- add basic support for the SoC
- add basic support for the pumpkin board

* tag 'v5.6-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm64: dts: add RTC nodes for MT2712
  arm64: dts: mediatek: add pumpkin board dts
  arm64: dts: mediatek: add dtsi for MT8516
  arm64: dts: mt8183: Add #cooling-cells to CPU nodes
  arm64: dts: mt8183: add/update dynamic power coefficients
  arm64: dts: mediatek: rename scpsys nodes to power-controller
  amr64: dts: mt8183: Add watchdog node
  arm64: dts: mt8173: add arm,no-tick-in-suspend in timer
  arm64: dts: mt8183: Enable CPU idle-states

Link: https://lore.kernel.org/r/c512b5cb-e639-1429-64db-9c1a53378c49@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0db5ee73 836e4a2e

arch/arm64/boot/dts/mediatek/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-evb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8516-pumpkin.dtb

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

+7 −1
Original line number Diff line number Diff line
@@ -278,7 +278,7 @@ 
		interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;

	};



	scpsys: scpsys@10006000 {

	scpsys: power-controller@10006000 {

		compatible = "mediatek,mt2712-scpsys", "syscon";

		#power-domain-cells = <1>;

		reg = <0 0x10006000 0 0x1000>;
@@ -303,6 +303,12 @@ 
		status = "disabled";

	};



	rtc: rtc@10011000 {

		compatible = "mediatek,mt2712-rtc";

		reg = <0 0x10011000 0 0x1000>;

		interrupts = <GIC_SPI 239 IRQ_TYPE_LEVEL_LOW>;

	};



	spis1: spi@10013000 {

		compatible = "mediatek,mt2712-spi-slave";

		reg = <0 0x10013000 0 0x100>;

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

+1 −1
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ 
		};

	};



	scpsys: scpsys@10006000 {

	scpsys: power-controller@10006000 {

		compatible = "mediatek,mt6797-scpsys";

		#power-domain-cells = <1>;

		reg = <0 0x10006000 0 0x1000>;

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

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ 
		#reset-cells = <1>;

	};



	scpsys: scpsys@10006000 {

	scpsys: power-controller@10006000 {

		compatible = "mediatek,mt7622-scpsys",

			     "syscon";

		#power-domain-cells = <1>;

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

+2 −1
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ 
			      (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 10

			      (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;

		arm,no-tick-in-suspend;

	};



	soc {
@@ -436,7 +437,7 @@ 
			};

		};



		scpsys: scpsys@10006000 {

		scpsys: power-controller@10006000 {

			compatible = "mediatek,mt8173-scpsys";

			#power-domain-cells = <1>;

			reg = <0 0x10006000 0 0x1000>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE