Skip to content

Commit

Permalink
ARM: dts: dra7: Move cpus node to parent dts for dra74x and dra72x
Browse files Browse the repository at this point in the history
Nearly all of the information in the cpus node, especially for cpu0, is
the same between dra74x and dra72x so move the common information to
the parent dra7.dtsi to avoid duplication of data.

Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Dave Gerlach authored and Tony Lindgren committed Jun 10, 2016
1 parent 62e4fee commit b82ffb3
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 40 deletions.
27 changes: 27 additions & 0 deletions arch/arm/boot/dts/dra7.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,33 @@
interrupt-parent = <&gic>;
};

cpus {
#address-cells = <1>;
#size-cells = <0>;

cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;

operating-points = <
/* kHz uV */
1000000 1060000
1176000 1160000
>;

clocks = <&dpll_mpu_ck>;
clock-names = "cpu";

clock-latency = <300000>; /* From omap-cpufreq driver */

/* cooling options */
cooling-min-level = <0>;
cooling-max-level = <2>;
#cooling-cells = <2>; /* min followed by max */
};
};

/*
* The soc node represents the soc top level view. It is used for IPs
* that are not memory mapped in the MPU view or for the MPU itself.
Expand Down
16 changes: 0 additions & 16 deletions arch/arm/boot/dts/dra72x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,6 @@
/ {
compatible = "ti,dra722", "ti,dra72", "ti,dra7";

cpus {
#address-cells = <1>;
#size-cells = <0>;

cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;

/* cooling options */
cooling-min-level = <0>;
cooling-max-level = <2>;
#cooling-cells = <2>; /* min followed by max */
};
};

pmu {
compatible = "arm,cortex-a15-pmu";
interrupt-parent = <&wakeupgen>;
Expand Down
24 changes: 0 additions & 24 deletions arch/arm/boot/dts/dra74x.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,6 @@
compatible = "ti,dra742", "ti,dra74", "ti,dra7";

cpus {
#address-cells = <1>;
#size-cells = <0>;

cpu0: cpu@0 {
device_type = "cpu";
compatible = "arm,cortex-a15";
reg = <0>;

operating-points = <
/* kHz uV */
1000000 1060000
1176000 1160000
>;

clocks = <&dpll_mpu_ck>;
clock-names = "cpu";

clock-latency = <300000>; /* From omap-cpufreq driver */

/* cooling options */
cooling-min-level = <0>;
cooling-max-level = <2>;
#cooling-cells = <2>; /* min followed by max */
};
cpu@1 {
device_type = "cpu";
compatible = "arm,cortex-a15";
Expand Down

0 comments on commit b82ffb3

Please sign in to comment.