Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760326Ab3D3Lce (ORCPT ); Tue, 30 Apr 2013 07:32:34 -0400 Received: from zetta.elopez.com.ar ([199.30.59.35]:34448 "EHLO zetta.elopez.com.ar" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759520Ab3D3Lcd (ORCPT ); Tue, 30 Apr 2013 07:32:33 -0400 Message-ID: <517FABBA.5060902@elopez.com.ar> Date: Tue, 30 Apr 2013 08:32:10 -0300 From: =?ISO-8859-1?Q?Emilio_L=F3pez?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130403 Thunderbird/17.0.5 MIME-Version: 1.0 To: Maxime Ripard CC: linux-arm-kernel@lists.infradead.org, Emilio Lopez , Russell King , Mike Turquette , linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] ARM: sun5i: Update the clock compatible strings References: <1367315783-21345-1-git-send-email-maxime.ripard@free-electrons.com> <1367315783-21345-3-git-send-email-maxime.ripard@free-electrons.com> In-Reply-To: <1367315783-21345-3-git-send-email-maxime.ripard@free-electrons.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3537 Lines: 100 Hi Maxime, El 30/04/13 06:56, Maxime Ripard escribi?: > The Allwinner A13 has a smaller clock set than the one found in the A10. > Fix the A13 device tree and documentation to reflect this. > > Signed-off-by: Maxime Ripard The patch looks fine to me. Acked-by: Emilio L?pez > --- > arch/arm/boot/dts/sun5i-a13.dtsi | 35 ++++++++++++----------------------- > 1 file changed, 12 insertions(+), 23 deletions(-) > > diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi > index 31fa38f..8ba65c1 100644 > --- a/arch/arm/boot/dts/sun5i-a13.dtsi > +++ b/arch/arm/boot/dts/sun5i-a13.dtsi > @@ -95,20 +95,15 @@ > > ahb_gates: ahb_gates@01c20060 { > #clock-cells = <1>; > - compatible = "allwinner,sun4i-ahb-gates-clk"; > + compatible = "allwinner,sun5i-a13-ahb-gates-clk"; > reg = <0x01c20060 0x8>; > clocks = <&ahb>; > - clock-output-names = "ahb_usb0", "ahb_ehci0", > - "ahb_ohci0", "ahb_ehci1", "ahb_ohci1", "ahb_ss", > - "ahb_dma", "ahb_bist", "ahb_mmc0", "ahb_mmc1", > - "ahb_mmc2", "ahb_mmc3", "ahb_ms", "ahb_nand", > - "ahb_sdram", "ahb_ace", "ahb_emac", "ahb_ts", > - "ahb_spi0", "ahb_spi1", "ahb_spi2", "ahb_spi3", > - "ahb_pata", "ahb_sata", "ahb_gps", "ahb_ve", > - "ahb_tvd", "ahb_tve0", "ahb_tve1", "ahb_lcd0", > - "ahb_lcd1", "ahb_csi0", "ahb_csi1", "ahb_hdmi", > - "ahb_de_be0", "ahb_de_be1", "ahb_de_fe0", > - "ahb_de_fe1", "ahb_mp", "ahb_mali400"; > + clock-output-names = "ahb_usbotg", "ahb_ehci", "ahb_ohci", Should we keep the USB and DE names consistent between sun4i and sun5i? Nobody should be referencing them by name, however, so it wouldn't cause any issues on the long run. > + "ahb_ss", "ahb_dma", "ahb_bist", "ahb_mmc0", > + "ahb_mmc1", "ahb_mmc2", "ahb_nand", "ahb_sdram", > + "ahb_spi0", "ahb_spi1", "ahb_spi2", "ahb_stimer", > + "ahb_ve", "ahb_lcd", "ahb_csi", "ahb_de_be", > + "ahb_de_fe", "ahb_iep", "ahb_mali400"; > }; > > apb0: apb0@01c20054 { > @@ -120,15 +115,13 @@ > > apb0_gates: apb0_gates@01c20068 { > #clock-cells = <1>; > - compatible = "allwinner,sun4i-apb0-gates-clk"; > + compatible = "allwinner,sun5i-a13-apb0-gates-clk"; > reg = <0x01c20068 0x4>; > clocks = <&apb0>; > - clock-output-names = "apb0_codec", "apb0_spdif", > - "apb0_ac97", "apb0_iis", "apb0_pio", "apb0_ir0", > - "apb0_ir1", "apb0_keypad"; > + clock-output-names = "apb0_codec", "apb0_pio", "apb0_ir"; > }; > > - /* dummy is pll62 */ > + /* dummy is pll6 */ > apb1_mux: apb1_mux@01c20058 { > #clock-cells = <0>; > compatible = "allwinner,sun4i-apb1-mux-clk"; > @@ -145,15 +138,11 @@ > > apb1_gates: apb1_gates@01c2006c { > #clock-cells = <1>; > - compatible = "allwinner,sun4i-apb1-gates-clk"; > + compatible = "allwinner,sun5i-a13-apb1-gates-clk"; > reg = <0x01c2006c 0x4>; > clocks = <&apb1>; > clock-output-names = "apb1_i2c0", "apb1_i2c1", > - "apb1_i2c2", "apb1_can", "apb1_scr", > - "apb1_ps20", "apb1_ps21", "apb1_uart0", > - "apb1_uart1", "apb1_uart2", "apb1_uart3", > - "apb1_uart4", "apb1_uart5", "apb1_uart6", > - "apb1_uart7"; > + "apb1_i2c2", "apb1_uart1", "apb1_uart3"; > }; > }; > > Thanks, Emilio -- 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/