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

Commit 81026581 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek into next/dt 

Merge "ARM: mediatek: arm64 updates for v4.2" from Matthias Brugger:

- dts: mt8173: fix style convention for pinctrl node
- dts: mt8173: fix indentation for some nodes

* tag 'v4.1-next-arm64' of https://github.com/mbgg/linux-mediatek:
  arm64: dts: mt8173: fix some indentation
  arm64: dts: mt8173: Fixup pinctrl nodes
parents 63cb275e e881ad1b

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

+22 −19
Original line number Diff line number Diff line
@@ -106,14 +106,13 @@ 
		compatible = "simple-bus";

		ranges;



		syscfg_pctl_a: syscfg_pctl_a@10005000 {

			compatible = "mediatek,mt8173-pctl-a-syscfg", "syscon";

			reg = <0 0x10005000 0 0x1000>;

		};



		pio: pinctrl@0x10005000 {

		/*

		 * Pinctrl access register at 0x10005000 through regmap.

		 * Register 0x1000b000 is used by EINT.

		 */

		pio: pinctrl@10005000 {

			compatible = "mediatek,mt8173-pinctrl";

			reg = <0 0x1000B000 0 0x1000>;

			reg = <0 0x1000b000 0 0x1000>;

			mediatek,pctl-regmap = <&syscfg_pctl_a>;

			pins-are-numbered;

			gpio-controller;
@@ -125,6 +124,11 @@ 
				     <GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;

		};



		syscfg_pctl_a: syscfg_pctl_a@10005000 {

			compatible = "mediatek,mt8173-pctl-a-syscfg", "syscon";

			reg = <0 0x10005000 0 0x1000>;

		};



		sysirq: intpol-controller@10200620 {

			compatible = "mediatek,mt8173-sysirq",

				     "mediatek,mt6577-sysirq";
@@ -183,6 +187,5 @@ 
			status = "disabled";

		};

	};



};