Skip to content

Commit 88f1847

Browse files
arndbarndb
committed
Merge tag 'samsung-dt-devfreq-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/late
Merge "ARM: dts: exynos: Devfreq for v4.7: from Krzysztof Kozłowski: Topic branch for Device Tree changes adding new generic devfreq driver, for v4.7: 1. Add bus nodes for Exynos3250, Exynos4x12, Exynos4210 and Exynos542x. 2. Split out common PPMU (Performance Monitoring Unit) nodes into separate DTSI. The PPMU provides performance data for devfreq. 3. Add NoCP (Network on Chip Probe) node for Exynos542x. On this SoC, like PPMU on older designs, provides performance data for devfreq. 4. Enable DFVS (Dynamic Voltage and Frequency Scaling) on boards: - Exynos3250 Rinato, - Exynos4412 Odroid-X/X2/U3 and Trats2, - Exynos5422 Odroid XU3/XU3-Lite/XU4. * tag 'samsung-dt-devfreq-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Add support of Bus frequency using VDD_INT for exynos5422-odroidxu3 ARM: dts: exynos: Add bus nodes using VDD_INT for Exynos542x SoC ARM: dts: exynos: Add NoC Probe dt node for Exynos542x SoC ARM: dts: exynos: Add support of bus frequency for exynos4412-trats/odroidu3 ARM: dts: exynos: Expand the voltage range of buck1/3 regulator for exynos4412-odroidu3 ARM: dts: exynos: Add support of bus frequency using VDD_INT for exynos3250-rinato ARM: dts: exynos: Add exynos4412-ppmu-common dtsi to delete duplicate PPMU nodes ARM: dts: exynos: Add bus nodes using VDD_MIF for Exynos4210 ARM: dts: exynos: Add bus nodes using VDD_INT for Exynos4x12 ARM: dts: exynos: Add bus nodes using VDD_MIF for Exynos4x12 ARM: dts: exynos: Add bus nodes using VDD_INT for Exynos3250 ARM: dts: exynos: Add DMC bus frequency for exynos3250-rinato/monk ARM: dts: exynos: Add DMC bus node for Exynos3250 clk: samsung: exynos542x: Add the clock id for ACLK dt-bindings: clock: Add the clock id for ACLK clock of Exynos542x SoC
2 parents 28f3136 + 3f2129f commit 88f1847

12 files changed

+1295
-155
lines changed

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

Lines changed: 7 additions & 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>
@@ -156,6 +157,12 @@
156157
};
157158
};
158159

160+
&bus_dmc {
161+
devfreq-events = <&ppmu_dmc0_3>, <&ppmu_dmc1_3>;
162+
vdd-supply = <&buck1_reg>;
163+
status = "okay";
164+
};
165+
159166
&cpu0 {
160167
cpu0-supply = <&buck2_reg>;
161168
};
@@ -458,46 +465,6 @@
458465
status = "okay";
459466
};
460467

461-
&ppmu_dmc0 {
462-
status = "okay";
463-
464-
events {
465-
ppmu_dmc0_3: ppmu-event3-dmc0 {
466-
event-name = "ppmu-event3-dmc0";
467-
};
468-
};
469-
};
470-
471-
&ppmu_dmc1 {
472-
status = "okay";
473-
474-
events {
475-
ppmu_dmc1_3: ppmu-event3-dmc1 {
476-
event-name = "ppmu-event3-dmc1";
477-
};
478-
};
479-
};
480-
481-
&ppmu_leftbus {
482-
status = "okay";
483-
484-
events {
485-
ppmu_leftbus_3: ppmu-event3-leftbus {
486-
event-name = "ppmu-event3-leftbus";
487-
};
488-
};
489-
};
490-
491-
&ppmu_rightbus {
492-
status = "okay";
493-
494-
events {
495-
ppmu_rightbus_3: ppmu-event3-rightbus {
496-
event-name = "ppmu-event3-rightbus";
497-
};
498-
};
499-
};
500-
501468
&xusbxti {
502469
clock-frequency = <24000000>;
503470
};

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

Lines changed: 48 additions & 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>
@@ -147,6 +148,53 @@
147148
};
148149
};
149150

