Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 369291a4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

mt8183:
- fix pwrap interrupt number
- add i2c notes

dt-bindings:
- add compatible for mt6779
- add mt6779 uart and sysirq compatible

* tag 'v5.3-next-dts64' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  dt-bindings: irq: mtk, sysirq: add support for mt6779
  dt-bindings: mtk-uart: add mt6779 uart bindings
  dt-bindings: mediatek: add support for mt6779 reference board
  arm64: dts: mt8183: add I2C nodes
  arm64: dts: mt8183: fix pwrap gic number

Link: https://lore.kernel.org/r/def8fb77-fce4-097d-7ae2-8c4670bc09c1@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 90104e2b 7b07a7a4

Documentation/devicetree/bindings/arm/mediatek.yaml

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

              - mediatek,mt6765-evb

          - const: mediatek,mt6765

      - items:

          - enum:

              - mediatek,mt6779-evb

          - const: mediatek,mt6779

      - items:

          - enum:

              - mediatek,mt6795-evb

Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ Required properties: 
	"mediatek,mt7629-sysirq", "mediatek,mt6577-sysirq": for MT7629

	"mediatek,mt6795-sysirq", "mediatek,mt6577-sysirq": for MT6795

	"mediatek,mt6797-sysirq", "mediatek,mt6577-sysirq": for MT6797

	"mediatek,mt6779-sysirq", "mediatek,mt6577-sysirq": for MT6779

	"mediatek,mt6765-sysirq", "mediatek,mt6577-sysirq": for MT6765

	"mediatek,mt6755-sysirq", "mediatek,mt6577-sysirq": for MT6755

	"mediatek,mt6592-sysirq", "mediatek,mt6577-sysirq": for MT6592

Documentation/devicetree/bindings/serial/mtk-uart.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
  * "mediatek,mt6589-uart" for MT6589 compatible UARTS

  * "mediatek,mt6755-uart" for MT6755 compatible UARTS

  * "mediatek,mt6765-uart" for MT6765 compatible UARTS

  * "mediatek,mt6779-uart" for MT6779 compatible UARTS

  * "mediatek,mt6795-uart" for MT6795 compatible UARTS

  * "mediatek,mt6797-uart" for MT6797 compatible UARTS

  * "mediatek,mt7622-uart" for MT7622 compatible UARTS

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

+96 −0
Original line number Diff line number Diff line
@@ -30,7 +30,103 @@ 
	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c_pins_0>;

	status = "okay";

	clock-frequency = <100000>;

};



&i2c1 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c_pins_1>;

	status = "okay";

	clock-frequency = <100000>;

};



&i2c2 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c_pins_2>;

	status = "okay";

	clock-frequency = <100000>;

};



&i2c3 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c_pins_3>;

	status = "okay";

	clock-frequency = <100000>;

};



&i2c4 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c_pins_4>;

	status = "okay";

	clock-frequency = <1000000>;

};



&i2c5 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c_pins_5>;

	status = "okay";

	clock-frequency = <1000000>;

};



