Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 101649
b: refs/heads/master
c: 4fb035f
h: refs/heads/master
i:
  101647: f53b8f4
v: v3
  • Loading branch information
Wolfgang Grandegger authored and Kumar Gala committed Jun 10, 2008
1 parent 224fa67 commit 712251c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 917f0af9e5a9ceecf9e72537fabb501254ba321d
refs/heads/master: 4fb035f69e3d08506b65d33b97be1b0e78af39a2
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/tqm8540.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
/dts-v1/;

/ {
model = "tqm,8540";
compatible = "tqm,8540", "tqm,85xx";
model = "tqc,tqm8540";
compatible = "tqc,tqm8540";
#address-cells = <1>;
#size-cells = <1>;

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/tqm8541.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
/dts-v1/;

/ {
model = "tqm,8541";
compatible = "tqm,8541", "tqm,85xx";
model = "tqc,tqm8541";
compatible = "tqc,tqm8541";
#address-cells = <1>;
#size-cells = <1>;

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/tqm8555.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
/dts-v1/;

/ {
model = "tqm,8555";
compatible = "tqm,8555", "tqm,85xx";
model = "tqc,tqm8555";
compatible = "tqc,tqm8555";
#address-cells = <1>;
#size-cells = <1>;

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/powerpc/boot/dts/tqm8560.dts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
/dts-v1/;

/ {
model = "tqm,8560";
compatible = "tqm,8560", "tqm,85xx";
model = "tqc,tqm8560";
compatible = "tqc,tqm8560";
#address-cells = <1>;
#size-cells = <1>;

Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/powerpc/platforms/85xx/tqm85xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ static int __init tqm85xx_probe(void)
{
unsigned long root = of_get_flat_dt_root();

if ((of_flat_dt_is_compatible(root, "tqm,8540")) ||
(of_flat_dt_is_compatible(root, "tqm,8541")) ||
(of_flat_dt_is_compatible(root, "tqm,8555")) ||
(of_flat_dt_is_compatible(root, "tqm,8560")))
if ((of_flat_dt_is_compatible(root, "tqc,tqm8540")) ||
(of_flat_dt_is_compatible(root, "tqc,tqm8541")) ||
(of_flat_dt_is_compatible(root, "tqc,tqm8555")) ||
(of_flat_dt_is_compatible(root, "tqc,tqm8560")))
return 1;

return 0;
Expand Down

0 comments on commit 712251c

Please sign in to comment.