arm/km: trigger reconfiguration for the Xilinx FPGA

The Xilinx FPGA must be reconfigured each time the unit
reboots. The FPGA is connected to the GPIO pin 39 from kirkwood.
This patch triggers this pin for km_kirkwood_pci targets.

Signed-off-by: Holger Brunck <holger.brunck@keymile.com>
Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com>
cc: Prafulla Wadaskar <prafulla@marvell.com>

diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 4a4e1d0289afe3bb53b1d02ec8a49b002f053ad9..3c9b91768f3a37b39080c1216423083f61f1cbe5 100644 (file)
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -267,7 +267,12 @@ int board_early_init_f(void)
        kw_gpio_set_valid(KM_KIRKWOOD_ENV_WP, 38);
        kw_gpio_direction_output(KM_KIRKWOOD_ENV_WP, 1);
 #endif
-
+#if defined(CONFIG_KM_RECONFIG_XLX)
+       /* trigger the reconfiguration of the xilinx fpga */
+       kw_gpio_set_valid(KM_XLX_PROGRAM_B_PIN, 1);
+       kw_gpio_direction_output(KM_XLX_PROGRAM_B_PIN, 0);
+       kw_gpio_direction_input(KM_XLX_PROGRAM_B_PIN);
+#endif
        return 0;
 }
 

diff --git a/boards.cfg b/boards.cfg
index 8bd91c5beb4beafe063e645b61d71963f68f2b91..17effc84fee4b491c561014811a0abe155125cb9 100644 (file)
--- a/boards.cfg
+++ b/boards.cfg
@@ -134,7 +134,7 @@ davinci_schmoogie            arm         arm926ejs   schmoogie           davinci
 davinci_sffsdr               arm         arm926ejs   sffsdr              davinci        davinci
 davinci_sonata               arm         arm926ejs   sonata              davinci        davinci
 km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood       km_kirkwood:KM_DISABLE_PCI
-km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood       km_kirkwood
+km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood       km_kirkwood:KM_RECONFIG_XLX
 mgcoge3un                    arm         arm926ejs   km_arm              keymile        kirkwood
 portl2                       arm         arm926ejs   km_arm              keymile        kirkwood
 inetspace_v2                 arm         arm926ejs   netspace_v2         LaCie          kirkwood    netspace_v2:INETSPACE_V2

diff --git a/include/configs/km_kirkwood.h b/include/configs/km_kirkwood.h
index e51b270e1d16a2c336b78b1e251d2193b72fcfe3..ed3612415675e5553b34b20fc85855c8ba3c98fd 100644 (file)
--- a/include/configs/km_kirkwood.h
+++ b/include/configs/km_kirkwood.h
@@ -54,4 +54,7 @@
 #define KM_IVM_BUS     "pca9544a:70:9" /* I2C2 (Mux-Port 1)*/
 #define KM_ENV_BUS     "pca9544a:70:d" /* I2C2 (Mux-Port 5)*/
 
+/* GPIO Pin from kirkwood connected to PROGRAM_B pin of the xilinx FPGA */
+#define KM_XLX_PROGRAM_B_PIN    39
+
 #endif /* _CONFIG_KM_KIRKWOOD */