Skip to content

Commit 4a80467

Browse files
chanwoochoikrzk
authored andcommitted
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 <[email protected]> Reviewed-by: Krzysztof Kozlowski <[email protected]> [m.reichl and linux.amoon: Tested it on exynos4412-odroidu3 board] Tested-by: Markus Reichl <[email protected]> Tested-by: Anand Moon <[email protected]> Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent f0ba9ea commit 4a80467

File tree

5 files changed

+54
-120
lines changed

5 files changed

+54
-120
lines changed

arch/arm/boot/dts/exynos3250-monk.dts

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
/dts-v1/;
1616
#include "exynos3250.dtsi"
17+
#include "exynos4412-ppmu-common.dtsi"
1718
#include <dt-bindings/input/input.h>
1819
#include <dt-bindings/gpio/gpio.h>
1920
#include <dt-bindings/clock/samsung,s2mps11.h>
@@ -464,46 +465,6 @@
464465
status = "okay";
465466
};
466467

467-
&ppmu_dmc0 {
468-
status = "okay";
469-
470-
events {
471-
ppmu_dmc0_3: ppmu-event3-dmc0 {
472-
event-name = "ppmu-event3-dmc0";
473-
};
474-
};
475-
};
476-
477-
&ppmu_dmc1 {
478-
status = "okay";
479-
480-
events {
481-
ppmu_dmc1_3: ppmu-event3-dmc1 {
482-
event-name = "ppmu-event3-dmc1";
483-
};
484-
};
485-
};
486-
487-
&ppmu_leftbus {
488-
status = "okay";
489-
490-
events {
491-
ppmu_leftbus_3: ppmu-event3-leftbus {
492-
event-name = "ppmu-event3-leftbus";
493-
};
494-
};
495-
};
496-
497-
&ppmu_rightbus {
498-
status = "okay";
499-
500-
events {
501-
ppmu_rightbus_3: ppmu-event3-rightbus {
502-
event-name = "ppmu-event3-rightbus";
503-
};
504-
};
505-
};
506-
507468
&xusbxti {
508469
clock-frequency = <24000000>;
509470
};

arch/arm/boot/dts/exynos3250-rinato.dts

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
/dts-v1/;
1616
#include "exynos3250.dtsi"
17+
#include "exynos4412-ppmu-common.dtsi"
1718
#include <dt-bindings/input/input.h>
1819
#include <dt-bindings/gpio/gpio.h>
1920
#include <dt-bindings/clock/samsung,s2mps11.h>
@@ -641,46 +642,6 @@
641642
status = "okay";
642643
};
643644

644-
&ppmu_dmc0 {
645-
status = "okay";
646-
647-
events {
648-
ppmu_dmc0_3: ppmu-event3-dmc0 {
649-
event-name = "ppmu-event3-dmc0";
650-
};
651-
};
652-
};
653-
654-
&ppmu_dmc1 {
655-
status = "okay";
656-
657-
events {
658-
ppmu_dmc1_3: ppmu-event3-dmc1 {
659-
event-name = "ppmu-event3-dmc1";
660-
};
661-
};
662-
};
663-
664-
&ppmu_leftbus {
665-
status = "okay";
666-
667-
events {
668-
ppmu_leftbus_3: ppmu-event3-leftbus {
669-
event-name = "ppmu-event3-leftbus";
670-
};
671-
};
672-
};
673-
674-
&ppmu_rightbus {
675-
status = "okay";
676-
677-
events {
678-
ppmu_rightbus_3: ppmu-event3-rightbus {
679-
event-name = "ppmu-event3-rightbus";
680-
};
681-
};
682-
};
683-
684645
&xusbxti {
685646
clock-frequency = <24000000>;
686647
};

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <dt-bindings/input/input.h>
1212
#include <dt-bindings/clock/maxim,max77686.h>
1313
#include "exynos4412.dtsi"
14+
#include "exynos4412-ppmu-common.dtsi"
1415
#include <dt-bindings/gpio/gpio.h>
1516

1617
/ {
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Device tree sources for Exynos4412 PPMU common device tree
3+
*
4+
* Copyright (C) 2015 Samsung Electronics
5+
* Author: Chanwoo Choi <[email protected]>
6+
*
7+
* This program is free software; you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License version 2 as
9+
* published by the Free Software Foundation.
10+
*/
11+
12+
&ppmu_dmc0 {
13+
status = "okay";
14+
15+
events {
16+
ppmu_dmc0_3: ppmu-event3-dmc0 {
17+
event-name = "ppmu-event3-dmc0";
18+
};
19+
};
20+
};
21+
22+
&ppmu_dmc1 {
23+
status = "okay";
24+
25+
events {
26+
ppmu_dmc1_3: ppmu-event3-dmc1 {
27+
event-name = "ppmu-event3-dmc1";
28+
};
29+
};
30+
};
31+
32+
&ppmu_leftbus {
33+
status = "okay";
34+
35+
events {
36+
ppmu_leftbus_3: ppmu-event3-leftbus {
37+
event-name = "ppmu-event3-leftbus";
38+
};
39+
};
40+
};
41+
42+
&ppmu_rightbus {
43+
status = "okay";
44+
45+
events {
46+
ppmu_rightbus_3: ppmu-event3-rightbus {
47+
event-name = "ppmu-event3-rightbus";
48+
};
49+
};
50+
};

arch/arm/boot/dts/exynos4412-trats2.dts

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
/dts-v1/;
1616
#include "exynos4412.dtsi"
17+
#include "exynos4412-ppmu-common.dtsi"
1718
#include <dt-bindings/gpio/gpio.h>
1819
#include <dt-bindings/interrupt-controller/irq.h>
1920
#include <dt-bindings/clock/maxim,max77686.h>
@@ -871,46 +872,6 @@
871872
assigned-clock-parents = <&clock CLK_XUSBXTI>;
872873
};
873874

874-
&ppmu_dmc0 {
875-
status = "okay";
876-
877-
events {
878-
ppmu_dmc0_3: ppmu-event3-dmc0 {
879-
event-name = "ppmu-event3-dmc0";
880-
};
881-
};
882-
};
883-
884-
&ppmu_dmc1 {
885-
status = "okay";
886-
887-
events {
888-
ppmu_dmc1_3: ppmu-event3-dmc1 {
889-
event-name = "ppmu-event3-dmc1";
890-
};
891-
};
892-
};
893-
894-
&ppmu_leftbus {
895-
status = "okay";
896-
897-
events {
898-
ppmu_leftbus_3: ppmu-event3-leftbus {
899-
event-name = "ppmu-event3-leftbus";
900-
};
901-
};
902-
};
903-
904-
&ppmu_rightbus {
905-
status = "okay";
906-
907-
events {
908-
ppmu_rightbus_3: ppmu-event3-rightbus {
909-
event-name = "ppmu-event3-rightbus";
910-
};
911-
};
912-
};
913-
914875
&pinctrl_0 {
915876
pinctrl-names = "default";
916877
pinctrl-0 = <&sleep0>;

0 commit comments

Comments
 (0)