From: Sebastian Reichel <sebastian.reichel@collabora.co.uk> To: "Sebastian Reichel" <sre@kernel.org>, "Tony Lindgren" <tony@atomide.com>, "Paul Walmsley" <paul@pwsan.com>, "Tero Kristo" <t-kristo@ti.com>, "Benoît Cousson" <bcousson@baylibre.com> Cc: Russell King <linux@armlinux.org.uk>, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sebastian Reichel <sebastian.reichel@collabora.co.uk>, Joel Fernandes <joelf@ti.com> Subject: [PATCHv2 3/5] ARM: OMAP4: hwmod data: add aes1 Date: Tue, 13 Jun 2017 11:28:45 +0200 [thread overview] Message-ID: <20170613092847.16732-4-sebastian.reichel@collabora.co.uk> (raw) In-Reply-To: <20170613092847.16732-1-sebastian.reichel@collabora.co.uk> This fixes the following error during kernel boot: platform 4b501000.aes: Cannot lookup hwmod 'aes1' Unfortunately the AES module is only documented partly in the OMAP4430 TRM. I found an old patch from Joel, which I took over and updated for currently mainline. Signed-off-by: Joel Fernandes <joelf@ti.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 94f09c720f29..0aff064d6469 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -953,6 +953,46 @@ static struct omap_hwmod omap44xx_emif2_hwmod = { }; /* + Crypto modules AES0/1 belong to: + PD_L4_PER power domain + CD_L4_SEC clock domain + On the L3, the AES modules are mapped to + L3_CLK2: Peripherals and multimedia sub clock domain +*/ +static struct omap_hwmod_class_sysconfig omap44xx_aes_sysc = { + .rev_offs = 0x80, + .sysc_offs = 0x84, + .syss_offs = 0x88, + .sysc_flags = SYSS_HAS_RESET_STATUS, +}; + +static struct omap_hwmod_class omap44xx_aes_hwmod_class = { + .name = "aes", + .sysc = &omap44xx_aes_sysc, +}; + +static struct omap_hwmod omap44xx_aes1_hwmod = { + .name = "aes1", + .class = &omap44xx_aes_hwmod_class, + .clkdm_name = "l4_secure_clkdm", + .main_clk = "l3_div_ck", + .prcm = { + .omap4 = { + .context_offs = OMAP4_RM_L4SEC_AES1_CONTEXT_OFFSET, + .clkctrl_offs = OMAP4_CM_L4SEC_AES1_CLKCTRL_OFFSET, + .modulemode = MODULEMODE_SWCTRL, + }, + }, +}; + +static struct omap_hwmod_ocp_if omap44xx_l3_main_2__aes1 = { + .master = &omap44xx_l4_per_hwmod, + .slave = &omap44xx_aes1_hwmod, + .clk = "l3_div_ck", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + +/* * 'fdif' class * face detection hw accelerator module */ @@ -4793,6 +4833,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_abe__wd_timer3_dma, &omap44xx_mpu__emif1, &omap44xx_mpu__emif2, + &omap44xx_l3_main_2__aes1, NULL, }; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: sebastian.reichel@collabora.co.uk (Sebastian Reichel) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv2 3/5] ARM: OMAP4: hwmod data: add aes1 Date: Tue, 13 Jun 2017 11:28:45 +0200 [thread overview] Message-ID: <20170613092847.16732-4-sebastian.reichel@collabora.co.uk> (raw) In-Reply-To: <20170613092847.16732-1-sebastian.reichel@collabora.co.uk> This fixes the following error during kernel boot: platform 4b501000.aes: Cannot lookup hwmod 'aes1' Unfortunately the AES module is only documented partly in the OMAP4430 TRM. I found an old patch from Joel, which I took over and updated for currently mainline. Signed-off-by: Joel Fernandes <joelf@ti.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> --- arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 94f09c720f29..0aff064d6469 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -953,6 +953,46 @@ static struct omap_hwmod omap44xx_emif2_hwmod = { }; /* + Crypto modules AES0/1 belong to: + PD_L4_PER power domain + CD_L4_SEC clock domain + On the L3, the AES modules are mapped to + L3_CLK2: Peripherals and multimedia sub clock domain +*/ +static struct omap_hwmod_class_sysconfig omap44xx_aes_sysc = { + .rev_offs = 0x80, + .sysc_offs = 0x84, + .syss_offs = 0x88, + .sysc_flags = SYSS_HAS_RESET_STATUS, +}; + +static struct omap_hwmod_class omap44xx_aes_hwmod_class = { + .name = "aes", + .sysc = &omap44xx_aes_sysc, +}; + +static struct omap_hwmod omap44xx_aes1_hwmod = { + .name = "aes1", + .class = &omap44xx_aes_hwmod_class, + .clkdm_name = "l4_secure_clkdm", + .main_clk = "l3_div_ck", + .prcm = { + .omap4 = { + .context_offs = OMAP4_RM_L4SEC_AES1_CONTEXT_OFFSET, + .clkctrl_offs = OMAP4_CM_L4SEC_AES1_CLKCTRL_OFFSET, + .modulemode = MODULEMODE_SWCTRL, + }, + }, +}; + +static struct omap_hwmod_ocp_if omap44xx_l3_main_2__aes1 = { + .master = &omap44xx_l4_per_hwmod, + .slave = &omap44xx_aes1_hwmod, + .clk = "l3_div_ck", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + +/* * 'fdif' class * face detection hw accelerator module */ @@ -4793,6 +4833,7 @@ static struct omap_hwmod_ocp_if *omap44xx_hwmod_ocp_ifs[] __initdata = { &omap44xx_l4_abe__wd_timer3_dma, &omap44xx_mpu__emif1, &omap44xx_mpu__emif2, + &omap44xx_l3_main_2__aes1, NULL, }; -- 2.11.0
next prev parent reply other threads:[~2017-06-13 9:29 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-06-13 9:28 [PATCHv2 0/5] OMAP4: crypto support Sebastian Reichel 2017-06-13 9:28 ` Sebastian Reichel 2017-06-13 9:28 ` [PATCHv2 1/5] ARM: dts: omap4: Fix aes entry Sebastian Reichel 2017-06-13 9:28 ` Sebastian Reichel 2017-06-13 9:28 ` [PATCHv2 2/5] ARM: dts: omap4.dtsi: remove aes[12]_fck Sebastian Reichel 2017-06-13 9:28 ` Sebastian Reichel 2017-06-13 9:28 ` Sebastian Reichel [this message] 2017-06-13 9:28 ` [PATCHv2 3/5] ARM: OMAP4: hwmod data: add aes1 Sebastian Reichel 2017-06-13 9:28 ` [RFCv2 4/5] ARM: OMAP4: hwmod data: add aes2 Sebastian Reichel 2017-06-13 9:28 ` Sebastian Reichel 2017-06-13 9:28 ` [PATCHv2 5/5] ARM: OMAP4: hwmod data: add des Sebastian Reichel 2017-06-13 9:28 ` Sebastian Reichel 2017-06-13 13:49 ` [PATCHv2 0/5] OMAP4: crypto support Tero Kristo 2017-06-13 13:49 ` Tero Kristo 2017-06-13 13:49 ` Tero Kristo 2017-06-13 14:24 ` Sebastian Reichel 2017-06-13 14:24 ` Sebastian Reichel 2017-06-13 14:42 ` Tero Kristo 2017-06-13 14:42 ` Tero Kristo 2017-06-13 14:42 ` Tero Kristo 2017-06-14 7:57 ` Tony Lindgren 2017-06-14 7:57 ` Tony Lindgren
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=20170613092847.16732-4-sebastian.reichel@collabora.co.uk \ --to=sebastian.reichel@collabora.co.uk \ --cc=bcousson@baylibre.com \ --cc=joelf@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=paul@pwsan.com \ --cc=sre@kernel.org \ --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.