leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-sh

Browse Source 
- Initial DM conversion
This commit is contained in:
Tom Rini
2019-09-07 13:49:39 -04:00
parent ba83753289 eaae4ee2bd
commit 2f760735c1
13 changed files with 177 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/Kconfig
View File

@@ -137,6 +137,7 @@ config SANDBOX
config SH config SH
bool "SuperH architecture" bool "SuperH architecture"
select HAVE_PRIVATE_LIBGCC select HAVE_PRIVATE_LIBGCC
select SUPPORT_OF_CONTROL
config X86 config X86
bool "x86 architecture" bool "x86 architecture"

1
arch/sh/cpu/u-boot.lds
View File

@@ -75,6 +75,7 @@ SECTIONS
PROVIDE (__init_end = .); PROVIDE (__init_end = .);
PROVIDE (reloc_dst_end = .); PROVIDE (reloc_dst_end = .);
PROVIDE (_end = .);
PROVIDE (bss_start = .); PROVIDE (bss_start = .);
PROVIDE (__bss_start = .); PROVIDE (__bss_start = .);

12
arch/sh/dts/Makefile Normal file
View File

@@ -0,0 +1,12 @@
dtb-y += sh7751-r2dplus.dtb
targets += $(dtb-y)
# Add any required device tree compiler flags here
DTC_FLAGS +=
PHONY += dtbs
dtbs: $(addprefix $(obj)/, $(dtb-y))
@:
clean-files := *.dtb *_HS

26
arch/sh/dts/sh7751-r2dplus.dts Normal file
View File

@@ -0,0 +1,26 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source for the SH7751 R2Dplus
*
* Copyright (C) 2019 Marek Vasut <marek.vasut@gmail.com>
*/
/dts-v1/;
/ {
model = "R2D";
compatible = "renesas,r2d", "renesas,sh7751";
pci@fe200000 {
compatible = "renesas,pci-sh7751";
device_type = "pci";
reg = <0 0xfe200000 0 0x1000>;
status = "okay";
bus-range = <0 0>;
#address-cells = <3>;
#size-cells = <2>;
#interrupt-cells = <1>;
ranges = <0x01000000 0 0xfe240000 0 0xfe240000 0 0x00040000
0x02000000 0 0xfd000000 0 0xfd000000 0 0x01000000>;
};
};

4
arch/sh/include/asm/config.h
View File

@@ -8,9 +8,11 @@
#include <asm/processor.h> #include <asm/processor.h>
#define CONFIG_LMB
/* Timer */ /* Timer */
#define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_TIMER_COUNTS_DOWN
#define CONFIG_SYS_TIMER_COUNTER (TMU_BASE + 0x8) /* TCNT0 */ #define CONFIG_SYS_TIMER_COUNTER (TMU_BASE + 0xc) /* TCNT0 */
#define CONFIG_SYS_TIMER_RATE (CONFIG_SYS_CLK_FREQ / 4) #define CONFIG_SYS_TIMER_RATE (CONFIG_SYS_CLK_FREQ / 4)
#endif #endif

14
arch/sh/lib/start.S
View File

@@ -22,6 +22,17 @@ _start:
mov.l ._reloc_dst, r4 mov.l ._reloc_dst, r4
add #(_start-1b), r5 add #(_start-1b), r5
mov.l ._reloc_dst_end, r6 mov.l ._reloc_dst_end, r6
#ifdef CONFIG_OF_SEPARATE
mov.l ._reloc_size, r0
add r5, r0
add #4, r0
mov.l @r0, r0
swap.b r0, r0
swap.w r0, r0
swap.b r0, r0
add #4, r0
add r0, r6
#endif
2: mov.l @r5+, r1 2: mov.l @r5+, r1
mov.l r1, @r4 mov.l r1, @r4
@@ -29,6 +40,7 @@ _start:
cmp/hs r6, r4 cmp/hs r6, r4
bf 2b bf 2b
#ifndef CONFIG_OF_SEPARATE
mov.l ._bss_start, r4 mov.l ._bss_start, r4
mov.l ._bss_end, r5 mov.l ._bss_end, r5
mov #0, r1 mov #0, r1
@@ -37,6 +49,7 @@ _start:
add #4, r4 add #4, r4
cmp/hs r5, r4 cmp/hs r5, r4
bf 3b bf 3b
#endif
mov.l ._gd_init, r13 /* global data */ mov.l ._gd_init, r13 /* global data */
mov.l ._stack_init, r15 /* stack */ mov.l ._stack_init, r15 /* stack */
@@ -53,6 +66,7 @@ loop:
._lowlevel_init: .long (lowlevel_init - (100b + 4)) ._lowlevel_init: .long (lowlevel_init - (100b + 4))
._reloc_dst: .long _start ._reloc_dst: .long _start
._reloc_dst_end: .long reloc_dst_end ._reloc_dst_end: .long reloc_dst_end
._reloc_size: .long (_end - _start)
._bss_start: .long bss_start ._bss_start: .long bss_start
._bss_end: .long bss_end ._bss_end: .long bss_end
._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE) ._gd_init: .long (_start - GENERATED_GBL_DATA_SIZE)

