Unverified Commit 82706d6f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

MT8195:
- add evaluation and demo board

MT8192:
- add new nodes: pwrap, PMIC, scp, USB, efuse, IOMMU, smi, DPI, PCIe,
  SPMI, audio system, MMC and video enconder
- add evaluation board

MT8183:
- fix dtschema issues
- update compatible for the display ambient light processor (disp-aal)
- fix dtschema warning for the pumpki board

MT8173:
- add power domains to the video enconder nodes
- add GCE support to the display mutex node

MT7622:
- specify number of DMA requests explicitely
- specify level 2 cache topology
- add SPI-NAND flash device
- fix dtschema warnings for the System Companion Processor (SCP)

* tag 'v5.18-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: (37 commits)
  arm64: dts: mt8192: Follow binding order for SCP registers
  arm64: dts: mediatek: add mtk-snfi for mt7622
  arm64: dts: mediatek: mt8195-demo: enable uart1
  arm64: dts: mediatek: mt8195-demo: Remove input-name property
  arm64: dts: mediatek: mt8183-pumpkin: fix bad thermistor node name
  arm64: dts: mt7622: specify the L2 cache topology
  arm64: dts: mt7622: specify the number of DMA requests
  arm64: dts: mediatek: pumpkin: Remove input-name property
  arm64: dts: mediatek: mt8173: Add gce-client-reg handle to disp-mutex
  arm64: dts: mediatek: Add device-tree for MT8195 Demo board
  dt-bindings: arm64: dts: mediatek: Add mt8195-demo board
  arm64: dts: Add mediatek SoC mt8195 and evaluation board
  arm64: dts: mt8192: Add mmc device nodes
  arm64: dts: mt8183: Update disp_aal node compatible
  arm64: dts: mt8192: Add audio-related nodes
  arm64: dts: mt8192: Add spmi node
  dt-bindings: arm: Add compatible for Mediatek MT8192
  arm64: dts: mt6359: add PMIC MT6359 related nodes
  arm64: dts: mediatek: mt8173: Add power domain to encoder nodes
  arm64: dts: mediatek: Get rid of mediatek, larb for MM nodes
  ...

Link: https://lore.kernel.org/r/2cd90ca7-7541-d47a-fec6-b0c64cf74fa3@gmail.com



Like the 32-bit branch, this contains an incompatible binding change
by removing the mediatek,larb properties from the dts files, so these
no longer work with kernels prior to 5.18.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 204637ec c7510476

Documentation/devicetree/bindings/arm/mediatek.yaml

+5 −0
Original line number Diff line number Diff line
@@ -133,6 +133,11 @@ properties: 
          - const: mediatek,mt8183

      - items:

          - enum:

              - mediatek,mt8192-evb

          - const: mediatek,mt8192

      - items:

          - enum:

              - mediatek,mt8195-demo

              - mediatek,mt8195-evb

          - const: mediatek,mt8195

      - description: Google Burnet (HP Chromebook x360 11MK G3 EE)

Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.yaml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ properties: 
              - mediatek,mt8135-pericfg

              - mediatek,mt8173-pericfg

              - mediatek,mt8183-pericfg

              - mediatek,mt8195-pericfg

              - mediatek,mt8516-pericfg

          - const: syscon

      - items:

arch/arm64/boot/dts/mediatek/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -38,4 +38,6 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku0.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku176.dtb

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

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

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-demo.dtb

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

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

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

