Skip to content

Commit

Permalink
ARM: dts: omap3: bulk convert compatible to be explicitly ti,omap3430…
Browse files Browse the repository at this point in the history 
… or ti,omap3630 or ti,am3517

For the ti-cpufreq driver we need a clear separation between omap34 and omap36 families
since they have different silicon revisions and efuses.

So far ti,omap3630/ti,omap36xx is just an additional flag to ti,omap3 while omap34 has no
required entry.

Therefore we can not match omap34 boards properly.

This needs to add ti,omap3430 and ti,omap3630 where it is missing.

We also clean up some instances of missing ti,am3517 so that we can rely on
seeing either one of:

ti,am3517
ti,omap3430
ti,omap3630

in addition to ti,omap3.

We leave ti,omap34xx and ti,omap36xx untouched for compatibility.

The script to do the conversion is:

manually fix am3517_mt_ventoux.dts
find arch/arm/boot/dts -name '*.dts*' -exec fgrep -q '"ti,omap34xx"' {} \; ! -exec fgrep -q '"ti,omap3430"' {} \; -exec sed -i '' 's/"ti,omap34xx"/"ti,omap3430", "ti,omap34xx"/' {} \;
find arch/arm/boot/dts -name '*.dts*' -exec fgrep -q '"ti,omap36xx"' {} \; ! -exec fgrep -q '"ti,omap3630"' {} \; -exec sed -i '' 's/"ti,omap36xx"/"ti,omap3630", "ti,omap36xx"/' {} \;
find arch/arm/boot/dts \( -name 'omap*.dts*' -o -name 'logic*.dts*' \) -exec fgrep -q '"ti,omap3"' {} \; ! -exec fgrep -q '"ti,omap3630"' {} \; ! -exec fgrep -q '"ti,omap36xx"' {} \; ! -exec fgrep -q '"ti,am3517"' {} \; ! -exec fgrep -q '"ti,omap34xx"' {} \; ! -exec fgrep -q '"ti,omap3430"' {} \; -exec sed -i '' 's/"ti,omap3"/"ti,omap3430", "ti,omap3"/' {} \;

So if your out-of-tree omap3 board does not show any OPPs, please check
the compatibility entry and update if needed.

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Adam Ford <aford173@gmail.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
  • Loading branch information
H. Nikolaus Schaller authored and Viresh Kumar committed Oct 10, 2019
1 parent b552904 commit 6ddf6c9
Show file tree
Hide file tree
Showing 37 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/am3517_mt_ventoux.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "TeeJet Mt.Ventoux";
compatible = "teejet,mt_ventoux", "ti,omap3";
compatible = "teejet,mt_ventoux", "ti,am3517", "ti,omap3";

