Skip to content

Commit

Permalink
ARM: dts: exynos: Add exynos4412-ppmu-common dtsi to delete duplicate…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Chanwoo Choi authored and Krzysztof Kozlowski committed May 3, 2016
1 parent f0ba9ea commit 4a80467
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 120 deletions.
41 changes: 1 addition & 40 deletions arch/arm/boot/dts/exynos3250-monk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>
#include <dt-bindings/clock/samsung,s2mps11.h>
Expand Down Expand Up @@ -464,46 +465,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>;
};
Expand Down
41 changes: 1 addition & 40 deletions arch/arm/boot/dts/exynos3250-rinato.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>
#include <dt-bindings/clock/samsung,s2mps11.h>
Expand Down Expand Up @@ -641,46 +642,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>;
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/exynos4412-odroid-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -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"
#include <dt-bindings/gpio/gpio.h>

/ {
Expand Down
50 changes: 50 additions & 0 deletions arch/arm/boot/dts/exynos4412-ppmu-common.dtsi
Original file line number Diff line number Diff line change
@@ -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";
};
};
};
41 changes: 1 addition & 40 deletions arch/arm/boot/dts/exynos4412-trats2.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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>
#include <dt-bindings/clock/maxim,max77686.h>
Expand Down Expand Up @@ -871,46 +872,6 @@
assigned-clock-parents = <&clock CLK_XUSBXTI>;
};

&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>;
Expand Down

0 comments on commit 4a80467

Please sign in to comment.