summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongmei Gou <a0271529@ti.com>2018-05-09 02:20:22 +0000
committerDenys Dmytriyenko <denys@ti.com>2018-05-09 00:49:25 -0400
commit42fa84fe063cec67446d7b2a6ddf59ca6aaf47ec (patch)
tree6346413ab27f7190545be761ad64aabfc26b4676
parentc49d3b6605e7cb4f76a08f69057896afee449347 (diff)
downloadmeta-ti-42fa84fe063cec67446d7b2a6ddf59ca6aaf47ec.tar.gz
linux-ti-staging: ti-uio: rebase pru-uio.dtsi for k2g and am3
Signed-off-by: Hongmei Gou <a0271529@ti.com> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
-rw-r--r--recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi4
-rw-r--r--recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi8
2 files changed, 2 insertions, 10 deletions
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 69955a44..2ba57f0e 100644
--- a/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi
+++ b/recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi
@@ -2,7 +2,7 @@
2 uio_pruss1_mdio: uio_mdio@20ab2400 { 2 uio_pruss1_mdio: uio_mdio@20ab2400 {
3 compatible = "ti,davinci_mdio"; 3 compatible = "ti,davinci_mdio";
4 reg = <0x20ab2400 0x90>; 4 reg = <0x20ab2400 0x90>;
5 clocks = <&k2g_clks K2G_DEV_ICSS0 K2G_DEV_ICSS_CORE_CLK>; 5 clocks = <&k2g_clks 0x0014 1>;
6 clock-names = "fck"; 6 clock-names = "fck";
7 #address-cells = <1>; 7 #address-cells = <1>;
8 #size-cells = <0>; 8 #size-cells = <0>;
@@ -98,7 +98,7 @@
98 uio_pruss2_mdio: uio_mdio@20af2400 { 98 uio_pruss2_mdio: uio_mdio@20af2400 {
99 compatible = "ti,davinci_mdio"; 99 compatible = "ti,davinci_mdio";
100 reg = <0x20af2400 0x90>; 100 reg = <0x20af2400 0x90>;
101 clocks = <&k2g_clks K2G_DEV_ICSS1 K2G_DEV_ICSS_CORE_CLK>; 101 clocks = <&k2g_clks 0x0015 1>;
102 clock-names = "fck"; 102 clock-names = "fck";
103 #address-cells = <1>; 103 #address-cells = <1>;
104 #size-cells = <0>; 104 #size-cells = <0>;
diff --git a/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi b/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi
index 2d9127b8..ddf45663 100644
--- a/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi
+++ b/recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi
@@ -182,11 +182,3 @@
182&pruss_mdio { 182&pruss_mdio {
183 status = "disabled"; 183 status = "disabled";
184}; 184};
185
186&pruss_emac0 {
187 status = "disabled";
188};
189
190&pruss_emac1 {
191 status = "disabled";
192};