Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bcafdb4f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt-scif-for-v3.16' of... 

Merge tag 'renesas-dt-scif-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Merge "Renesas ARM Based SoC dt-scif Updates for v3.16" from Simon Horman:

r8a7791 (R-Car M2) based Koelsch board and
r8a7790 (R-Car H1) based Lager board
* Enable SCIF0 and SCIF1 serial ports in DT

* tag 'renesas-dt-scif-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: koelsch: Enable SCIF0 and SCIF1 serial ports in DT
  ARM: shmobile: lager: Enable SCIF0 and SCIF1 serial ports in DT

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 82711e7b 5ba55fa8

arch/arm/boot/dts/r8a7790-lager.dts

+20 −1
Original line number Diff line number Diff line
@@ -17,6 +17,11 @@ 
	model = "Lager";

	compatible = "renesas,lager", "renesas,r8a7790";



	aliases {

		serial6 = &scif0;

		serial7 = &scif1;

	};



	chosen {

		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";

	};
@@ -112,7 +117,7 @@ 
};



&pfc {

	pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;

	pinctrl-0 = <&du_pins>;

	pinctrl-names = "default";



	du_pins: du {
@@ -221,6 +226,20 @@ 
	};

};



&scif0 {

	pinctrl-0 = <&scif0_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&scif1 {

	pinctrl-0 = <&scif1_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-names = "default";

arch/arm/boot/dts/r8a7791-koelsch.dts

+20 −1
Original line number Diff line number Diff line
@@ -18,6 +18,11 @@ 
	model = "Koelsch";

	compatible = "renesas,koelsch", "renesas,r8a7791";



	aliases {

		serial6 = &scif0;

		serial7 = &scif1;

	};



	chosen {

		bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";

	};
@@ -196,7 +201,7 @@ 
};



&pfc {

	pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;

	pinctrl-0 = <&du_pins>;

	pinctrl-names = "default";



	i2c2_pins: i2c {
@@ -269,6 +274,20 @@ 
	status = "okay";

};



&scif0 {

	pinctrl-0 = <&scif0_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&scif1 {

	pinctrl-0 = <&scif1_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&sdhi0 {

	pinctrl-0 = <&sdhi0_pins>;

	pinctrl-names = "default";

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

+0 −15
Original line number Diff line number Diff line
@@ -87,21 +87,6 @@ static void __init koelsch_add_du_device(void) 
 */

static const struct clk_name clk_names[] __initconst = {

	{ "cmt0", "fck", "sh-cmt-48-gen2.0" },

	{ "scifa0", NULL, "sh-sci.0" },

	{ "scifa1", NULL, "sh-sci.1" },

	{ "scifb0", NULL, "sh-sci.2" },

	{ "scifb1", NULL, "sh-sci.3" },

	{ "scifb2", NULL, "sh-sci.4" },

	{ "scifa2", NULL, "sh-sci.5" },

	{ "scif0", NULL, "sh-sci.6" },

	{ "scif1", NULL, "sh-sci.7" },

	{ "scif2", NULL, "sh-sci.8" },

	{ "scif3", NULL, "sh-sci.9" },

	{ "scif4", NULL, "sh-sci.10" },

	{ "scif5", NULL, "sh-sci.11" },

	{ "scifa3", NULL, "sh-sci.12" },

	{ "scifa4", NULL, "sh-sci.13" },

	{ "scifa5", NULL, "sh-sci.14" },

	{ "du0", "du.0", "rcar-du-r8a7791" },

	{ "du1", "du.1", "rcar-du-r8a7791" },

	{ "lvds0", "lvds.0", "rcar-du-r8a7791" },

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

+0 −10
Original line number Diff line number Diff line
@@ -91,16 +91,6 @@ static void __init lager_add_du_device(void) 
 */

static const struct clk_name clk_names[] __initconst = {

	{ "cmt0", "fck", "sh-cmt-48-gen2.0" },

	{ "scifa0", NULL, "sh-sci.0" },

	{ "scifa1", NULL, "sh-sci.1" },

	{ "scifb0", NULL, "sh-sci.2" },

	{ "scifb1", NULL, "sh-sci.3" },

	{ "scifb2", NULL, "sh-sci.4" },

	{ "scifa2", NULL, "sh-sci.5" },

	{ "scif0", NULL, "sh-sci.6" },

	{ "scif1", NULL, "sh-sci.7" },

	{ "hscif0", NULL, "sh-sci.8" },

	{ "hscif1", NULL, "sh-sci.9" },

	{ "du0", "du.0", "rcar-du-r8a7790" },

	{ "du1", "du.1", "rcar-du-r8a7790" },

	{ "du2", "du.2", "rcar-du-r8a7790" },

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

+5 −5
Original line number Diff line number Diff line
@@ -286,6 +286,11 @@ static struct resource cmt0_resources[] = { 
					  sizeof(struct sh_timer_config))



void __init r8a7790_add_dt_devices(void)

{

	r8a7790_register_cmt(0);

}



void __init r8a7790_add_standard_devices(void)

{

	r8a7790_register_scif(0);

	r8a7790_register_scif(1);
@@ -297,11 +302,6 @@ void __init r8a7790_add_dt_devices(void) 
	r8a7790_register_scif(7);

	r8a7790_register_scif(8);

	r8a7790_register_scif(9);

	r8a7790_register_cmt(0);

}



void __init r8a7790_add_standard_devices(void)

{

	r8a7790_add_dt_devices();

	r8a7790_register_irqc(0);

	r8a7790_register_thermal();