| Message ID | 1409760190-17275-1-git-send-email-nm@ti.com |
|---|---|
| State | Accepted |
| Commit | 9a15fff05b702c3ea29ae64db0d3ff0355431eab |
| Headers | show |
* Nishanth Menon <nm@ti.com> [140903 09:03]: > 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> Thanks applying into omap-for-v3.18/fixes-not-urgent. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi index bde1777..d9d9869 100644 --- a/arch/arm/boot/dts/am335x-bone-common.dtsi +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi @@ -7,9 +7,6 @@ */ / { - model = "TI AM335x BeagleBone"; - compatible = "ti,am335x-bone", "ti,am33xx"; - cpus { cpu@0 { cpu0-supply = <&dcdc2_reg>; diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts index 94ee427..83d40f7 100644 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm/boot/dts/am335x-bone.dts @@ -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>; diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts index 305975d..901739f 100644 --- a/arch/arm/boot/dts/am335x-boneblack.dts +++ b/arch/arm/boot/dts/am335x-boneblack.dts @@ -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>;
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> --- Based on v3.17-rc1: Before: beaglebone-black: Boot PASS: http://paste.ubuntu.org.cn/1473558 beaglebone: Boot PASS: http://paste.ubuntu.org.cn/1473559 After: beaglebone-black: Boot PASS: http://paste.ubuntu.org.cn/1473480 beaglebone: Boot PASS: http://paste.ubuntu.org.cn/1473481 Side notes: Sorry, new IT policies, new paste website needed :( arch/arm/boot/dts/am335x-bone-common.dtsi | 3 --- arch/arm/boot/dts/am335x-bone.dts | 5 +++++ arch/arm/boot/dts/am335x-boneblack.dts | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-)