Commit 622a380d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

MT2712:
- replace deprecated compatible for the usb PHY

MT6797:
- switch to SPDX identifier
- add and enable I2C device for x20 development board
- add I2C compatible to the binding description

MT7622:
- add Wi-Fi device and enable it for the Bananpi-R64

MT8173:
- add CPU capacities based on Dhryston benchmark
- fix DT build warnings
- set throtteling range to limitless
- add Elm and Hana devices on which several chromebooks are based
- add Global Command Queue entries to the users

MT8183:
- split cpuidle states in two as the clusters have different target residencies

* tag 'v5.7-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm64: dts: mt8173: Add capacity-dmips-mhz attributes
  arm64: dts: mt2712: use non-empty ranges for usb-phy
  arm64: dts: mt8173: fix mdp aliases property name
  arm64: dts: mediatek: Switch to SPDX license identifier for MT6797 SoC
  arm64: dts: mediatek: Enable I2C support for 96Boards X20 Development board
  arm64: dts: mediatek: Add I2C support for MT6797 SoC
  dt-bindings: i2c: Document I2C controller binding for MT6797 SoC
  arm64: dts: mt8173: fix cooling device range
  arm64: dts: mediatek: add mt8173 elm and hana board
  arm64: dts: mt8173: fix unit name warnings
  arm64: dts: mt8173: add uart aliases
  dt-bindings: arm64: dts: mediatek: Add mt8173 elm and hana
  arm64: dts: mt8183: adjust cpuidle target residency
  arm64: dts: mt8173: Add gce setting in mmsys and display node
  arm64: dts: mt7622: add built-in Wi-Fi device nodes

Link: https://lore.kernel.org/r/2794a8db-c14f-ac34-9e28-9f3700db6c4c@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 409b6294 f0e5405b

Documentation/devicetree/bindings/arm/mediatek.yaml

+22 −0
Original line number Diff line number Diff line
@@ -84,6 +84,28 @@ properties: 
          - enum:

              - mediatek,mt8135-evbp1

          - const: mediatek,mt8135

      - description: Google Elm (Acer Chromebook R13)

        items:

          - const: google,elm-rev8

          - const: google,elm-rev7

          - const: google,elm-rev6

          - const: google,elm-rev5

          - const: google,elm-rev4

          - const: google,elm-rev3

          - const: google,elm

          - const: mediatek,mt8173

      - description: Google Hana (Lenovo Chromebook N23 Yoga, C330, 300e,...)

        items:

          - const: google,hana-rev6

          - const: google,hana-rev5

          - const: google,hana-rev4

          - const: google,hana-rev3

          - const: google,hana

          - const: mediatek,mt8173

      - description: Google Hana rev7 (Poin2 Chromebook 11C)

        items:

          - const: google,hana-rev7

          - const: mediatek,mt8173

      - items:

          - enum:

              - mediatek,mt8173-evb

Documentation/devicetree/bindings/i2c/i2c-mt65xx.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Required properties: 
      "mediatek,mt2712-i2c": for MediaTek MT2712

      "mediatek,mt6577-i2c": for MediaTek MT6577

      "mediatek,mt6589-i2c": for MediaTek MT6589

      "mediatek,mt6797-i2c", "mediatek,mt6577-i2c": for MediaTek MT6797

      "mediatek,mt7622-i2c": for MediaTek MT7622

      "mediatek,mt7623-i2c", "mediatek,mt6577-i2c": for MediaTek MT7623

      "mediatek,mt7629-i2c", "mediatek,mt2712-i2c": for MediaTek MT7629

arch/arm64/boot/dts/mediatek/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 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) += mt8173-elm.dtb

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) += mt8516-pumpkin.dtb

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

+22 −20
Original line number Diff line number Diff line
@@ -703,30 +703,31 @@ 
	};



	u3phy0: usb-phy@11290000 {

		compatible = "mediatek,mt2712-u3phy";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		compatible = "mediatek,mt2712-tphy",

			     "mediatek,generic-tphy-v2";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0 0x11290000 0x9000>;

		status = "okay";



		u2port0: usb-phy@11290000 {

			reg = <0 0x11290000 0 0x700>;

		u2port0: usb-phy@0 {

			reg = <0x0 0x700>;

			clocks = <&clk26m>;

			clock-names = "ref";

			#phy-cells = <1>;

			status = "okay";

		};



		u2port1: usb-phy@11298000 {

			reg = <0 0x11298000 0 0x700>;

		u2port1: usb-phy@8000 {

			reg = <0x8000 0x700>;

			clocks = <&clk26m>;

			clock-names = "ref";

			#phy-cells = <1>;

			status = "okay";

		};



		u3port0: usb-phy@11298700 {

			reg = <0 0x11298700 0 0x900>;

		u3port0: usb-phy@8700 {

			reg = <0x8700 0x900>;

			clocks = <&clk26m>;

			clock-names = "ref";

			#phy-cells = <1>;
@@ -766,30 +767,31 @@ 
	};



	u3phy1: usb-phy@112e0000 {

		compatible = "mediatek,mt2712-u3phy";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;

		compatible = "mediatek,mt2712-tphy",

			     "mediatek,generic-tphy-v2";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges = <0 0 0x112e0000 0x9000>;

		status = "okay";



		u2port2: usb-phy@112e0000 {

			reg = <0 0x112e0000 0 0x700>;

		u2port2: usb-phy@0 {

			reg = <0x0 0x700>;

			clocks = <&clk26m>;

			clock-names = "ref";

			#phy-cells = <1>;

			status = "okay";

		};



		u2port3: usb-phy@112e8000 {

			reg = <0 0x112e8000 0 0x700>;

		u2port3: usb-phy@8000 {

			reg = <0x8000 0x700>;

			clocks = <&clk26m>;

			clock-names = "ref";

			#phy-cells = <1>;

			status = "okay";

		};



		u3port1: usb-phy@112e8700 {

			reg = <0 0x112e8700 0 0x900>;

		u3port1: usb-phy@8700 {

			reg = <0x8700 0x900>;

			clocks = <&clk26m>;

			clock-names = "ref";

			#phy-cells = <1>;

arch/arm64/boot/dts/mediatek/mt6797-x20-dev.dts

+49 −0
Original line number Diff line number Diff line
@@ -28,6 +28,55 @@ 
	};

};



/* HDMI */

&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c1_pins_a>;

	status = "okay";

};



/* HS - I2C2 */

&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c2_pins_a>;

	status = "okay";

};



/* HS - I2C3 */

&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c3_pins_a>;

	status = "okay";

};



/* LS - I2C0 */

&i2c4 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c4_pins_a>;

	status = "okay";

};



/* LS - I2C1 */

&i2c5 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c5_pins_a>;

	status = "okay";

};



/* POWER_VPROC */

&i2c6 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c6_pins_a>;

	status = "okay";

};



/* FAN53555 */

&i2c7 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c7_pins_a>;

	status = "okay";

};



&uart1 {

	status = "okay";

	pinctrl-names = "default";

CRA Git | Maintained and supported by SUSTech CRA and CCSE