AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-02 21:46:40 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renesas ARM Based SoC r8a73a4 DT Timers Updates for v3.19

Browse Source 
* Initialise CMT1 timer using DT
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUUG1xAAoJENfPZGlqN0++kNQP/1pfyx9m1XnBqj5Xt6GldxLp
 /5nUzU/q/JgSW457NGiigPdYC9z4yELknL00PYbM1pCvJJAtGnpdcnFUku8JPyiE
 0YrLCRT/JZk0a1MlDJ3Ve0osaefyEoK0LmFWvnJJgm672gE3/sUlDfg4CmmOJqer
 4c0sgz7xS1xU1xuciyvhIaZ7gZ8sz1k5ZXm3em8uwG+uHWE+JQl6BGiup+9XMGaS
 MYjTpL9Vlgz2LH8VZHrnkTbrfeZwT/ufwf12GkXw3nGEvVcVcU2SHPbiHJckETsz
 7w4Jaf5fY/fjHHGbocnbCVH9a4VHqy5pI3pm3Gr8dRqM6s/9oEw50rrXqeFvdjNN
 5SQVoRzScghh+t1bESrf3r3h8dSdCwfkwKkn5SsQZLpJfnvxHUXe1yf3Bvwsklv/
 4U3FmisHDurCCHWyGxEdnAhsUOQT+lbpi+tKuaSCVxwfawiAHCK5hAIRVHGNm0Zr
 hwq28Rrfxd5Nd1z/LREm3ObQCPMyaFm1x3Zd4sGNjoRq6yElf52+O9jW52gAwrqi
 9WObGI7fgIZj5/o8ZDxZl02JnKvRTHuOLWNAnJtDnjtktAxNZsZns7IYK4RA/aIv
 bmDJLUquQWaUkl6gYFXIOUd3nqi4cy54aAsUtwIbjGsVS/bosSb2hqWm6EHnIP/j
 IrtOo8W2PlC7pPsvJ+jH
 =Htuq
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-11-04 14:37:47 -08:00
commit 2c49e0250a
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
View File

@ -94,6 +94,10 @@ &cpu0 {
voltage-tolerance = <1>; /* 1% */
};
&cmt1 {
status = "okay";
};
&pfc {
scifa0_pins: serial0 {
renesas,groups = "scifa0_data";

11
arch/arm/boot/dts/r8a73a4.dtsi
View File

@ -109,6 +109,17 @@ i2c5: i2c@e60b0000 {
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";
};

1
arch/arm/mach-shmobile/board-ape6evm-reference.c
View File

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

1
arch/arm/mach-shmobile/r8a73a4.h
View File

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

9
arch/arm/mach-shmobile/setup-r8a73a4.c
View File

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