iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DaVinci SoC support updates enhancing DSP remoteproc

Browse Source 
support for DA850 SoC. This lays the foundation for
 DT conversion of da8xx remoteproc driver.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZOSevAAoJEGFBu2jqvgRNisUP/1q7m/7W/ofDdpTxpD8ktTEW
 jWTcEFcK6aRL1mAA3gJXy5RD0Zn9sfD/Hr1T4ETfvYGDOwFpYfhUcKG06FWlw6vF
 JpJgDa1n3fJDHinBnV83KF0uHFPGGbCewHZZoFKfTVv2ox6RxKoKt1YammYrVBP1
 00EWbgVIwn5YjMHy0YvG276abNCWdXdbUElBzXIpLCaWjfNcfQx4iO6SP/qiFzrb
 6KUSVgE2npvR2wJN51jcDXi35+FBTNzQ6YRxRGmfIQzwbcLKHZKEFXcRyqar6Dad
 f4XXxBq7nSOeD4+6AoFqnToBp8hSJg0EdNyBwTkefXpZLSITdFbswtUjgeinuKfs
 U/SvSHEwXQMh5xpPBp6TJI/KQEoeR79tMroLuQBhKrzCaVc/tEtWu+i1H4WupsSG
 zOeZNcTpMBlGUdmQpP2WPzQgxd5TChGC+ZfsvA304VdQ1q4JKZb+HclyFv06NEqc
 1snbaDlZWlnjGXlJrsM0TJNtPasnTDF8wlp6bVnvicLWkoP1hch4rLYEMeSj4j6P
 I90u3fNuacxLjXhb62OU5gVnyQMLbg5/rfpsls4Mnigfddapmqj4+21qv+YBkE7E
 SAsbIisKcx9zJhhJYcvYt0ds4QrgKrbXG9aHOADjR64JXeUGusI6IhhBi0nXnknm
 hyWxKNZLcGHvYUL5vEHn
 =xwdB
 -----END PGP SIGNATURE-----

Merge tag 'davinci-for-v4.13/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

DaVinci SoC support updates enhancing DSP remoteproc
support for DA850 SoC. This lays the foundation for
DT conversion of da8xx remoteproc driver.

* tag 'davinci-for-v4.13/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da8xx: Add DSP internal RAM memories as IOMEM resources
  ARM: davinci: da8xx: Add names to DSP IOMEM resources
  ARM: davinci: da8xx: Create DSP device only when assigned memory

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-06-18 19:04:47 -07:00
commit 7c3b54a550
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm/mach-davinci/devices-da8xx.c
View File

@ -789,15 +789,35 @@ int __init da850_register_mmcsd1(struct davinci_mmc_config *config)
static struct resource da8xx_rproc_resources[] = {
{ /* DSP boot address */
.name = "host1cfg",
.start = DA8XX_SYSCFG0_BASE + DA8XX_HOST1CFG_REG,
.end = DA8XX_SYSCFG0_BASE + DA8XX_HOST1CFG_REG + 3,
.flags = IORESOURCE_MEM,
},
{ /* DSP interrupt registers */
.name = "chipsig",
.start = DA8XX_SYSCFG0_BASE + DA8XX_CHIPSIG_REG,
.end = DA8XX_SYSCFG0_BASE + DA8XX_CHIPSIG_REG + 7,
.flags = IORESOURCE_MEM,
},
{ /* DSP L2 RAM */
.name = "l2sram",
.start = DA8XX_DSP_L2_RAM_BASE,
.end = DA8XX_DSP_L2_RAM_BASE + SZ_256K - 1,
.flags = IORESOURCE_MEM,
},
{ /* DSP L1P RAM */
.name = "l1pram",
.start = DA8XX_DSP_L1P_RAM_BASE,
.end = DA8XX_DSP_L1P_RAM_BASE + SZ_32K - 1,
.flags = IORESOURCE_MEM,
},
{ /* DSP L1D RAM */
.name = "l1dram",
.start = DA8XX_DSP_L1D_RAM_BASE,
.end = DA8XX_DSP_L1D_RAM_BASE + SZ_32K - 1,
.flags = IORESOURCE_MEM,
},
{ /* dsp irq */
.start = IRQ_DA8XX_CHIPINT0,
.end = IRQ_DA8XX_CHIPINT0,
@ -814,6 +834,8 @@ static struct platform_device da8xx_dsp = {
.resource = da8xx_rproc_resources,
};
static bool rproc_mem_inited __initdata;
#if IS_ENABLED(CONFIG_DA8XX_REMOTEPROC)
static phys_addr_t rproc_base __initdata;
@ -852,6 +874,8 @@ void __init da8xx_rproc_reserve_cma(void)
ret = dma_declare_contiguous(&da8xx_dsp.dev, rproc_size, rproc_base, 0);
if (ret)
pr_err("%s: dma_declare_contiguous failed %d\n", __func__, ret);
else
rproc_mem_inited = true;
}
#else
@ -866,6 +890,12 @@ int __init da8xx_register_rproc(void)
{
int ret;
if (!rproc_mem_inited) {
pr_warn("%s: memory not reserved for DSP, not registering DSP device\n",
__func__);
return -ENOMEM;
}
ret = platform_device_register(&da8xx_dsp);
if (ret)
pr_err("%s: can't register DSP device: %d\n", __func__, ret);

5
arch/arm/mach-davinci/include/mach/da8xx.h
View File

@ -75,6 +75,11 @@ extern unsigned int da850_max_speed;
#define DA8XX_VPIF_BASE 0x01e17000
#define DA8XX_GPIO_BASE 0x01e26000
#define DA8XX_PSC1_BASE 0x01e27000
#define DA8XX_DSP_L2_RAM_BASE 0x11800000
#define DA8XX_DSP_L1P_RAM_BASE (DA8XX_DSP_L2_RAM_BASE + 0x600000)
#define DA8XX_DSP_L1D_RAM_BASE (DA8XX_DSP_L2_RAM_BASE + 0x700000)
#define DA8XX_AEMIF_CS2_BASE 0x60000000
#define DA8XX_AEMIF_CS3_BASE 0x62000000
#define DA8XX_AEMIF_CTL_BASE 0x68000000