hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Pull "DaVinci DT updates for v4.15" from Sekhar Nori:

Add support for accessing DSP on DA850 SoC when using
device-tree.

* tag 'davinci-for-v4.15/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da8xx-dt: Add OF_DEV_AUXDATA entry for DSP clock matching
  ARM: dts: da850-lcdk: Add and enable CMA reserved pool for DSP
  ARM: dts: da850: Add DSP node
This commit is contained in:
Arnd Bergmann 2017-10-20 00:17:50 +02:00
parent 4167ca1e85 933311fdfa
commit b073a8991f
3 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/boot/dts/da850-lcdk.dts
View File

@ -26,6 +26,19 @@
reg = <0xc0000000 0x08000000>; reg = <0xc0000000 0x08000000>;
}; };
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
dsp_memory_region: dsp-memory@c3000000 {
compatible = "shared-dma-pool";
reg = <0xc3000000 0x1000000>;
reusable;
status = "okay";
};
};
sound { sound {
compatible = "simple-audio-card"; compatible = "simple-audio-card";
simple-audio-card,name = "DA850/OMAP-L138 LCDK"; simple-audio-card,name = "DA850/OMAP-L138 LCDK";
@ -319,3 +332,8 @@
pinctrl-0 = <&vpif_capture_pins>; pinctrl-0 = <&vpif_capture_pins>;
status = "okay"; status = "okay";
}; };
&dsp {
memory-region = <&dsp_memory_region>;
status = "okay";
};

12
arch/arm/boot/dts/da850.dtsi
View File

@ -23,6 +23,18 @@
reg = <0xfffee000 0x2000>; reg = <0xfffee000 0x2000>;
}; };
}; };
dsp: dsp@11800000 {
compatible = "ti,da850-dsp";
reg = <0x11800000 0x40000>,
<0x11e00000 0x8000>,
<0x11f00000 0x8000>,
<0x01c14044 0x4>,
<0x01c14174 0x8>;
reg-names = "l2sram", "l1pram", "l1dram", "host1cfg", "chipsig";
interrupt-parent = <&intc>;
interrupts = <28>;
status = "disabled";
};
soc@1c00000 { soc@1c00000 {
compatible = "simple-bus"; compatible = "simple-bus";
model = "da850"; model = "da850";

1
arch/arm/mach-davinci/da8xx-dt.c
View File

@ -54,6 +54,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL), OF_DEV_AUXDATA("ti,da830-usb-phy", 0x01c1417c, "da8xx-usb-phy", NULL),
OF_DEV_AUXDATA("ti,da850-ahci", 0x01e18000, "ahci_da850", NULL), OF_DEV_AUXDATA("ti,da850-ahci", 0x01e18000, "ahci_da850", NULL),
OF_DEV_AUXDATA("ti,da850-vpif", 0x01e17000, "vpif", NULL), OF_DEV_AUXDATA("ti,da850-vpif", 0x01e17000, "vpif", NULL),
OF_DEV_AUXDATA("ti,da850-dsp", 0x11800000, "davinci-rproc.0", NULL),
{} {}
}; };