Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752723AbbGXPWK (ORCPT ); Fri, 24 Jul 2015 11:22:10 -0400 Received: from mail.kernel.org ([198.145.29.136]:36053 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751895AbbGXPWG (ORCPT ); Fri, 24 Jul 2015 11:22:06 -0400 Date: Fri, 24 Jul 2015 16:22:00 +0100 From: Lee Jones To: Eric Anholt Cc: linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Stephen Warren , linux-clk@vger.kernel.org, Stephen Boyd , Mike Turquette Subject: Re: [PATCH v4 6/8] ARM: bcm2835: Use the RPi firmware clocks for uart. Message-ID: <20150724152200.GL3436@x1> References: <1437420787-32137-1-git-send-email-eric@anholt.net> <1437420787-32137-7-git-send-email-eric@anholt.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1437420787-32137-7-git-send-email-eric@anholt.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1723 Lines: 53 On Mon, 20 Jul 2015, Eric Anholt wrote: > This gets us a correct apb_pclk, which previously was accidentally > using the "20201000.uart" clock from clk-bcm2835.c, due to the > fallback clk_get_sys() path. > > Signed-off-by: Eric Anholt > Acked-by: Stephen Warren > --- > arch/arm/boot/dts/bcm2835-rpi.dtsi | 7 +++++++ > arch/arm/boot/dts/bcm2835.dtsi | 2 +- > 2 files changed, 8 insertions(+), 1 deletion(-) For my own reference: Acked-by: Lee Jones > diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi > index 7cc47fb..9549eb8 100644 > --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi > +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi > @@ -1,3 +1,4 @@ > +#include > #include "bcm2835.dtsi" > > / { > @@ -62,3 +63,9 @@ > status = "okay"; > bus-width = <4>; > }; > + > +&uart0 { > + clocks = <&firmware_clocks RPI_CLOCK_UART0>, > + <&firmware_clocks RPI_CLOCK_CORE>; > + clock-names = "uartclk", "apb_pclk"; > +}; > diff --git a/arch/arm/boot/dts/bcm2835.dtsi b/arch/arm/boot/dts/bcm2835.dtsi > index 32f5830..5be2862 100644 > --- a/arch/arm/boot/dts/bcm2835.dtsi > +++ b/arch/arm/boot/dts/bcm2835.dtsi > @@ -92,7 +92,7 @@ > #interrupt-cells = <2>; > }; > > - uart@7e201000 { > + uart0: uart@7e201000 { > compatible = "brcm,bcm2835-pl011", "arm,pl011", "arm,primecell"; > reg = <0x7e201000 0x1000>; > interrupts = <2 25>; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/