Re: [PATCH 05/10] ARM: shmobile: lager-reference: Switch to multiplaform

[Simon Horman <horms@verge.net.au>]

On Tue, Oct 29, 2013 at 04:04:37PM +0100, Laurent Pinchart wrote:
> Move the Lager reference board to multiplaform ARM architecture. As
> multiplatform requires usage of the common clock framework, switch from
> legacy clocks to CCF by replacing the legacy clock framework
> initialization code in the machine init handler with a common clock
> framework initialization call in the time init handler.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm/mach-shmobile/Kconfig                 |  7 +++++++
>  arch/arm/mach-shmobile/Makefile                |  1 +
>  arch/arm/mach-shmobile/board-lager-reference.c | 13 +++++++++----
>  3 files changed, 17 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
> index 4bb548f..b39f6b6 100644
> --- a/arch/arm/mach-shmobile/Kconfig
> +++ b/arch/arm/mach-shmobile/Kconfig
> @@ -20,6 +20,9 @@ comment "SH-Mobile System Type"
>  config ARCH_EMEV2
>  	bool "Emma Mobile EV2"
>  
> +config ARCH_R8A7790
> +	bool "R-Car H2 (R8A77900)"
> +

I realise that up until now there has only been one entry,
but in keeping with the non-SHMOBILE_MULTI entries I think it
would be good to have the SHMOBILE_MULTI entries sorted in alphabetical
order. With this in mind could you move ARCH_R8A7790 to
above ARCH_EMEV2?

>  comment "SH-Mobile Board Type"
>  
>  config MACH_KZM9D
> @@ -27,6 +30,10 @@ config MACH_KZM9D
>  	depends on ARCH_EMEV2
>  	select REGULATOR_FIXED_VOLTAGE if REGULATOR
>  
> +config MACH_LAGER
> +	bool "Lager board"
> +	depends on ARCH_R8A7790
> +
>  comment "SH-Mobile System Configuration"
>  endif
>  
> diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
> index cc48f14..32f3975 100644
> --- a/arch/arm/mach-shmobile/Makefile
> +++ b/arch/arm/mach-shmobile/Makefile
> @@ -57,6 +57,7 @@ obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o
>  # Board objects
>  ifdef CONFIG_ARCH_SHMOBILE_MULTI
>  obj-$(CONFIG_MACH_KZM9D)	+= board-kzm9d-reference.o
> +obj-$(CONFIG_MACH_LAGER)	+= board-lager-reference.o
>  else
>  obj-$(CONFIG_MACH_APE6EVM)	+= board-ape6evm.o
>  obj-$(CONFIG_MACH_APE6EVM_REFERENCE)	+= board-ape6evm-reference.o
> diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
> index 1a1a4a8..e436d06 100644
> --- a/arch/arm/mach-shmobile/board-lager-reference.c
> +++ b/arch/arm/mach-shmobile/board-lager-reference.c
> @@ -18,16 +18,21 @@
>   * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
>   */
>  
> +#include <linux/clk/shmobile.h>
>  #include <linux/init.h>
>  #include <linux/of_platform.h>
>  #include <mach/r8a7790.h>
>  #include <asm/mach/arch.h>
>  
> -static void __init lager_add_standard_devices(void)
> +static void __init lager_init_time(void)
>  {
> -	/* clocks are setup late during boot in the case of DT */
> -	r8a7790_clock_init();
> +	r8a7790_clocks_init(rcar_gen2_read_mode_pins());
> +
> +	rcar_gen2_timer_init();
> +}
>  
> +static void __init lager_add_standard_devices(void)
> +{
>  	r8a7790_add_dt_devices();
>          of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
>  }
> @@ -40,7 +45,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
>  DT_MACHINE_START(LAGER_DT, "lager")
>  	.smp		= smp_ops(r8a7790_smp_ops),
>  	.init_early	= r8a7790_init_early,
> -	.init_time	= rcar_gen2_timer_init,
> +	.init_time	= lager_init_time,
>  	.init_machine	= lager_add_standard_devices,
>  	.dt_compat	= lager_boards_compat_dt,
>  MACHINE_END
> -- 
> 1.8.1.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>