AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-26 23:40:55 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renesas ARM Based SoC dt-scif Updates for v3.16

Browse Source 
r8a7791 (R-Car M2) based Koelsch board and
 r8a7790 (R-Car H1) based Lager board
 * Enable SCIF0 and SCIF1 serial ports in DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.14 (GNU/Linux)
 
 iQIcBAABAgAGBQJTdWHAAAoJENfPZGlqN0++CooP/R0lSwmJr0qRN6IarjTPnPNh
 R3yuLn2owGvtgF5N6tdsUeo9VrTWsS38QaW3F0Adn1xSF/ub+KwIpmpkelaqhYO/
 UZIa6q0hT9Jwj0n06lrn8esf+1fkLNQYqg3YHmJwq29EK+Hf1O3UYG+B4gOPvII7
 EkYRhALTZW4MO5iW5Ys5Vv9Ohs128PCsbxH+mP9RWVU2BzI12NUcQrnfk9GLvyoZ
 Y9JWddB/MQTPiWKs5DOlhr3PnZAbujJIKpt2jFJrfqgIARFGYpIFfoIk96eQPsvL
 LVPxrs2n7Y/HUTW1RCF2pOI+F/j1dJ+wggG2/tbn1zzNGjq/kYMeF5sOVXhDoCMQ
 JLDtJokp5WU3ttszuFnCOPVPILZQJLOh5rsZT81uncZdr91IuRHIHg6S6l4Yn4qI
 vH5BCm+j//WM/0Lp5Pa2OQQG1q0aALsstxiNxE7ZyYBMp81YuHJ6AKHf8k8ZbatG
 Cusb4WwWjV7ST+YElV/bUs2dz0daGEOSMexG72XqEnMza6ZnL2rdj0Gg4QtWuTw0
 FTFKsLBUalG8NzQtkNJ+g2GBZjlT03quaTJ+JMS+3r9EDWGMM/6o1yaeY5WKXWBw
 kTX6bnS/RLfBs0FSdhB3S2YpPB71wzM/kOTSdVRulbctE9ZJjRUMvENycPzWZfH8
 MSTGMpCjive8HsKcGdRb
 =gSwR
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-05-21 14:26:44 -07:00
commit bcafdb4fe8
6 changed files with 50 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/boot/dts/r8a7790-lager.dts
View File

@ -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 @@ &extal_clk {
};
&pfc {
pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
pinctrl-0 = <&du_pins>;
pinctrl-names = "default";
du_pins: du {
@ -221,6 +226,20 @@ partition@440000 {
};
};
&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";

21
arch/arm/boot/dts/r8a7791-koelsch.dts
View File

@ -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 @@ eeprom@50 {
};
&pfc {
pinctrl-0 = <&du_pins &scif0_pins &scif1_pins>;
pinctrl-0 = <&du_pins>;
pinctrl-names = "default";
i2c2_pins: i2c {
@ -269,6 +274,20 @@ &sata0 {
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";

15
arch/arm/mach-shmobile/board-koelsch-reference.c
View File

@ -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" },

10
arch/arm/mach-shmobile/board-lager-reference.c
View File

@ -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" },

10
arch/arm/mach-shmobile/setup-r8a7790.c
View File

@ -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();

10
arch/arm/mach-shmobile/setup-r8a7791.c
View File

@ -181,6 +181,11 @@ static const struct resource thermal_resources[] __initconst = {
ARRAY_SIZE(thermal_resources))
void __init r8a7791_add_dt_devices(void)
{
r8a7791_register_cmt(0);
}
void __init r8a7791_add_standard_devices(void)
{
r8a7791_register_scif(0);
r8a7791_register_scif(1);
@ -197,11 +202,6 @@ void __init r8a7791_add_dt_devices(void)
r8a7791_register_scif(12);
r8a7791_register_scif(13);
r8a7791_register_scif(14);
r8a7791_register_cmt(0);
}
void __init r8a7791_add_standard_devices(void)
{
r8a7791_add_dt_devices();
r8a7791_register_irqc(0);
r8a7791_register_thermal();