Commit 81026581 authored by Arnd Bergmann's avatar Arnd Bergmann

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
...@@ -106,14 +106,13 @@ soc { ...@@ -106,14 +106,13 @@ soc {
compatible = "simple-bus"; compatible = "simple-bus";
ranges; ranges;
syscfg_pctl_a: syscfg_pctl_a@10005000 { /*
compatible = "mediatek,mt8173-pctl-a-syscfg", "syscon"; * Pinctrl access register at 0x10005000 through regmap.
reg = <0 0x10005000 0 0x1000>; * Register 0x1000b000 is used by EINT.
}; */
pio: pinctrl@10005000 {
pio: pinctrl@0x10005000 {
compatible = "mediatek,mt8173-pinctrl"; compatible = "mediatek,mt8173-pinctrl";
reg = <0 0x1000B000 0 0x1000>; reg = <0 0x1000b000 0 0x1000>;
mediatek,pctl-regmap = <&syscfg_pctl_a>; mediatek,pctl-regmap = <&syscfg_pctl_a>;
pins-are-numbered; pins-are-numbered;
gpio-controller; gpio-controller;
...@@ -125,6 +124,11 @@ pio: pinctrl@0x10005000 { ...@@ -125,6 +124,11 @@ pio: pinctrl@0x10005000 {
<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>; <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 { sysirq: intpol-controller@10200620 {
compatible = "mediatek,mt8173-sysirq", compatible = "mediatek,mt8173-sysirq",
"mediatek,mt6577-sysirq"; "mediatek,mt6577-sysirq";
...@@ -183,6 +187,5 @@ uart3: serial@11005000 { ...@@ -183,6 +187,5 @@ uart3: serial@11005000 {
status = "disabled"; status = "disabled";
}; };
}; };
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment