mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 0/4] ARM: socfpga: misc fixes
@ 2018-04-12  5:35 Antony Pavlov
  2018-04-12  5:35 ` [PATCH 1/4] net: make SoCFPGA-specific designware driver work again Antony Pavlov
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Antony Pavlov @ 2018-04-12  5:35 UTC (permalink / raw)
  To: barebox

Antony Pavlov (4):
  net: make SoCFPGA-specific designware driver work again
  ARM: socfpga: boards: pll_config.h: remove duplicate macros
  ARM: socfpga: mach/pll_config.h: add guard macro
  ARM: socfpga_defconfig: enable Altera firmware stuff

 arch/arm/boards/ebv-socrates/pll_config.h       | 6 ------
 arch/arm/boards/terasic-sockit/pll_config.h     | 6 ------
 arch/arm/configs/socfpga_defconfig              | 3 +++
 arch/arm/mach-socfpga/include/mach/pll_config.h | 4 ++++
 drivers/net/Kconfig                             | 1 +
 5 files changed, 8 insertions(+), 12 deletions(-)

-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/4] net: make SoCFPGA-specific designware driver work again
  2018-04-12  5:35 [PATCH 0/4] ARM: socfpga: misc fixes Antony Pavlov
@ 2018-04-12  5:35 ` Antony Pavlov
  2018-04-12  5:35 ` [PATCH 2/4] ARM: socfpga: boards: pll_config.h: remove duplicate macros Antony Pavlov
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Antony Pavlov @ 2018-04-12  5:35 UTC (permalink / raw)
  To: barebox; +Cc: Steffen Trumtrar

If MFD_SYSCON is disabled in .config then socfpga_designware_eth probe
fails with this message:

  socfpga_designware_eth ff702000.ethernet: Could not get sysmgr-syscon node

Thanks to Steffen for hint!

Cc: Steffen Trumtrar <s.trumtrar@pengutronix.de>
Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/arm/configs/socfpga_defconfig | 1 +
 drivers/net/Kconfig                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index dbc33f952f..6883b5f526 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -71,6 +71,7 @@ CONFIG_OF_BAREBOX_DRIVERS=y
 CONFIG_OF_BAREBOX_ENV_IN_FS=y
 CONFIG_DRIVER_SERIAL_NS16550=y
 CONFIG_DRIVER_NET_DESIGNWARE=y
+CONFIG_DRIVER_NET_DESIGNWARE_SOCFPGA=y
 CONFIG_MCI=y
 CONFIG_MCI_DW=y
 CONFIG_MFD_MC13XXX=y
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 09676b3d60..b633a3ac4d 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -82,6 +82,7 @@ config DRIVER_NET_DESIGNWARE_GENERIC
 config DRIVER_NET_DESIGNWARE_SOCFPGA
 	bool "Designware Universal MAC ethernet driver for SoCFPGA platforms"
 	depends on ARCH_SOCFPGA
+	select MFD_SYSCON
 	help
 	  This option enables support for the Synopsys
 	  Designware Core Univesal MAC 10M/100M/1G ethernet IP on SoCFPGA.
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/4] ARM: socfpga: boards: pll_config.h: remove duplicate macros
  2018-04-12  5:35 [PATCH 0/4] ARM: socfpga: misc fixes Antony Pavlov
  2018-04-12  5:35 ` [PATCH 1/4] net: make SoCFPGA-specific designware driver work again Antony Pavlov
@ 2018-04-12  5:35 ` Antony Pavlov
  2018-04-12  5:35 ` [PATCH 3/4] ARM: socfpga: mach/pll_config.h: add guard macro Antony Pavlov
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: Antony Pavlov @ 2018-04-12  5:35 UTC (permalink / raw)
  To: barebox

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/arm/boards/ebv-socrates/pll_config.h   | 6 ------
 arch/arm/boards/terasic-sockit/pll_config.h | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/arch/arm/boards/ebv-socrates/pll_config.h b/arch/arm/boards/ebv-socrates/pll_config.h
