diff options
| author | Tom Rini | 2019-11-22 10:41:46 -0500 |
|---|---|---|
| committer | Tom Rini | 2019-11-22 10:41:46 -0500 |
| commit | 47b48fe186ad26740f97016d93e991f51447ddd6 (patch) | |
| tree | 8e28a3cbe7819b263e0888dc4f06bfeac2030112 /arch/arm | |
| parent | 71d96eb99e79ba69f47504b72cd54ce121eca422 (diff) | |
| parent | 0c14bb5ad3311de2c26e66e88f8a6886773b8e0a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Assorted fixes
Diffstat (limited to 'arch/arm')
| -rwxr-xr-x | arch/arm/dts/socfpga_stratix10_socdk.dts | 5 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/misc.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/dts/socfpga_stratix10_socdk.dts b/arch/arm/dts/socfpga_stratix10_socdk.dts index c5409df026e..b7b48a5d310 100755 --- a/arch/arm/dts/socfpga_stratix10_socdk.dts +++ b/arch/arm/dts/socfpga_stratix10_socdk.dts @@ -9,6 +9,7 @@ model = "SoCFPGA Stratix 10 SoCDK"; aliases { + ethernet0 = &gmac0; i2c0 = &i2c1; serial0 = &uart0; }; @@ -36,6 +37,8 @@ }; memory { + #address-cells = <2>; + #size-cells = <2>; device_type = "memory"; /* 4GB */ reg = <0 0x00000000 0 0x80000000>, @@ -71,7 +74,7 @@ rxd2-skew-ps = <420>; /* 0ps */ rxd3-skew-ps = <420>; /* 0ps */ txen-skew-ps = <0>; /* -420ps */ - txc-skew-ps = <1860>; /* 960ps */ + txc-skew-ps = <900>; /* 0ps */ rxdv-skew-ps = <420>; /* 0ps */ rxc-skew-ps = <1680>; /* 780ps */ }; diff --git a/arch/arm/mach-socfpga/include/mach/misc.h b/arch/arm/mach-socfpga/include/mach/misc.h index 27d0b6a3708..f11f907e1ce 100644 --- a/arch/arm/mach-socfpga/include/mach/misc.h +++ b/arch/arm/mach-socfpga/include/mach/misc.h @@ -3,8 +3,8 @@ * Copyright (C) 2016-2017 Intel Corporation */ -#ifndef _MISC_H_ -#define _MISC_H_ +#ifndef _SOCFPGA_MISC_H_ +#define _SOCFPGA_MISC_H_ #include <asm/sections.h> @@ -42,4 +42,4 @@ void socfpga_sdram_remap_zero(void); void do_bridge_reset(int enable, unsigned int mask); void socfpga_pl310_clear(void); -#endif /* _MISC_H_ */ +#endif /* _SOCFPGA_MISC_H_ */ |