Commit 4a80467a authored by Chanwoo Choi's avatar Chanwoo Choi Committed by Krzysztof Kozlowski
Browse files

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: default avatarChanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
[m.reichl and linux.amoon: Tested it on exynos4412-odroidu3 board]
Tested-by: default avatarMarkus Reichl <m.reichl@fivetechno.de>
Tested-by: default avatarAnand Moon <linux.amoon@gmail.com>
Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
parent f0ba9eaa

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

+1 −40
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 




/dts-v1/;

/dts-v1/;

#include "exynos3250.dtsi"

#include "exynos3250.dtsi"

#include "exynos4412-ppmu-common.dtsi"

#include <dt-bindings/input/input.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/samsung,s2mps11.h>

#include <dt-bindings/clock/samsung,s2mps11.h>
@@ -464,46 +465,6 @@ 
	status = "okay";

	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 {

&xusbxti {

	clock-frequency = <24000000>;

	clock-frequency = <24000000>;

};

};

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

+1 −40
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 




/dts-v1/;

/dts-v1/;

#include "exynos3250.dtsi"

#include "exynos3250.dtsi"

#include "exynos4412-ppmu-common.dtsi"

#include <dt-bindings/input/input.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/samsung,s2mps11.h>

#include <dt-bindings/clock/samsung,s2mps11.h>
@@ -641,46 +642,6 @@ 
	status = "okay";

	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 {

&xusbxti {

	clock-frequency = <24000000>;

	clock-frequency = <24000000>;

};

};

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <dt-bindings/input/input.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/clock/maxim,max77686.h>

#include <dt-bindings/clock/maxim,max77686.h>

#include "exynos4412.dtsi"

#include "exynos4412.dtsi"

#include "exynos4412-ppmu-common.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/gpio/gpio.h>





/ {

/ {

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

0 → 100644
+50 −0
Original line number Original line Diff line number Diff line 
/*

 * 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";

	       };

       };

};

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

+1 −40
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 




/dts-v1/;

/dts-v1/;

#include "exynos4412.dtsi"

#include "exynos4412.dtsi"

#include "exynos4412-ppmu-common.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/clock/maxim,max77686.h>

#include <dt-bindings/clock/maxim,max77686.h>
@@ -871,46 +872,6 @@ 
	assigned-clock-parents =  <&clock CLK_XUSBXTI>;

	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_0 {

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&sleep0>;

	pinctrl-0 = <&sleep0>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE