浏览代码

ARM: shmobile: ape6evm-reference: Initialise CMT1 device using DT

Initialise CMT1 device using DT when booting ape6evm
using DT-reference.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Simon Horman 11 年之前
父节点
当前提交
dfb846c95e
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 4 0
      arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
  2. 1 2
      arch/arm/mach-shmobile/setup-r8a73a4.c

+ 4 - 0
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts

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

+ 1 - 2
arch/arm/mach-shmobile/setup-r8a73a4.c

@@ -189,7 +189,6 @@ static struct resource cmt1_resources[] = {
 
 void __init r8a73a4_add_dt_devices(void)
 {
-	r8a73a4_register_cmt(1);
 }
 
 /* DMA */
@@ -282,7 +281,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);