From: Archit Taneja <archit@ti.com> To: <linux-media@vger.kernel.org> Cc: <linux-omap@vger.kernel.org>, <dagriego@biglakesoftware.com>, <dale@farnsworth.org>, <pawel@osciak.com>, <m.szyprowski@samsung.com>, <hverkuil@xs4all.nl>, <laurent.pinchart@ideasonboard.com>, <tomi.valkeinen@ti.com>, Archit Taneja <archit@ti.com>, Rajendra Nayak <rnayak@ti.com>, Sricharan R <r.sricharan@ti.com> Subject: [PATCH 5/6] arm: dra7xx: hwmod data: add VPE hwmod data and ocp_if info Date: Fri, 2 Aug 2013 19:33:42 +0530 [thread overview] Message-ID: <1375452223-30524-6-git-send-email-archit@ti.com> (raw) In-Reply-To: <1375452223-30524-1-git-send-email-archit@ti.com> Add hwmod data for the VPE IP, this is needed for the IP to be reset during boot, and control the functional clock when the driver needs it via pm_runtime apis. Add the corresponding ocp_if struct and add it DRA7XX's ocp interface list. Cc: Rajendra Nayak <rnayak@ti.com> Cc: Sricharan R <r.sricharan@ti.com> Signed-off-by: Archit Taneja <archit@ti.com> --- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index f647998b..181365d 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1883,6 +1883,39 @@ static struct omap_hwmod dra7xx_wd_timer2_hwmod = { }, }; +/* + * 'vpe' class + * + */ + +static struct omap_hwmod_class_sysconfig dra7xx_vpe_sysc = { + .sysc_offs = 0x0010, + .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE), + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | + SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | + MSTANDBY_SMART | MSTANDBY_SMART_WKUP), + .sysc_fields = &omap_hwmod_sysc_type2, +}; + +static struct omap_hwmod_class dra7xx_vpe_hwmod_class = { + .name = "vpe", + .sysc = &dra7xx_vpe_sysc, +}; + +/* vpe */ +static struct omap_hwmod dra7xx_vpe_hwmod = { + .name = "vpe", + .class = &dra7xx_vpe_hwmod_class, + .clkdm_name = "vpe_clkdm", + .main_clk = "dpll_core_h23x2_ck", + .prcm = { + .omap4 = { + .clkctrl_offs = DRA7XX_CM_VPE_VPE_CLKCTRL_OFFSET, + .context_offs = DRA7XX_RM_VPE_VPE_CONTEXT_OFFSET, + .modulemode = MODULEMODE_HWCTRL, + }, + }, +}; /* * Interfaces @@ -2636,6 +2669,14 @@ static struct omap_hwmod_ocp_if dra7xx_l4_wkup__wd_timer2 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; +/* l4_per3 -> vpe */ +static struct omap_hwmod_ocp_if dra7xx_l4_per3__vpe = { + .master = &dra7xx_l4_per3_hwmod, + .slave = &dra7xx_vpe_hwmod, + .clk = "l3_iclk_div", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l3_main_2__l3_instr, &dra7xx_l4_cfg__l3_main_1, @@ -2714,6 +2755,7 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l3_main_1__vcp2, &dra7xx_l4_per2__vcp2, &dra7xx_l4_wkup__wd_timer2, + &dra7xx_l4_per3__vpe, NULL, }; -- 1.8.1.2
WARNING: multiple messages have this Message-ID (diff)
From: Archit Taneja <archit@ti.com> To: linux-media@vger.kernel.org Cc: linux-omap@vger.kernel.org, dagriego@biglakesoftware.com, dale@farnsworth.org, pawel@osciak.com, m.szyprowski@samsung.com, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com, tomi.valkeinen@ti.com, Archit Taneja <archit@ti.com>, Rajendra Nayak <rnayak@ti.com>, Sricharan R <r.sricharan@ti.com> Subject: [PATCH 5/6] arm: dra7xx: hwmod data: add VPE hwmod data and ocp_if info Date: Fri, 2 Aug 2013 19:33:42 +0530 [thread overview] Message-ID: <1375452223-30524-6-git-send-email-archit@ti.com> (raw) In-Reply-To: <1375452223-30524-1-git-send-email-archit@ti.com> Add hwmod data for the VPE IP, this is needed for the IP to be reset during boot, and control the functional clock when the driver needs it via pm_runtime apis. Add the corresponding ocp_if struct and add it DRA7XX's ocp interface list. Cc: Rajendra Nayak <rnayak@ti.com> Cc: Sricharan R <r.sricharan@ti.com> Signed-off-by: Archit Taneja <archit@ti.com> --- arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index f647998b..181365d 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1883,6 +1883,39 @@ static struct omap_hwmod dra7xx_wd_timer2_hwmod = { }, }; +/* + * 'vpe' class + * + */ + +static struct omap_hwmod_class_sysconfig dra7xx_vpe_sysc = { + .sysc_offs = 0x0010, + .sysc_flags = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE), + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART | + SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO | + MSTANDBY_SMART | MSTANDBY_SMART_WKUP), + .sysc_fields = &omap_hwmod_sysc_type2, +}; + +static struct omap_hwmod_class dra7xx_vpe_hwmod_class = { + .name = "vpe", + .sysc = &dra7xx_vpe_sysc, +}; + +/* vpe */ +static struct omap_hwmod dra7xx_vpe_hwmod = { + .name = "vpe", + .class = &dra7xx_vpe_hwmod_class, + .clkdm_name = "vpe_clkdm", + .main_clk = "dpll_core_h23x2_ck", + .prcm = { + .omap4 = { + .clkctrl_offs = DRA7XX_CM_VPE_VPE_CLKCTRL_OFFSET, + .context_offs = DRA7XX_RM_VPE_VPE_CONTEXT_OFFSET, + .modulemode = MODULEMODE_HWCTRL, + }, + }, +}; /* * Interfaces @@ -2636,6 +2669,14 @@ static struct omap_hwmod_ocp_if dra7xx_l4_wkup__wd_timer2 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; +/* l4_per3 -> vpe */ +static struct omap_hwmod_ocp_if dra7xx_l4_per3__vpe = { + .master = &dra7xx_l4_per3_hwmod, + .slave = &dra7xx_vpe_hwmod, + .clk = "l3_iclk_div", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l3_main_2__l3_instr, &dra7xx_l4_cfg__l3_main_1, @@ -2714,6 +2755,7 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { &dra7xx_l3_main_1__vcp2, &dra7xx_l4_per2__vcp2, &dra7xx_l4_wkup__wd_timer2, + &dra7xx_l4_per3__vpe, NULL, }; -- 1.8.1.2
next prev parent reply other threads:[~2013-08-02 14:05 UTC|newest] Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-08-02 14:03 [PATCH 0/6] v4l: VPE mem to mem driver Archit Taneja 2013-08-02 14:03 ` Archit Taneja 2013-08-02 14:03 ` [PATCH 1/6] v4l: ti-vpe: Create a vpdma helper library Archit Taneja 2013-08-02 14:03 ` Archit Taneja 2013-08-05 8:13 ` Tomi Valkeinen 2013-08-05 8:13 ` Tomi Valkeinen 2013-08-05 11:26 ` Archit Taneja 2013-08-05 11:26 ` Archit Taneja 2013-08-05 12:26 ` Tomi Valkeinen 2013-08-05 12:26 ` Tomi Valkeinen 2013-08-08 21:35 ` Laurent Pinchart 2013-08-14 10:19 ` Archit Taneja 2013-08-14 10:19 ` Archit Taneja 2013-08-08 22:04 ` Laurent Pinchart 2013-08-14 10:57 ` Archit Taneja 2013-08-14 10:57 ` Archit Taneja 2013-08-20 11:39 ` Laurent Pinchart 2013-08-20 12:51 ` Archit Taneja 2013-08-20 12:51 ` Archit Taneja 2013-08-20 13:16 ` Archit Taneja 2013-08-20 13:16 ` Archit Taneja 2013-08-20 13:56 ` Laurent Pinchart 2013-08-21 6:47 ` Archit Taneja 2013-08-21 6:47 ` Archit Taneja 2013-08-02 14:03 ` [PATCH 2/6] v4l: ti-vpe: Add helpers for creating VPDMA descriptors Archit Taneja 2013-08-02 14:03 ` Archit Taneja 2013-08-05 9:11 ` Tomi Valkeinen 2013-08-05 9:11 ` Tomi Valkeinen 2013-08-05 12:05 ` Archit Taneja 2013-08-05 12:05 ` Archit Taneja 2013-08-05 13:03 ` Tomi Valkeinen 2013-08-05 13:03 ` Tomi Valkeinen 2013-08-02 14:03 ` [PATCH 3/6] v4l: ti-vpe: Add VPE mem to mem driver Archit Taneja 2013-08-02 14:03 ` Archit Taneja 2013-08-02 14:36 ` Hans Verkuil 2013-08-02 14:55 ` Archit Taneja 2013-08-02 14:55 ` Archit Taneja 2013-08-05 9:18 ` Tomi Valkeinen 2013-08-05 9:18 ` Tomi Valkeinen 2013-08-02 14:03 ` [PATCH 4/6] v4l: ti-vpe: Add de-interlacer support in VPE Archit Taneja 2013-08-02 14:03 ` Archit Taneja 2013-08-02 14:40 ` Hans Verkuil 2013-08-02 14:03 ` Archit Taneja [this message] 2013-08-02 14:03 ` [PATCH 5/6] arm: dra7xx: hwmod data: add VPE hwmod data and ocp_if info Archit Taneja 2013-08-02 14:03 ` [PATCH 6/6] experimental: arm: dts: dra7xx: Add a DT node for VPE Archit Taneja 2013-08-02 14:03 ` Archit Taneja 2013-08-08 22:11 ` Laurent Pinchart 2013-10-25 10:35 ` Archit Taneja 2013-10-25 10:35 ` Archit Taneja 2013-12-03 10:08 ` Archit Taneja 2013-12-03 10:08 ` Archit Taneja 2013-08-20 11:00 ` [PATCH v2 0/6] v4l: VPE mem to mem driver Archit Taneja 2013-08-20 11:00 ` Archit Taneja 2013-08-20 11:00 ` [PATCH v2 1/6] v4l: ti-vpe: Create a vpdma helper library Archit Taneja 2013-08-20 11:00 ` Archit Taneja 2013-08-20 11:00 ` [PATCH v2 2/6] v4l: ti-vpe: Add helpers for creating VPDMA descriptors Archit Taneja 2013-08-20 11:00 ` Archit Taneja 2013-08-20 11:00 ` [PATCH v2 3/6] v4l: ti-vpe: Add VPE mem to mem driver Archit Taneja 2013-08-20 11:00 ` Archit Taneja 2013-08-20 11:00 ` [PATCH v2 4/6] v4l: ti-vpe: Add de-interlacer support in VPE Archit Taneja 2013-08-20 11:00 ` Archit Taneja 2013-08-20 11:00 ` [PATCH v2 5/6] arm: dra7xx: hwmod data: add VPE hwmod data and ocp_if info Archit Taneja 2013-08-20 11:00 ` Archit Taneja 2013-08-20 11:00 ` [PATCH v2 6/6] experimental: arm: dts: dra7xx: Add a DT node for VPE Archit Taneja 2013-08-20 11:00 ` Archit Taneja 2013-08-29 12:32 ` [PATCH v3 0/6] v4l: VPE mem to mem driver Archit Taneja 2013-08-29 12:32 ` Archit Taneja 2013-08-29 12:32 ` [PATCH v3 1/6] v4l: ti-vpe: Create a vpdma helper library Archit Taneja 2013-08-29 12:32 ` Archit Taneja 2013-08-29 12:32 ` [PATCH v3 2/6] v4l: ti-vpe: Add helpers for creating VPDMA descriptors Archit Taneja 2013-08-29 12:32 ` Archit Taneja 2013-08-29 12:32 ` [PATCH v3 3/6] v4l: ti-vpe: Add VPE mem to mem driver Archit Taneja 2013-08-29 12:32 ` Archit Taneja 2013-08-29 13:28 ` Hans Verkuil 2013-08-30 6:47 ` Archit Taneja 2013-08-30 6:47 ` Archit Taneja 2013-08-30 7:07 ` Hans Verkuil 2013-08-30 10:05 ` Archit Taneja 2013-08-30 10:05 ` Archit Taneja 2013-08-30 10:44 ` Hans Verkuil 2013-09-05 5:56 ` Archit Taneja 2013-09-05 5:56 ` Archit Taneja 2013-08-29 12:32 ` [PATCH v3 4/6] v4l: ti-vpe: Add de-interlacer support in VPE Archit Taneja 2013-08-29 12:32 ` Archit Taneja 2013-08-29 12:32 ` [PATCH v3 5/6] arm: dra7xx: hwmod data: add VPE hwmod data and ocp_if info Archit Taneja 2013-08-29 12:32 ` Archit Taneja 2013-08-29 12:42 ` Rajendra Nayak 2013-08-29 12:42 ` Rajendra Nayak 2013-08-29 13:42 ` Archit Taneja 2013-08-29 13:42 ` Archit Taneja 2013-08-29 12:32 ` [PATCH v3 6/6] experimental: arm: dts: dra7xx: Add a DT node for VPE Archit Taneja 2013-08-29 12:32 ` Archit Taneja 2013-09-06 10:12 ` [PATCH v4 0/4] v4l: VPE mem to mem driver Archit Taneja 2013-09-06 10:12 ` Archit Taneja 2013-09-06 10:12 ` [PATCH v4 1/4] v4l: ti-vpe: Create a vpdma helper library Archit Taneja 2013-09-06 10:12 ` Archit Taneja 2013-10-07 7:46 ` Hans Verkuil 2013-09-06 10:12 ` [PATCH v4 2/4] v4l: ti-vpe: Add helpers for creating VPDMA descriptors Archit Taneja 2013-09-06 10:12 ` Archit Taneja 2013-10-07 7:46 ` Hans Verkuil 2013-09-06 10:12 ` [PATCH v4 3/4] v4l: ti-vpe: Add VPE mem to mem driver Archit Taneja 2013-09-06 10:12 ` Archit Taneja 2013-10-07 7:55 ` Hans Verkuil 2013-10-07 9:16 ` Archit Taneja 2013-10-07 9:16 ` Archit Taneja 2013-10-07 9:34 ` Hans Verkuil 2013-10-07 10:22 ` Archit Taneja 2013-10-07 10:22 ` Archit Taneja 2013-10-07 14:02 ` Hans Verkuil 2013-10-07 14:34 ` Archit Taneja 2013-10-07 14:34 ` Archit Taneja 2013-09-06 10:12 ` [PATCH v4 4/4] v4l: ti-vpe: Add de-interlacer support in VPE Archit Taneja 2013-09-06 10:12 ` Archit Taneja 2013-10-07 7:57 ` Hans Verkuil 2013-09-16 6:59 ` [PATCH v4 0/4] v4l: VPE mem to mem driver Archit Taneja 2013-09-16 6:59 ` Archit Taneja 2013-10-07 6:39 ` Archit Taneja 2013-10-07 6:39 ` Archit Taneja 2013-10-09 14:29 ` [PATCH v5 3/4] v4l: ti-vpe: Add " Archit Taneja 2013-10-09 14:29 ` Archit Taneja 2013-10-11 7:46 ` Hans Verkuil 2013-10-15 13:47 ` Archit Taneja 2013-10-15 13:47 ` Archit Taneja 2013-10-15 13:51 ` Hans Verkuil 2013-10-15 14:13 ` Kamil Debski 2013-10-15 15:54 ` Kamil Debski 2013-10-16 5:08 ` Archit Taneja 2013-10-16 5:08 ` Archit Taneja 2013-10-16 5:36 ` [PATCH v5 0/4] v4l: " Archit Taneja 2013-10-16 5:36 ` Archit Taneja 2013-10-16 5:36 ` [PATCH v5 1/4] v4l: ti-vpe: Create a vpdma helper library Archit Taneja 2013-10-16 5:36 ` Archit Taneja 2013-10-16 5:36 ` [PATCH v5 2/4] v4l: ti-vpe: Add helpers for creating VPDMA descriptors Archit Taneja 2013-10-16 5:36 ` Archit Taneja 2013-10-16 5:36 ` [PATCH v5 3/4] v4l: ti-vpe: Add VPE mem to mem driver Archit Taneja 2013-10-16 5:36 ` Archit Taneja 2013-10-16 5:36 ` [PATCH v5 4/4] v4l: ti-vpe: Add de-interlacer support in VPE Archit Taneja 2013-10-16 5:36 ` Archit Taneja
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=1375452223-30524-6-git-send-email-archit@ti.com \ --to=archit@ti.com \ --cc=dagriego@biglakesoftware.com \ --cc=dale@farnsworth.org \ --cc=hverkuil@xs4all.nl \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-media@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=pawel@osciak.com \ --cc=r.sricharan@ti.com \ --cc=rnayak@ti.com \ --cc=tomi.valkeinen@ti.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.