diff options
author | Murali Karicheri | 2019-12-09 12:02:41 -0600 |
---|---|---|
committer | Murali Karicheri | 2019-12-10 15:09:52 -0600 |
commit | 8e7ad5c94d872f6fc312b35036707133ccffa4ee (patch) | |
tree | 5a85eb959c110e93c8d3a9456cd90feca70aa9e7 | |
parent | d84fa63717b40d21a6d162a426d544ecdfe9841d (diff) | |
download | processor-sdk-u-boot-8e7ad5c94d872f6fc312b35036707133ccffa4ee.tar.gz processor-sdk-u-boot-8e7ad5c94d872f6fc312b35036707133ccffa4ee.tar.xz processor-sdk-u-boot-8e7ad5c94d872f6fc312b35036707133ccffa4ee.zip |
Revert "arm: dts: k3-am654: add support for interposer card."
This reverts commit cfe135d1cbd939b192e6ab1958cd61b6327e1934.
-rw-r--r-- | arch/arm/dts/k3-am654-base-board-u-boot.dtsi | 5 | ||||
-rw-r--r-- | arch/arm/dts/k3-am654-idk.dtso | 137 |
2 files changed, 112 insertions, 30 deletions
diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi index 29ba8fc4ef..b62940df27 100644 --- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi +++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi | |||
@@ -496,7 +496,10 @@ | |||
496 | 496 | ||
497 | &msmc_ram { | 497 | &msmc_ram { |
498 | icssg0_sram: icssg0-sram@40000 { | 498 | icssg0_sram: icssg0-sram@40000 { |
499 | reg = <0x40000 0x20000>; | 499 | reg = <0x40000 0x10000>; |
500 | }; | ||
501 | icssg1_sram: icssg1-sram@50000 { | ||
502 | reg = <0x50000 0x10000>; | ||
500 | }; | 503 | }; |
501 | icssg2_sram: icssg2-sram@60000 { | 504 | icssg2_sram: icssg2-sram@60000 { |
502 | reg = <0x60000 0x10000>; | 505 | reg = <0x60000 0x10000>; |
diff --git a/arch/arm/dts/k3-am654-idk.dtso b/arch/arm/dts/k3-am654-idk.dtso index c149eb497d..eaf1363c4d 100644 --- a/arch/arm/dts/k3-am654-idk.dtso +++ b/arch/arm/dts/k3-am654-idk.dtso | |||
@@ -20,54 +20,47 @@ | |||
20 | __overlay__ { | 20 | __overlay__ { |
21 | aliases { | 21 | aliases { |
22 | ethernet2 = &pruss0_eth; | 22 | ethernet2 = &pruss0_eth; |
23 | ethernet3 = &pruss1_eth; | ||
23 | }; | 24 | }; |
24 | 25 | ||
25 | /* Dual Ethernet application node on PRU-ICSSG0 */ | 26 | /* Dual Ethernet application node on PRU-ICSSG0 */ |
26 | pruss0_eth: pruss0_eth { | 27 | pruss0_eth: pruss0_eth { |
27 | compatible = "ti,am654-dualicssg-prueth"; | 28 | compatible = "ti,am654-icssg-prueth"; |
28 | pinctrl-names = "default"; | 29 | pinctrl-names = "default"; |
29 | pinctrl-0 = <&icssg01_rgmii_pins_default>; | 30 | pinctrl-0 = <&icssg0_rgmii_pins_default>; |
30 | sram = <&icssg0_sram>; | 31 | sram = <&icssg0_sram>; |
31 | clocks = <&k3_clks 62 3>, <&k3_clks 63 3>; | 32 | clocks = <&k3_clks 62 3>; |
32 | clock-names = "mdio_fck", "mdio1_fck"; | 33 | clock-names = "mdio_fck"; |
33 | 34 | ||
34 | prus = <&pru0_0>, <&rtu0_0>, <&pru0_1>, <&rtu0_1>, <&pru1_0>, <&rtu1_0>, <&pru1_1>, <&rtu1_1>; | 35 | prus = <&pru0_0>, <&rtu0_0>, <&pru0_1>, <&rtu0_1>; |
35 | firmware-name = "ti-pruss/am65x-pru0-prueth-fw.elf", | 36 | firmware-name = "ti-pruss/am65x-pru0-prueth-fw.elf", |
36 | "ti-pruss/am65x-rtu0-prueth-fw.elf", | 37 | "ti-pruss/am65x-rtu0-prueth-fw.elf", |
37 | "ti-pruss/am65x-pru1-prueth-fw.elf", | 38 | "ti-pruss/am65x-pru1-prueth-fw.elf", |
38 | "ti-pruss/am65x-rtu1-prueth-fw.elf", | ||
39 | "ti-pruss/am65x-pru0-prueth-fw.elf", | ||
40 | "ti-pruss/am65x-rtu0-prueth-fw.elf", | ||
41 | "ti-pruss/am65x-pru1-prueth-fw.elf", | ||
42 | "ti-pruss/am65x-rtu1-prueth-fw.elf"; | 39 | "ti-pruss/am65x-rtu1-prueth-fw.elf"; |
43 | mii-g-rt = <&icssg0_mii_g_rt>; | 40 | mii-g-rt = <&icssg0_mii_g_rt>; |
44 | mii-g-rt-paired = <&icssg1_mii_g_rt>; | ||
45 | dma-coherent; | 41 | dma-coherent; |
46 | dmas = <&mcu_udmap &icssg0 4 UDMA_DIR_TX>, /* egress icssg0 slice 1 */ | 42 | dmas = <&mcu_udmap &icssg0 0 UDMA_DIR_TX>, /* egress slice 0 */ |
47 | <&mcu_udmap &icssg0 5 UDMA_DIR_TX>, /* egress icssg0 slice 1 */ | 43 | <&mcu_udmap &icssg0 1 UDMA_DIR_TX>, /* egress slice 0 */ |
48 | <&mcu_udmap &icssg0 6 UDMA_DIR_TX>, /* egress icssg0 slice 1 */ | 44 | <&mcu_udmap &icssg0 2 UDMA_DIR_TX>, /* egress slice 0 */ |
49 | <&mcu_udmap &icssg0 7 UDMA_DIR_TX>, /* egress icssg0 mgmnt cmd slice 1 */ | 45 | <&mcu_udmap &icssg0 3 UDMA_DIR_TX>, /* egress slice 0 */ |
50 | 46 | <&mcu_udmap &icssg0 4 UDMA_DIR_TX>, /* egress slice 1 */ | |
51 | <&mcu_udmap &icssg0 0 UDMA_DIR_RX>, /* ingress icssg0 slice 0 */ | 47 | <&mcu_udmap &icssg0 5 UDMA_DIR_TX>, /* egress slice 1 */ |
52 | <&mcu_udmap &icssg0 2 UDMA_DIR_RX>, /* ingress icssg0 mgmnt resp slice 0 */ | 48 | <&mcu_udmap &icssg0 6 UDMA_DIR_TX>, /* egress slice 1 */ |
53 | 49 | <&mcu_udmap &icssg0 7 UDMA_DIR_TX>, /* egress slice 1 */ | |
54 | <&mcu_udmap &icssg1 4 UDMA_DIR_TX>, /* egress icssg1 slice 1 */ | ||
55 | <&mcu_udmap &icssg1 5 UDMA_DIR_TX>, /* egress icssg1 slice 1 */ | ||
56 | <&mcu_udmap &icssg1 6 UDMA_DIR_TX>, /* egress icssg1 slice 1 */ | ||
57 | <&mcu_udmap &icssg1 7 UDMA_DIR_TX>, /* egress icssg1 mgmnt cmd slice 1 */ | ||
58 | 50 | ||
59 | 51 | <&mcu_udmap &icssg0 0 UDMA_DIR_RX>, /* ingress slice 0 */ | |
60 | <&mcu_udmap &icssg1 0 UDMA_DIR_RX>, /* ingress icssg1 slice 0 */ | 52 | <&mcu_udmap &icssg0 1 UDMA_DIR_RX>, /* ingress slice 1 */ |
61 | <&mcu_udmap &icssg1 2 UDMA_DIR_RX>; /* ingress icssg1 mgmnt resp slice 0 */ | 53 | <&mcu_udmap &icssg0 2 UDMA_DIR_RX>, /* mgmnt rsp slice 0 */ |
54 | <&mcu_udmap &icssg0 3 UDMA_DIR_RX>; /* mgmnt rsp slice 1 */ | ||
62 | dma-names = "tx0-0", "tx0-1", "tx0-2", "tx0-3", | 55 | dma-names = "tx0-0", "tx0-1", "tx0-2", "tx0-3", |
63 | "rx0", "rxmgm0", | ||
64 | "tx1-0", "tx1-1", "tx1-2", "tx1-3", | 56 | "tx1-0", "tx1-1", "tx1-2", "tx1-3", |
65 | "rx1", "rxmgm1"; | 57 | "rx0", "rx1", |
58 | "rxmgm0", "rxmgm1"; | ||
66 | 59 | ||
67 | pruss0_emac0: ethernet-mii0 { | 60 | pruss0_emac0: ethernet-mii0 { |
68 | phy-handle = <&pruss0_eth0_phy>; | 61 | phy-handle = <&pruss0_eth0_phy>; |
69 | phy-mode = "rgmii-rxid"; | 62 | phy-mode = "rgmii-rxid"; |
70 | syscon-rgmii-delay = <&scm_conf 0x4114>; | 63 | syscon-rgmii-delay = <&scm_conf 0x4100>; |
71 | /* Filled in by bootloader */ | 64 | /* Filled in by bootloader */ |
72 | local-mac-address = [00 00 00 00 00 00]; | 65 | local-mac-address = [00 00 00 00 00 00]; |
73 | }; | 66 | }; |
@@ -86,6 +79,61 @@ | |||
86 | */ | 79 | */ |
87 | }; | 80 | }; |
88 | 81 | ||
82 | /* Dual Ethernet application node on PRU-ICSSG1 */ | ||
83 | pruss1_eth: pruss1_eth { | ||
84 | compatible = "ti,am654-icssg-prueth"; | ||
85 | pinctrl-names = "default"; | ||
86 | pinctrl-0 = <&icssg1_rgmii_pins_default>; | ||
87 | sram = <&icssg1_sram>; | ||
88 | clocks = <&k3_clks 63 3>; | ||
89 | clock-names = "mdio_fck"; | ||
90 | |||
91 | prus = <&pru1_0>, <&rtu1_0>, <&pru1_1>, <&rtu1_1>; | ||
92 | firmware-name = "ti-pruss/am65x-pru0-prueth-fw.elf", | ||
93 | "ti-pruss/am65x-rtu0-prueth-fw.elf", | ||
94 | "ti-pruss/am65x-pru1-prueth-fw.elf", | ||
95 | "ti-pruss/am65x-rtu1-prueth-fw.elf"; | ||
96 | mii-g-rt = <&icssg1_mii_g_rt>; | ||
97 | dma-coherent; | ||
98 | dmas = <&mcu_udmap &icssg1 0 UDMA_DIR_TX>, /* egress slice 0 */ | ||
99 | <&mcu_udmap &icssg1 1 UDMA_DIR_TX>, /* egress slice 0 */ | ||
100 | <&mcu_udmap &icssg1 2 UDMA_DIR_TX>, /* egress slice 0 */ | ||
101 | <&mcu_udmap &icssg1 3 UDMA_DIR_TX>, /* egress slice 0 */ | ||
102 | <&mcu_udmap &icssg1 4 UDMA_DIR_TX>, /* egress slice 1 */ | ||
103 | <&mcu_udmap &icssg1 5 UDMA_DIR_TX>, /* egress slice 1 */ | ||
104 | <&mcu_udmap &icssg1 6 UDMA_DIR_TX>, /* egress slice 1 */ | ||
105 | <&mcu_udmap &icssg1 7 UDMA_DIR_TX>, /* egress slice 1 */ | ||
106 | |||
107 | <&mcu_udmap &icssg1 0 UDMA_DIR_RX>, /* ingress slice 0 */ | ||
108 | <&mcu_udmap &icssg1 1 UDMA_DIR_RX>, /* ingress slice 1 */ | ||
109 | <&mcu_udmap &icssg1 2 UDMA_DIR_RX>, /* mgmnt rsp slice 0 */ | ||
110 | <&mcu_udmap &icssg1 3 UDMA_DIR_RX>; /* mgmnt rsp slice 1 */ | ||
111 | dma-names = "tx0-0", "tx0-1", "tx0-2", "tx0-3", | ||
112 | "tx1-0", "tx1-1", "tx1-2", "tx1-3", | ||
113 | "rx0", "rx1", | ||
114 | "rxmgm0", "rxmgm1"; | ||
115 | |||
116 | pruss1_emac0: ethernet-mii0 { | ||
117 | phy-handle = <&pruss1_eth0_phy>; | ||
118 | phy-mode = "rgmii-rxid"; | ||
119 | syscon-rgmii-delay = <&scm_conf 0x4110>; | ||
120 | /* Filled in by bootloader */ | ||
121 | local-mac-address = [00 00 00 00 00 00]; | ||
122 | }; | ||
123 | |||
124 | /* | ||
125 | * Commenting out the second mii interface as the framework | ||
126 | * supports one interface in a single probe | ||
127 | * So either mii1 or mii2 can be used. In case mii1 is needed | ||
128 | * uncomment mii1 and comment out mii0 | ||
129 | pruss1_emac1: ethernet-mii1 { | ||
130 | phy-handle = <&pruss1_eth1_phy>; | ||
131 | phy-mode = "rgmii-rxid"; | ||
132 | syscon-rgmii-delay = <&scm_conf 0x4114>; | ||
133 | local-mac-address = [00 00 00 00 00 00]; | ||
134 | }; | ||
135 | */ | ||
136 | }; | ||
89 | }; | 137 | }; |
90 | }; | 138 | }; |
91 | }; | 139 | }; |
@@ -98,7 +146,7 @@ | |||
98 | >; | 146 | >; |
99 | }; | 147 | }; |
100 | 148 | ||
101 | icssg01_rgmii_pins_default: icssg01_rgmii_pins_default { | 149 | icssg0_rgmii_pins_default: icssg0_rgmii_pins_default { |
102 | pinctrl-single,pins = < | 150 | pinctrl-single,pins = < |
103 | AM65X_IOPAD(0x0244, PIN_INPUT, 2) /* (AB28) PRG0_PRU1_GPO0.PRG0_RGMII2_RD0 */ | 151 | AM65X_IOPAD(0x0244, PIN_INPUT, 2) /* (AB28) PRG0_PRU1_GPO0.PRG0_RGMII2_RD0 */ |
104 | AM65X_IOPAD(0x0248, PIN_INPUT, 2) /* (AC28) PRG0_PRU1_GPO1.PRG0_RGMII2_RD1 */ | 152 | AM65X_IOPAD(0x0248, PIN_INPUT, 2) /* (AC28) PRG0_PRU1_GPO1.PRG0_RGMII2_RD1 */ |
@@ -128,7 +176,18 @@ | |||
128 | /* HACK As there is no driver for mdio */ | 176 | /* HACK As there is no driver for mdio */ |
129 | AM65X_IOPAD(0x0294, PIN_INPUT , 0) /* (AE26) PRG0_MDIO0_MDIO */ | 177 | AM65X_IOPAD(0x0294, PIN_INPUT , 0) /* (AE26) PRG0_MDIO0_MDIO */ |
130 | AM65X_IOPAD(0x0298, PIN_OUTPUT , 0) /* (AE28) PRG0_MDIO0_MDC */ | 178 | AM65X_IOPAD(0x0298, PIN_OUTPUT , 0) /* (AE28) PRG0_MDIO0_MDC */ |
179 | >; | ||
180 | }; | ||
131 | 181 | ||
182 | icssg1_mdio_pins_default: icssg1_mdio_pins_default { | ||
183 | pinctrl-single,pins = < | ||
184 | AM65X_IOPAD(0x0180, PIN_INPUT, 0) /* (AD18) PRG1_MDIO0_MDIO */ | ||
185 | AM65X_IOPAD(0x0184, PIN_OUTPUT, 0) /* (AH18) PRG1_MDIO0_MDC */ | ||
186 | >; | ||
187 | }; | ||
188 | |||
189 | icssg1_rgmii_pins_default: icssg1_rgmii_pins_default { | ||
190 | pinctrl-single,pins = < | ||
132 | AM65X_IOPAD(0x0130, PIN_INPUT, 2) /* (AH24) PRG1_PRU1_GPO0.PRG1_RGMII2_RD0 */ | 191 | AM65X_IOPAD(0x0130, PIN_INPUT, 2) /* (AH24) PRG1_PRU1_GPO0.PRG1_RGMII2_RD0 */ |
133 | AM65X_IOPAD(0x0134, PIN_INPUT, 2) /* (AH23) PRG1_PRU1_GPO1.PRG1_RGMII2_RD1 */ | 192 | AM65X_IOPAD(0x0134, PIN_INPUT, 2) /* (AH23) PRG1_PRU1_GPO1.PRG1_RGMII2_RD1 */ |
134 | AM65X_IOPAD(0x0138, PIN_INPUT, 2) /* (AG21) PRG1_PRU1_GPO2.PRG1_RGMII2_RD2 */ | 193 | AM65X_IOPAD(0x0138, PIN_INPUT, 2) /* (AG21) PRG1_PRU1_GPO2.PRG1_RGMII2_RD2 */ |
@@ -209,3 +268,23 @@ | |||
209 | ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; | 268 | ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; |
210 | }; | 269 | }; |
211 | }; | 270 | }; |
271 | |||
272 | &icssg1_mdio { | ||
273 | status = "okay"; | ||
274 | pinctrl-names = "default"; | ||
275 | pinctrl-0 = <&icssg1_mdio_pins_default>; | ||
276 | #address-cells = <1>; | ||
277 | #size-cells = <0>; | ||
278 | |||
279 | pruss1_eth0_phy: ethernet-phy@0 { | ||
280 | reg = <0>; | ||
281 | ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>; | ||
282 | ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; | ||
283 | }; | ||
284 | |||
285 | pruss1_eth1_phy: ethernet-phy@3 { | ||
286 | reg = <3>; | ||
287 | ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>; | ||
288 | ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; | ||
289 | }; | ||
290 | }; | ||