diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-06 04:17:35 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-06 04:17:35 +0300 |
| commit | 14573fb78fef99266f7691ac9af2ddb388f9491f (patch) | |
| tree | 2cf9ae2121e84de19585424a27a8d40ff775d34a /arch | |
| parent | 1b484736ce47cb220cb523f00ebe77025cab219f (diff) | |
| parent | 806df252c1dafea0bee40f70f7bae050c07ee0c9 (diff) | |
| download | u-boot-14573fb78fef99266f7691ac9af2ddb388f9491f.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/r8a7791-porter.dts | 5 | ||||
| -rw-r--r-- | arch/arm/mach-rmobile/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-rmobile/memmap-gen3.c | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/dts/r8a7791-porter.dts b/arch/arm/dts/r8a7791-porter.dts index f2d5723fbd..fa9a57d770 100644 --- a/arch/arm/dts/r8a7791-porter.dts +++ b/arch/arm/dts/r8a7791-porter.dts @@ -372,6 +372,11 @@ clock-frequency = <400000>; }; +&i2c6 { + status = "okay"; + clock-frequency = <400000>; +}; + &sata0 { status = "okay"; }; diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig index fc4b3c3219..ac08d6eb12 100644 --- a/arch/arm/mach-rmobile/Kconfig +++ b/arch/arm/mach-rmobile/Kconfig @@ -11,6 +11,7 @@ config RCAR_32 config RCAR_GEN3 bool "Renesas ARM SoCs R-Car Gen3 (64bit)" select ARM64 + select PHY endchoice diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-rmobile/memmap-gen3.c index 57a2f88fc4..92c8f2e80d 100644 --- a/arch/arm/mach-rmobile/memmap-gen3.c +++ b/arch/arm/mach-rmobile/memmap-gen3.c @@ -30,6 +30,12 @@ static struct mm_region gen3_mem_map[] = { PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN }, { + .virt = 0x100000000UL, + .phys = 0x100000000UL, + .size = 0xf00000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | + PTE_BLOCK_INNER_SHARE + }, { /* List terminator */ 0, } |