From: Tomi Valkeinen <tomi.valkeinen@ti.com> To: Tony Lindgren <tony@atomide.com>, paul@pwsan.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Tero Kristo <t-kristo@ti.com>, Nishanth Menon <nm@ti.com>, Tomi Valkeinen <tomi.valkeinen@ti.com>, devicetree@vger.kernel.org Subject: [PATCHv3 06/10] arm/dts: dra7.dtsi: add DSS support Date: Wed, 6 May 2015 13:08:54 +0300 [thread overview] Message-ID: <1430906938-26128-7-git-send-email-tomi.valkeinen@ti.com> (raw) In-Reply-To: <1430906938-26128-1-git-send-email-tomi.valkeinen@ti.com> DRA7xxx contains a very similar DSS to OMAP5. The main differences are: * no DSI or RFBI support. * 1 or 2 dedicated video PLLs. * need to do additional configuration to the DRA7 CONTROL module. DRA72xx has only one video PLL, and DRA74xx has two. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: devicetree@vger.kernel.org --- arch/arm/boot/dts/dra7.dtsi | 38 ++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/dra72x.dtsi | 11 +++++++++++ arch/arm/boot/dts/dra74x.dtsi | 15 +++++++++++++++ 3 files changed, 64 insertions(+) diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 5332b57b4950..a319de723851 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1469,6 +1469,44 @@ clocks = <&sys_clkin1>; status = "disabled"; }; + + dss: dss@58000000 { + compatible = "ti,dra7-dss"; + /* 'reg' defined in dra72x.dtsi and dra74x.dtsi */ + /* 'clocks' defined in dra72x.dtsi and dra74x.dtsi */ + status = "disabled"; + ti,hwmods = "dss_core"; + /* CTRL_CORE_DSS_PLL_CONTROL */ + syscon-pll-ctrl = <&scm_conf 0x538>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + dispc@58001000 { + compatible = "ti,dra7-dispc"; + reg = <0x58001000 0x1000>; + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; + ti,hwmods = "dss_dispc"; + clocks = <&dss_dss_clk>; + clock-names = "fck"; + /* CTRL_CORE_SMA_SW_1 */ + syscon-pol = <&scm_conf 0x534>; + }; + + hdmi: encoder@58060000 { + compatible = "ti,dra7-hdmi"; + reg = <0x58040000 0x200>, + <0x58040200 0x80>, + <0x58040300 0x80>, + <0x58060000 0x19000>; + reg-names = "wp", "pll", "phy", "core"; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + ti,hwmods = "dss_hdmi"; + clocks = <&dss_48mhz_clk>, <&dss_hdmi_clk>; + clock-names = "fck", "sys_clk"; + }; + }; }; thermal_zones: thermal-zones { diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi index 03d742f8d572..eaca143faa77 100644 --- a/arch/arm/boot/dts/dra72x.dtsi +++ b/arch/arm/boot/dts/dra72x.dtsi @@ -34,3 +34,14 @@ interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; }; }; + +&dss { + reg = <0x58000000 0x80>, + <0x58004054 0x4>, + <0x58004300 0x20>; + reg-names = "dss", "pll1_clkctrl", "pll1"; + + clocks = <&dss_dss_clk>, + <&dss_video1_clk>; + clock-names = "fck", "video1_clk"; +}; diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi index cc560a70926f..fa995d0ca1f2 100644 --- a/arch/arm/boot/dts/dra74x.dtsi +++ b/arch/arm/boot/dts/dra74x.dtsi @@ -73,3 +73,18 @@ }; }; }; + +&dss { + reg = <0x58000000 0x80>, + <0x58004054 0x4>, + <0x58004300 0x20>, + <0x58005054 0x4>, + <0x58005300 0x20>; + reg-names = "dss", "pll1_clkctrl", "pll1", + "pll2_clkctrl", "pll2"; + + clocks = <&dss_dss_clk>, + <&dss_video1_clk>, + <&dss_video2_clk>; + clock-names = "fck", "video1_clk", "video2_clk"; +}; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: tomi.valkeinen@ti.com (Tomi Valkeinen) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv3 06/10] arm/dts: dra7.dtsi: add DSS support Date: Wed, 6 May 2015 13:08:54 +0300 [thread overview] Message-ID: <1430906938-26128-7-git-send-email-tomi.valkeinen@ti.com> (raw) In-Reply-To: <1430906938-26128-1-git-send-email-tomi.valkeinen@ti.com> DRA7xxx contains a very similar DSS to OMAP5. The main differences are: * no DSI or RFBI support. * 1 or 2 dedicated video PLLs. * need to do additional configuration to the DRA7 CONTROL module. DRA72xx has only one video PLL, and DRA74xx has two. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: devicetree at vger.kernel.org --- arch/arm/boot/dts/dra7.dtsi | 38 ++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/dra72x.dtsi | 11 +++++++++++ arch/arm/boot/dts/dra74x.dtsi | 15 +++++++++++++++ 3 files changed, 64 insertions(+) diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 5332b57b4950..a319de723851 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -1469,6 +1469,44 @@ clocks = <&sys_clkin1>; status = "disabled"; }; + + dss: dss at 58000000 { + compatible = "ti,dra7-dss"; + /* 'reg' defined in dra72x.dtsi and dra74x.dtsi */ + /* 'clocks' defined in dra72x.dtsi and dra74x.dtsi */ + status = "disabled"; + ti,hwmods = "dss_core"; + /* CTRL_CORE_DSS_PLL_CONTROL */ + syscon-pll-ctrl = <&scm_conf 0x538>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + dispc at 58001000 { + compatible = "ti,dra7-dispc"; + reg = <0x58001000 0x1000>; + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>; + ti,hwmods = "dss_dispc"; + clocks = <&dss_dss_clk>; + clock-names = "fck"; + /* CTRL_CORE_SMA_SW_1 */ + syscon-pol = <&scm_conf 0x534>; + }; + + hdmi: encoder at 58060000 { + compatible = "ti,dra7-hdmi"; + reg = <0x58040000 0x200>, + <0x58040200 0x80>, + <0x58040300 0x80>, + <0x58060000 0x19000>; + reg-names = "wp", "pll", "phy", "core"; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + ti,hwmods = "dss_hdmi"; + clocks = <&dss_48mhz_clk>, <&dss_hdmi_clk>; + clock-names = "fck", "sys_clk"; + }; + }; }; thermal_zones: thermal-zones { diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi index 03d742f8d572..eaca143faa77 100644 --- a/arch/arm/boot/dts/dra72x.dtsi +++ b/arch/arm/boot/dts/dra72x.dtsi @@ -34,3 +34,14 @@ interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>; }; }; + +&dss { + reg = <0x58000000 0x80>, + <0x58004054 0x4>, + <0x58004300 0x20>; + reg-names = "dss", "pll1_clkctrl", "pll1"; + + clocks = <&dss_dss_clk>, + <&dss_video1_clk>; + clock-names = "fck", "video1_clk"; +}; diff --git a/arch/arm/boot/dts/dra74x.dtsi b/arch/arm/boot/dts/dra74x.dtsi index cc560a70926f..fa995d0ca1f2 100644 --- a/arch/arm/boot/dts/dra74x.dtsi +++ b/arch/arm/boot/dts/dra74x.dtsi @@ -73,3 +73,18 @@ }; }; }; + +&dss { + reg = <0x58000000 0x80>, + <0x58004054 0x4>, + <0x58004300 0x20>, + <0x58005054 0x4>, + <0x58005300 0x20>; + reg-names = "dss", "pll1_clkctrl", "pll1", + "pll2_clkctrl", "pll2"; + + clocks = <&dss_dss_clk>, + <&dss_video1_clk>, + <&dss_video2_clk>; + clock-names = "fck", "video1_clk", "video2_clk"; +}; -- 2.1.4
next prev parent reply other threads:[~2015-05-06 10:08 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-05-06 10:08 [PATCHv3 00/10] ARM: DRA7: add display support Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen [not found] ` <1430906938-26128-1-git-send-email-tomi.valkeinen-l0cyMroinI0@public.gmane.org> 2015-05-06 10:08 ` [PATCHv3 01/10] arm/dts: dra7xx: add 'ti,set-rate-parent' for dss_dss_clk Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 01/10] arm/dts: dra7xx: add 'ti, set-rate-parent' " Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 07/10] arm/dts: dra72-evm.dts: add HDMI Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 08/10] arm/dts: am57xx-beagle-x15.dts: " Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 02/10] ARM: DRA7: hwmod: add DMM hwmod description Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 03/10] ARM: DRA7: hwmod: set DSS submodule parent hwmods Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 04/10] ARM: OMAP: display: change compat names to array Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 05/10] ARM: OMAP2+: display: detect DRA7 DSS Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen [this message] 2015-05-06 10:08 ` [PATCHv3 06/10] arm/dts: dra7.dtsi: add DSS support Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 09/10] arm: dra7: add DESHDCP clock Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen 2015-05-06 10:08 ` [PATCHv3 10/10] CLK: TI: always enable " Tomi Valkeinen 2015-05-06 10:08 ` Tomi Valkeinen 2015-05-20 11:47 ` Tero Kristo 2015-05-20 11:47 ` Tero Kristo 2015-05-20 11:50 ` Tero Kristo 2015-05-20 11:50 ` Tero Kristo 2015-05-20 19:34 ` Stephen Boyd 2015-05-20 19:34 ` Stephen Boyd 2015-05-21 3:06 ` Paul Walmsley 2015-05-21 3:06 ` Paul Walmsley 2015-05-22 6:27 ` Tomi Valkeinen 2015-05-22 6:27 ` Tomi Valkeinen 2015-05-22 6:27 ` Tomi Valkeinen 2015-05-28 4:22 ` Michael Turquette 2015-05-28 4:22 ` Michael Turquette 2015-05-28 6:25 ` Tero Kristo 2015-05-28 6:25 ` Tero Kristo 2015-05-28 22:49 ` Stephen Boyd 2015-05-28 22:49 ` Stephen Boyd 2015-05-27 9:11 ` Tomi Valkeinen 2015-05-27 9:11 ` Tomi Valkeinen 2015-06-03 16:19 ` Michael Turquette 2015-06-03 16:19 ` Michael Turquette 2015-05-20 8:24 ` [PATCHv3 00/10] ARM: DRA7: add display support Tomi Valkeinen 2015-05-20 8:24 ` Tomi Valkeinen 2015-06-01 5:46 ` Paul Walmsley 2015-06-01 5:46 ` Paul Walmsley 2015-06-01 6:21 ` Tomi Valkeinen 2015-06-01 6:21 ` Tomi Valkeinen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1430906938-26128-7-git-send-email-tomi.valkeinen@ti.com \ --to=tomi.valkeinen@ti.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=nm@ti.com \ --cc=paul@pwsan.com \ --cc=t-kristo@ti.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.