151+
&bus_dmc {
152+
devfreq-events = <&ppmu_dmc0_3>, <&ppmu_dmc1_3>;
153+
vdd-supply = <&buck1_reg>;
154+
status = "okay";
155+
};
156+
157+
&bus_leftbus {
158+
devfreq-events = <&ppmu_leftbus_3>, <&ppmu_rightbus_3>;
159+
vdd-supply = <&buck3_reg>;
160+
status = "okay";
161+
};
162+
163+
&bus_rightbus {
164+
devfreq = <&bus_leftbus>;
165+
status = "okay";
166+
};
167+
168+
&bus_lcd0 {
169+
devfreq = <&bus_leftbus>;
170+
status = "okay";
171+
};
172+
173+
&bus_fsys {
174+
devfreq = <&bus_leftbus>;
175+
status = "okay";
176+
};
177+
178+
&bus_mcuisp {
179+
devfreq = <&bus_leftbus>;
180+
status = "okay";
181+
};
182+
183+
&bus_isp {
184+
devfreq = <&bus_leftbus>;
185+
status = "okay";
186+
};
187+
188+
&bus_peril {
189+
devfreq = <&bus_leftbus>;
190+
status = "okay";
191+
};
192+
193+
&bus_mfc {
194+
devfreq = <&bus_leftbus>;
195+
status = "okay";
196+
};
197+
150198
&cpu0 {
151199
cpu0-supply = <&buck2_reg>;
152200
};
@@ -635,46 +683,6 @@
635683
status = "okay";
636684
};
637685

638-
&ppmu_dmc0 {
639-
status = "okay";
640-
641-
events {
642-
ppmu_dmc0_3: ppmu-event3-dmc0 {
643-
event-name = "ppmu-event3-dmc0";
644-
};
645-
};
646-
};
647-
648-
&ppmu_dmc1 {
649-
status = "okay";
650-
651-
events {
652-
ppmu_dmc1_3: ppmu-event3-dmc1 {
653-
event-name = "ppmu-event3-dmc1";
654-
};
655-
};
656-
};
657-
658-
&ppmu_leftbus {
659-
status = "okay";
660-
661-
events {
662-
ppmu_leftbus_3: ppmu-event3-leftbus {
663-
event-name = "ppmu-event3-leftbus";
664-
};
665-
};
666-
};
667-
668-
&ppmu_rightbus {
669-
status = "okay";
670-
671-
events {
672-
ppmu_rightbus_3: ppmu-event3-rightbus {
673-
event-name = "ppmu-event3-rightbus";
674-
};
675-
};
676-
};
677-
678686
&xusbxti {
679687
clock-frequency = <24000000>;
680688
};

‎arch/arm/boot/dts/exynos3250.dtsi

Lines changed: 181 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -688,6 +688,187 @@
688688
clock-names = "ppmu";
689689
status = "disabled";
690690
};
691+
692+
bus_dmc: bus_dmc {
693+
compatible = "samsung,exynos-bus";
694+
clocks = <&cmu_dmc CLK_DIV_DMC>;
695+
clock-names = "bus";
696+
operating-points-v2 = <&bus_dmc_opp_table>;
697+
status = "disabled";
698+
};
699+
700+
bus_dmc_opp_table: opp_table1 {
701+
compatible = "operating-points-v2";
702+
opp-shared;
703+
704+
opp@50000000 {
705+
opp-hz = /bits/ 64 <50000000>;
706+
opp-microvolt = <800000>;
707+
};
708+
opp@100000000 {
709+
opp-hz = /bits/ 64 <100000000>;
710+
opp-microvolt = <800000>;
711+
};
712+
opp@134000000 {
713+
opp-hz = /bits/ 64 <134000000>;
714+
opp-microvolt = <800000>;
715+
};
716+
opp@200000000 {
717+
opp-hz = /bits/ 64 <200000000>;
718+
opp-microvolt = <825000>;
719+
};
720+
opp@400000000 {
721+
opp-hz = /bits/ 64 <400000000>;
722+
opp-microvolt = <875000>;
723+
};
724+
};
725+
726+
bus_leftbus: bus_leftbus {
727+
compatible = "samsung,exynos-bus";
728+
clocks = <&cmu CLK_DIV_GDL>;
729+
clock-names = "bus";
730+
operating-points-v2 = <&bus_leftbus_opp_table>;
731+
status = "disabled";
732+
};
733+
734+
bus_rightbus: bus_rightbus {
735+
compatible = "samsung,exynos-bus";
736+
clocks = <&cmu CLK_DIV_GDR>;
737+
clock-names = "bus";
738+
operating-points-v2 = <&bus_leftbus_opp_table>;
739+
status = "disabled";
740+
};
741+
742+
bus_lcd0: bus_lcd0 {
743+
compatible = "samsung,exynos-bus";
744+
clocks = <&cmu CLK_DIV_ACLK_160>;
745+
clock-names = "bus";
746+
operating-points-v2 = <&bus_leftbus_opp_table>;
747+
status = "disabled";
748+
};
749+
750+
bus_fsys: bus_fsys {
751+
compatible = "samsung,exynos-bus";
752+
clocks = <&cmu CLK_DIV_ACLK_200>;
753+
clock-names = "bus";
754+
operating-points-v2 = <&bus_leftbus_opp_table>;
755+
status = "disabled";
756+
};
757+
758+
bus_mcuisp: bus_mcuisp {
759+
compatible = "samsung,exynos-bus";
760+
clocks = <&cmu CLK_DIV_ACLK_400_MCUISP>;
761+
clock-names = "bus";
762+
operating-points-v2 = <&bus_mcuisp_opp_table>;
763+
status = "disabled";
764+
};
765+
766+
bus_isp: bus_isp {
767+
compatible = "samsung,exynos-bus";
768+
clocks = <&cmu CLK_DIV_ACLK_266>;
769+
clock-names = "bus";
770+
operating-points-v2 = <&bus_isp_opp_table>;
771+
status = "disabled";
772+
};
773+
774+
bus_peril: bus_peril {
775+
compatible = "samsung,exynos-bus";
776+
clocks = <&cmu CLK_DIV_ACLK_100>;
777+
clock-names = "bus";
778+
operating-points-v2 = <&bus_peril_opp_table>;
779+
status = "disabled";
780+
};
781+
782+
bus_mfc: bus_mfc {
783+
compatible = "samsung,exynos-bus";
784+
clocks = <&cmu CLK_SCLK_MFC>;
785+
clock-names = "bus";
786+
operating-points-v2 = <&bus_leftbus_opp_table>;
787+
status = "disabled";
788+
};
789+
790+
bus_leftbus_opp_table: opp_table2 {
791+
compatible = "operating-points-v2";
792+
opp-shared;
793+
794+
opp@50000000 {
795+
opp-hz = /bits/ 64 <50000000>;
796+
opp-microvolt = <900000>;
797+
};
798+
opp@80000000 {
799+
opp-hz = /bits/ 64 <80000000>;
800+
opp-microvolt = <900000>;
801+
};
802+
opp@100000000 {
803+
opp-hz = /bits/ 64 <100000000>;
804+
opp-microvolt = <1000000>;
805+
};
806+
opp@134000000 {
807+
opp-hz = /bits/ 64 <134000000>;
808+
opp-microvolt = <1000000>;
809+
};
810+
opp@200000000 {
811+
opp-hz = /bits/ 64 <200000000>;
812+
opp-microvolt = <1000000>;
813+
};
814+
};
815+
816+
bus_mcuisp_opp_table: opp_table3 {
817+
compatible = "operating-points-v2";
818+
opp-shared;
819+
820+
opp@50000000 {
821+
opp-hz = /bits/ 64 <50000000>;
822+
};
823+
opp@80000000 {
824+
opp-hz = /bits/ 64 <80000000>;
825+
};
826+
opp@100000000 {
827+
opp-hz = /bits/ 64 <100000000>;
828+
};
829+
opp@200000000 {
830+
opp-hz = /bits/ 64 <200000000>;
831+
};
832+
opp@400000000 {
833+
opp-hz = /bits/ 64 <400000000>;
834+
};
835+
};
836+
837+
bus_isp_opp_table: opp_table4 {
838+
compatible = "operating-points-v2";
839+
opp-shared;
840+
841+
opp@50000000 {
842+
opp-hz = /bits/ 64 <50000000>;
843+
};
844+
opp@80000000 {
845+
opp-hz = /bits/ 64 <80000000>;
846+
};
847+
opp@100000000 {
848+
opp-hz = /bits/ 64 <100000000>;
849+
};
850+
opp@200000000 {
851+
opp-hz = /bits/ 64 <200000000>;
852+
};
853+
opp@300000000 {
854+
opp-hz = /bits/ 64 <300000000>;
855+
};
856+
};
857+
858+
bus_peril_opp_table: opp_table5 {
859+
compatible = "operating-points-v2";
860+
opp-shared;
861+
862+
opp@50000000 {
863+
opp-hz = /bits/ 64 <50000000>;
864+
};
865+
opp@80000000 {
866+
opp-hz = /bits/ 64 <80000000>;
867+
};
868+
opp@100000000 {
869+
opp-hz = /bits/ 64 <100000000>;
870+
};
871+
};
691872
};
692873
};
693874

0 commit comments

Comments
 (0)