@@ -32,11 +32,6 @@
reg = <0x98000000 0x04000000>; /* 64M */
};
- coldfire_memory: codefire_memory@9ef00000 {
- reg = <0x9ef00000 0x00100000>;
- no-map;
- };
-
gfx_memory: framebuffer {
size = <0x01000000>;
alignment = <0x01000000>;
@@ -53,15 +48,11 @@
};
fsi: gpio-fsi {
- compatible = "aspeed,ast2500-cf-fsi-master", "fsi-master";
+ compatible = "fsi-master-gpio", "fsi-master";
#address-cells = <2>;
#size-cells = <0>;
no-gpio-delays;
- memory-region = <&coldfire_memory>;
- aspeed,sram = <&sram>;
- aspeed,cvic = <&cvic>;
-
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(I, 2) GPIO_ACTIVE_HIGH>;
Cold-fire for fsi needs a dedicated gpio bank. There should be no other pins in the bank in use. But cold-fire is a new thing after the system is designed. There is a conflict in the pins, so use the fsi-master-gpio driver instead of the cf one Signed-off-by: John Wang <wangzqbj@inspur.com> --- arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)