7
board/renesas/r2dplus/r2dplus.c
View File

@@ -9,7 +9,6 @@
#include <netdev.h> #include <netdev.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/pci.h>
int checkboard(void) int checkboard(void)
{ {
@@ -45,12 +44,6 @@ void ide_set_reset(int idereset)
} }
} }
static struct pci_controller hose;
void pci_init_board(void)
{
pci_sh7751_init(&hose);
}
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)
{ {
return pci_eth_init(bis); return pci_eth_init(bis);

7
configs/r2dplus_defconfig
View File

@@ -1,12 +1,14 @@
CONFIG_SH=y CONFIG_SH=y
CONFIG_SYS_TEXT_BASE=0x8FE00000 CONFIG_SYS_TEXT_BASE=0x8FE00000
CONFIG_TARGET_R2DPLUS=y CONFIG_TARGET_R2DPLUS=y
# CONFIG_SYS_MALLOC_F is not set
CONFIG_BOOTDELAY=-1 CONFIG_BOOTDELAY=-1
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="console=ttySC0,115200" CONFIG_BOOTARGS="console=ttySC0,115200"
# CONFIG_CMDLINE_EDITING is not set # CONFIG_CMDLINE_EDITING is not set
# CONFIG_AUTO_COMPLETE is not set # CONFIG_AUTO_COMPLETE is not set
CONFIG_CMD_IMLS=y CONFIG_CMD_IMLS=y
CONFIG_CMD_DM=y
CONFIG_CMD_IDE=y CONFIG_CMD_IDE=y
CONFIG_CMD_PCI=y CONFIG_CMD_PCI=y
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
@@ -14,11 +16,16 @@ CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y CONFIG_CMD_CACHE=y
CONFIG_CMD_EXT2=y CONFIG_CMD_EXT2=y
CONFIG_DOS_PARTITION=y CONFIG_DOS_PARTITION=y
CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="sh7751-r2dplus"
CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y
CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_CFI=y CONFIG_SYS_FLASH_CFI=y
CONFIG_RTL8139=y CONFIG_RTL8139=y
CONFIG_PCI=y CONFIG_PCI=y
CONFIG_DM_PCI=y
CONFIG_DM_PCI_COMPAT=y
CONFIG_SCIF_CONSOLE=y CONFIG_SCIF_CONSOLE=y
CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_PRIVATE_LIBGCC=y

4
drivers/core/device.c
View File

@@ -526,6 +526,7 @@ static int device_get_device_tail(struct udevice *dev, int ret,
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
/** /**
* device_find_by_ofnode() - Return device associated with given ofnode * device_find_by_ofnode() - Return device associated with given ofnode
* *
@@ -552,6 +553,7 @@ static int device_find_by_ofnode(ofnode node, struct udevice **devp)
return -ENODEV; return -ENODEV;
} }
#endif
int device_get_child(struct udevice *parent, int index, struct udevice **devp) int device_get_child(struct udevice *parent, int index, struct udevice **devp)
{ {
@@ -817,6 +819,7 @@ int device_set_name(struct udevice *dev, const char *name)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
bool device_is_compatible(struct udevice *dev, const char *compat) bool device_is_compatible(struct udevice *dev, const char *compat)
{ {
return ofnode_device_is_compatible(dev_ofnode(dev), compat); return ofnode_device_is_compatible(dev_ofnode(dev), compat);
@@ -879,3 +882,4 @@ int dev_enable_by_path(const char *path)
return lists_bind_fdt(parent, node, NULL, false); return lists_bind_fdt(parent, node, NULL, false);
} }
#endif

8
drivers/core/root.c
View File

@@ -314,13 +314,6 @@ int dm_scan_fdt(const void *blob, bool pre_reloc_only)
#endif #endif
return dm_scan_fdt_node(gd->dm_root, blob, 0, pre_reloc_only); return dm_scan_fdt_node(gd->dm_root, blob, 0, pre_reloc_only);
} }
#else
static int dm_scan_fdt_node(struct udevice *parent, const void *blob,
int offset, bool pre_reloc_only)
{
return 0;
}
#endif
static int dm_scan_fdt_ofnode_path(const char *path, bool pre_reloc_only) static int dm_scan_fdt_ofnode_path(const char *path, bool pre_reloc_only)
{ {
@@ -360,6 +353,7 @@ int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only)
return ret; return ret;
} }
#endif
__weak int dm_scan_other(bool pre_reloc_only) __weak int dm_scan_other(bool pre_reloc_only)
{ {

2
drivers/core/util.c
View File

@@ -31,6 +31,7 @@ int list_count_items(struct list_head *head)
return count; return count;
} }
#if CONFIG_IS_ENABLED(OF_CONTROL) && !CONFIG_IS_ENABLED(OF_PLATDATA)
bool dm_ofnode_pre_reloc(ofnode node) bool dm_ofnode_pre_reloc(ofnode node)
{ {
#if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD) #if defined(CONFIG_SPL_BUILD) || defined(CONFIG_TPL_BUILD)
@@ -56,3 +57,4 @@ bool dm_ofnode_pre_reloc(ofnode node)
return false; return false;
#endif #endif
} }
#endif

164
drivers/pci/pci_sh7751.c
View File

@@ -6,6 +6,7 @@
*/ */
#include <common.h> #include <common.h>
#include <dm.h>
#include <pci.h> #include <pci.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
@@ -19,82 +20,113 @@
#define SH7751_WCR3 (vu_long *)0xFF800010 #define SH7751_WCR3 (vu_long *)0xFF800010
#define SH7751_MCR (vu_long *)0xFF800014 #define SH7751_MCR (vu_long *)0xFF800014
#define SH7751_BCR3 (vu_short *)0xFF800050 #define SH7751_BCR3 (vu_short *)0xFF800050
#define SH7751_PCICONF0 (vu_long *)0xFE200000 #define SH7751_PCICONF0 (vu_long *)0xFE200000
#define SH7751_PCICONF1 (vu_long *)0xFE200004 #define SH7751_PCICONF1 (vu_long *)0xFE200004
#define SH7751_PCICONF2 (vu_long *)0xFE200008 #define SH7751_PCICONF2 (vu_long *)0xFE200008
#define SH7751_PCICONF3 (vu_long *)0xFE20000C #define SH7751_PCICONF3 (vu_long *)0xFE20000C
#define SH7751_PCICONF4 (vu_long *)0xFE200010 #define SH7751_PCICONF4 (vu_long *)0xFE200010
#define SH7751_PCICONF5 (vu_long *)0xFE200014 #define SH7751_PCICONF5 (vu_long *)0xFE200014
#define SH7751_PCICONF6 (vu_long *)0xFE200018 #define SH7751_PCICONF6 (vu_long *)0xFE200018
#define SH7751_PCICR (vu_long *)0xFE200100 #define SH7751_PCICR (vu_long *)0xFE200100
#define SH7751_PCILSR0 (vu_long *)0xFE200104 #define SH7751_PCILSR0 (vu_long *)0xFE200104
#define SH7751_PCILSR1 (vu_long *)0xFE200108 #define SH7751_PCILSR1 (vu_long *)0xFE200108
#define SH7751_PCILAR0 (vu_long *)0xFE20010C #define SH7751_PCILAR0 (vu_long *)0xFE20010C
#define SH7751_PCILAR1 (vu_long *)0xFE200110 #define SH7751_PCILAR1 (vu_long *)0xFE200110
#define SH7751_PCIMBR (vu_long *)0xFE2001C4 #define SH7751_PCIMBR (vu_long *)0xFE2001C4
#define SH7751_PCIIOBR (vu_long *)0xFE2001C8 #define SH7751_PCIIOBR (vu_long *)0xFE2001C8
#define SH7751_PCIPINT (vu_long *)0xFE2001CC #define SH7751_PCIPINT (vu_long *)0xFE2001CC
#define SH7751_PCIPINTM (vu_long *)0xFE2001D0 #define SH7751_PCIPINTM (vu_long *)0xFE2001D0
#define SH7751_PCICLKR (vu_long *)0xFE2001D4 #define SH7751_PCICLKR (vu_long *)0xFE2001D4
#define SH7751_PCIBCR1 (vu_long *)0xFE2001E0 #define SH7751_PCIBCR1 (vu_long *)0xFE2001E0
#define SH7751_PCIBCR2 (vu_long *)0xFE2001E4 #define SH7751_PCIBCR2 (vu_long *)0xFE2001E4
#define SH7751_PCIWCR1 (vu_long *)0xFE2001E8 #define SH7751_PCIWCR1 (vu_long *)0xFE2001E8
#define SH7751_PCIWCR2 (vu_long *)0xFE2001EC #define SH7751_PCIWCR2 (vu_long *)0xFE2001EC
#define SH7751_PCIWCR3 (vu_long *)0xFE2001F0 #define SH7751_PCIWCR3 (vu_long *)0xFE2001F0
#define SH7751_PCIMCR (vu_long *)0xFE2001F4 #define SH7751_PCIMCR (vu_long *)0xFE2001F4
#define SH7751_PCIBCR3 (vu_long *)0xFE2001F8 #define SH7751_PCIBCR3 (vu_long *)0xFE2001F8
#define BCR1_BREQEN 0x00080000 #define BCR1_BREQEN 0x00080000
#define PCI_SH7751_ID 0x35051054 #define PCI_SH7751_ID 0x35051054
#define PCI_SH7751R_ID 0x350E1054 #define PCI_SH7751R_ID 0x350E1054
#define SH7751_PCICONF1_WCC 0x00000080 #define SH7751_PCICONF1_WCC 0x00000080
#define SH7751_PCICONF1_PER 0x00000040 #define SH7751_PCICONF1_PER 0x00000040
#define SH7751_PCICONF1_BUM 0x00000004 #define SH7751_PCICONF1_BUM 0x00000004
#define SH7751_PCICONF1_MES 0x00000002 #define SH7751_PCICONF1_MES 0x00000002
#define SH7751_PCICONF1_CMDS 0x000000C6 #define SH7751_PCICONF1_CMDS 0x000000C6
#define SH7751_PCI_HOST_BRIDGE 0x6 #define SH7751_PCI_HOST_BRIDGE 0x6
#define SH7751_PCICR_PREFIX 0xa5000000 #define SH7751_PCICR_PREFIX 0xa5000000
#define SH7751_PCICR_PRST 0x00000002 #define SH7751_PCICR_PRST 0x00000002
#define SH7751_PCICR_CFIN 0x00000001 #define SH7751_PCICR_CFIN 0x00000001
#define SH7751_PCIPINT_D3 0x00000002 #define SH7751_PCIPINT_D3 0x00000002
#define SH7751_PCIPINT_D0 0x00000001 #define SH7751_PCIPINT_D0 0x00000001
#define SH7751_PCICLKR_PREFIX 0xa5000000 #define SH7751_PCICLKR_PREFIX 0xa5000000
#define SH7751_PCI_MEM_BASE 0xFD000000 #define SH7751_PCI_MEM_BASE 0xFD000000
#define SH7751_PCI_MEM_SIZE 0x01000000 #define SH7751_PCI_MEM_SIZE 0x01000000
#define SH7751_PCI_IO_BASE 0xFE240000 #define SH7751_PCI_IO_BASE 0xFE240000
#define SH7751_PCI_IO_SIZE 0x00040000 #define SH7751_PCI_IO_SIZE 0x00040000
#define SH7751_PCIPAR (vu_long *)0xFE2001C0 #define SH7751_PCIPAR (vu_long *)0xFE2001C0
#define SH7751_PCIPDR (vu_long *)0xFE200220 #define SH7751_PCIPDR (vu_long *)0xFE200220
#define p4_in(addr) (*addr) #define p4_in(addr) (*addr)
#define p4_out(data, addr) (*addr) = (data) #define p4_out(data, addr) (*addr) = (data)
/* Double word */ static int sh7751_pci_addr_valid(pci_dev_t d, uint offset)
int pci_sh4_read_config_dword(struct pci_controller *hose,
pci_dev_t dev, int offset, u32 *value)
{ {
u32 par_data = 0x80000000 | dev; if (PCI_FUNC(d))
return -EINVAL;
p4_out(par_data | (offset & 0xfc), SH7751_PCIPAR);
*value = p4_in(SH7751_PCIPDR);
return 0; return 0;
} }
int pci_sh4_write_config_dword(struct pci_controller *hose, static u32 get_bus_address(struct udevice *dev, pci_dev_t bdf, u32 offset)
pci_dev_t dev, int offset, u32 value)
{ {
u32 par_data = 0x80000000 | dev; return BIT(31) | (PCI_DEV(bdf) << 8) | (offset & ~3);
}
p4_out(par_data | (offset & 0xfc), SH7751_PCIPAR); static int sh7751_pci_read_config(struct udevice *dev, pci_dev_t bdf,
p4_out(value, SH7751_PCIPDR); uint offset, ulong *value,
enum pci_size_t size)
{
u32 addr, reg;
int ret;
ret = sh7751_pci_addr_valid(bdf, offset);
if (ret) {
*value = pci_get_ff(size);
return 0;
}
addr = get_bus_address(dev, bdf, offset);
p4_out(addr, SH7751_PCIPAR);
reg = p4_in(SH7751_PCIPDR);
*value = pci_conv_32_to_size(reg, offset, size);
return 0; return 0;
} }
int pci_sh7751_init(struct pci_controller *hose) static int sh7751_pci_write_config(struct udevice *dev, pci_dev_t bdf,
uint offset, ulong value,
enum pci_size_t size)
{
u32 addr, reg, old;
int ret;
ret = sh7751_pci_addr_valid(bdf, offset);
if (ret)
return ret;
addr = get_bus_address(dev, bdf, offset);
p4_out(addr, SH7751_PCIPAR);
old = p4_in(SH7751_PCIPDR);
reg = pci_conv_size_to_32(old, value, offset, size);
p4_out(reg, SH7751_PCIPDR);
return 0;
}
static int sh7751_pci_probe(struct udevice *dev)
{ {
/* Double-check that we're a 7751 or 7751R chip */ /* Double-check that we're a 7751 or 7751R chip */
if (p4_in(SH7751_PCICONF0) != PCI_SH7751_ID if (p4_in(SH7751_PCICONF0) != PCI_SH7751_ID
@@ -178,7 +210,23 @@ int pci_sh7751_init(struct pci_controller *hose)
/* Finally, set central function init complete */ /* Finally, set central function init complete */
p4_out((SH7751_PCICR_PREFIX | SH7751_PCICR_CFIN), SH7751_PCICR); p4_out((SH7751_PCICR_PREFIX | SH7751_PCICR_CFIN), SH7751_PCICR);
pci_sh4_init(hose);
return 0; return 0;
} }
static const struct dm_pci_ops sh7751_pci_ops = {
.read_config = sh7751_pci_read_config,
.write_config = sh7751_pci_write_config,
};
static const struct udevice_id sh7751_pci_ids[] = {
{ .compatible = "renesas,pci-sh7751" },
{ }
};
U_BOOT_DRIVER(sh7751_pci) = {
.name = "sh7751_pci",
.id = UCLASS_PCI,
.of_match = sh7751_pci_ids,
.ops = &sh7751_pci_ops,
.probe = sh7751_pci_probe,
};

13
include/configs/r2dplus.h
View File

@@ -64,19 +64,6 @@
/* /*
* SuperH PCI Bridge Configration * SuperH PCI Bridge Configration
*/ */
#define CONFIG_SH4_PCI
#define CONFIG_SH7751_PCI #define CONFIG_SH7751_PCI
#define CONFIG_PCI_SCAN_SHOW 1
#define __mem_pci
#define CONFIG_PCI_MEM_BUS 0xFD000000 /* Memory space base addr */
#define CONFIG_PCI_MEM_PHYS CONFIG_PCI_MEM_BUS
#define CONFIG_PCI_MEM_SIZE 0x01000000 /* Size of Memory window */
#define CONFIG_PCI_IO_BUS 0xFE240000 /* IO space base address */
#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS
#define CONFIG_PCI_IO_SIZE 0x00040000 /* Size of IO window */
#define CONFIG_PCI_SYS_BUS CONFIG_SYS_SDRAM_BASE
#define CONFIG_PCI_SYS_PHYS CONFIG_SYS_SDRAM_BASE
#define CONFIG_PCI_SYS_SIZE CONFIG_SYS_SDRAM_SIZE
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */