msm: copper: Convert tzlog to Device Tree.
Remove the device instantiation from the board file and
add it to the Device Tree.
Change-Id: I7c94e4b2dd0f076523c7d8f49c9196ed9eaa13f7
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
diff --git a/arch/arm/boot/dts/msm8974.dtsi b/arch/arm/boot/dts/msm8974.dtsi
index ad6f99b..584bd11 100644
--- a/arch/arm/boot/dts/msm8974.dtsi
+++ b/arch/arm/boot/dts/msm8974.dtsi
@@ -466,4 +466,9 @@
qcom,pet-time = <10000>;
qcom,ipi-ping = <1>;
};
+
+ qcom,tz-log@fe805720 {
+ compatible = "qcom,tz-log";
+ reg = <0xfe805720 0x1000>;
+ };
};
diff --git a/arch/arm/mach-msm/board-8974.c b/arch/arm/mach-msm/board-8974.c
index 4e881df..557331a 100644
--- a/arch/arm/mach-msm/board-8974.c
+++ b/arch/arm/mach-msm/board-8974.c
@@ -395,22 +395,6 @@
.id = -1,
};
-#define SHARED_IMEM_TZ_BASE 0xFE805720
-static struct resource msm8974_tzlog_resources[] = {
- {
- .start = SHARED_IMEM_TZ_BASE,
- .end = SHARED_IMEM_TZ_BASE + SZ_4K - 1,
- .flags = IORESOURCE_MEM,
- },
-};
-
-struct platform_device msm8974_device_tz_log = {
- .name = "tz_log",
- .id = 0,
- .num_resources = ARRAY_SIZE(msm8974_tzlog_resources),
- .resource = msm8974_tzlog_resources,
-};
-
#define BIMC_BASE 0xfc380000
#define BIMC_SIZE 0x0006A000
#define SYS_NOC_BASE 0xfc460000
@@ -556,7 +540,6 @@
platform_device_register(&android_usb_device);
platform_add_devices(msm_8974_stub_regulator_devices,
msm_8974_stub_regulator_devices_len);
- platform_device_register(&msm8974_device_tz_log);
}
static struct clk_lookup msm_clocks_dummy[] = {
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index 4f37e08..167a5af 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -408,8 +408,6 @@
extern struct platform_device apq8064_cache_dump_device;
extern struct platform_device msm8930_cache_dump_device;
-extern struct platform_device msm8974_device_tz_log;
-
extern struct platform_device mdm_sglte_device;
extern struct platform_device apq_device_tz_log;