From patchwork Mon Jan 25 11:19:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sjoerd Simons X-Patchwork-Id: 60338 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1288352lbb; Mon, 25 Jan 2016 03:19:32 -0800 (PST) X-Received: by 10.98.80.135 with SMTP id g7mr24923065pfj.132.1453720772752; Mon, 25 Jan 2016 03:19:32 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r71si33104786pfi.85.2016.01.25.03.19.32; Mon, 25 Jan 2016 03:19:32 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756072AbcAYLTb (ORCPT + 6 others); Mon, 25 Jan 2016 06:19:31 -0500 Received: from bhuna.collabora.co.uk ([46.235.227.227]:59318 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755711AbcAYLTa (ORCPT ); Mon, 25 Jan 2016 06:19:30 -0500 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: sjoerd) with ESMTPSA id E2D96260303 Received: by dusk.luon.net (Postfix, from userid 1000) id 9C2C9226B8; Mon, 25 Jan 2016 12:19:26 +0100 (CET) From: Sjoerd Simons To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH] ARM: dts: rockchip: Assign RK3288 EDP_24M input centrally Date: Mon, 25 Jan 2016 12:19:26 +0100 Message-Id: <1453720766-13086-1-git-send-email-sjoerd.simons@collabora.co.uk> X-Mailer: git-send-email 2.7.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The EDP 24M clock can be fed either by an SoC internal fixed clock or from an external IC. Change the default parent to the internal clock in the main rk3288 dtsi, to ensure (by default) it gets setup with a non-orphaned clock (hardware defaults to the externa clock). This prevents potential issues when the clock framework get support for deferring on orphaned clocks, while specific boards can always change the parent clock if an external input is preferred. Signed-off-by: Sjoerd Simons --- arch/arm/boot/dts/rk3288-veyron.dtsi | 5 ----- arch/arm/boot/dts/rk3288.dtsi | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) -- 2.7.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 9fce91f..5e61f07 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -340,11 +340,6 @@ i2c-scl-rising-time-ns = <1000>; }; -&power { - assigned-clocks = <&cru SCLK_EDP_24M>; - assigned-clock-parents = <&xin24m>; -}; - &pwm1 { status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 8ac49f3..03bb747 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi @@ -630,6 +630,9 @@ #address-cells = <1>; #size-cells = <0>; + assigned-clocks = <&cru SCLK_EDP_24M>; + assigned-clock-parents = <&xin24m>; + /* * Note: Although SCLK_* are the working clocks * of device without including on the NOC, needed for