&pio {

	i2c_pins_0: i2c0{

		pins_i2c{

			pinmux = <PINMUX_GPIO82__FUNC_SDA0>,

				 <PINMUX_GPIO83__FUNC_SCL0>;

			mediatek,pull-up-adv = <3>;

			mediatek,drive-strength-adv = <00>;

		};

	};



	i2c_pins_1: i2c1{

		pins_i2c{

			pinmux = <PINMUX_GPIO81__FUNC_SDA1>,

				 <PINMUX_GPIO84__FUNC_SCL1>;

			mediatek,pull-up-adv = <3>;

			mediatek,drive-strength-adv = <00>;

		};

	};



	i2c_pins_2: i2c2{

		pins_i2c{

			pinmux = <PINMUX_GPIO103__FUNC_SCL2>,

				 <PINMUX_GPIO104__FUNC_SDA2>;

			mediatek,pull-up-adv = <3>;

			mediatek,drive-strength-adv = <00>;

		};

	};



	i2c_pins_3: i2c3{

		pins_i2c{

			pinmux = <PINMUX_GPIO50__FUNC_SCL3>,

				 <PINMUX_GPIO51__FUNC_SDA3>;

			mediatek,pull-up-adv = <3>;

			mediatek,drive-strength-adv = <00>;

		};

	};



	i2c_pins_4: i2c4{

		pins_i2c{

			pinmux = <PINMUX_GPIO105__FUNC_SCL4>,

				 <PINMUX_GPIO106__FUNC_SDA4>;

			mediatek,pull-up-adv = <3>;

			mediatek,drive-strength-adv = <00>;

		};

	};



	i2c_pins_5: i2c5{

		pins_i2c{

			pinmux = <PINMUX_GPIO48__FUNC_SCL5>,

				 <PINMUX_GPIO49__FUNC_SDA5>;

			mediatek,pull-up-adv = <3>;

			mediatek,drive-strength-adv = <00>;

		};

	};



	spi_pins_0: spi0{

		pins_spi{

			pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,

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

+190 −1
Original line number Diff line number Diff line
@@ -16,6 +16,21 @@ 
	#address-cells = <2>;

	#size-cells = <2>;



	aliases {

		i2c0 = &i2c0;

		i2c1 = &i2c1;

		i2c2 = &i2c2;

		i2c3 = &i2c3;

		i2c4 = &i2c4;

		i2c5 = &i2c5;

		i2c6 = &i2c6;

		i2c7 = &i2c7;

		i2c8 = &i2c8;

		i2c9 = &i2c9;

		i2c10 = &i2c10;

		i2c11 = &i2c11;

	};



	cpus {

		#address-cells = <1>;

		#size-cells = <0>;
@@ -248,7 +263,7 @@ 
			compatible = "mediatek,mt8183-pwrap";

			reg = <0 0x1000d000 0 0x1000>;

			reg-names = "pwrap";

			interrupts = <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>;

			interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&topckgen CLK_TOP_MUX_PMICSPI>,

				 <&infracfg CLK_INFRA_PMIC_AP>;

			clock-names = "spi", "wrap";
@@ -294,6 +309,64 @@ 
			status = "disabled";

		};



		i2c6: i2c@11005000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11005000 0 0x1000>,

			      <0 0x11000600 0 0x80>;

			interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C6>,

				 <&infracfg CLK_INFRA_AP_DMA>;

			clock-names = "main", "dma";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		i2c0: i2c@11007000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11007000 0 0x1000>,

			      <0 0x11000080 0 0x80>;

			interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C0>,

				 <&infracfg CLK_INFRA_AP_DMA>;

			clock-names = "main", "dma";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		i2c4: i2c@11008000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11008000 0 0x1000>,

			      <0 0x11000100 0 0x80>;

			interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C1>,

				 <&infracfg CLK_INFRA_AP_DMA>,

				 <&infracfg CLK_INFRA_I2C1_ARBITER>;

			clock-names = "main", "dma","arb";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		i2c2: i2c@11009000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11009000 0 0x1000>,

			      <0 0x11000280 0 0x80>;

			interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C2>,

				 <&infracfg CLK_INFRA_AP_DMA>,

				 <&infracfg CLK_INFRA_I2C2_ARBITER>;

			clock-names = "main", "dma", "arb";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		spi0: spi@1100a000 {

			compatible = "mediatek,mt8183-spi";

			#address-cells = <1>;
@@ -307,6 +380,20 @@ 
			status = "disabled";

		};



		i2c3: i2c@1100f000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x1100f000 0 0x1000>,

			      <0 0x11000400 0 0x80>;

			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C3>,

				 <&infracfg CLK_INFRA_AP_DMA>;

			clock-names = "main", "dma";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		spi1: spi@11010000 {

			compatible = "mediatek,mt8183-spi";

			#address-cells = <1>;
@@ -320,6 +407,20 @@ 
			status = "disabled";

		};



		i2c1: i2c@11011000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11011000 0 0x1000>,

			      <0 0x11000480 0 0x80>;

			interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C4>,

				 <&infracfg CLK_INFRA_AP_DMA>;

			clock-names = "main", "dma";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		spi2: spi@11012000 {

			compatible = "mediatek,mt8183-spi";

			#address-cells = <1>;
@@ -346,6 +447,66 @@ 
			status = "disabled";

		};



		i2c9: i2c@11014000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11014000 0 0x1000>,

			      <0 0x11000180 0 0x80>;

			interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C1_IMM>,

				 <&infracfg CLK_INFRA_AP_DMA>,

				 <&infracfg CLK_INFRA_I2C1_ARBITER>;

			clock-names = "main", "dma", "arb";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		i2c10: i2c@11015000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11015000 0 0x1000>,

			      <0 0x11000300 0 0x80>;

			interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C2_IMM>,

				 <&infracfg CLK_INFRA_AP_DMA>,

				 <&infracfg CLK_INFRA_I2C2_ARBITER>;

			clock-names = "main", "dma", "arb";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		i2c5: i2c@11016000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11016000 0 0x1000>,

			      <0 0x11000500 0 0x80>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C5>,

				 <&infracfg CLK_INFRA_AP_DMA>,

				 <&infracfg CLK_INFRA_I2C5_ARBITER>;

			clock-names = "main", "dma", "arb";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		i2c11: i2c@11017000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x11017000 0 0x1000>,

			      <0 0x11000580 0 0x80>;

			interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C5_IMM>,

				 <&infracfg CLK_INFRA_AP_DMA>,

				 <&infracfg CLK_INFRA_I2C5_ARBITER>;

			clock-names = "main", "dma", "arb";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		spi4: spi@11018000 {

			compatible = "mediatek,mt8183-spi";

			#address-cells = <1>;
@@ -372,6 +533,34 @@ 
			status = "disabled";

		};



		i2c7: i2c@1101a000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x1101a000 0 0x1000>,

			      <0 0x11000680 0 0x80>;

			interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C7>,

				 <&infracfg CLK_INFRA_AP_DMA>;

			clock-names = "main", "dma";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		i2c8: i2c@1101b000 {

			compatible = "mediatek,mt8183-i2c";

			reg = <0 0x1101b000 0 0x1000>,

			      <0 0x11000700 0 0x80>;

			interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_LOW>;

			clocks = <&infracfg CLK_INFRA_I2C8>,

				 <&infracfg CLK_INFRA_AP_DMA>;

			clock-names = "main", "dma";

			clock-div = <1>;

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		audiosys: syscon@11220000 {

			compatible = "mediatek,mt8183-audiosys", "syscon";

			reg = <0 0x11220000 0 0x1000>;