From 713b53ba2e7a4bbd22da999b607ee190cf13125c Mon Sep 17 00:00:00 2001 From: "Gou, Hongmei" Date: Tue, 18 Jun 2019 04:55:26 +0000 Subject: 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 Signed-off-by: Denys Dmytriyenko --- .../linux/files/dra7xx/am571x-pru-uio.dtsi | 20 ++++---------------- .../linux/files/dra7xx/am57xx-pru-uio.dtsi | 4 ++-- .../linux/files/k2g/keystone-k2g-pru-uio.dtsi | 8 ++++---- recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi | 4 ++-- recipes-kernel/linux/files/ti43x/am437x-pru-uio.dtsi | 4 ++-- 5 files changed, 14 insertions(+), 26 deletions(-) (limited to 'recipes-kernel') 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 @@ &pruss_soc_bus1 { - uio_pruss1_mdio { + uio_pruss1_mdio: uio_mdio@4b232400 { status = "okay"; compatible = "ti,davinci_mdio"; + reg = <0x4b232400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; reset-gpios = <&gpio5 8 GPIO_ACTIVE_LOW>; reset-delay-us = <2>; /* PHY datasheet states 1uS min */ @@ -112,14 +112,14 @@ }; &pruss_soc_bus2 { - uio_pruss2_mdio { + uio_pruss2_mdio: uio_mdio@4b2b2400 { compatible = "ti,davinci_mdio"; + reg = <0x4b2b2400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; status = "okay"; reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>; @@ -223,18 +223,6 @@ }; }; -&pruss1_eth { - status = "disabled"; -}; - -&pruss1_emac0 { - status = "disabled"; -}; - -&pruss1_emac1 { - status = "disabled"; -}; - &pruss2_emac0 { status = "disabled"; }; 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 @@ }; &pruss_soc_bus2 { - uio_pruss2_mdio: uio_pruss2_mdio { + uio_pruss2_mdio: uio_mdio@4b2b2400 { compatible = "ti,davinci_mdio"; + reg = <0x4b2b2400 0x90>; #address-cells = <1>; #size-cells = <0>; clocks = <&dpll_gmac_h13x2_ck>; clock-names = "fck"; bus_freq = <1000000>; - reg = <0x32400 0x90>; status = "disabled"; }; 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 @@ &pruss_soc_bus0 { - uio_pruss1_mdio: uio_mdio@32400 { + uio_pruss1_mdio: uio_mdio@20ab2400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x20ab2400 0x90>; clocks = <&k2g_clks 0x0014 1>; clock-names = "fck"; #address-cells = <1>; @@ -95,9 +95,9 @@ }; &pruss_soc_bus1 { - uio_pruss2_mdio: uio_mdio@32400 { + uio_pruss2_mdio: uio_mdio@20af2400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x20af2400 0x90>; clocks = <&k2g_clks 0x0015 1>; clock-names = "fck"; #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 @@ &pruss_soc_bus { - uio_pruss_mdio: uio_pruss_mdio@32400 { + uio_pruss_mdio: uio_mdio@4a332400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x4a332400 0x90>; clocks = <&dpll_core_m4_ck>; clock-names = "fck"; 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 @@ &pruss_soc_bus { - uio_pruss2_mdio: uio_mdio@32400 { + uio_pruss2_mdio: uio_mdio@54432400 { compatible = "ti,davinci_mdio"; - reg = <0x32400 0x90>; + reg = <0x54432400 0x90>; clocks = <&dpll_core_m4_ck>; clock-names = "fck"; bus_freq = <1000000>; -- cgit v1.2.3-54-g00ecf