From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227mJAMtB0XdbXJGp5G5HIiyKyWRAMbSXVrXGzVZVLuo5DNu01iL843cwf0nO1zvKh/UzQNR ARC-Seal: i=1; a=rsa-sha256; t=1516611241; cv=none; d=google.com; s=arc-20160816; b=JqsmtQZC46SGJIrm4uFeTnlnOJ35VzMveoW/lQex2kupy58p/N6oLtgwL5IZLeDA5R d8Y+21poviZ9vbKf+XMNXVT0EUu5EDj7SwU+qz57nnvj4lzBl32MmfSQFu/H8+10t8ML bgz5knOG9owWcp5vqlm6KUywxXG2gUEDdZssj8ThqzbnknqHBSQv/BEv0lO38paSGB5R oWNtJwMgFT3YjOlrPClFArOHYO8WOY6WQ12rTW9Pi0eVzV7VUQ25V7Fw4jAoi2+Zqbka KLMuFAq7ibuoQoj+ZeEqizWtvqPekEoGMgy+65Ck3gH7RprDUGuwpuA3UPPesPAUdFRe du9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=vTbgx2y0jbysjpiaNbn/cm7nsQ6nY6+g0tCldLZ+0Uc=; b=VJXqr9i4KZC3nFq2JJ1b3Q35HoZTA45LCH6GkLGV+5M1nu8Brpagc1ky2AGHuCbt6V H/1eVNO692NVjvIYabqFswxrXa4b5fT3ySAt52ombG+kxEWlHMYodPLSi4P8E1ZGTYc1 8mZagTlQc+Q5QCZ9tCD6Nr/HmupONfUcyLfzOURvjq/kIZfT+IpdyeKfXCbKWa05LPza +bwfix1f33/WSGiTM6T89S3tY/vU1pOibXygNfsPwGhcVfZ3pN67zqILOWurjQpjyw/v 2V+PamoDi2tCPWvc6rJWFjLa6VQoVILx0ZqHCaA40t47IlE0gAHvUqPWkjrFJXIgPDGN N29A== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Riku Voipio , Gregory CLEMENT Subject: [PATCH 4.14 57/89] ARM64: dts: marvell: armada-cp110: Fix clock resources for various node Date: Mon, 22 Jan 2018 09:45:37 +0100 Message-Id: <20180122084000.394055611@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590282149905348525?= X-GMAIL-MSGID: =?utf-8?q?1590282149905348525?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Gregory CLEMENT commit e3af9f7c6ece29fdb7fe0aeb83ac5d3077a06edb upstream. On the CP modules we found on Armada 7K/8K, many IP block actually also need a "functional" clock (from the bus). This patch add them which allows to fix some issues hanging the kernel: If Ethernet and sdhci driver are built as modules and sdhci was loaded first then the kernel hang. Fixes: bb16ea1742c8 ("mmc: sdhci-xenon: Fix clock resource by adding an optional bus clock") Reported-by: Riku Voipio Signed-off-by: Gregory CLEMENT Signed-off-by: Greg Kroah-Hartman --- arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 13 ++++++++----- arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 9 ++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -63,8 +63,10 @@ cpm_ethernet: ethernet@0 { compatible = "marvell,armada-7k-pp22"; reg = <0x0 0x100000>, <0x129000 0xb000>; - clocks = <&cpm_clk 1 3>, <&cpm_clk 1 9>, <&cpm_clk 1 5>; - clock-names = "pp_clk", "gop_clk", "mg_clk"; + clocks = <&cpm_clk 1 3>, <&cpm_clk 1 9>, + <&cpm_clk 1 5>, <&cpm_clk 1 18>; + clock-names = "pp_clk", "gop_clk", + "mg_clk","axi_clk"; marvell,system-controller = <&cpm_syscon0>; status = "disabled"; dma-coherent; @@ -114,7 +116,8 @@ #size-cells = <0>; compatible = "marvell,orion-mdio"; reg = <0x12a200 0x10>; - clocks = <&cpm_clk 1 9>, <&cpm_clk 1 5>; + clocks = <&cpm_clk 1 9>, <&cpm_clk 1 5>, + <&cpm_clk 1 6>, <&cpm_clk 1 18>; status = "disabled"; }; @@ -295,8 +298,8 @@ compatible = "marvell,armada-cp110-sdhci"; reg = <0x780000 0x300>; interrupts = ; - clock-names = "core"; - clocks = <&cpm_clk 1 4>; + clock-names = "core","axi"; + clocks = <&cpm_clk 1 4>, <&cpm_clk 1 18>; dma-coherent; status = "disabled"; }; --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi @@ -63,8 +63,10 @@ cps_ethernet: ethernet@0 { compatible = "marvell,armada-7k-pp22"; reg = <0x0 0x100000>, <0x129000 0xb000>; - clocks = <&cps_clk 1 3>, <&cps_clk 1 9>, <&cps_clk 1 5>; - clock-names = "pp_clk", "gop_clk", "mg_clk"; + clocks = <&cps_clk 1 3>, <&cps_clk 1 9>, + <&cps_clk 1 5>, <&cps_clk 1 18>; + clock-names = "pp_clk", "gop_clk", + "mg_clk", "axi_clk"; marvell,system-controller = <&cps_syscon0>; status = "disabled"; dma-coherent; @@ -114,7 +116,8 @@ #size-cells = <0>; compatible = "marvell,orion-mdio"; reg = <0x12a200 0x10>; - clocks = <&cps_clk 1 9>, <&cps_clk 1 5>; + clocks = <&cps_clk 1 9>, <&cps_clk 1 5>, + <&cps_clk 1 6>, <&cps_clk 1 18>; status = "disabled"; };