|
|
@@ -550,6 +550,36 @@ static struct omap_hwmod dra7xx_tptc1_hwmod = {
|
|
|
},
|
|
|
};
|
|
|
|
|
|
+/*
|
|
|
+ * 'dsp' class
|
|
|
+ * dsp sub-system
|
|
|
+ */
|
|
|
+
|
|
|
+static struct omap_hwmod_class dra7xx_dsp_hwmod_class = {
|
|
|
+ .name = "dsp",
|
|
|
+};
|
|
|
+
|
|
|
+static struct omap_hwmod_rst_info dra7xx_dsp_resets[] = {
|
|
|
+ { .name = "dsp", .rst_shift = 0 },
|
|
|
+};
|
|
|
+
|
|
|
+/* dsp1 processor */
|
|
|
+static struct omap_hwmod dra7xx_dsp1_hwmod = {
|
|
|
+ .name = "dsp1",
|
|
|
+ .class = &dra7xx_dsp_hwmod_class,
|
|
|
+ .clkdm_name = "dsp1_clkdm",
|
|
|
+ .rst_lines = dra7xx_dsp_resets,
|
|
|
+ .rst_lines_cnt = ARRAY_SIZE(dra7xx_dsp_resets),
|
|
|
+ .main_clk = "dpll_dsp_m2_ck",
|
|
|
+ .prcm = {
|
|
|
+ .omap4 = {
|
|
|
+ .clkctrl_offs = DRA7XX_CM_DSP1_DSP1_CLKCTRL_OFFSET,
|
|
|
+ .rstctrl_offs = DRA7XX_RM_DSP1_RSTCTRL_OFFSET,
|
|
|
+ .context_offs = DRA7XX_RM_DSP1_DSP1_CONTEXT_OFFSET,
|
|
|
+ },
|
|
|
+ },
|
|
|
+};
|
|
|
+
|
|
|
/*
|
|
|
* 'dss' class
|
|
|
*
|
|
|
@@ -1168,6 +1198,54 @@ static struct omap_hwmod dra7xx_i2c5_hwmod = {
|
|
|
},
|
|
|
};
|
|
|
|
|
|
+/*
|
|
|
+ * 'ipu' class
|
|
|
+ * imaging processor unit
|
|
|
+ */
|
|
|
+
|
|
|
+static struct omap_hwmod_class dra7xx_ipu_hwmod_class = {
|
|
|
+ .name = "ipu",
|
|
|
+};
|
|
|
+
|
|
|
+static struct omap_hwmod_rst_info dra7xx_ipu_resets[] = {
|
|
|
+ { .name = "cpu0", .rst_shift = 0 },
|
|
|
+ { .name = "cpu1", .rst_shift = 1 },
|
|
|
+};
|
|
|
+
|
|
|
+/* ipu1 processor */
|
|
|
+static struct omap_hwmod dra7xx_ipu1_hwmod = {
|
|
|
+ .name = "ipu1",
|
|
|
+ .class = &dra7xx_ipu_hwmod_class,
|
|
|
+ .clkdm_name = "ipu1_clkdm",
|
|
|
+ .rst_lines = dra7xx_ipu_resets,
|
|
|
+ .rst_lines_cnt = ARRAY_SIZE(dra7xx_ipu_resets),
|
|
|
+ .main_clk = "ipu1_gfclk_mux",
|
|
|
+ .prcm = {
|
|
|
+ .omap4 = {
|
|
|
+ .clkctrl_offs = DRA7XX_CM_IPU1_IPU1_CLKCTRL_OFFSET,
|
|
|
+ .rstctrl_offs = DRA7XX_RM_IPU1_RSTCTRL_OFFSET,
|
|
|
+ .context_offs = DRA7XX_RM_IPU1_IPU1_CONTEXT_OFFSET,
|
|
|
+ },
|
|
|
+ },
|
|
|
+};
|
|
|
+
|
|
|
+/* ipu2 processor */
|
|
|
+static struct omap_hwmod dra7xx_ipu2_hwmod = {
|
|
|
+ .name = "ipu2",
|
|
|
+ .class = &dra7xx_ipu_hwmod_class,
|
|
|
+ .clkdm_name = "ipu2_clkdm",
|
|
|
+ .rst_lines = dra7xx_ipu_resets,
|
|
|
+ .rst_lines_cnt = ARRAY_SIZE(dra7xx_ipu_resets),
|
|
|
+ .main_clk = "dpll_core_h22x2_ck",
|
|
|
+ .prcm = {
|
|
|
+ .omap4 = {
|
|
|
+ .clkctrl_offs = DRA7XX_CM_IPU2_IPU2_CLKCTRL_OFFSET,
|
|
|
+ .rstctrl_offs = DRA7XX_RM_IPU2_RSTCTRL_OFFSET,
|
|
|
+ .context_offs = DRA7XX_RM_IPU2_IPU2_CONTEXT_OFFSET,
|
|
|
+ },
|
|
|
+ },
|
|
|
+};
|
|
|
+
|
|
|
/*
|
|
|
* 'mailbox' class
|
|
|
*
|
|
|
@@ -3189,6 +3267,14 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__tptc1 = {
|
|
|
.user = OCP_USER_MPU,
|
|
|
};
|
|
|
|
|
|
+/* dsp1 -> l3_main_1 */
|
|
|
+static struct omap_hwmod_ocp_if dra7xx_dsp1__l3_main_1 = {
|
|
|
+ .master = &dra7xx_dsp1_hwmod,
|
|
|
+ .slave = &dra7xx_l3_main_1_hwmod,
|
|
|
+ .clk = "l3_iclk_div",
|
|
|
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
|
|
|
+};
|
|
|
+
|
|
|
/* l3_main_1 -> dss */
|
|
|
static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dss = {
|
|
|
.master = &dra7xx_l3_main_1_hwmod,
|
|
|
@@ -3453,6 +3539,22 @@ static struct omap_hwmod_ocp_if dra7xx_l4_per1__i2c5 = {
|
|
|
.user = OCP_USER_MPU | OCP_USER_SDMA,
|
|
|
};
|
|
|
|
|
|
+/* ipu1 -> l3_main_1 */
|
|
|
+static struct omap_hwmod_ocp_if dra7xx_ipu1__l3_main_1 = {
|
|
|
+ .master = &dra7xx_ipu1_hwmod,
|
|
|
+ .slave = &dra7xx_l3_main_1_hwmod,
|
|
|
+ .clk = "l3_iclk_div",
|
|
|
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
|
|
|
+};
|
|
|
+
|
|
|
+/* ipu2 -> l3_main_1 */
|
|
|
+static struct omap_hwmod_ocp_if dra7xx_ipu2__l3_main_1 = {
|
|
|
+ .master = &dra7xx_ipu2_hwmod,
|
|
|
+ .slave = &dra7xx_l3_main_1_hwmod,
|
|
|
+ .clk = "l3_iclk_div",
|
|
|
+ .user = OCP_USER_MPU | OCP_USER_SDMA,
|
|
|
+};
|
|
|
+
|
|
|
/* l4_cfg -> mailbox1 */
|
|
|
static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mailbox1 = {
|
|
|
.master = &dra7xx_l4_cfg_hwmod,
|
|
|
@@ -4097,6 +4199,7 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
|
|
|
&dra7xx_l3_main_1__tptc1,
|
|
|
&dra7xx_l3_main_1__dss,
|
|
|
&dra7xx_l3_main_1__dispc,
|
|
|
+ &dra7xx_dsp1__l3_main_1,
|
|
|
&dra7xx_l3_main_1__hdmi,
|
|
|
&dra7xx_l3_main_1__aes1,
|
|
|
&dra7xx_l3_main_1__aes2,
|
|
|
@@ -4117,6 +4220,8 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
|
|
|
&dra7xx_l4_per1__i2c3,
|
|
|
&dra7xx_l4_per1__i2c4,
|
|
|
&dra7xx_l4_per1__i2c5,
|
|
|
+ &dra7xx_ipu1__l3_main_1,
|
|
|
+ &dra7xx_ipu2__l3_main_1,
|
|
|
&dra7xx_l4_cfg__mailbox1,
|
|
|
&dra7xx_l4_per3__mailbox2,
|
|
|
&dra7xx_l4_per3__mailbox3,
|