Skip to contentSkip to conversation

arm: aspeed: dts: Fix OCC compatible strings

RFC PATCH NAK [email protected] 2 participants 2 messages Nov 29, 2016 – Dec 13, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

RFC PATCH v6 7/9 arm: aspeed: dts: Fix OCC compatible strings

From: "Edward A. James" <[email protected]>

---
 arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 4 ++--
 arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 4 ++--
 arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts  | 4 ++--
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +2 -2
index bedff97..42f734e 100644
@@ -110,12 +110,12 @@
 	status = "okay";
 
 	occ@50 {
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";
 		reg = <0x50>;
 	};
 
 	occ@51 {
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";
 		reg = <0x51>;
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +2 -2
index bbe09fc..df12e6b 100644
@@ -122,7 +122,7 @@
 
 	// turismo
 	occ@50 {
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";
 		reg = <0x50>;
 	};
 
@@ -137,7 +137,7 @@
 
 	// turismo
 	occ@50 {
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";
 		reg = <0x50>;
 	};
 
arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +2 -2
index 7737c09..38d51bf 100644
@@ -63,7 +63,7 @@
 	status = "okay";
 
 	occ@50 {
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";
 		reg = <0x50>;
 	};
 };
@@ -72,7 +72,7 @@
 	status = "okay";
 
 	occ@50 {
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";
 		reg = <0x50>;
 	};
 };
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +1 -1
index e17158f..8d9aaa3 100644
@@ -120,7 +120,7 @@
 	status = "okay";
 
 	occ@50 {
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";
 		reg = <0x50>;
 	};
 };
Signature · 1 line
1.9.1
#1 lore raw
Quoted 19 lines · On Tue, 2016-11-29 at 17:04 -0600, [email protected] wrote:
Quoted 3 lines

From: "Edward A. James" <[email protected]>

---
 arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 4 ++-- arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 4 ++-- arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts  | 4 ++-- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts  | 2 +-

 4 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +0 -0
index bedff97..42f734e 100644
@@ -110,12 +110,12 @@
 >  	status = "okay";

Quoted 2 lines

  occ@50 {

(quoted diff) +0 -1
-		compatible = "ibm,occ-i2c";

arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts

Quoted 1 line
arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +1 -0
+		compatible = "ibm,occ-p8-i2c";

We will need to give this some thought with respect to the naming consistency mentioned in previous patches.

Also, this patch should be re-worked so it's relevant for upstream which doesn't have the existing OCC driver.

Other than that I think this is fine.

Andrew

Quoted 66 lines

  reg = <0x50>;

Quoted 1 line

  };

Quoted 5 lines

  occ@51 {

(quoted diff) +1 -1
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";

  reg = <0x51>;
  };

 };

arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +0 -0
index bbe09fc..df12e6b 100644
@@ -122,7 +122,7 @@

Quoted 6 lines

  // turismo
  occ@50 {

(quoted diff) +1 -1
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";

  reg = <0x50>;
  };

arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +0 -0
@@ -137,7 +137,7 @@

Quoted 6 lines

  // turismo
  occ@50 {

(quoted diff) +1 -1
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";

  reg = <0x50>;
  };

arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +0 -0
index 7737c09..38d51bf 100644
@@ -63,7 +63,7 @@
 >  	status = "okay";

Quoted 5 lines

  occ@50 {

(quoted diff) +1 -1
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";

  reg = <0x50>;
  };

 };

arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +0 -0
@@ -72,7 +72,7 @@
 >  	status = "okay";

Quoted 5 lines

  occ@50 {

(quoted diff) +1 -1
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";

  reg = <0x50>;
  };

 };

arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +0 -0
index e17158f..8d9aaa3 100644
@@ -120,7 +120,7 @@
 >  	status = "okay";

Quoted 5 lines

  occ@50 {

(quoted diff) +1 -1
-		compatible = "ibm,occ-i2c";
+		compatible = "ibm,occ-p8-i2c";

  reg = <0x50>;
  };

 };