Unverified Commit 79d01625 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v6.6-next-dts64.3' of... 

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

MediaTek ARM64 DTS updates for v6.7

- Add support for SMI/IOMMU/LARBs, power domains and multimedia
  related subsystems for the MT8365 SoC
- Add support for MediaTek Genio 1200 IoT evaluation board
- Add support for newer revisions of MT8192 Chromebooks
- Add support for internal eDP display on MT8195 Cherry Chromebooks
- Add display and display backlight support for the Helio X10 SoC and
  for the Sony Xperia M5 smartphone

* tag 'v6.6-next-dts64.3' of https://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: (21 commits)
  arm64: dts: mediatek: cherry: Configure eDP and internal display
  arm64: dts: mediatek: mt6795-xperia-m5: Add DSI Display and its vregs
  arm64: dts: mediatek: mt6795-xperia-m5: Add display backlight support
  arm64: dts: mediatek: mt6795: Add support for display blocks and DPI/DSI
  arm64: dts: mediatek: Add spherion-rev4
  arm64: dts: mediatek: Add hayato-rev5-sku2
  arm64: dts: mediatek: Remove asurada-audio dtsi files
  dt-bindings: arm64: dts: mediatek: Add rev4 of spherion
  dt-bindings: arm64: dts: mediatek: Add rev5-sku2 of hayato
  arm64: dts: mediatek: add iommu support for mt8365 SoC
  arm64: dts: mediatek: add larb support for mt8365 SoC
  arm64: dts: mediatek: add smi support for mt8365 SoC
  arm64: dts: mediatek: add power domain support for mt8365 SoC
  arm64: dts: mediatek: add apu support for mt8365 SoC
  arm64: dts: mediatek: add camsys support for mt8365 SoC
  arm64: dts: mediatek: add mmsys support for mt8365 SoC
  arm64: dts: mediatek: mt8183-kukui: Add PMIC regulator supplies
  arm64: dts: mediatek: add device-tree for Genio 1200 EVK board
  dt-bindings: arm64: mediatek: add mt8395-evk board
  dt-bindings: power: Add MT8365 power domains
  ...

Link: https://lore.kernel.org/r/298f159c-f80d-3ba8-fde9-b11b59e5a58e@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a8eddbe3 4055758a

Documentation/devicetree/bindings/arm/mediatek.yaml

+16 −0
Original line number Diff line number Diff line
@@ -133,11 +133,22 @@ properties: 
          - enum:

              - mediatek,mt8183-evb

          - const: mediatek,mt8183

      - description: Google Hayato rev5

        items:

          - const: google,hayato-rev5-sku2

          - const: google,hayato-sku2

          - const: google,hayato

          - const: mediatek,mt8192

      - description: Google Hayato

        items:

          - const: google,hayato-rev1

          - const: google,hayato

          - const: mediatek,mt8192

      - description: Google Spherion rev4 (Acer Chromebook 514)

        items:

          - const: google,spherion-rev4

          - const: google,spherion

          - const: mediatek,mt8192

      - description: Google Spherion (Acer Chromebook 514)

        items:

          - const: google,spherion-rev3
@@ -248,6 +259,11 @@ properties: 
          - enum:

              - mediatek,mt8365-evk

          - const: mediatek,mt8365

      - items:

          - enum:

              - mediatek,mt8395-evk

          - const: mediatek,mt8395

          - const: mediatek,mt8195

      - items:

          - enum:

              - mediatek,mt8516-pumpkin

Documentation/devicetree/bindings/power/mediatek,power-controller.yaml

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
      - mediatek,mt8188-power-controller

      - mediatek,mt8192-power-controller

      - mediatek,mt8195-power-controller

      - mediatek,mt8365-power-controller



  '#power-domain-cells':

    const: 1
@@ -88,6 +89,7 @@ $defs: 
              "include/dt-bindings/power/mediatek,mt8188-power.h" - for MT8188 type power domain.

              "include/dt-bindings/power/mt8192-power.h" - for MT8192 type power domain.

              "include/dt-bindings/power/mt8195-power.h" - for MT8195 type power domain.

              "include/dt-bindings/power/mediatek,mt8365-power.h" - for MT8365 type power domain.

        maxItems: 1



      clocks:
