diff mbox

[U-Boot] arm: am57xx: cl-som-am57x: fix Ethernet

Message ID 1485170058-963-1-git-send-email-uri.mashiach@compulab.co.il
State Accepted
Commit 9b6ef528d0dd83ce4b09adb559e5336b107d5654
Delegated to: Tom Rini
Headers show

Commit Message

Uri Mashiach Jan. 23, 2017, 11:14 a.m. UTC
The module is continuously rebooting with the following message:
Net:   data abort
pc : [<fff77f42>]          lr : [<fff6e32b>]
reloc pc : [<80816f42>]    lr : [<8080d32b>]
sp : fdf5ce48  ip : fdf5d79c     fp : 00000017
r10: 8083cd58  r9 : fdf5cef0     r8 : fdf5d5d0
r7 : 48485000  r6 : 400000ff     r5 : fdf5d6e0  r4 : fdf5d618
r3 : fdf5d5b4  r2 : fdf5d5d0     r1 : 643a3631  r0 : fdf5d6e0
Flags: nzCv  IRQs off  FIQs off  Mode SVC_32
Resetting CPU ...

Modifications:
* Enable Ethernet configuration in the SPL.
* Update PINMUX of PHY enable GPIO.

Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
---
 board/compulab/cl-som-am57x/mux.c | 2 +-
 include/configs/cl-som-am57x.h    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Comments

Tom Rini Jan. 23, 2017, 6:13 p.m. UTC | #1
On Mon, Jan 23, 2017 at 01:14:18PM +0200, Uri Mashiach wrote:

> The module is continuously rebooting with the following message:
> Net:   data abort
> pc : [<fff77f42>]          lr : [<fff6e32b>]
> reloc pc : [<80816f42>]    lr : [<8080d32b>]
> sp : fdf5ce48  ip : fdf5d79c     fp : 00000017
> r10: 8083cd58  r9 : fdf5cef0     r8 : fdf5d5d0
> r7 : 48485000  r6 : 400000ff     r5 : fdf5d6e0  r4 : fdf5d618
> r3 : fdf5d5b4  r2 : fdf5d5d0     r1 : 643a3631  r0 : fdf5d6e0
> Flags: nzCv  IRQs off  FIQs off  Mode SVC_32
> Resetting CPU ...
> 
> Modifications:
> * Enable Ethernet configuration in the SPL.
> * Update PINMUX of PHY enable GPIO.
> 
> Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>

Reviewed-by: Tom Rini <trini@konsulko.com>
Tom Rini Jan. 25, 2017, 2:15 a.m. UTC | #2
On Mon, Jan 23, 2017 at 01:14:18PM +0200, Uri Mashiach wrote:

> The module is continuously rebooting with the following message:
> Net:   data abort
> pc : [<fff77f42>]          lr : [<fff6e32b>]
> reloc pc : [<80816f42>]    lr : [<8080d32b>]
> sp : fdf5ce48  ip : fdf5d79c     fp : 00000017
> r10: 8083cd58  r9 : fdf5cef0     r8 : fdf5d5d0
> r7 : 48485000  r6 : 400000ff     r5 : fdf5d6e0  r4 : fdf5d618
> r3 : fdf5d5b4  r2 : fdf5d5d0     r1 : 643a3631  r0 : fdf5d6e0
> Flags: nzCv  IRQs off  FIQs off  Mode SVC_32
> Resetting CPU ...
> 
> Modifications:
> * Enable Ethernet configuration in the SPL.
> * Update PINMUX of PHY enable GPIO.
> 
> Signed-off-by: Uri Mashiach <uri.mashiach@compulab.co.il>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/board/compulab/cl-som-am57x/mux.c b/board/compulab/cl-som-am57x/mux.c
index 5b71975..0db0609 100644
--- a/board/compulab/cl-som-am57x/mux.c
+++ b/board/compulab/cl-som-am57x/mux.c
@@ -102,7 +102,7 @@  static const struct pad_conf_entry cl_som_am57x_padconf_ethernet[] = {
 	{VIN2A_D22,  (IEN  | PDIS | PTD | M3) }, /* VIN2A_D22.RGMII1_RXD1 */
 	{VIN2A_D23,  (IEN  | PDIS | PTD | M3) }, /* VIN2A_D23.RGMII1_RXD0 */
 	/* Eth PHY1 reset GPIOs*/
-	{VIN1B_CLK1, (IDIS | PDIS | PTD | M14)}, /* VIN1B_CLK1.GPIO2_31 */
+	{VIN2A_CLK0, (IDIS | PDIS | PTD | M14)}, /* VIN2A_CLK0.GPIO3_28 */
 };
 
 #define SET_MUX(mux_array) do_set_mux32((*ctrl)->control_padconf_core_base, \
diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h
index 6692acc..9111cbd 100644
--- a/include/configs/cl-som-am57x.h
+++ b/include/configs/cl-som-am57x.h
@@ -103,6 +103,8 @@ 
 #define CONFIG_USB_ETHER_ASIX
 #define CONFIG_USB_ETHER_MCS7830
 
+#endif /* !CONFIG_SPL_BUILD */
+
 /* CPSW Ethernet */
 #define CONFIG_DRIVER_TI_CPSW
 #define CONFIG_MII
@@ -120,8 +122,6 @@ 
 #define CONFIG_BOOTP_SUBNETMASK
 #define CONFIG_NET_RETRY_COUNT		10
 
-#endif /* !CONFIG_SPL_BUILD */
-
 /* Default environment */
 #undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS \