ARM: dts: exynos: Add exynos4412-ppmu-common dtsi to delete duplicate PPMU nodes

This patch adds the exynos4412-ppmu-common.dtsi to remove duplicate PPMU nodes
because exynos3250-rinato/monk, exynos4412-trats2/odroidu3 has the same
PPMU device tree node.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
[m.reichl and linux.amoon: Tested it on exynos4412-odroidu3 board]
Tested-by: Markus Reichl <m.reichl@fivetechno.de>
Tested-by: Anand Moon <linux.amoon@gmail.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
[cw00.choi: Fix merge issue and apply mainline patch]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Change-Id: Ic2609b3fbc6736bd74e68d709e74a19e6c77d0e6

diff --git a/arch/arm/boot/dts/exynos3250-monk.dts b/arch/arm/boot/dts/exynos3250-monk.dts
index 4c6e338c854a021dc769cc9de861ad54fff6933d..c2382e8c195d7b9027dcee62ab627c548241ccb5 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-monk.dts
+++ b/arch/arm/boot/dts/exynos3250-monk.dts
@@ -14,6 +14,7 @@
 
 /dts-v1/;
 #include "exynos3250.dtsi"
+#include "exynos4412-ppmu-common.dtsi"
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 
@@ -443,46 +444,6 @@
        status = "okay";
 };
 
-&ppmu_dmc0 {
-       status = "okay";
-
-       events {
-               ppmu_dmc0_3: ppmu-event3-dmc0 {
-                       event-name = "ppmu-event3-dmc0";
-               };
-       };
-};
-
-&ppmu_dmc1 {
-       status = "okay";
-
-       events {
-               ppmu_dmc1_3: ppmu-event3-dmc1 {
-                       event-name = "ppmu-event3-dmc1";
-               };
-       };
-};
-
-&ppmu_leftbus {
-       status = "okay";
-
-       events {
-               ppmu_leftbus_3: ppmu-event3-leftbus {
-                       event-name = "ppmu-event3-leftbus";
-               };
-       };
-};
-
-&ppmu_rightbus {
-       status = "okay";
-
-       events {
-               ppmu_rightbus_3: ppmu-event3-rightbus {
-                       event-name = "ppmu-event3-rightbus";
-               };
-       };
-};
-
 &xusbxti {
        clock-frequency = <24000000>;
 };

diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index 1302cf813b523574c490de0b9a11f5ae49df45b4..9dfccb432655e11f3e2efe3299f8e8074289744d 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -14,6 +14,7 @@
 
 /dts-v1/;
 #include "exynos3250.dtsi"
+#include "exynos4412-ppmu-common.dtsi"
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/gpio/gpio.h>
 
@@ -798,46 +799,6 @@
        status = "okay";
 };
 
-&ppmu_dmc0 {
-       status = "okay";
-
-       events {
-               ppmu_dmc0_3: ppmu-event3-dmc0 {
-                       event-name = "ppmu-event3-dmc0";
-               };
-       };
-};
-
-&ppmu_dmc1 {
-       status = "okay";
-
-       events {
-               ppmu_dmc1_3: ppmu-event3-dmc1 {
-                       event-name = "ppmu-event3-dmc1";
-               };
-       };
-};
-
-&ppmu_leftbus {
-       status = "okay";
-
-       events {
-               ppmu_leftbus_3: ppmu-event3-leftbus {
-                       event-name = "ppmu-event3-leftbus";
-               };
-       };
-};
-
-&ppmu_rightbus {
-       status = "okay";
-
-       events {
-               ppmu_rightbus_3: ppmu-event3-rightbus {
-                       event-name = "ppmu-event3-rightbus";
-               };
-       };
-};
-
 &xusbxti {
        clock-frequency = <24000000>;
 };

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 1bddf650896089892f26014a94faafba12e4bdec..42f51a0a6e1a625b1023b431b3cbd86967d4f9eb 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -11,6 +11,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/clock/maxim,max77686.h>
 #include "exynos4412.dtsi"
+#include "exynos4412-ppmu-common.dtsi"
 
 / {
        chosen {

diff --git a/arch/arm/boot/dts/exynos4412-ppmu-common.dtsi b/arch/arm/boot/dts/exynos4412-ppmu-common.dtsi
new file mode 100644 (file)
index 0000000..16e4b77
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-ppmu-common.dtsi
@@ -0,0 +1,50 @@
+/*
+ * Device tree sources for Exynos4412 PPMU common device tree
+ *
+ * Copyright (C) 2015 Samsung Electronics
+ * Author: Chanwoo Choi <cw00.choi@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+&ppmu_dmc0 {
+       status = "okay";
+
+       events {
+              ppmu_dmc0_3: ppmu-event3-dmc0 {
+                      event-name = "ppmu-event3-dmc0";
+              };
+       };
+};
+
+&ppmu_dmc1 {
+       status = "okay";
+
+       events {
+              ppmu_dmc1_3: ppmu-event3-dmc1 {
+                      event-name = "ppmu-event3-dmc1";
+              };
+       };
+};
+
+&ppmu_leftbus {
+       status = "okay";
+
+       events {
+              ppmu_leftbus_3: ppmu-event3-leftbus {
+                      event-name = "ppmu-event3-leftbus";
+              };
+       };
+};
+
+&ppmu_rightbus {
+       status = "okay";
+
+       events {
+              ppmu_rightbus_3: ppmu-event3-rightbus {
+                      event-name = "ppmu-event3-rightbus";
+              };
+       };
+};

diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
index 54a99109a4dd118f256f57c606d42f84d3406c15..9c17ad2118052db5cae02b89a290ca23562a694b 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-trats2.dts
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -14,6 +14,7 @@
 
 /dts-v1/;
 #include "exynos4412.dtsi"
+#include "exynos4412-ppmu-common.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 
@@ -956,46 +957,6 @@
        reboot-inform = <0x080C>;
 };
 
-&ppmu_dmc0 {
-       status = "okay";
-
-       events {
-               ppmu_dmc0_3: ppmu-event3-dmc0 {
-                       event-name = "ppmu-event3-dmc0";
-               };
-       };
-};
-
-&ppmu_dmc1 {
-       status = "okay";
-
-       events {
-               ppmu_dmc1_3: ppmu-event3-dmc1 {
-                       event-name = "ppmu-event3-dmc1";
-               };
-       };
-};
-
-&ppmu_leftbus {
-       status = "okay";
-
-       events {
-               ppmu_leftbus_3: ppmu-event3-leftbus {
-                       event-name = "ppmu-event3-leftbus";
-               };
-       };
-};
-
-&ppmu_rightbus {
-       status = "okay";
-
-       events {
-               ppmu_rightbus_3: ppmu-event3-rightbus {
-                       event-name = "ppmu-event3-rightbus";
-               };
-       };
-};
-
 &pinctrl_0 {
        pinctrl-names = "default";
        pinctrl-0 = <&sleep0>;