Commit 542b9f11 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

mt6779:
- add DEVAPC node to detect mallicious bus accesses
- add PMIC wrapper node

mt7622:
- add reset to mmc node

mt8183:
- fix typo in drma-fifo-size property
- refine compatible for the disp-gamma
- add phandel of PM domain to the PWM node
- add second PWM node
- add regulator to MFG power domain
- enable DSI node in kukui
- add krane sku0, which uses different panel
- fix mailbox dt-bindings include path

mt8192:
- add NOR flash node
- add PSCI based CPU idle states

mt8516:
- add node for the UART's APDMA controller

* tag 'v5.11-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm64: dts: mt8183: Fix GCE include path
  dts64: mt7622: fix slow sd card access
  dt-bindings: arm64: dts: mediatek: Add krane sku0
  arm64: dts: mt8183: Add krane-sku0 board.
  arm64: dts: mt8183: config dsi node
  arm64: dts: mt6779: Support pwrap on Mediatek MT6779 platform
  arm64: dts: mt6779: Support devapc
  arm64: dts: mt8192: Add cpu-idle-states
  arm64: dts: mediatek: mt8183: Add domain supply for mfg
  arm64: dts: mt8192: add nor_flash device node
  arm64: dts: mediatek: mt8516: add support for APDMA
  arm64: dts: mediatek: mt8183-evb: add PWM support
  arm64: dts: mediatek: mt8183: add pwm node
  arm64: dts: mt8183: Add missing power-domain for pwm0 node
  arm64: dts: mt8183: refine gamma compatible name
  arm64: dts: mt8183: rename rdma fifo size

Link: https://lore.kernel.org/r/565be0cc-460a-7d0b-47da-09bf0401e8fe@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e9cb878e 18d6e3f6

Documentation/devicetree/bindings/arm/mediatek.yaml

+3 −1
Original line number Diff line number Diff line
@@ -120,7 +120,9 @@ properties: 
          - const: mediatek,mt8183

      - description: Google Krane (Lenovo IdeaPad Duet, 10e,...)

        items:

          - const: google,krane-sku176

          - enum:

              - google,krane-sku0

              - google,krane-sku176

          - const: google,krane

          - const: mediatek,mt8183

arch/arm64/boot/dts/mediatek/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana-rev7.dtb

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

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

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku0.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku176.dtb

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

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

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

+17 −0
Original line number Diff line number Diff line
@@ -189,6 +189,23 @@ apmixed: clock-controller@1000c000 { 
			#clock-cells = <1>;

		};



		pwrap: pwrap@1000d000 {

			compatible = "mediatek,mt6779-pwrap";

			reg = <0 0x1000d000 0 0x1000>;

			reg-names = "pwrap";

			interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk26m>, <&infracfg_ao CLK_INFRA_PMIC_AP>;

			clock-names = "spi", "wrap";

		};



		devapc: devapc@10207000 {

			compatible = "mediatek,mt6779-devapc";

			reg = <0 0x10207000 0 0x1000>;

			interrupts = <GIC_SPI 168 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg_ao CLK_INFRA_DEVICE_APC>;

			clock-names = "devapc-infra-clock";

		};



		uart0: serial@11002000 {

			compatible = "mediatek,mt6779-uart",

				     "mediatek,mt6577-uart";

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

+2 −0
Original line number Diff line number Diff line
@@ -698,6 +698,8 @@ mmc1: mmc@11240000 { 
		clocks = <&pericfg CLK_PERI_MSDC30_1_PD>,

			 <&topckgen CLK_TOP_AXI_SEL>;

		clock-names = "source", "hclk";

		resets = <&pericfg MT7622_PERI_MSDC1_SW_RST>;

		reset-names = "hrst";

		status = "disabled";

	};

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

+12 −0
Original line number Diff line number Diff line
@@ -344,6 +344,12 @@ pins_spi{ 
			bias-disable;

		};

	};



	pwm_pins_1: pwm1 {

		pins_pwm {

			pinmux = <PINMUX_GPIO90__FUNC_PWM_A>;

		};

	};

};



&spi0 {
@@ -392,3 +398,9 @@ &spi5 { 
&uart0 {

	status = "okay";

};



&pwm1 {

	status = "okay";

	pinctrl-0 = <&pwm_pins_1>;

	pinctrl-names = "default";

};