Commit 2c49e025 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-r8a73a4-dt-timers-for-v3.19' of... 

Merge tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Merge "Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19" from Simon
Horman:

* Initialise CMT1 timer using DT

* tag 'renesas-r8a73a4-dt-timers-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: r8a73a4: Remove empty r8a73a4_add_dt_devices
  ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT
  ARM: shmobile: r8a73a4: Rename cmt registration helper
  ARM: shmobile: r8a73a4: Add CMT1 node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5d3e1cf2 fd3edcbe

arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts

+4 −0
Original line number Diff line number Diff line
@@ -94,6 +94,10 @@ 
	voltage-tolerance = <1>; /* 1% */

};



&cmt1 {

	status = "okay";

};



&pfc {

	scifa0_pins: serial0 {

		renesas,groups = "scifa0_data";

arch/arm/boot/dts/r8a73a4.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -109,6 +109,17 @@ 
		compatible = "renesas,rmobile-iic";

		reg = <0 0xe60b0000 0 0x428>;

		interrupts = <0 179 IRQ_TYPE_LEVEL_HIGH>;



		status = "disabled";

	};



	cmt1: timer@e6130000 {

		compatible = "renesas,cmt-48-gen2";

		reg = <0 0xe6130000 0 0x1004>;

		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>;



		renesas,channels-mask = <0xff>;



		status = "disabled";

	};

arch/arm/mach-shmobile/board-ape6evm-reference.c

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ static void __init ape6evm_add_standard_devices(void) 
	clk_put(parent);

	clk_put(mp);



	r8a73a4_add_dt_devices();

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}

arch/arm/mach-shmobile/r8a73a4.h

+0 −1
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ enum { 
};



void r8a73a4_add_standard_devices(void);

void r8a73a4_add_dt_devices(void);

void r8a73a4_clock_init(void);

void r8a73a4_pinmux_init(void);

arch/arm/mach-shmobile/setup-r8a73a4.c

+2 −7
Original line number Diff line number Diff line
@@ -180,18 +180,13 @@ static struct resource cmt1_resources[] = { 
	DEFINE_RES_IRQ(gic_spi(120)),

};



#define r8a7790_register_cmt(idx)					\

#define r8a73a4_register_cmt(idx)					\

	platform_device_register_resndata(NULL, "sh-cmt-48-gen2",	\

					  idx, cmt##idx##_resources,	\

					  ARRAY_SIZE(cmt##idx##_resources), \

					  &cmt##idx##_platform_data,	\

					  sizeof(struct sh_timer_config))



void __init r8a73a4_add_dt_devices(void)

{

	r8a7790_register_cmt(1);

}



/* DMA */

static const struct sh_dmae_slave_config dma_slaves[] = {

	{
@@ -282,7 +277,7 @@ static struct resource dma_resources[] = { 


void __init r8a73a4_add_standard_devices(void)

{

	r8a73a4_add_dt_devices();

	r8a73a4_register_cmt(1);

	r8a73a4_register_scif(0);

	r8a73a4_register_scif(1);

	r8a73a4_register_scif(2);

CRA Git | Maintained and supported by SUSTech CRA and CCSE