Skip to content

Commit 94224c2

Browse files
arndbarndb
committed
Merge tag 'actions-arm64-dt-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions into arm/dt
Actions ARM64 DT changes for v5.1: - Add interrupt properties to S900 pinctrl node - Add Reset controller support for S700 - Add Reset controller support for S900 - Add pinctrl support for S700 - Add I2C support for S700 - Enable I2C0 and I2C1 for s700-cubieboard7 * tag 'actions-arm64-dt-for-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions: arm64: dts: actions: s700-cubieboard7: Enable I2C0 and I2C1 arm64: dts: actions: s700: Add I2C controller nodes arm64: dts: actions: Add pinctrl node for Actions Semi S700 arm64: dts: actions: Add Reset Controller support for S900 SoC arm64: dts: actions: Add Reset Controller support for S700 SoC arm64: dts: actions: Add interrupt properties to pinctrl node for S900 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 0d6367c + 9175a81 commit 94224c2

File tree

3 files changed

+121
-0
lines changed

3 files changed

+121
-0
lines changed

‎arch/arm64/boot/dts/actions/s700-cubieboard7.dts

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,59 @@
3030
};
3131
};
3232

33+
&i2c0 {
34+
status = "okay";
35+
pinctrl-names = "default";
36+
pinctrl-0 = <&i2c0_default>;
37+
};
38+
39+
&i2c1 {
40+
status = "okay";
41+
pinctrl-names = "default";
42+
pinctrl-0 = <&i2c1_default>;
43+
};
44+
45+
&i2c2 {
46+
status = "disabled";
47+
pinctrl-names = "default";
48+
pinctrl-0 = <&i2c2_default>;
49+
};
50+
51+
&pinctrl {
52+
i2c0_default: i2c0_default {
53+
pinmux {
54+
groups = "i2c0_mfp";
55+
function = "i2c0";
56+
};
57+
pinconf {
58+
pins = "i2c0_sclk", "i2c0_sdata";
59+
bias-pull-up;
60+
};
61+
};
62+
63+
i2c1_default: i2c1_default {
64+
pinmux {
65+
groups = "i2c1_dummy";
66+
function = "i2c1";
67+
};
68+
pinconf {
69+
pins = "i2c1_sclk", "i2c1_sdata";
70+
bias-pull-up;
71+
};
72+
};
73+
74+
i2c2_default: i2c2_default {
75+
pinmux {
76+
groups = "i2c2_dummy";
77+
function = "i2c2";
78+
};
79+
pinconf {
80+
pins = "i2c2_sclk", "i2c2_sdata";
81+
bias-pull-up;
82+
};
83+
};
84+
};
85+
3386
&timer {
3487
clocks = <&hosc>;
3588
};

‎arch/arm64/boot/dts/actions/s700.dtsi

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include <dt-bindings/clock/actions,s700-cmu.h>
77
#include <dt-bindings/interrupt-controller/arm-gic.h>
8+
#include <dt-bindings/reset/actions,s700-reset.h>
89

910
/ {
1011
compatible = "actions,s700";
@@ -172,6 +173,47 @@
172173
reg = <0x0 0xe0168000 0x0 0x1000>;
173174
clocks = <&hosc>, <&losc>;
174175
#clock-cells = <1>;
176+
#reset-cells = <1>;
177+
};
178+
179+
i2c0: i2c@e0170000 {
180+
compatible = "actions,s700-i2c";
181+
reg = <0 0xe0170000 0 0x1000>;
182+
clocks = <&cmu CLK_I2C0>;
183+
interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
184+
#address-cells = <1>;
185+
#size-cells = <0>;
186+
status = "disabled";
187+
};
188+
189+
i2c1: i2c@e0174000 {
190+
compatible = "actions,s700-i2c";
191+
reg = <0 0xe0174000 0 0x1000>;
192+
clocks = <&cmu CLK_I2C1>;
193+
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
194+
#address-cells = <1>;
195+
#size-cells = <0>;
196+
status = "disabled";
197+
};
198+
199+
i2c2: i2c@e0178000 {
200+
compatible = "actions,s700-i2c";
201+
reg = <0 0xe0178000 0 0x1000>;
202+
clocks = <&cmu CLK_I2C2>;
203+
interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
204+
#address-cells = <1>;
205+
#size-cells = <0>;
206+
status = "disabled";
207+
};
208+
209+
i2c3: i2c@e017c000 {
210+
compatible = "actions,s700-i2c";
211+
reg = <0 0xe017c000 0 0x1000>;
212+
clocks = <&cmu CLK_I2C3>;
213+
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
214+
#address-cells = <1>;
215+
#size-cells = <0>;
216+
status = "disabled";
175217
};
176218

177219
sps: power-controller@e01b0100 {
@@ -186,5 +228,21 @@
186228
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
187229
interrupt-names = "timer1";
188230
};
231+
232+
pinctrl: pinctrl@e01b0000 {
233+
compatible = "actions,s700-pinctrl";
234+
reg = <0x0 0xe01b0000 0x0 0x1000>;
235+
clocks = <&cmu CLK_GPIO>;
236+
gpio-controller;
237+
gpio-ranges = <&pinctrl 0 0 136>;
238+
#gpio-cells = <2>;
239+
interrupt-controller;
240+
#interrupt-cells = <2>;
241+
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
242+
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
243+
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
244+
<GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
245+
<GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
246+
};
189247
};
190248
};

‎arch/arm64/boot/dts/actions/s900.dtsi

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
#include <dt-bindings/clock/actions,s900-cmu.h>
77
#include <dt-bindings/interrupt-controller/arm-gic.h>
8+
#include <dt-bindings/reset/actions,s900-reset.h>
89

910
/ {
1011
compatible = "actions,s900";
@@ -184,6 +185,7 @@
184185
reg = <0x0 0xe0160000 0x0 0x1000>;
185186
clocks = <&hosc>, <&losc>;
186187
#clock-cells = <1>;
188+
#reset-cells = <1>;
187189
};
188190

189191
i2c0: i2c@e0170000 {
@@ -253,6 +255,14 @@
253255
gpio-controller;
254256
gpio-ranges = <&pinctrl 0 0 146>;
255257
#gpio-cells = <2>;
258+
interrupt-controller;
259+
#interrupt-cells = <2>;
260+
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
261+
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
262+
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
263+
<GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
264+
<GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
265+
<GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
256266
};
257267

258268
timer: timer@e0228000 {

0 commit comments

Comments
 (0)