+5 −5
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
	#address-cells = <2>;

	#size-cells = <2>;



	cluster0_opp: opp_table0 {

	cluster0_opp: opp-table-0 {

		compatible = "operating-points-v2";

		opp-shared;

		opp00 {
@@ -36,7 +36,7 @@ 
		};

	};



	cluster1_opp: opp_table1 {

	cluster1_opp: opp-table-1 {

		compatible = "operating-points-v2";

		opp-shared;

		opp00 {
@@ -329,8 +329,8 @@ 
		interrupts = <GIC_SPI 147 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&infracfg CLK_INFRA_M4U>;

		clock-names = "bclk";

		mediatek,larbs = <&larb0 &larb1 &larb2

				  &larb3 &larb6>;

		mediatek,larbs = <&larb0>, <&larb1>, <&larb2>,

				 <&larb3>, <&larb6>;

		#iommu-cells = <1>;

	};
@@ -346,7 +346,7 @@ 
		interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&infracfg CLK_INFRA_M4U>;

		clock-names = "bclk";

		mediatek,larbs = <&larb4 &larb5 &larb7>;

		mediatek,larbs = <&larb4>, <&larb5>, <&larb7>;

		#iommu-cells = <1>;

	};

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

0 → 100644
+298 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: (GPL-2.0 OR MIT)

/*

 * Copyright (C) 2022 MediaTek Inc.

 */



&pwrap {

	pmic: pmic {

		compatible = "mediatek,mt6359";

		interrupt-controller;

		#interrupt-cells = <2>;



		mt6359codec: mt6359codec {

		};



		regulators {

			mt6359_vs1_buck_reg: buck_vs1 {

				regulator-name = "vs1";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <2200000>;

				regulator-enable-ramp-delay = <0>;

				regulator-always-on;

			};

			mt6359_vgpu11_buck_reg: buck_vgpu11 {

				regulator-name = "vgpu11";

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1193750>;

				regulator-ramp-delay = <5000>;

				regulator-enable-ramp-delay = <200>;

				regulator-allowed-modes = <0 1 2>;

			};

			mt6359_vmodem_buck_reg: buck_vmodem {

				regulator-name = "vmodem";

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1100000>;

				regulator-ramp-delay = <10760>;

				regulator-enable-ramp-delay = <200>;

			};

			mt6359_vpu_buck_reg: buck_vpu {

				regulator-name = "vpu";

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1193750>;

				regulator-ramp-delay = <5000>;

				regulator-enable-ramp-delay = <200>;

				regulator-allowed-modes = <0 1 2>;

			};

			mt6359_vcore_buck_reg: buck_vcore {

				regulator-name = "vcore";

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1300000>;

				regulator-ramp-delay = <5000>;

				regulator-enable-ramp-delay = <200>;

				regulator-allowed-modes = <0 1 2>;

			};

			mt6359_vs2_buck_reg: buck_vs2 {

				regulator-name = "vs2";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1600000>;

				regulator-enable-ramp-delay = <0>;

				regulator-always-on;

			};

			mt6359_vpa_buck_reg: buck_vpa {

				regulator-name = "vpa";

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <3650000>;

				regulator-enable-ramp-delay = <300>;

			};

			mt6359_vproc2_buck_reg: buck_vproc2 {

				regulator-name = "vproc2";

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1193750>;

				regulator-ramp-delay = <7500>;

				regulator-enable-ramp-delay = <200>;

				regulator-allowed-modes = <0 1 2>;

			};

			mt6359_vproc1_buck_reg: buck_vproc1 {

				regulator-name = "vproc1";

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1193750>;

				regulator-ramp-delay = <7500>;

				regulator-enable-ramp-delay = <200>;

				regulator-allowed-modes = <0 1 2>;

			};

			mt6359_vcore_sshub_buck_reg: buck_vcore_sshub {

				regulator-name = "vcore_sshub";

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1193750>;

			};

			mt6359_vgpu11_sshub_buck_reg: buck_vgpu11_sshub {

				regulator-name = "vgpu11_sshub";

				regulator-min-microvolt = <400000>;

				regulator-max-microvolt = <1193750>;

			};

			mt6359_vaud18_ldo_reg: ldo_vaud18 {

				regulator-name = "vaud18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <240>;

			};

			mt6359_vsim1_ldo_reg: ldo_vsim1 {

				regulator-name = "vsim1";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <3100000>;

			};

			mt6359_vibr_ldo_reg: ldo_vibr {

				regulator-name = "vibr";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3300000>;

			};

			mt6359_vrf12_ldo_reg: ldo_vrf12 {

				regulator-name = "vrf12";

				regulator-min-microvolt = <1100000>;

				regulator-max-microvolt = <1300000>;

			};

			mt6359_vusb_ldo_reg: ldo_vusb {

				regulator-name = "vusb";

				regulator-min-microvolt = <3000000>;

				regulator-max-microvolt = <3000000>;

				regulator-enable-ramp-delay = <960>;

				regulator-always-on;

			};

			mt6359_vsram_proc2_ldo_reg: ldo_vsram_proc2 {

				regulator-name = "vsram_proc2";

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <1293750>;

				regulator-ramp-delay = <7500>;

				regulator-enable-ramp-delay = <240>;

				regulator-always-on;

			};

			mt6359_vio18_ldo_reg: ldo_vio18 {

				regulator-name = "vio18";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <1900000>;

				regulator-enable-ramp-delay = <960>;

				regulator-always-on;

			};

			mt6359_vcamio_ldo_reg: ldo_vcamio {

				regulator-name = "vcamio";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <1900000>;

			};

			mt6359_vcn18_ldo_reg: ldo_vcn18 {

				regulator-name = "vcn18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <240>;

			};

			mt6359_vfe28_ldo_reg: ldo_vfe28 {

				regulator-name = "vfe28";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-enable-ramp-delay = <120>;

			};

			mt6359_vcn13_ldo_reg: ldo_vcn13 {

				regulator-name = "vcn13";

				regulator-min-microvolt = <900000>;

				regulator-max-microvolt = <1300000>;

			};

			mt6359_vcn33_1_bt_ldo_reg: ldo_vcn33_1_bt {

				regulator-name = "vcn33_1_bt";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <3500000>;

			};

			mt6359_vcn33_1_wifi_ldo_reg: ldo_vcn33_1_wifi {

				regulator-name = "vcn33_1_wifi";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <3500000>;

			};

			mt6359_vaux18_ldo_reg: ldo_vaux18 {

				regulator-name = "vaux18";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <1800000>;

				regulator-enable-ramp-delay = <240>;

				regulator-always-on;

			};

			mt6359_vsram_others_ldo_reg: ldo_vsram_others {

				regulator-name = "vsram_others";

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <1293750>;

				regulator-ramp-delay = <5000>;

				regulator-enable-ramp-delay = <240>;

			};

			mt6359_vefuse_ldo_reg: ldo_vefuse {

				regulator-name = "vefuse";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <2000000>;

			};

			mt6359_vxo22_ldo_reg: ldo_vxo22 {

				regulator-name = "vxo22";

				regulator-min-microvolt = <1800000>;

				regulator-max-microvolt = <2200000>;

				regulator-always-on;

			};

			mt6359_vrfck_ldo_reg: ldo_vrfck {

				regulator-name = "vrfck";

				regulator-min-microvolt = <1500000>;

				regulator-max-microvolt = <1700000>;

			};

			mt6359_vrfck_1_ldo_reg: ldo_vrfck_1 {

				regulator-name = "vrfck";

				regulator-min-microvolt = <1240000>;

				regulator-max-microvolt = <1600000>;

			};

			mt6359_vbif28_ldo_reg: ldo_vbif28 {

				regulator-name = "vbif28";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

				regulator-enable-ramp-delay = <240>;

			};

			mt6359_vio28_ldo_reg: ldo_vio28 {

				regulator-name = "vio28";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};

			mt6359_vemc_ldo_reg: ldo_vemc {

				regulator-name = "vemc";

				regulator-min-microvolt = <2900000>;

				regulator-max-microvolt = <3300000>;

			};

			mt6359_vemc_1_ldo_reg: ldo_vemc_1 {

				regulator-name = "vemc";

				regulator-min-microvolt = <2500000>;

				regulator-max-microvolt = <3300000>;

			};

			mt6359_vcn33_2_bt_ldo_reg: ldo_vcn33_2_bt {

				regulator-name = "vcn33_2_bt";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <3500000>;

			};

			mt6359_vcn33_2_wifi_ldo_reg: ldo_vcn33_2_wifi {

				regulator-name = "vcn33_2_wifi";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <3500000>;

			};

			mt6359_va12_ldo_reg: ldo_va12 {

				regulator-name = "va12";

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <1300000>;

				regulator-always-on;

			};

			mt6359_va09_ldo_reg: ldo_va09 {

				regulator-name = "va09";

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <1200000>;

			};

			mt6359_vrf18_ldo_reg: ldo_vrf18 {

				regulator-name = "vrf18";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <1810000>;

			};

			mt6359_vsram_md_ldo_reg: ldo_vsram_md {

				regulator-name = "vsram_md";

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <1293750>;

				regulator-ramp-delay = <10760>;

				regulator-enable-ramp-delay = <240>;

			};

			mt6359_vufs_ldo_reg: ldo_vufs {

				regulator-name = "vufs";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <1900000>;

			};

			mt6359_vm18_ldo_reg: ldo_vm18 {

				regulator-name = "vm18";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <1900000>;

				regulator-always-on;

			};

			mt6359_vbbck_ldo_reg: ldo_vbbck {

				regulator-name = "vbbck";

				regulator-min-microvolt = <1100000>;

				regulator-max-microvolt = <1200000>;

			};

			mt6359_vsram_proc1_ldo_reg: ldo_vsram_proc1 {

				regulator-name = "vsram_proc1";

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <1293750>;

				regulator-ramp-delay = <7500>;

				regulator-enable-ramp-delay = <240>;

				regulator-always-on;

			};

			mt6359_vsim2_ldo_reg: ldo_vsim2 {

				regulator-name = "vsim2";

				regulator-min-microvolt = <1700000>;

				regulator-max-microvolt = <3100000>;

			};

			mt6359_vsram_others_sshub_ldo: ldo_vsram_others_sshub {

				regulator-name = "vsram_others_sshub";

				regulator-min-microvolt = <500000>;

				regulator-max-microvolt = <1293750>;

			};

		};



		mt6359rtc: mt6359rtc {

			compatible = "mediatek,mt6358-rtc";

		};

	};

};