ARM: dts: aspeed: romulus: Add fsi-master GPIO bindings
Subsystems (2)
PATCH 2/3 ARM: dts: aspeed: romulus: Add fsi-master GPIO bindings
Define the pins used on Romulus by the FSI GPIO master.
--- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +12 -1
@@ -1,7 +1,7 @@ /dts-v1/; #include "aspeed-g5.dtsi" -#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/aspeed-gpio.h> / { model = "Romulus BMC";
@@ -31,6 +31,17 @@ }; }; + fsi-master { + compatible = "ibm,fsi-master", "ibm,fsi-master-gpio"; + + status = "disabled"; + + clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; + data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>; + mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; + trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>; + }; }; &fmc {
Signature · 1 line
1.9.1
Hi Lei,
Quoted 28 lines · Lei YU
Define the pins used on Romulus by the FSI GPIO master.
Quoted 1 line
Signed-off-by Lei YU <[email protected]>---
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 13 ++++++++++++-1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +0
-0@@ -1,7 +1,7 @@ /dts-v1/;
#include "aspeed-g5.dtsi"arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-1-#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/aspeed-gpio.h>
/ {Quoted 1 line
model = "Romulus BMC";
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +0
-0@@ -31,6 +31,17 @@ > }; > };arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 35
Quoted 2 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +2
-0+ fsi-master { + compatible = "ibm,fsi-master", "ibm,fsi-master-gpio";+
Quoted 1 line
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-0+ status = "disabled";
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
Quoted 2 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +2
-0+ + clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
This looks okay
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 40
Quoted 1 line
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-0+ data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;
According to my Romulus datasheet, FSI_SOFT_DAT is GPIOE0 and GPIOAA2 doesn't appear to be connected. Am I looking at an out-of-date datasheet? Did something change here?
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 43
Quoted 3 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-0+ mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>;Quoted 1 line
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-0+ enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>;arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-0+ trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>;
These three also look okay to me.
Andrew
Quoted 4 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-0+ };};
&fmc {
Hi Andrew,
Quoted 34 lines · Andrew Jeffery
Hi Lei,
Quoted 21 lines · Lei YU
Define the pins used on Romulus by the FSI GPIO master.
Quoted 1 line
Signed-off-by Lei YU <[email protected]>--- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-1@@ -1,7 +1,7 @@ /dts-v1/; #include "aspeed-g5.dtsi" -#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/aspeed-gpio.h> / { > model = "Romulus BMC";arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 39
Quoted 9 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +3
-0@@ -31,6 +31,17 @@ > }; > }; > + fsi-master { > + compatible = "ibm,fsi-master", "ibm,fsi-master-gpio"; + > + status = "disabled"; + + clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;
Quoted 7 lines
This looks okay
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 40
Quoted 1 line
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-0+ data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;According to my Romulus datasheet,
FSI_SOFT_DATis GPIOE0 and GPIOAA2 doesn't appear to be connected. Am I looking at an out-of-date datasheet? Did something change here?
Romulus FSI_SOFT_DAT is always GPIOAA2 (from GPIO Romulus 20161102.xls to GPIO Romulus 20170112.xls, and I confirm that FSI is working with this config.
Maybe you were referring Witherspoon's GPIO, where FSI_SOFT_DAT is GPIOE0?
Quoted 13 lines
Quoted 4 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-0+ mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>;Quoted 1 line
+ enable-gpios = <&gpio
ASPEED_GPIO(D, 0)GPIO_ACTIVE_HIGH>;+ trans-gpios = <&gpio
ASPEED_GPIO(R, 2)GPIO_ACTIVE_HIGH>;These three also look okay to me.
Andrew
Quoted 4 lines
+ };
};&fmc {
Andrew Jeffery
Acked-byQuoted 4 lines · Mine
Quoted 3 lines
According to my Romulus datasheet,
FSI_SOFT_DATis GPIOE0 and GPIOAA2 doesn't appear to be connected. Am I looking at an out-of-date datasheet? Did something change here?
s/datasheet/schematic/, pre caffeine.
Quoted 2 lines
Romulus
FSI_SOFT_DATis always GPIOAA2 (from GPIO Romulus 20161102.xls to GPIO Romulus 20170112.xls,
The schematic I have has 20160811 in the title, so it's probably a long way out of date.
Quoted 2 lines
and I confirm that FSI is working with
this config.
I'll trust you :)
Quoted 1 line · Lei YU
Define the pins used on Romulus by the FSI GPIO master.
I compared these pins to pdbg and they look good.
Quoted 1 line
Signed-off-by Lei YU <[email protected]>
Quoted 38 lines
--- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +12
-2@@ -1,7 +1,7 @@ /dts-v1/; #include "aspeed-g5.dtsi" -#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/aspeed-gpio.h> / { model = "Romulus BMC";@@ -31,6 +31,17 @@ }; }; + fsi-master { + compatible = "ibm,fsi-master", "ibm,fsi-master-gpio"; + + status = "disabled"; + + clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; + data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>; + mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; + trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>; + }; }; &fmc { --1.9.1
Looks good.
Quoted 38 lines · Lei YU
Define the pins used on Romulus by the FSI GPIO master.
Signed-off-by Lei YU <[email protected]>--- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +12
-1@@ -1,7 +1,7 @@ /dts-v1/; #include "aspeed-g5.dtsi" -#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/aspeed-gpio.h> / { model = "Romulus BMC";@@ -31,6 +31,17 @@ }; }; + fsi-master { + compatible = "ibm,fsi-master", "ibm,fsi-master-gpio"; + + status = "disabled"; + + clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; + data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>; + mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; + trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>; + }; }; &fmc {
Quoted 33 lines · Eddie James
Looks good.
Acked-by Eddie James <[email protected]>Quoted 26 lines · Lei YU
Define the pins used on Romulus by the FSI GPIO master.
Signed-off-by Lei YU <[email protected]>--- arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +1
-1@@ -1,7 +1,7 @@ /dts-v1/; #include "aspeed-g5.dtsi" -#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/gpio/aspeed-gpio.h> / { model = "Romulus BMC";@@ -31,6 +31,17 @@ }; };
Quoted 12 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts line 45
Quoted 12 lines
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts +11
-0+ fsi-master { + compatible = "ibm,fsi-master", "ibm,fsi-master-gpio"; + + status = "disabled"; + + clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>; + data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>; + mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>; + trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>; + }; };
I just noticed that this is inside the i2c11 node. We want it to be up the top, so I moved it there.
Applied to dev-4.7.
Thanks to everyone for the review.
Cheers,
Joel