From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1751665AbbH1IIS (ORCPT <rfc822;w@1wt.eu>);
	Fri, 28 Aug 2015 04:08:18 -0400
Received: from down.free-electrons.com ([37.187.137.238]:37048 "EHLO
	mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org
	with ESMTP id S1750733AbbH1IIN (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 28 Aug 2015 04:08:13 -0400
Date: Fri, 28 Aug 2015 10:08:09 +0200
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org, Peter Ujfalusi <peter.ujfalusi@ti.com>,
        Tony Lindgren <tony@atomide.com>
Subject: Re: linux-next: manual merge of the rtc tree with the arm-soc tree
Message-ID: <20150828080809.GU13155@piout.net>
References: <20150827162229.10fe7255@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20150827162229.10fe7255@canb.auug.org.au>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Stephen,

On 27/08/2015 at 16:22:29 +1000, Stephen Rothwell wrote :
>   		clock-frequency = <12000000>;
>   	};
>   
>  +	sound0: sound@0 {
>  +		compatible = "simple-audio-card";
>  +		simple-audio-card,name = "AM437x-GP-EVM";
>  +		simple-audio-card,widgets =
>  +			"Headphone", "Headphone Jack",
>  +			"Line", "Line In";
>  +		simple-audio-card,routing =
>  +			"Headphone Jack",	"HPLOUT",
>  +			"Headphone Jack",	"HPROUT",
>  +			"LINE1L",		"Line In",
>  +			"LINE1R",		"Line In";
>  +		simple-audio-card,format = "dsp_b";
>  +		simple-audio-card,bitclock-master = <&sound0_master>;
>  +		simple-audio-card,frame-master = <&sound0_master>;
>  +		simple-audio-card,bitclock-inversion;
>  +
>  +		simple-audio-card,cpu {
>  +			sound-dai = <&mcasp1>;
>  +			system-clock-frequency = <12000000>;
>  +		};
>  +
>  +		sound0_master: simple-audio-card,codec {
>  +			sound-dai = <&tlv320aic3106>;
>  +			system-clock-frequency = <12000000>;
>  +		};
>  +	};
> ++
> + 	/* fixed 32k external oscillator clock */
> + 	clk_32k_rtc: clk_32k_rtc {
> + 		#clock-cells = <0>;
> + 		compatible = "fixed-clock";
> + 		clock-frequency = <32768>;
> + 	};

It is just a matter of taste but maybe both oscillators/clocks can be
grouped.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com