index 083ebd4a87..e912912c9a 100644
--- a/arch/arm/boards/ebv-socrates/pll_config.h
+++ b/arch/arm/boards/ebv-socrates/pll_config.h
@@ -87,12 +87,6 @@
 #define CONFIG_HPS_CLK_MAINVCO_HZ (1600000000)
 #define CONFIG_HPS_CLK_PERVCO_HZ (1000000000)
 #define CONFIG_HPS_CLK_SDRVCO_HZ (666666666)
-#define CONFIG_HPS_CLK_OSC1_HZ (25000000)
-#define CONFIG_HPS_CLK_OSC2_HZ (25000000)
-#define CONFIG_HPS_CLK_F2S_SDR_REF_HZ (0)
-#define CONFIG_HPS_CLK_F2S_PER_REF_HZ (0)
-#define CONFIG_HPS_CLK_MAINVCO_HZ (1600000000)
-#define CONFIG_HPS_CLK_PERVCO_HZ (1000000000)
 #define CONFIG_HPS_CLK_EMAC0_HZ (1953125)
 #define CONFIG_HPS_CLK_EMAC1_HZ (250000000)
 #define CONFIG_HPS_CLK_USBCLK_HZ (200000000)
diff --git a/arch/arm/boards/terasic-sockit/pll_config.h b/arch/arm/boards/terasic-sockit/pll_config.h
index e064e2b2b2..ef4a59a611 100644
--- a/arch/arm/boards/terasic-sockit/pll_config.h
+++ b/arch/arm/boards/terasic-sockit/pll_config.h
@@ -87,12 +87,6 @@
 #define CONFIG_HPS_CLK_MAINVCO_HZ (1600000000)
 #define CONFIG_HPS_CLK_PERVCO_HZ (1000000000)
 #define CONFIG_HPS_CLK_SDRVCO_HZ (800000000)
-#define CONFIG_HPS_CLK_OSC1_HZ (25000000)
-#define CONFIG_HPS_CLK_OSC2_HZ (25000000)
-#define CONFIG_HPS_CLK_F2S_SDR_REF_HZ (0)
-#define CONFIG_HPS_CLK_F2S_PER_REF_HZ (0)
-#define CONFIG_HPS_CLK_MAINVCO_HZ (1600000000)
-#define CONFIG_HPS_CLK_PERVCO_HZ (1000000000)
 #define CONFIG_HPS_CLK_EMAC0_HZ (1953125)
 #define CONFIG_HPS_CLK_EMAC1_HZ (250000000)
 #define CONFIG_HPS_CLK_USBCLK_HZ (200000000)
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 3/4] ARM: socfpga: mach/pll_config.h: add guard macro
  2018-04-12  5:35 [PATCH 0/4] ARM: socfpga: misc fixes Antony Pavlov
  2018-04-12  5:35 ` [PATCH 1/4] net: make SoCFPGA-specific designware driver work again Antony Pavlov
  2018-04-12  5:35 ` [PATCH 2/4] ARM: socfpga: boards: pll_config.h: remove duplicate macros Antony Pavlov
