From 9d65f902ddcaf2f37ef58b937650805d697cfcd2 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Wed, 7 Dec 2016 10:49:51 +0100 Subject: [PATCH 01/11] ARM: dts: STiH410-B2120: enable sti-hda at board level As sti-hda is only available on STiH410-B2120, disable it in STiH410.dtsi and enable it at board level. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih410-b2120.dts | 6 ++++++ arch/arm/boot/dts/stih410.dtsi | 1 + 2 files changed, 7 insertions(+) diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 118ac284fc4b..83313b51915d 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -60,5 +60,11 @@ ohci1: usb@9a83c00 { ehci1: usb@9a83e00 { status = "okay"; }; + + sti-display-subsystem { + sti-hda@8d02000 { + status = "okay"; + }; + }; }; }; diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index 281a12424cf6..fe994ebb5ec2 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -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", From 241a687853b988cb00cfd362824bf3fad180dd0e Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Wed, 7 Dec 2016 10:51:31 +0100 Subject: [PATCH 02/11] ARM: dts: STiH410: add hqvdp node Enable High Quality Video Data Plane which is an hardware IP dedicated to video rendering. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih410.dtsi | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index fe994ebb5ec2..b2c9a5705f89 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -233,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 { From b32a2297f4b520b1737c3090b20243860f4fe8ca Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Thu, 8 Dec 2016 17:04:44 +0100 Subject: [PATCH 03/11] ARM: dts: STiH407-family: disable fdma1 and fdma2 Only fdma0 instance is used for audio, so disable the 2 others instances. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index c8b2944e304a..c0b8fe1d4621 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -889,6 +889,8 @@ fdma1: dma-controller@8e40000 { interrupts = ; dma-channels = <16>; #dma-cells = <3>; + + status = "disabled"; }; /* fdma free running */ @@ -906,6 +908,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 { From b005ebf945e936cacd317a51500cb01033e86aec Mon Sep 17 00:00:00 2001 From: Hugues Fruchet Date: Mon, 5 Dec 2016 18:11:00 +0100 Subject: [PATCH 04/11] ARM: dts: STiH410: add DELTA dt node This patch adds DT node for STMicroelectronics DELTA V4L2 video decoder Signed-off-by: Hugues Fruchet --- arch/arm/boot/dts/stih410.dtsi | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index b2c9a5705f89..8be99d010fb3 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -271,5 +271,15 @@ thermal@91a0000 { clocks = <&clk_sysin>; interrupts = ; }; + + 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>; + }; }; }; From b9ec866d223f38eb0bf2a7c836e10031ee17f7af Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Fri, 6 Jan 2017 14:30:21 +0100 Subject: [PATCH 05/11] ARM: dts: STiH410-family: fix wrong parent clock frequency The clock parent was lower than child clock which is not correct. In some use case, it leads to division by zero. Signed-off-by: Gabriel Fernandez --- arch/arm/boot/dts/stih410.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index 8be99d010fb3..3c9672c5b09f 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -131,7 +131,7 @@ sti-display-subsystem { <&clk_s_d2_quadfs 0>; assigned-clock-rates = <297000000>, - <108000000>, + <297000000>, <0>, <400000000>, <400000000>; From 04f0d55f905011ad94aa3079ec9ab74a6e083e58 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Thu, 12 Jan 2017 11:59:01 +0100 Subject: [PATCH 06/11] ARM: dts: STiH407-family: update gp0_reserved memory region Update the start address of gp0_reserved memory region and enable it Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index c0b8fe1d4621..790a252d3e24 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -20,11 +20,10 @@ 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 { From 5eac80e8cd13133c95f3456b1634f26a75ba6068 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Thu, 12 Jan 2017 12:02:35 +0100 Subject: [PATCH 07/11] ARM: dts: STiH407-family: remove audio remoteproc node This node is unused, remove it Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 790a252d3e24..bad43411ecd9 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -33,12 +33,6 @@ gp1_reserved: rproc@41000000 { 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"; @@ -835,16 +829,6 @@ st231_gp1: remote-processor { 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>; From f0e3ed1c0b849b7449e272f5e8ecd5566a652ce0 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Thu, 12 Jan 2017 14:11:58 +0100 Subject: [PATCH 08/11] ARM: dts: STiH407-family: remove gp1 remoteproc node This node is unused, remove it Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index bad43411ecd9..7866ee1811db 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -26,14 +26,6 @@ gp0_reserved: rproc@45000000 { no-map; }; - gp1_reserved: rproc@41000000 { - compatible = "shared-dma-pool"; - reg = <0x41000000 0x01000000>; - no-map; - status = "disabled"; - }; - - dmu_reserved: rproc@43000000 { compatible = "shared-dma-pool"; reg = <0x43000000 0x01000000>; @@ -818,17 +810,6 @@ st231_gp0: remote-processor { st,syscfg = <&syscfg_core 0x22c>; }; - - st231_gp1: 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_dmu: remote-processor { compatible = "st,st231-rproc"; memory-region = <&dmu_reserved>; From 2196cb86f9554d6bbc100d27f46055009546ec89 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Thu, 12 Jan 2017 14:15:21 +0100 Subject: [PATCH 09/11] ARM: dts: STiH407-family: update dmu remoteproc node Rename dmu_reserved to delta_reserved Rename st231_dmu to st231_delta Update the delta_reserved memory region start address Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 7866ee1811db..54963f89b59a 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -26,9 +26,9 @@ gp0_reserved: rproc@45000000 { no-map; }; - dmu_reserved: rproc@43000000 { + delta_reserved: rproc@44000000 { compatible = "shared-dma-pool"; - reg = <0x43000000 0x01000000>; + reg = <0x44000000 0x01000000>; no-map; }; }; @@ -810,9 +810,9 @@ st231_gp0: remote-processor { st,syscfg = <&syscfg_core 0x22c>; }; - st231_dmu: remote-processor { + st231_delta: 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>; From eea6b611de9b8b838020a8e939eb728a07e48774 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Thu, 12 Jan 2017 14:17:35 +0100 Subject: [PATCH 10/11] ARM: dts: STiH407-family: Supply mailbox properties to GP0 RProc Signed-off-by: Loic Pallardy Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 54963f89b59a..9ce657d69102 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -808,6 +808,9 @@ 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_delta: remote-processor { From 2016ead446b98c42dffd9b6c03ce813e5cb3b810 Mon Sep 17 00:00:00 2001 From: Patrice Chotard Date: Thu, 12 Jan 2017 14:19:39 +0100 Subject: [PATCH 11/11] ARM: dts: STiH407-family: Supply Mailbox properties to delta RProc Signed-off-by: Lee Jones Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index 9ce657d69102..508895f3ef09 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -821,6 +821,9 @@ st231_delta: remote-processor { 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 */