tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+22
-19
+22
-19
arch/arm64/boot/dts/mediatek/mt8173.dtsi
+22
-19
arch/arm64/boot/dts/mediatek/mt8173.dtsi
···
91
91
compatible = "arm,armv8-timer";
92
92
interrupt-parent = <&gic>;
93
93
interrupts = <GIC_PPI 13
94
-
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
94
+
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
95
95
<GIC_PPI 14
96
-
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
96
+
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
97
97
<GIC_PPI 11
98
-
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
98
+
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
99
99
<GIC_PPI 10
100
-
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
100
+
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
101
101
};
102
102
103
103
soc {
···
106
106
compatible = "simple-bus";
107
107
ranges;
108
108
109
-
syscfg_pctl_a: syscfg_pctl_a@10005000 {
110
-
compatible = "mediatek,mt8173-pctl-a-syscfg", "syscon";
111
-
reg = <0 0x10005000 0 0x1000>;
112
-
};
113
-
114
-
pio: pinctrl@0x10005000 {
109
+
/*
110
+
* Pinctrl access register at 0x10005000 through regmap.
111
+
* Register 0x1000b000 is used by EINT.
112
+
*/
113
+
pio: pinctrl@10005000 {
115
114
compatible = "mediatek,mt8173-pinctrl";
116
-
reg = <0 0x1000B000 0 0x1000>;
115
+
reg = <0 0x1000b000 0 0x1000>;
117
116
mediatek,pctl-regmap = <&syscfg_pctl_a>;
118
117
pins-are-numbered;
119
118
gpio-controller;
···
120
121
interrupt-controller;
121
122
#interrupt-cells = <2>;
122
123
interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
123
-
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
124
-
<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
124
+
<GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
125
+
<GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
126
+
};
127
+
128
+
syscfg_pctl_a: syscfg_pctl_a@10005000 {
129
+
compatible = "mediatek,mt8173-pctl-a-syscfg", "syscon";
130
+
reg = <0 0x10005000 0 0x1000>;
125
131
};
126
132
127
133
sysirq: intpol-controller@10200620 {
128
134
compatible = "mediatek,mt8173-sysirq",
129
-
"mediatek,mt6577-sysirq";
135
+
"mediatek,mt6577-sysirq";
130
136
interrupt-controller;
131
137
#interrupt-cells = <3>;
132
138
interrupt-parent = <&gic>;
···
153
149
154
150
uart0: serial@11002000 {
155
151
compatible = "mediatek,mt8173-uart",
156
-
"mediatek,mt6577-uart";
152
+
"mediatek,mt6577-uart";
157
153
reg = <0 0x11002000 0 0x400>;
158
154
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_LOW>;
159
155
clocks = <&uart_clk>;
···
162
158
163
159
uart1: serial@11003000 {
164
160
compatible = "mediatek,mt8173-uart",
165
-
"mediatek,mt6577-uart";
161
+
"mediatek,mt6577-uart";
166
162
reg = <0 0x11003000 0 0x400>;
167
163
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_LOW>;
168
164
clocks = <&uart_clk>;
···
171
167
172
168
uart2: serial@11004000 {
173
169
compatible = "mediatek,mt8173-uart",
174
-
"mediatek,mt6577-uart";
170
+
"mediatek,mt6577-uart";
175
171
reg = <0 0x11004000 0 0x400>;
176
172
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_LOW>;
177
173
clocks = <&uart_clk>;
···
180
176
181
177
uart3: serial@11005000 {
182
178
compatible = "mediatek,mt8173-uart",
183
-
"mediatek,mt6577-uart";
179
+
"mediatek,mt6577-uart";
184
180
reg = <0 0x11005000 0 0x400>;
185
181
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>;
186
182
clocks = <&uart_clk>;
187
183
status = "disabled";
188
184
};
189
185
};
190
-
191
186
};
192
187