@@ -115,6 +117,10 @@ $defs: 
        $ref: /schemas/types.yaml#/definitions/phandle

        description: phandle to the device containing the INFRACFG register range.



      mediatek,infracfg-nao:

        $ref: /schemas/types.yaml#/definitions/phandle

        description: phandle to the device containing the INFRACFG-NAO register range.



      mediatek,smi:

        $ref: /schemas/types.yaml#/definitions/phandle

        description: phandle to the device containing the SMI register range.

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ properties: 
      - qcom,sm6125-rpmpd

      - qcom,sm6350-rpmhpd

      - qcom,sm6375-rpmpd

      - qcom,sm7150-rpmhpd

      - qcom,sm8150-rpmhpd

      - qcom,sm8250-rpmhpd

      - qcom,sm8350-rpmhpd

arch/arm64/boot/dts/mediatek/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-kukui-krane-sku176.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8183-pumpkin.dtb

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

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r1.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-hayato-r5-sku2.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r0.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8192-asurada-spherion-r4.dtb

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

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r1.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r2.dtb
@@ -53,4 +55,5 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-cherry-tomato-r3.dtb 
dtb-$(CONFIG_ARCH_MEDIATEK) += mt8195-demo.dtb

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

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8365-evk.dtb

dtb-$(CONFIG_ARCH_MEDIATEK) += mt8395-genio-1200-evk.dtb

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

arch/arm64/boot/dts/mediatek/mt6795-sony-xperia-m5.dts

+101 −0
Original line number Diff line number Diff line
@@ -22,6 +22,23 @@ aliases { 
		serial1 = &uart1;

	};



	backlight_lcd0: backlight {

		compatible = "led-backlight";

		leds = <&disp_led_pwm>, <&pmic_bl_led>;



		default-brightness-level = <300>;

	};



	led-controller-display {

		compatible = "pwm-leds";



		disp_led_pwm: led-0 {

			label = "backlight-pwm";

			pwms = <&pwm0 0 500000>;

			max-brightness = <1024>;

		};

	};



	memory@40000000 {

		device_type = "memory";

		reg = <0 0x40000000 0 0x1e800000>;
@@ -49,6 +66,65 @@ bootloader-region@46000000 { 
			no-map;

		};

	};



	vreg_disp_avdd: regulator-disp-avdd {

		compatible = "regulator-fixed";

		regulator-name = "disp_avdd";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&pio 138 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vreg_disp_avee: regulator-disp-avee {

		compatible = "regulator-fixed";

		regulator-name = "disp_avee";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&pio 139 GPIO_ACTIVE_HIGH>;

		enable-active-high;

	};



	vreg_disp_vddh: regulator-disp-vddh {

		compatible = "regulator-fixed";

		regulator-name = "disp_vddh";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

		regulator-boot-on;

	};

};



&dsi0 {

	status = "okay";

	#address-cells = <1>;

	#size-cells = <0>;



	panel: panel@0 {

		compatible = "sharp,ls060t1sx01";

		reg = <0>;

		avdd-supply = <&vreg_disp_avdd>;

		avee-supply = <&vreg_disp_avee>;

		vddi-supply = <&mt6331_vgp3_reg>;

		vddh-supply = <&vreg_disp_vddh>;

		reset-gpios = <&pio 106 GPIO_ACTIVE_LOW>;

		backlight = <&backlight_lcd0>;



		pinctrl-0 = <&disp_rst_pins>;

		pinctrl-names = "default";



		port {

			panel_in: endpoint {

				remote-endpoint = <&dsi0_out>;

			};

		};

	};



	port {

		dsi0_out: endpoint {

			remote-endpoint = <&panel_in>;

		};

	};

};



&fhctl {
@@ -163,7 +239,17 @@ &mmc2 { 
	status = "okay";

};



&mt6331_vgp3_reg {

	regulator-min-microvolt = <1800000>;

};



&pio {

	disp_rst_pins: lcm-pins {

		pins-rst {

			pinmux = <PINMUX_GPIO106__FUNC_GPIO106>;

		};

	};



	mmc0_pins_default: emmc-sdr-pins {

		pins-cmd-dat {

			pinmux = <PINMUX_GPIO154__FUNC_MSDC0_DAT0>,
@@ -338,6 +424,21 @@ &pmic { 
	 * an interrupt on the companion, so we use the MT6332 IRQ GPIO.

	 */

	interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>;



	mt6332-led {

		compatible = "mediatek,mt6332-led";

		#address-cells = <1>;

		#size-cells = <0>;



		pmic_bl_led: led@0 {

			reg = <0>;

			label = "backlight-pmic";

		};

	};

};



&pwm0 {

	status = "okay";

};



&uart0 {