@ 2018-04-12  5:35 ` Antony Pavlov
  2018-04-12  5:35 ` [PATCH 4/4] ARM: socfpga_defconfig: enable Altera firmware stuff Antony Pavlov
  2018-04-12  8:00 ` [PATCH 0/4] ARM: socfpga: misc fixes Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Antony Pavlov @ 2018-04-12  5:35 UTC (permalink / raw)
  To: barebox

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/arm/mach-socfpga/include/mach/pll_config.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-socfpga/include/mach/pll_config.h b/arch/arm/mach-socfpga/include/mach/pll_config.h
index 1a7e851eda..d6fb60dd24 100644
--- a/arch/arm/mach-socfpga/include/mach/pll_config.h
+++ b/arch/arm/mach-socfpga/include/mach/pll_config.h
@@ -1,3 +1,5 @@
+#ifndef _MACH_SOCFPGA_PRELOADER_PLL_CONFIG_H_
+#define _MACH_SOCFPGA_PRELOADER_PLL_CONFIG_H_
 
 #include <mach/cyclone5-clock-manager.h>
 
@@ -54,3 +56,5 @@ static struct socfpga_cm_config cm_default_cfg = {
 	.alteragrp_mpu = CONFIG_HPS_ALTERAGRP_MPUCLK,
 	.alteregrp_main = CONFIG_HPS_ALTERAGRP_MAINCLK,
 };
+
+#endif /* _MACH_SOCFPGA_PRELOADER_PLL_CONFIG_H_ */
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 4/4] ARM: socfpga_defconfig: enable Altera firmware stuff
  2018-04-12  5:35 [PATCH 0/4] ARM: socfpga: misc fixes Antony Pavlov
                   ` (2 preceding siblings ...)
  2018-04-12  5:35 ` [PATCH 3/4] ARM: socfpga: mach/pll_config.h: add guard macro Antony Pavlov
@ 2018-04-12  5:35 ` Antony Pavlov
  2018-04-12  8:00 ` [PATCH 0/4] ARM: socfpga: misc fixes Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Antony Pavlov @ 2018-04-12  5:35 UTC (permalink / raw)
  To: barebox

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
---
 arch/arm/configs/socfpga_defconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index 6883b5f526..3a50bae8f2 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -60,6 +60,7 @@ CONFIG_CMD_LED=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_LED_TRIGGER=y
 CONFIG_CMD_BAREBOX_UPDATE=y
+CONFIG_CMD_FIRMWARELOAD=y
 CONFIG_CMD_OF_NODE=y
 CONFIG_CMD_OF_PROPERTY=y
 CONFIG_CMD_OFTREE=y
@@ -82,6 +83,7 @@ CONFIG_LED_TRIGGERS=y
 CONFIG_EEPROM_AT25=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_GPIO_DESIGNWARE=y
+CONFIG_FIRMWARE_ALTERA_SOCFPGA=y
 CONFIG_FS_EXT4=y
 CONFIG_FS_TFTP=y
 CONFIG_FS_NFS=y
-- 
2.17.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 0/4] ARM: socfpga: misc fixes
  2018-04-12  5:35 [PATCH 0/4] ARM: socfpga: misc fixes Antony Pavlov
                   ` (3 preceding siblings ...)
  2018-04-12  5:35 ` [PATCH 4/4] ARM: socfpga_defconfig: enable Altera firmware stuff Antony Pavlov
@ 2018-04-12  8:00 ` Sascha Hauer
  4 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2018-04-12  8:00 UTC (permalink / raw)
  To: Antony Pavlov; +Cc: barebox

On Thu, Apr 12, 2018 at 08:35:55AM +0300, Antony Pavlov wrote:
> Antony Pavlov (4):
>   net: make SoCFPGA-specific designware driver work again
>   ARM: socfpga: boards: pll_config.h: remove duplicate macros
>   ARM: socfpga: mach/pll_config.h: add guard macro
>   ARM: socfpga_defconfig: enable Altera firmware stuff
> 

Applied all, thanks

Sascha

>  arch/arm/boards/ebv-socrates/pll_config.h       | 6 ------
>  arch/arm/boards/terasic-sockit/pll_config.h     | 6 ------
>  arch/arm/configs/socfpga_defconfig              | 3 +++
>  arch/arm/mach-socfpga/include/mach/pll_config.h | 4 ++++
>  drivers/net/Kconfig                             | 1 +
>  5 files changed, 8 insertions(+), 12 deletions(-)
> 
> -- 
> 2.17.0
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-04-12  8:00 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-12  5:35 [PATCH 0/4] ARM: socfpga: misc fixes Antony Pavlov
2018-04-12  5:35 ` [PATCH 1/4] net: make SoCFPGA-specific designware driver work again Antony Pavlov
2018-04-12  5:35 ` [PATCH 2/4] ARM: socfpga: boards: pll_config.h: remove duplicate macros Antony Pavlov
2018-04-12  5:35 ` [PATCH 3/4] ARM: socfpga: mach/pll_config.h: add guard macro Antony Pavlov
2018-04-12  5:35 ` [PATCH 4/4] ARM: socfpga_defconfig: enable Altera firmware stuff Antony Pavlov
2018-04-12  8:00 ` [PATCH 0/4] ARM: socfpga: misc fixes Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox