mirror of https://gitee.com/openkylin/linux.git
STi dts update:
Enable High Quality Video Data Plane (HQVDP) DT entry Add DELTA V4L2 video decoder DT entry Disable unused fdma instances Fix sti-display-subsystem wrong clock parent's value Cleanup and update DT entries related to remoteproc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJYd7UrAAoJEMrHeC97M/+mMmAP+QFapWLQvKjGCLe2Uhz4Fcej MCKXSdJnlKRNDMIsyYulqIq08V0Dkw56ATKo01QfQNfyxud4tQAYzML6y4dv4ec7 Gc5hQgvExtfy9q3WQjqZ94R2NExvMk17EpyGamH4FYM9jXpfa9DhRiXZz8E8ymEX DW58UynoaA01mm6ZaDwjV03JPxOzSUNi4SCngvO+aFA3ERjbUMnsuidCQCoG2pt+ YxyRyxeNtjBOYfFI6oHRoug7tAb+y2xwlgg0tzFDPdVom9Cijo7bLodTlne+EALD EF+Cqj4wPJgeWbolVcgJZcvHu3I7I4+dKADEjyf6FgZO4rUIphPwZAnOHdyI0R3X aJ8DSkeXOWjh11AK8F/+s1X8cGHPPAhbaXh5qyGP66xCURmBZ0nlHuOLFZX0yCHl XplzD0UatrSQuM5bX+eJxvTOls9YBgrLBjOcz9yETkjhJ3FiNyYYE8uuntfJH9dV PlYJ+2+Q1ZV7wok3XjqP56K2lsGT3kC7ncTYsn05BORDXRRh+cGHFOSPm939iQsi fzZDaxNUnJ1eY85bDK/VlE1EseQUOFdLTtd3cWGBxivdYIpT+tZOcnAKjn7fs17a Jz+V8mhbiFxVgAHfvijwswdqvde/+vhZar7a8ygZfzbPNzZTOYUW/WWN/jIeY5c+ 391WomqiPStQrMC7lvq3 =FVj0 -----END PGP SIGNATURE----- Merge tag 'sti-dt-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt STi dts update: Enable High Quality Video Data Plane (HQVDP) DT entry Add DELTA V4L2 video decoder DT entry Disable unused fdma instances Fix sti-display-subsystem wrong clock parent's value Cleanup and update DT entries related to remoteproc * tag 'sti-dt-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti: ARM: dts: STiH407-family: Supply Mailbox properties to delta RProc ARM: dts: STiH407-family: Supply mailbox properties to GP0 RProc ARM: dts: STiH407-family: update dmu remoteproc node ARM: dts: STiH407-family: remove gp1 remoteproc node ARM: dts: STiH407-family: remove audio remoteproc node ARM: dts: STiH407-family: update gp0_reserved memory region ARM: dts: STiH410-family: fix wrong parent clock frequency ARM: dts: STiH410: add DELTA dt node ARM: dts: STiH407-family: disable fdma1 and fdma2 ARM: dts: STiH410: add hqvdp node ARM: dts: STiH410-B2120: enable sti-hda at board level Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson
commit
71c554ece7
|
|
@ -20,30 +20,15 @@ reserved-memory {
|
|||
#size-cells = <1>;
|
||||
ranges;
|
||||
|
||||
gp0_reserved: rproc@40000000 {
|
||||
gp0_reserved: rproc@45000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0x40000000 0x01000000>;
|
||||
reg = <0x45000000 0x00400000>;
|
||||
no-map;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
gp1_reserved: rproc@41000000 {
|
||||
delta_reserved: rproc@44000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0x41000000 0x01000000>;
|
||||
no-map;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
audio_reserved: rproc@42000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0x42000000 0x01000000>;
|
||||
no-map;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
dmu_reserved: rproc@43000000 {
|
||||
compatible = "shared-dma-pool";
|
||||
reg = <0x43000000 0x01000000>;
|
||||
reg = <0x44000000 0x01000000>;
|
||||
no-map;
|
||||
};
|
||||
};
|
||||
|
|
@ -823,37 +808,22 @@ st231_gp0: remote-processor {
|
|||
clocks = <&clk_s_c0_flexgen CLK_ST231_GP_0>;
|
||||
clock-frequency = <600000000>;
|
||||
st,syscfg = <&syscfg_core 0x22c>;
|
||||
#mbox-cells = <1>;
|
||||
mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";
|
||||
mboxes = <&mailbox0 0 2>, <&mailbox2 0 1>, <&mailbox0 0 3>, <&mailbox2 0 0>;
|
||||
};
|
||||
|
||||
|
||||
st231_gp1: remote-processor {
|
||||
st231_delta: remote-processor {
|
||||
compatible = "st,st231-rproc";
|
||||
memory-region = <&gp1_reserved>;
|
||||
resets = <&softreset STIH407_ST231_GP1_SOFTRESET>;
|
||||
reset-names = "sw_reset";
|
||||
clocks = <&clk_s_c0_flexgen CLK_ST231_GP_1>;
|
||||
clock-frequency = <600000000>;
|
||||
st,syscfg = <&syscfg_core 0x220>;
|
||||
};
|
||||
|
||||
st231_audio: remote-processor {
|
||||
compatible = "st,st231-rproc";
|
||||
memory-region = <&audio_reserved>;
|
||||
resets = <&softreset STIH407_ST231_AUD_SOFTRESET>;
|
||||
reset-names = "sw_reset";
|
||||
clocks = <&clk_s_c0_flexgen CLK_ST231_AUD_0>;
|
||||
clock-frequency = <600000000>;
|
||||
st,syscfg = <&syscfg_core 0x228>;
|
||||
};
|
||||
|
||||
st231_dmu: remote-processor {
|
||||
compatible = "st,st231-rproc";
|
||||
memory-region = <&dmu_reserved>;
|
||||
memory-region = <&delta_reserved>;
|
||||
resets = <&softreset STIH407_ST231_DMU_SOFTRESET>;
|
||||
reset-names = "sw_reset";
|
||||
clocks = <&clk_s_c0_flexgen CLK_ST231_DMU>;
|
||||
clock-frequency = <600000000>;
|
||||
st,syscfg = <&syscfg_core 0x224>;
|
||||
#mbox-cells = <1>;
|
||||
mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";
|
||||
mboxes = <&mailbox0 0 0>, <&mailbox3 0 1>, <&mailbox0 0 1>, <&mailbox3 0 0>;
|
||||
};
|
||||
|
||||
/* fdma audio */
|
||||
|
|
@ -889,6 +859,8 @@ fdma1: dma-controller@8e40000 {
|
|||
interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>;
|
||||
dma-channels = <16>;
|
||||
#dma-cells = <3>;
|
||||
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
/* fdma free running */
|
||||
|
|
@ -906,6 +878,8 @@ fdma2: dma-controller@8e60000 {
|
|||
<&clk_s_c0_flexgen CLK_EXT2F_A9>,
|
||||
<&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,
|
||||
<&clk_s_c0_flexgen CLK_EXT2F_A9>;
|
||||
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sti_sasg_codec: sti-sasg-codec {
|
||||
|
|
|
|||
|
|
@ -60,5 +60,11 @@ ohci1: usb@9a83c00 {
|
|||
ehci1: usb@9a83e00 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
sti-display-subsystem {
|
||||
sti-hda@8d02000 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ sti-display-subsystem {
|
|||
<&clk_s_d2_quadfs 0>;
|
||||
|
||||
assigned-clock-rates = <297000000>,
|
||||
<108000000>,
|
||||
<297000000>,
|
||||
<0>,
|
||||
<400000000>,
|
||||
<400000000>;
|
||||
|
|
@ -221,6 +221,7 @@ sti_hdmi: sti-hdmi@8d04000 {
|
|||
|
||||
sti-hda@8d02000 {
|
||||
compatible = "st,stih407-hda";
|
||||
status = "disabled";
|
||||
reg = <0x8d02000 0x400>, <0x92b0120 0x4>;
|
||||
reg-names = "hda-reg", "video-dacs-ctrl";
|
||||
clock-names = "pix",
|
||||
|
|
@ -232,6 +233,17 @@ sti-hda@8d02000 {
|
|||
<&clk_s_d2_quadfs 0>,
|
||||
<&clk_s_d2_quadfs 1>;
|
||||
};
|
||||
|
||||
sti-hqvdp@9c000000 {
|
||||
compatible = "st,stih407-hqvdp";
|
||||
reg = <0x9C00000 0x100000>;
|
||||
clock-names = "hqvdp", "pix_main";
|
||||
clocks = <&clk_s_c0_flexgen CLK_MAIN_DISP>,
|
||||
<&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>;
|
||||
reset-names = "hqvdp";
|
||||
resets = <&softreset STIH407_HDQVDP_SOFTRESET>;
|
||||
st,vtg = <&vtg_main>;
|
||||
};
|
||||
};
|
||||
|
||||
bdisp0:bdisp@9f10000 {
|
||||
|
|
@ -259,5 +271,15 @@ thermal@91a0000 {
|
|||
clocks = <&clk_sysin>;
|
||||
interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;
|
||||
};
|
||||
|
||||
delta0 {
|
||||
compatible = "st,st-delta";
|
||||
clock-names = "delta",
|
||||
"delta-st231",
|
||||
"delta-flash-promip";
|
||||
clocks = <&clk_s_c0_flexgen CLK_VID_DMU>,
|
||||
<&clk_s_c0_flexgen CLK_ST231_DMU>,
|
||||
<&clk_s_c0_flexgen CLK_FLASH_PROMIP>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue