tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
xtensa: xtfpga: introduce SoC I/O bus
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+64
-53
+25
-23
arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi
+25
-23
arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi
···
1
1
/ {
2
-
flash: flash@f8000000 {
3
-
#address-cells = <1>;
4
-
#size-cells = <1>;
5
-
compatible = "cfi-flash";
6
-
reg = <0xf8000000 0x01000000>;
7
-
bank-width = <2>;
8
-
device-width = <2>;
9
-
partition@0x0 {
10
-
label = "boot loader area";
11
-
reg = <0x00000000 0x00400000>;
2
+
soc {
3
+
flash: flash@08000000 {
4
+
#address-cells = <1>;
5
+
#size-cells = <1>;
6
+
compatible = "cfi-flash";
7
+
reg = <0x08000000 0x01000000>;
8
+
bank-width = <2>;
9
+
device-width = <2>;
10
+
partition@0x0 {
11
+
label = "boot loader area";
12
+
reg = <0x00000000 0x00400000>;
13
+
};
14
+
partition@0x400000 {
15
+
label = "kernel image";
16
+
reg = <0x00400000 0x00600000>;
17
+
};
18
+
partition@0xa00000 {
19
+
label = "data";
20
+
reg = <0x00a00000 0x005e0000>;
21
+
};
22
+
partition@0xfe0000 {
23
+
label = "boot environment";
24
+
reg = <0x00fe0000 0x00020000>;
25
+
};
12
26
};
13
-
partition@0x400000 {
14
-
label = "kernel image";
15
-
reg = <0x00400000 0x00600000>;
16
-
};
17
-
partition@0xa00000 {
18
-
label = "data";
19
-
reg = <0x00a00000 0x005e0000>;
20
-
};
21
-
partition@0xfe0000 {
22
-
label = "boot environment";
23
-
reg = <0x00fe0000 0x00020000>;
24
-
};
25
-
};
27
+
};
26
28
};
+17
-15
arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi
+17
-15
arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi
···
1
1
/ {
2
-
flash: flash@f8000000 {
3
-
#address-cells = <1>;
4
-
#size-cells = <1>;
5
-
compatible = "cfi-flash";
6
-
reg = <0xf8000000 0x00400000>;
7
-
bank-width = <2>;
8
-
device-width = <2>;
9
-
partition@0x0 {
10
-
label = "boot loader area";
11
-
reg = <0x00000000 0x003f0000>;
2
+
soc {
3
+
flash: flash@08000000 {
4
+
#address-cells = <1>;
5
+
#size-cells = <1>;
6
+
compatible = "cfi-flash";
7
+
reg = <0x08000000 0x00400000>;
8
+
bank-width = <2>;
9
+
device-width = <2>;
10
+
partition@0x0 {
11
+
label = "boot loader area";
12
+
reg = <0x00000000 0x003f0000>;
13
+
};
14
+
partition@0x3f0000 {
15
+
label = "boot environment";
16
+
reg = <0x003f0000 0x00010000>;
17
+
};
12
18
};
13
-
partition@0x3f0000 {
14
-
label = "boot environment";
15
-
reg = <0x003f0000 0x00010000>;
16
-
};
17
-
};
19
+
};
18
20
};
+22
-15
arch/xtensa/boot/dts/xtfpga.dtsi
+22
-15
arch/xtensa/boot/dts/xtfpga.dtsi
···
42
42
};
43
43
};
44
44
45
-
serial0: serial@fd050020 {
46
-
device_type = "serial";
47
-
compatible = "ns16550a";
48
-
no-loopback-test;
49
-
reg = <0xfd050020 0x20>;
50
-
reg-shift = <2>;
51
-
interrupts = <0 1>; /* external irq 0 */
52
-
clocks = <&osc>;
53
-
};
45
+
soc {
46
+
#address-cells = <1>;
47
+
#size-cells = <1>;
48
+
compatible = "simple-bus";
49
+
ranges = <0x00000000 0xf0000000 0x10000000>;
54
50
55
-
enet0: ethoc@fd030000 {
56
-
compatible = "opencores,ethoc";
57
-
reg = <0xfd030000 0x4000 0xfd800000 0x4000>;
58
-
interrupts = <1 1>; /* external irq 1 */
59
-
local-mac-address = [00 50 c2 13 6f 00];
60
-
clocks = <&osc>;
51
+
serial0: serial@0d050020 {
52
+
device_type = "serial";
53
+
compatible = "ns16550a";
54
+
no-loopback-test;
55
+
reg = <0x0d050020 0x20>;
56
+
reg-shift = <2>;
57
+
interrupts = <0 1>; /* external irq 0 */
58
+
clocks = <&osc>;
59
+
};
60
+
61
+
enet0: ethoc@0d030000 {
62
+
compatible = "opencores,ethoc";
63
+
reg = <0x0d030000 0x4000 0x0d800000 0x4000>;
64
+
interrupts = <1 1>; /* external irq 1 */
65
+
local-mac-address = [00 50 c2 13 6f 00];
66
+
clocks = <&osc>;
67
+
};
61
68
};
62
69
};