memory@80000000 {
device_type = "memory";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

/ {
model = "LogicPD Zoom OMAP35xx SOM-LV Development Kit";
compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3";
compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3430", "ti,omap3";
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@

/ {
model = "LogicPD Zoom OMAP35xx Torpedo Development Kit";
compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3";
compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3430", "ti,omap3";
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-beagle-xm.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "TI OMAP3 BeagleBoard xM";
compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3";
compatible = "ti,omap3-beagle-xm", "ti,omap3630", "ti,omap36xx", "ti,omap3";

cpus {
cpu@0 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-beagle.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "TI OMAP3 BeagleBoard";
compatible = "ti,omap3-beagle", "ti,omap3";
compatible = "ti,omap3-beagle", "ti,omap3430", "ti,omap3";

cpus {
cpu@0 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-cm-t3530.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/ {
model = "CompuLab CM-T3530";
compatible = "compulab,omap3-cm-t3530", "ti,omap34xx", "ti,omap3";
compatible = "compulab,omap3-cm-t3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";

/* Regulator to trigger the reset signal of the Wifi module */
mmc2_sdio_reset: regulator-mmc2-sdio-reset {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-cm-t3730.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/ {
model = "CompuLab CM-T3730";
compatible = "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3";
compatible = "compulab,omap3-cm-t3730", "ti,omap3630", "ti,omap36xx", "ti,omap3";

wl12xx_vmmc2: wl12xx_vmmc2 {
compatible = "regulator-fixed";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-devkit8000-lcd43.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "omap3-devkit8000-lcd-common.dtsi"
/ {
model = "TimLL OMAP3 Devkit8000 with 4.3'' LCD panel";
compatible = "timll,omap3-devkit8000", "ti,omap3";
compatible = "timll,omap3-devkit8000", "ti,omap3430", "ti,omap3";

lcd0: display {
panel-timing {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-devkit8000-lcd70.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "omap3-devkit8000-lcd-common.dtsi"
/ {
model = "TimLL OMAP3 Devkit8000 with 7.0'' LCD panel";
compatible = "timll,omap3-devkit8000", "ti,omap3";
compatible = "timll,omap3-devkit8000", "ti,omap3430", "ti,omap3";

lcd0: display {
panel-timing {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-devkit8000.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "omap3-devkit8000-common.dtsi"
/ {
model = "TimLL OMAP3 Devkit8000";
compatible = "timll,omap3-devkit8000", "ti,omap3";
compatible = "timll,omap3-devkit8000", "ti,omap3430", "ti,omap3";

aliases {
display1 = &dvi0;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-gta04.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

/ {
model = "OMAP3 GTA04";
compatible = "ti,omap3-gta04", "ti,omap36xx", "ti,omap3";
compatible = "ti,omap3-gta04", "ti,omap3630", "ti,omap36xx", "ti,omap3";

cpus {
cpu@0 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-ha-lcd.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "TI OMAP3 HEAD acoustics LCD-baseboard with TAO3530 SOM";
compatible = "headacoustics,omap3-ha-lcd", "technexion,omap3-tao3530", "ti,omap34xx", "ti,omap3";
compatible = "headacoustics,omap3-ha-lcd", "technexion,omap3-tao3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
};

&omap3_pmx_core {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-ha.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "TI OMAP3 HEAD acoustics baseboard with TAO3530 SOM";
compatible = "headacoustics,omap3-ha", "technexion,omap3-tao3530", "ti,omap34xx", "ti,omap3";
compatible = "headacoustics,omap3-ha", "technexion,omap3-tao3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
};

&omap3_pmx_core {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-igep0020-rev-f.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/ {
model = "IGEPv2 Rev. F (TI OMAP AM/DM37x)";
compatible = "isee,omap3-igep0020-rev-f", "ti,omap36xx", "ti,omap3";
compatible = "isee,omap3-igep0020-rev-f", "ti,omap3630", "ti,omap36xx", "ti,omap3";

/* Regulator to trigger the WL_EN signal of the Wifi module */
lbep5clwmc_wlen: regulator-lbep5clwmc-wlen {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-igep0020.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/ {
model = "IGEPv2 Rev. C (TI OMAP AM/DM37x)";
compatible = "isee,omap3-igep0020", "ti,omap36xx", "ti,omap3";
compatible = "isee,omap3-igep0020", "ti,omap3630", "ti,omap36xx", "ti,omap3";

vmmcsdio_fixed: fixedregulator-mmcsdio {
compatible = "regulator-fixed";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-igep0030-rev-g.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/ {
model = "IGEP COM MODULE Rev. G (TI OMAP AM/DM37x)";
compatible = "isee,omap3-igep0030-rev-g", "ti,omap36xx", "ti,omap3";
compatible = "isee,omap3-igep0030-rev-g", "ti,omap3630", "ti,omap36xx", "ti,omap3";

/* Regulator to trigger the WL_EN signal of the Wifi module */
lbep5clwmc_wlen: regulator-lbep5clwmc-wlen {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-igep0030.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/ {
model = "IGEP COM MODULE Rev. E (TI OMAP AM/DM37x)";
compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3";
compatible = "isee,omap3-igep0030", "ti,omap3630", "ti,omap36xx", "ti,omap3";

vmmcsdio_fixed: fixedregulator-mmcsdio {
compatible = "regulator-fixed";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-ldp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

/ {
model = "TI OMAP3430 LDP (Zoom1 Labrador)";
compatible = "ti,omap3-ldp", "ti,omap3";
compatible = "ti,omap3-ldp", "ti,omap3430", "ti,omap3";

memory@80000000 {
device_type = "memory";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-lilly-a83x.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

/ {
model = "INCOstartec LILLY-A83X module (DM3730)";
compatible = "incostartec,omap3-lilly-a83x", "ti,omap36xx", "ti,omap3";
compatible = "incostartec,omap3-lilly-a83x", "ti,omap3630", "ti,omap36xx", "ti,omap3";

chosen {
bootargs = "console=ttyO0,115200n8 vt.global_cursor_default=0 consoleblank=0";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-lilly-dbb056.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "INCOstartec LILLY-DBB056 (DM3730)";
compatible = "incostartec,omap3-lilly-dbb056", "incostartec,omap3-lilly-a83x", "ti,omap36xx", "ti,omap3";
compatible = "incostartec,omap3-lilly-dbb056", "incostartec,omap3-lilly-a83x", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

&twl {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-n9.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

/ {
model = "Nokia N9";
compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
compatible = "nokia,omap3-n9", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

&i2c2 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-n950.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

/ {
model = "Nokia N950";
compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
compatible = "nokia,omap3-n950", "ti,omap3630", "ti,omap36xx", "ti,omap3";

keys {
compatible = "gpio-keys";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-overo-storm-alto35.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Alto35";
compatible = "gumstix,omap3-overo-alto35", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
compatible = "gumstix,omap3-overo-alto35", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Chestnut43";
compatible = "gumstix,omap3-overo-chestnut43", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
compatible = "gumstix,omap3-overo-chestnut43", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

&omap3_pmx_core2 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-overo-storm-gallop43.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Gallop43";
compatible = "gumstix,omap3-overo-gallop43", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
compatible = "gumstix,omap3-overo-gallop43", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

&omap3_pmx_core2 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-overo-storm-palo35.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Palo35";
compatible = "gumstix,omap3-overo-palo35", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
compatible = "gumstix,omap3-overo-palo35", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

&omap3_pmx_core2 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-overo-storm-palo43.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Palo43";
compatible = "gumstix,omap3-overo-palo43", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
compatible = "gumstix,omap3-overo-palo43", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

&omap3_pmx_core2 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-overo-storm-summit.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Summit";
compatible = "gumstix,omap3-overo-summit", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
compatible = "gumstix,omap3-overo-summit", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

&omap3_pmx_core2 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-overo-storm-tobi.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@

/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Tobi";
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
compatible = "gumstix,omap3-overo-tobi", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on TobiDuo";
compatible = "gumstix,omap3-overo-tobiduo", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
compatible = "gumstix,omap3-overo-tobiduo", "gumstix,omap3-overo", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-pandora-1ghz.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/ {
model = "Pandora Handheld Console 1GHz";

compatible = "openpandora,omap3-pandora-1ghz", "ti,omap36xx", "ti,omap3";
compatible = "openpandora,omap3-pandora-1ghz", "ti,omap3630", "ti,omap36xx", "ti,omap3";
};

&omap3_pmx_core2 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-sbc-t3530.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "CompuLab SBC-T3530 with CM-T3530";
compatible = "compulab,omap3-sbc-t3530", "compulab,omap3-cm-t3530", "ti,omap34xx", "ti,omap3";
compatible = "compulab,omap3-sbc-t3530", "compulab,omap3-cm-t3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";

aliases {
display0 = &dvi0;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-sbc-t3730.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "CompuLab SBC-T3730 with CM-T3730";
compatible = "compulab,omap3-sbc-t3730", "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3";
compatible = "compulab,omap3-sbc-t3730", "compulab,omap3-cm-t3730", "ti,omap3630", "ti,omap36xx", "ti,omap3";

aliases {
display0 = &dvi0;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-sniper.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/ {
model = "LG Optimus Black";
compatible = "lg,omap3-sniper", "ti,omap36xx", "ti,omap3";
compatible = "lg,omap3-sniper", "ti,omap3630", "ti,omap36xx", "ti,omap3";

cpus {
cpu@0 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-thunder.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "TI OMAP3 Thunder baseboard with TAO3530 SOM";
compatible = "technexion,omap3-thunder", "technexion,omap3-tao3530", "ti,omap34xx", "ti,omap3";
compatible = "technexion,omap3-thunder", "technexion,omap3-tao3530", "ti,omap3430", "ti,omap34xx", "ti,omap3";
};

&omap3_pmx_core {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3-zoom3.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

/ {
model = "TI Zoom3";
compatible = "ti,omap3-zoom3", "ti,omap36xx", "ti,omap3";
compatible = "ti,omap3-zoom3", "ti,omap3630", "ti,omap36xx", "ti,omap3";

cpus {
cpu@0 {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/omap3430-sdp.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

/ {
model = "TI OMAP3430 SDP";
compatible = "ti,omap3430-sdp", "ti,omap3";
compatible = "ti,omap3430-sdp", "ti,omap3430", "ti,omap3";

memory@80000000 {
device_type = "memory";
Expand Down

0 comments on commit 6ddf6c9

Please sign in to comment.