diff options
author | Gou, Hongmei <h-gou@ti.com> | 2019-06-18 04:55:26 +0000 |
---|---|---|
committer | Denys Dmytriyenko <denys@ti.com> | 2019-06-19 17:44:44 +0000 |
commit | f4aa1fe59c9fb5f7a633bd61071eea97928511e3 (patch) | |
tree | 18ba6112e178a6867ecc369cd13eeb46c48718ee /recipes-kernel | |
parent | b6b6d6dbab194678bdcf9920da144b3dbc571c71 (diff) | |
download | meta-ti-f4aa1fe59c9fb5f7a633bd61071eea97928511e3.tar.gz |
ti-uio: rebase pru-uio device tree files
* Update mdio register entries to use the full address
* For AM571x, remove the entries which are available after using DT overlay
Signed-off-by: Hongmei Gou <h-gou@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-kernel')
5 files changed, 14 insertions, 26 deletions
diff --git a/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi b/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi index 4228827e..8ca11c78 100644 --- a/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi +++ b/recipes-kernel/linux/files/dra7xx/am571x-pru-uio.dtsi | |||
@@ -1,14 +1,14 @@ | |||
1 | &pruss_soc_bus1 { | 1 | &pruss_soc_bus1 { |
2 | uio_pruss1_mdio { | 2 | uio_pruss1_mdio: uio_mdio@4b232400 { |
3 | status = "okay"; | 3 | status = "okay"; |
4 | 4 | ||
5 | compatible = "ti,davinci_mdio"; | 5 | compatible = "ti,davinci_mdio"; |
6 | reg = <0x4b232400 0x90>; | ||
6 | #address-cells = <1>; | 7 | #address-cells = <1>; |
7 | #size-cells = <0>; | 8 | #size-cells = <0>; |
8 | clocks = <&dpll_gmac_h13x2_ck>; | 9 | clocks = <&dpll_gmac_h13x2_ck>; |
9 | clock-names = "fck"; | 10 | clock-names = "fck"; |
10 | bus_freq = <1000000>; | 11 | bus_freq = <1000000>; |
11 | reg = <0x32400 0x90>; | ||
12 | 12 | ||
13 | reset-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>; | 13 | reset-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>; |
14 | reset-delay-us = <2>; /* PHY datasheet states 1uS min */ | 14 | reset-delay-us = <2>; /* PHY datasheet states 1uS min */ |
@@ -112,14 +112,14 @@ | |||
112 | }; | 112 | }; |
113 | 113 | ||
114 | &pruss_soc_bus2 { | 114 | &pruss_soc_bus2 { |
115 | uio_pruss2_mdio { | 115 | uio_pruss2_mdio: uio_mdio@4b2b2400 { |
116 | compatible = "ti,davinci_mdio"; | 116 | compatible = "ti,davinci_mdio"; |
117 | reg = <0x4b2b2400 0x90>; | ||
117 | #address-cells = <1>; | 118 | #address-cells = <1>; |
118 | #size-cells = <0>; | 119 | #size-cells = <0>; |
119 | clocks = <&dpll_gmac_h13x2_ck>; | 120 | clocks = <&dpll_gmac_h13x2_ck>; |
120 | clock-names = "fck"; | 121 | clock-names = "fck"; |
121 | bus_freq = <1000000>; | 122 | bus_freq = <1000000>; |
122 | reg = <0x32400 0x90>; | ||
123 | status = "okay"; | 123 | status = "okay"; |
124 | 124 | ||
125 | reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; | 125 | reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; |
@@ -223,18 +223,6 @@ | |||
223 | }; | 223 | }; |
224 | }; | 224 | }; |
225 | 225 | ||
226 | &pruss1_eth { | ||
227 | status = "disabled"; | ||
228 | }; | ||
229 | |||
230 | &pruss1_emac0 { | ||
231 | status = "disabled"; | ||
232 | }; | ||
233 | |||
234 | &pruss1_emac1 { | ||
235 | status = "disabled"; | ||
236 | }; | ||
237 | |||
238 | &pruss2_emac0 { | 226 | &pruss2_emac0 { |
239 | status = "disabled"; | 227 | status = "disabled"; |
240 | }; | 228 | }; |
diff --git a/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi b/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi index 17b3f963..4cc57118 100644 --- a/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi +++ b/recipes-kernel/linux/files/dra7xx/am57xx-pru-uio.dtsi | |||
@@ -106,14 +106,14 @@ | |||
106 | }; | 106 | }; |
107 | 107 | ||
108 | &pruss_soc_bus2 { | 108 | &pruss_soc_bus2 { |
109 | uio_pruss2_mdio: uio_pruss2_mdio { | 109 | uio_pruss2_mdio: uio_mdio@4b2b2400 { |
110 | compatible = "ti,davinci_mdio"; | 110 | compatible = "ti,davinci_mdio"; |
111 | reg = <0x4b2b2400 0x90>; | ||
111 | #address-cells = <1>; | 112 | #address-cells = <1>; |
112 | #size-cells = <0>; | 113 | #size-cells = <0>; |
113 | clocks = <&dpll_gmac_h13x2_ck>; | 114 | clocks = <&dpll_gmac_h13x2_ck>; |
114 | clock-names = "fck"; | 115 | clock-names = "fck"; |
115 | bus_freq = <1000000>; | 116 | bus_freq = <1000000>; |
116 | reg = <0x32400 0x90>; | ||
117 | status = "disabled"; | 117 | status = "disabled"; |
118 | }; | 118 | }; |
119 | 119 | ||
diff --git a/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi b/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi index e4baca50..49894e0d 100644 --- a/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi +++ b/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | &pruss_soc_bus0 { | 1 | &pruss_soc_bus0 { |
2 | uio_pruss1_mdio: uio_mdio@32400 { | 2 | uio_pruss1_mdio: uio_mdio@20ab2400 { |
3 | compatible = "ti,davinci_mdio"; | 3 | compatible = "ti,davinci_mdio"; |
4 | reg = <0x32400 0x90>; | 4 | reg = <0x20ab2400 0x90>; |
5 | clocks = <&k2g_clks 0x0014 1>; | 5 | clocks = <&k2g_clks 0x0014 1>; |
6 | clock-names = "fck"; | 6 | clock-names = "fck"; |
7 | #address-cells = <1>; | 7 | #address-cells = <1>; |
@@ -95,9 +95,9 @@ | |||
95 | }; | 95 | }; |
96 | 96 | ||
97 | &pruss_soc_bus1 { | 97 | &pruss_soc_bus1 { |
98 | uio_pruss2_mdio: uio_mdio@32400 { | 98 | uio_pruss2_mdio: uio_mdio@20af2400 { |
99 | compatible = "ti,davinci_mdio"; | 99 | compatible = "ti,davinci_mdio"; |
100 | reg = <0x32400 0x90>; | 100 | reg = <0x20af2400 0x90>; |
101 | clocks = <&k2g_clks 0x0015 1>; | 101 | clocks = <&k2g_clks 0x0015 1>; |
102 | clock-names = "fck"; | 102 | clock-names = "fck"; |
103 | #address-cells = <1>; | 103 | #address-cells = <1>; |
diff --git a/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi b/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi index 714b1d78..93a40ab5 100644 --- a/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi +++ b/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | &pruss_soc_bus { | 1 | &pruss_soc_bus { |
2 | uio_pruss_mdio: uio_pruss_mdio@32400 { | 2 | uio_pruss_mdio: uio_mdio@4a332400 { |
3 | compatible = "ti,davinci_mdio"; | 3 | compatible = "ti,davinci_mdio"; |
4 | reg = <0x32400 0x90>; | 4 | reg = <0x4a332400 0x90>; |
5 | clocks = <&dpll_core_m4_ck>; | 5 | clocks = <&dpll_core_m4_ck>; |
6 | clock-names = "fck"; | 6 | clock-names = "fck"; |
7 | bus_freq = <1000000>; | 7 | bus_freq = <1000000>; |
diff --git a/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi b/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi index 81c16e34..80993c4b 100644 --- a/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi +++ b/recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi | |||
@@ -1,7 +1,7 @@ | |||
1 | &pruss_soc_bus { | 1 | &pruss_soc_bus { |
2 | uio_pruss2_mdio: uio_mdio@32400 { | 2 | uio_pruss2_mdio: uio_mdio@54432400 { |
3 | compatible = "ti,davinci_mdio"; | 3 | compatible = "ti,davinci_mdio"; |
4 | reg = <0x32400 0x90>; | 4 | reg = <0x54432400 0x90>; |
5 | clocks = <&dpll_core_m4_ck>; | 5 | clocks = <&dpll_core_m4_ck>; |
6 | clock-names = "fck"; | 6 | clock-names = "fck"; |
7 | bus_freq = <1000000>; | 7 | bus_freq = <1000000>; |