Skip to content

Commit

Permalink
ARM: dts: am335x-bone*: Fix model name and update compatibility infor…
Browse files Browse the repository at this point in the history
…mation

Beaglebone white and beaglebone black differ in tiny little aspects.
This is the reason why we maintain seperate dts for these platforms.
However, there is no real way to decode from dtb which platform it is
since compatible and model name are the same for both platforms.

Fix this so that beaglebone black and beaglebone are identifiable,
while maintaining compatibility for older zImages which might use old
beaglebone compatible flag for black as well.

Reported-by: Tom Rini <trini@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Nishanth Menon authored and Tony Lindgren committed Sep 3, 2014
1 parent a1a57ab commit 9a15fff
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
3 changes: 0 additions & 3 deletions arch/arm/boot/dts/am335x-bone-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
*/

/ {
model = "TI AM335x BeagleBone";
compatible = "ti,am335x-bone", "ti,am33xx";

cpus {
cpu@0 {
cpu0-supply = <&dcdc2_reg>;
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/am335x-bone.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
#include "am33xx.dtsi"
#include "am335x-bone-common.dtsi"

/ {
model = "TI AM335x BeagleBone";
compatible = "ti,am335x-bone", "ti,am33xx";
};

&ldo3_reg {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/am335x-boneblack.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
#include "am33xx.dtsi"
#include "am335x-bone-common.dtsi"

/ {
model = "TI AM335x BeagleBone Black";
compatible = "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx";
};

&ldo3_reg {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
Expand Down

0 comments on commit 9a15fff

Please sign in to comment.