From: b.brezillon@overkiz•com (Boris BREZILLON)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3 04/15] ARM: at91: prepare common clk transition for sam9261 SoC
Date: Fri, 07 Feb 2014 09:35:55 +0100 [thread overview]
Message-ID: <52F49AEB.6060307@overkiz.com> (raw)
In-Reply-To: <20140207082537.GU9558@ns203013.ovh.net>
Hello Jean-Christophe,
On 07/02/2014 09:25, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 16:57 Thu 23 Jan , Jean-Jacques Hiblot wrote:
>> This patch encloses sam9261 old clk registration in
>> "#if defined(CONFIG_OLD_CLK_AT91) #endif" sections.
>>
>> Signed-off-by: Jean-Jacques Hiblot <jjhiblot@traphandler•com>
>> ---
>> arch/arm/mach-at91/at91sam9261.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
>> index 6a2c869..2c0e940 100644
>> --- a/arch/arm/mach-at91/at91sam9261.c
>> +++ b/arch/arm/mach-at91/at91sam9261.c
>> @@ -25,10 +25,12 @@
>> #include "at91_rstc.h"
>> #include "soc.h"
>> #include "generic.h"
>> -#include "clock.h"
>> #include "sam9_smc.h"
>> #include "pm.h"
>>
>> +#if defined(CONFIG_OLD_CLK_AT91)
>> +#include "clock.h"
>> +
>> /* --------------------------------------------------------------------
>> * Clocks
>> * -------------------------------------------------------------------- */
>> @@ -262,7 +264,7 @@ static void __init at91sam9261_register_clocks(void)
>> clk_register(&hck0);
>> clk_register(&hck1);
>> }
>> -
> do this here
>
> #else
> #define at91sam9261_register_clocks NULL
>> +#endif
>> /* --------------------------------------------------------------------
>> * GPIO
>> * -------------------------------------------------------------------- */
>> @@ -362,6 +364,8 @@ AT91_SOC_START(at91sam9261)
>> .extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
>> | (1 << AT91SAM9261_ID_IRQ2),
>> .ioremap_registers = at91sam9261_ioremap_registers,
>> +#if defined(CONFIG_OLD_CLK_AT91)
>> .register_clocks = at91sam9261_register_clocks,
>> +#endif
> so no ifdef here
I guess he did this based on what I did for the sama5 SoC, but you're right:
your proposal is cleaner.
Best Regards,
Boris
>> .init = at91sam9261_initialize,
>> AT91_SOC_END
>> --
>> 1.8.5.2
>>
next prev parent reply other threads:[~2014-02-07 8:35 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-23 15:57 [PATCH v3 00/15] Device Tree support for the at91sam9261ek Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 01/15] at91: dt: Add at91sam9261 dt SoC support Jean-Jacques Hiblot
2014-02-07 8:23 ` Jean-Christophe PLAGNIOL-VILLARD
2014-02-07 8:43 ` Boris BREZILLON
2014-02-07 9:47 ` Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 02/15] at91: dt: defconfig: Added the sam9261 to the list of supported SOCs Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 03/15] at91: dt: sam9261: Basic Device Tree support for the at91sam9261ek Jean-Jacques Hiblot
2014-02-07 8:30 ` Jean-Christophe PLAGNIOL-VILLARD
2014-02-07 9:33 ` Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 04/15] ARM: at91: prepare common clk transition for sam9261 SoC Jean-Jacques Hiblot
2014-02-07 8:25 ` Jean-Christophe PLAGNIOL-VILLARD
2014-02-07 8:35 ` Boris BREZILLON [this message]
2014-02-07 9:38 ` Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 05/15] ARM: at91: move sam9261 SoC to common clk Jean-Jacques Hiblot
2014-02-07 8:58 ` Boris BREZILLON
2014-01-23 15:57 ` [PATCH v3 06/15] at91: dt: at91sam9261ek: Adds DT entries for the 4 user buttons Jean-Jacques Hiblot
2014-02-07 8:27 ` Jean-Christophe PLAGNIOL-VILLARD
2014-02-07 9:30 ` Jean-Jacques Hiblot
2014-02-07 10:22 ` Nicolas Ferre
2014-02-10 9:51 ` Linus Walleij
2014-01-23 15:57 ` [PATCH v3 07/15] at91: dt: sam9261: Added the descriptions of hck0 and hck1 clocks (CCF) Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 08/15] at91: dt: sam9261: Added hclk declaration for the fb driver (non-CCF) Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 09/15] at91: dt: sam9261: Added support for the LCD display Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 10/15] at91: dt: at91sam9261ek: " Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 11/15] at91: dt: Adds support for the bus matrix declaration in the device tree Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 12/15] at91: dt: sam9261: adds description for the bus matrix Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 13/15] at91: dt: sam9261: CCF: Added USB clocks Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 14/15] at91: dt: at91sam9261ek: Enabled the USB host port (OHCI) Jean-Jacques Hiblot
2014-01-23 15:57 ` [PATCH v3 15/15] at91: dt: at91sam9261ek: Enabled the USB device port Jean-Jacques Hiblot
2014-02-07 8:33 ` [PATCH v3 00/15] Device Tree support for the at91sam9261ek Jean-Christophe PLAGNIOL-VILLARD
2014-02-07 9:36 ` Jean-Jacques Hiblot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52F49AEB.6060307@overkiz.com \
--to=b.brezillon@overkiz$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox