summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/keystone-k2l-netcp.dtsi
diff options
context:
space:
mode:
authorMurali Karicheri <m-karicheri2@ti.com>2017-03-29 16:02:18 +0530
committerArnd Bergmann <arnd@arndb.de>2017-05-26 10:10:50 +0200
commit791229f1d530a0f0a680a4c09f98199792485f33 (patch)
tree2338fb6e472f217593fc3a5bf717633dcd6d7371 /arch/arm/boot/dts/keystone-k2l-netcp.dtsi
parent5612ac83b9d7a32a7f2967d9f6f97e7f3428dfd2 (diff)
downloadtalos-obmc-linux-791229f1d530a0f0a680a4c09f98199792485f33.tar.gz
talos-obmc-linux-791229f1d530a0f0a680a4c09f98199792485f33.zip
ARM: dts: keystone-k2l: fix broken Ethernet due to disabled OSR
Ethernet networking on K2L has been broken since v4.11-rc1. This was caused by commit 32a34441a9bd ("ARM: keystone: dts: fix netcp clocks and add names"). This commit inadvertently moves on-chip static RAM clock to the end of list of clocks provided for netcp. Since keystone PM domain support does not have a list of recognized con_ids, only the first clock in the list comes under runtime PM management. This means the OSR (On-chip Static RAM) clock remains disabled and that broke networking on K2L. The OSR is used by QMSS on K2L as an external linking RAM. However this is a standalone RAM that can be used for non-QMSS usage (as well as from DSP side). So add a SRAM device node for the same and add the OSR clock to the node. Remove the now redundant OSR clock node from netcp. To manage all clocks defined for netCP's use by runtime PM needs keystone generic power domain (genpd) driver support which is under works. Meanwhile, this patch restores K2L networking and is correct irrespective of any future genpd work since OSR is an independent module and not part of NetCP anyway. Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> Acked-by: Tero Kristo <t-kristo@ti.com> [nsekhar@ti.com: commit message updates, port to latest mainline] Signed-off-by: Sekhar Nori <nsekhar@ti.com> Cc: stable@vger.kernel.org # for 4.11 Acked-by: Santosh Shilimkar <ssantosh@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/keystone-k2l-netcp.dtsi')
-rw-r--r--arch/arm/boot/dts/keystone-k2l-netcp.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/keystone-k2l-netcp.dtsi b/arch/arm/boot/dts/keystone-k2l-netcp.dtsi
index b6f26824e83a..66f615a74118 100644
--- a/arch/arm/boot/dts/keystone-k2l-netcp.dtsi
+++ b/arch/arm/boot/dts/keystone-k2l-netcp.dtsi
@@ -137,8 +137,8 @@ netcp: netcp@26000000 {
/* NetCP address range */
ranges = <0 0x26000000 0x1000000>;
- clocks = <&clkpa>, <&clkcpgmac>, <&chipclk12>, <&clkosr>;
- clock-names = "pa_clk", "ethss_clk", "cpts", "osr_clk";
+ clocks = <&clkpa>, <&clkcpgmac>, <&chipclk12>;
+ clock-names = "pa_clk", "ethss_clk", "cpts";
dma-coherent;
ti,navigator-dmas = <&dma_gbe 0>,
OpenPOWER on IntegriCloud