Unverified Commit 79668653 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.2-next-dts64' of... 

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

mt7986:
- add USB host support
- add support for mmc, pcie
- add support for Bananpi R3

mt8173:
- switch to SMC watchdog for Acer Chromebook R13
- move panel under aux bus

mt8183:
- support detachable keyboards on kukui based Chromebooks
- describe 13 MHz clock correctly
- complete CPU cache information

mt8186:
- Add pm-domains, iommu, dsi
- describe 13 MHz clock correctly
- complete CPU cache information
- add crypto support for the eMMC
- add audio controler, DPI and ADSP mailbox support
- describe CPUs as a single cluster

mt8192:
- describe 13 MHz clock correctly
- complete CPU cache information
- enable display regulators, backlight, internal display and audio on
  Acer Chromebook 514
- describe CPUs as a single cluster

mt8195:
- Add power domain to t-phy
- describe 13 MHz clock correctly
- complete CPU cache information
- enable audio for Acer Chromebook Spin 513
- add ethernet support for the demo board
- add JPG enconder and decoder device
- describe CPUs as a single cluster

Smaller changes for mt6795, mt7622, mt8516 and mt6358.

* tag 'v6.2-next-dts64' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: (58 commits)
  arm64: dts: mediatek: mt8516: Fix the watchdog node name
  arm64: dts: mediatek: mt7986: Fix watchdog compatible
  arm64: dts: mediatek: mt8195: Fix watchdog compatible
  arm64: dts: mediatek: mt8186: Fix watchdog compatible
  arm64: dts: mt8173-elm: Switch to SMC watchdog
  arm64: dts: mediatek: mt7622: Add missing pwm-cells to pwm node
  arm64: dts: mt8192: Change idle states names to reflect actual function
  arm64: dts: mt8186: Change idle states names to reflect actual function
  arm64: dts: mt8195: Change idle states names to reflect actual function
  arm64: dts: mt8186: Fix CPU map for single-cluster SoC
  arm64: dts: mt8192: Fix CPU map for single-cluster SoC
  arm64: dts: mt8195: Fix CPU map for single-cluster SoC
  arm64: dts: mt8195: add jpeg decode device node
  arm64: dts: mt8195: add jpeg encode device node
  arm64: dts: mediatek: mt8183: drop double interrupts
  arm64: dts: mediatek: mt7622: drop serial clock-names
  arm64: dts: mt8195: Add efuse node to mt8195
  arm64: dts: mt8183: jacuzzi: Move panel under aux-bus
  arm64: dts: mediatek: mt8173-elm: Move display to ps8640 auxiliary bus
  arm64: dts: mt8195: Add Ethernet controller
  ...

Link: https://lore.kernel.org/r/2eefe6d4-6ca3-dc5f-6a04-f4f3c49692dd@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 195631f7 6bbd1241

Documentation/devicetree/bindings/arm/mediatek.yaml

+4 −0
Original line number Diff line number Diff line
@@ -244,6 +244,10 @@ properties: 
          - enum:

              - mediatek,mt8183-pumpkin

          - const: mediatek,mt8183

      - items:

          - enum:

              - mediatek,mt8365-evk

          - const: mediatek,mt8365

      - items:

          - enum:

              - mediatek,mt8516-pumpkin

arch/arm64/boot/dts/mediatek/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-evb.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtbo

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd.dtbo

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb

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

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

+0 −1
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ pio: pinctrl@1000b000 { 
		compatible = "mediatek,mt2712-pinctrl";

		reg = <0 0x1000b000 0 0x1000>;

		mediatek,pctl-regmap = <&syscfg_pctl_a>;

		pins-are-numbered;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-controller;

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

+3 −3
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include <dt-bindings/input/input.h>



&pwrap {

	pmic: mt6358 {

	pmic: pmic {

		compatible = "mediatek,mt6358";

		interrupt-controller;

		interrupt-parent = <&pio>;
@@ -355,11 +355,11 @@ mt6358_vsim2_reg: ldo_vsim2 { 
			};

		};



		mt6358rtc: mt6358rtc {

		mt6358rtc: rtc {

			compatible = "mediatek,mt6358-rtc";

		};



		mt6358keys: mt6358keys {

		mt6358keys: keys {

			compatible = "mediatek,mt6358-keys";

			power {

				linux,keycodes = <KEY_POWER>;

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

+50 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ cpu1: cpu@1 { 
			enable-method = "psci";

			reg = <0x001>;

			cci-control-port = <&cci_control2>;

			i-cache-size = <32768>;

			i-cache-line-size = <64>;

			i-cache-sets = <256>;

			d-cache-size = <32768>;

			d-cache-line-size = <64>;

			d-cache-sets = <128>;

			next-level-cache = <&l2_0>;

		};
@@ -49,6 +55,12 @@ cpu2: cpu@2 { 
			enable-method = "psci";

			reg = <0x002>;

			cci-control-port = <&cci_control2>;

			i-cache-size = <32768>;

			i-cache-line-size = <64>;

			i-cache-sets = <256>;

			d-cache-size = <32768>;

			d-cache-line-size = <64>;

			d-cache-sets = <128>;

			next-level-cache = <&l2_0>;

		};
@@ -58,6 +70,12 @@ cpu3: cpu@3 { 
			enable-method = "psci";

			reg = <0x003>;

			cci-control-port = <&cci_control2>;

			i-cache-size = <32768>;

			i-cache-line-size = <64>;

			i-cache-sets = <256>;

			d-cache-size = <32768>;

			d-cache-line-size = <64>;

			d-cache-sets = <128>;

			next-level-cache = <&l2_0>;

		};
@@ -67,6 +85,12 @@ cpu4: cpu@100 { 
			enable-method = "psci";

			reg = <0x100>;

			cci-control-port = <&cci_control1>;

			i-cache-size = <32768>;

			i-cache-line-size = <64>;

			i-cache-sets = <256>;

			d-cache-size = <32768>;

			d-cache-line-size = <64>;

			d-cache-sets = <128>;

			next-level-cache = <&l2_1>;

		};
@@ -76,6 +100,12 @@ cpu5: cpu@101 { 
			enable-method = "psci";

			reg = <0x101>;

			cci-control-port = <&cci_control1>;

			i-cache-size = <32768>;

			i-cache-line-size = <64>;

			i-cache-sets = <256>;

			d-cache-size = <32768>;

			d-cache-line-size = <64>;

			d-cache-sets = <128>;

			next-level-cache = <&l2_1>;

		};
@@ -85,6 +115,12 @@ cpu6: cpu@102 { 
			enable-method = "psci";

			reg = <0x102>;

			cci-control-port = <&cci_control1>;

			i-cache-size = <32768>;

			i-cache-line-size = <64>;

			i-cache-sets = <256>;

			d-cache-size = <32768>;

			d-cache-line-size = <64>;

			d-cache-sets = <128>;

			next-level-cache = <&l2_1>;

		};
@@ -94,6 +130,12 @@ cpu7: cpu@103 { 
			enable-method = "psci";

			reg = <0x103>;

			cci-control-port = <&cci_control1>;

			i-cache-size = <32768>;

			i-cache-line-size = <64>;

			i-cache-sets = <256>;

			d-cache-size = <32768>;

			d-cache-line-size = <64>;

			d-cache-sets = <128>;

			next-level-cache = <&l2_1>;

		};
@@ -138,11 +180,19 @@ core3 { 
		l2_0: l2-cache0 {

			compatible = "cache";

			cache-level = <2>;

			cache-size = <1048576>;

			cache-line-size = <64>;

			cache-sets = <1024>;

			cache-unified;

		};



		l2_1: l2-cache1 {

			compatible = "cache";

			cache-level = <2>;

			cache-size = <1048576>;

			cache-line-size = <64>;

			cache-sets = <1024>;

			cache-unified;

		};

	};