From 42fa84fe063cec67446d7b2a6ddf59ca6aaf47ec Mon Sep 17 00:00:00 2001 From: Hongmei Gou Date: Wed, 9 May 2018 02:20:22 +0000 Subject: [PATCH] linux-ti-staging: ti-uio: rebase pru-uio.dtsi for k2g and am3 Signed-off-by: Hongmei Gou Signed-off-by: Denys Dmytriyenko --- recipes-kernel/linux/files/k2g/keystone-k2g-pru-uio.dtsi | 4 ++-- recipes-kernel/linux/files/ti33x/am335x-pru-uio.dtsi | 8 -------- 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 @@ uio_pruss1_mdio: uio_mdio@20ab2400 { compatible = "ti,davinci_mdio"; reg = <0x20ab2400 0x90>; - clocks = <&k2g_clks K2G_DEV_ICSS0 K2G_DEV_ICSS_CORE_CLK>; + clocks = <&k2g_clks 0x0014 1>; clock-names = "fck"; #address-cells = <1>; #size-cells = <0>; @@ -98,7 +98,7 @@ uio_pruss2_mdio: uio_mdio@20af2400 { compatible = "ti,davinci_mdio"; reg = <0x20af2400 0x90>; - clocks = <&k2g_clks K2G_DEV_ICSS1 K2G_DEV_ICSS_CORE_CLK>; + clocks = <&k2g_clks 0x0015 1>; clock-names = "fck"; #address-cells = <1>; #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 @@ &pruss_mdio { status = "disabled"; }; - -&pruss_emac0 { - status = "disabled"; -}; - -&pruss_emac1 { - status = "disabled"; -};