diff mbox series

[linux,dev-5.2,2/2] Revert "ARM: dts: aspeed: add I2C buffer mode support"

Message ID 20190808143342.27779-3-joel@jms.id.au
State Accepted, archived
Headers show
Series i2c: aspeed: Disable buffer mode | expand

Commit Message

Joel Stanley Aug. 8, 2019, 2:33 p.m. UTC 
This reverts commit 0a3231c83471b2ceca1fed916547d702c425236f to disable
buffer mode support. It is not supported in Qemu, which means this
change cannot pass OpenBMC CI.

Signed-off-by: Joel Stanley <joel@jms.id.au>
---
 arch/arm/boot/dts/aspeed-g4.dtsi | 61 ++++++++++----------------------
 arch/arm/boot/dts/aspeed-g5.dtsi | 61 ++++++++++----------------------
 2 files changed, 38 insertions(+), 84 deletions(-)

Comments

Jae Hyun Yoo Aug. 8, 2019, 4:15 p.m. UTC | #1 
On 8/8/2019 7:33 AM, Joel Stanley wrote:
> This reverts commit 0a3231c83471b2ceca1fed916547d702c425236f to disable
> buffer mode support. It is not supported in Qemu, which means this
> change cannot pass OpenBMC CI.
> 
> Signed-off-by: Joel Stanley <joel@jms.id.au>

Agreed for reverting it until Qemu support is ready.

Acked-by: Jae Hyun Yoo <jae.hyun.yoo@linux.intel.com>

Thanks,
Jae
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi
index 7eaf6a549436..fd857be397bf 100644
--- a/arch/arm/boot/dts/aspeed-g4.dtsi
+++ b/arch/arm/boot/dts/aspeed-g4.dtsi
@@ -404,21 +404,12 @@ 
 };
 
 &i2c {
-	i2c_gr: i2c-global-regs@0 {
-		compatible = "aspeed,ast2400-i2c-gr", "syscon";
+	i2c_ic: interrupt-controller@0 {
+		#interrupt-cells = <1>;
+		compatible = "aspeed,ast2400-i2c-ic";
 		reg = <0x0 0x40>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges = <0x0 0x0 0x40>;
-
-		i2c_ic: interrupt-controller@0 {
-			#interrupt-cells = <1>;
-			compatible = "aspeed,ast2400-i2c-ic";
-			reg = <0x0 0x4>;
-			interrupts = <12>;
-			interrupt-controller;
-		};
+		interrupts = <12>;
+		interrupt-controller;
 	};
 
 	i2c0: i2c-bus@40 {
@@ -426,8 +417,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x40 0x40>, <0x800 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x40 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -443,8 +433,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x80 0x40>, <0x880 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x80 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -460,8 +449,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0xc0 0x40>, <0x900 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0xc0 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -478,8 +466,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x100 0x40>, <0x980 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x100 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -496,8 +483,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x140 0x40>, <0xa00 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x140 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -514,8 +500,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x180 0x40>, <0xa80 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x180 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -532,8 +517,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x1c0 0x40>, <0xb00 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x1c0 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -550,8 +534,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x300 0x40>, <0xb80 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x300 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -568,8 +551,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x340 0x40>, <0xc00 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x340 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -586,8 +568,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x380 0x40>, <0xc80 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x380 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -604,8 +585,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x3c0 0x40>, <0xd00 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x3c0 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -622,8 +602,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x400 0x40>, <0xd80 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x400 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -640,8 +619,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x440 0x40>, <0xe00 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x440 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -658,8 +636,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x480 0x40>, <0xe80 0x80>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x480 0x40>;
 		compatible = "aspeed,ast2400-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi
index 44a1a0123a8a..dc58eb8c6969 100644
--- a/arch/arm/boot/dts/aspeed-g5.dtsi
+++ b/arch/arm/boot/dts/aspeed-g5.dtsi
@@ -526,21 +526,12 @@ 
 };
 
 &i2c {
-	i2c_gr: i2c-global-regs@0 {
-		compatible = "aspeed,ast2500-i2c-gr", "syscon";
+	i2c_ic: interrupt-controller@0 {
+		#interrupt-cells = <1>;
+		compatible = "aspeed,ast2500-i2c-ic";
 		reg = <0x0 0x40>;
-
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges = <0x0 0x0 0x40>;
-
-		i2c_ic: interrupt-controller@0 {
-			#interrupt-cells = <1>;
-			compatible = "aspeed,ast2500-i2c-ic";
-			reg = <0x0 0x4>;
-			interrupts = <12>;
-			interrupt-controller;
-		};
+		interrupts = <12>;
+		interrupt-controller;
 	};
 
 	i2c0: i2c-bus@40 {
@@ -548,8 +539,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x40 0x40>, <0x200 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x40 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -565,8 +555,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x80 0x40>, <0x210 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x80 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -582,8 +571,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0xc0 0x40>, <0x220 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0xc0 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -600,8 +588,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x100 0x40>, <0x230 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x100 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -618,8 +605,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x140 0x40>, <0x240 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x140 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -636,8 +622,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x180 0x40>, <0x250 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x180 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -654,8 +639,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x1c0 0x40>, <0x260 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x1c0 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -672,8 +656,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x300 0x40>, <0x270 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x300 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -690,8 +673,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x340 0x40>, <0x280 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x340 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -708,8 +690,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x380 0x40>, <0x290 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x380 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -726,8 +707,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x3c0 0x40>, <0x2a0 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x3c0 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -744,8 +724,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x400 0x40>, <0x2b0 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x400 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -762,8 +741,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x440 0x40>, <0x2c0 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x440 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;
@@ -780,8 +758,7 @@ 
 		#size-cells = <0>;
 		#interrupt-cells = <1>;
 
-		reg = <0x480 0x40>, <0x2d0 0x10>;
-		reg-names = "bus-regs", "buf";
+		reg = <0x480 0x40>;
 		compatible = "aspeed,ast2500-i2c-bus";
 		clocks = <&syscon ASPEED_CLK_APB>;
 		resets = <&syscon ASPEED_RESET_I2C>;