From eedaeaa4409f8f8f4d429c61b20041b7d742f755 Mon Sep 17 00:00:00 2001 From: user Date: Thu, 22 Feb 2018 08:44:00 +0100 Subject: [PATCH] nbhw18: fpga pin mapping fix --- arch/arm/dts/armada-385-nbhw18-common.dtsi | 1 + arch/arm/dts/armada-385-nbhw18-v1.dts | 3 +-- arch/arm/dts/armada-385-nbhw18-v2.dts | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/armada-385-nbhw18-common.dtsi b/arch/arm/dts/armada-385-nbhw18-common.dtsi index e96912715d..1f721b7dcb 100755 --- a/arch/arm/dts/armada-385-nbhw18-common.dtsi +++ b/arch/arm/dts/armada-385-nbhw18-common.dtsi @@ -47,6 +47,7 @@ spi-sdo = <&gpio1 6 0>; /* SDO slave data out */ spi-sck = <&gpio1 7 0>; /* SCK */ spi-sdi = <&gpio1 8 0>; /* SDI slave data in */ + fpga-reset = <&gpio0 19 0>; /* FPGA reset */ fpga-reset-logic = <&gpio1 12 0>; /* FPGA reset logic (after load)*/ }; diff --git a/arch/arm/dts/armada-385-nbhw18-v1.dts b/arch/arm/dts/armada-385-nbhw18-v1.dts index 52d6677a4e..5f15137922 100755 --- a/arch/arm/dts/armada-385-nbhw18-v1.dts +++ b/arch/arm/dts/armada-385-nbhw18-v1.dts @@ -18,8 +18,7 @@ soc { gpiofpga: gpio@fd0000000 { - fpga-reset = <&gpio0 19 0>; /* FPGA reset */ - fpga-cdone = <&gpio0 29 0>; /* FPGA cdone */ + fpga-cdone = <&gpio0 29 0>; /* FPGA cdone HW V1 */ }; }; }; diff --git a/arch/arm/dts/armada-385-nbhw18-v2.dts b/arch/arm/dts/armada-385-nbhw18-v2.dts index 7e43510514..c3800362ea 100755 --- a/arch/arm/dts/armada-385-nbhw18-v2.dts +++ b/arch/arm/dts/armada-385-nbhw18-v2.dts @@ -18,8 +18,7 @@ soc { gpiofpga: gpio@fd0000000 { - fpga-reset = <&gpio0 19 0>; /* FPGA reset */ - fpga-cdone = <&gpio0 21 0>; /* FPGA cdone */ + fpga-cdone = <&gpio0 29 0>; /* FPGA cdone HW V1 (TODO: For V2 use 21 instead of 29. Cannot change it while still using old hw due to conflict with eth phy reset. ) */ }; }; };