From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753580AbaETPTa (ORCPT ); Tue, 20 May 2014 11:19:30 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:37577 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751760AbaETPT2 (ORCPT ); Tue, 20 May 2014 11:19:28 -0400 Message-ID: <537B727C.5080404@atmel.com> Date: Tue, 20 May 2014 17:19:24 +0200 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Olof Johansson , Alexandre Belloni , Boris BREZILLON CC: Arnd Bergmann , , Linux Kernel list , linux-arm-kernel , Jean-Christophe PLAGNIOL-VILLARD , Wenyou Yang , "Ludovic Desroches" Subject: Re: [GIT PULL] at91: DT for 3.16 #2 References: <1400059162-630-1-git-send-email-nicolas.ferre@atmel.com> <20140520055041.GO18956@quad.lixom.net> In-Reply-To: <20140520055041.GO18956@quad.lixom.net> X-Enigmail-Version: 1.5.2 Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/05/2014 07:50, Olof Johansson : > On Wed, May 14, 2014 at 11:19:22AM +0200, Nicolas Ferre wrote: >> Arnd, Olof, Kevin, >> >> More DT material for AT91. Some fixes that apply on what was merged for 3.15 >> but that are not very critical. >> The other patches are feature additions to old or very recent product/board: >> at91sam9261 or sama5d3 Xplained. >> >> Thanks, best regards, >> >> The following changes since commit 27a96a0364787d2b41d2a72d08143d95263e1b07: >> >> ARM: at91: sama5d3: clock for ssc from rk pin (2014-04-18 22:43:44 +0200) >> >> are available in the git repository at: >> >> git://github.com/at91linux/linux-at91.git tags/at91-dt2 >> >> for you to fetch changes up to a93f9c88b7701d1c4c3b22d39d64a408f000a6ef: >> >> ARM: at91/dt: at91-sama5d3_xplained: add the regulator device node (2014-05-12 16:48:54 +0200) > > Merged, but: > >> arch/arm/boot/dts/at91-sama5d3_xplained.dts | 62 +++++++++++++++ >> arch/arm/boot/dts/at91sam9261.dtsi | 114 ++++++++++++++++++++++++++-- >> arch/arm/boot/dts/at91sam9rl.dtsi | 7 +- >> arch/arm/boot/dts/sama5d3.dtsi | 78 +++++++++++++++++++ > > Grmbl. I remember being somewhat annoyed that you didn't use at91 prefix > when you introduced the sama5d3 dtsi files, but please don't start using > it on a random board like this, especially when other boards just use > the sama5d3_.dts format. Well, I don't understand completely. Since our discussion during 3.10 merge window ([GIT PULL] at91: DT changes for 3.10 #2), I try to conform to this rule: 1/ all pre-3.10 and 3.10 device tree file names stay unchanged -> sama5d3.dti (SoC) -> sama5d35ek.dts (board) 2/ all *SoC* DT files conform to their marking: at91sam9263.dtsi at91sam9rl.dtsi sama5d3.dtsi, sama5d36.dtsi sama5d4.dtsi, sama5d46.dtsi (maybe in the future, who knows...) 3/ all post-3.10 *boards* have the "at91-" prefix, whether they are populated with sam9 or sama5: at91-ariag25.dts (since 3.10, using a at91sam9g25) at91-qil_a9260.dts (since 3.14, using at91sam9260) at91-sama5d3_xplained.dts (since 3.14, using sama5d36) The rule for AT91 has never been to prefix the board DT filename with the name of the SoC or SoC family. > Care to fix this up in time for 3.16 merge window? Well, I do not know what to fix as the files were already present in mainline before this kernel revision and that I am a little bit reluctant to change file names after they are merged in mainline. Now, can we keep the current policy described above (somehow weird, I admit) for future SoCs and boards? Best regards, -- Nicolas Ferre