Hi,
On 3/2/2015 4:39 AM, Paul Walmsley wrote:
> Hi
>
> On Fri, 27 Feb 2015, Vignesh R wrote:
>
>> From: "Poddar, Sourav" <sourav.poddar@xxxxxx>
>>
>> This patch adds hwmod data for hdq/1w driver on AM43xx.
>>
>> Signed-off-by: Sourav Poddar <sourav.poddar@xxxxxx>
>> [vigneshr@xxxxxx: Ported patch to v4.0-rc1]
>> Signed-off-by: Vignesh R <vigneshr@xxxxxx>
>> ---
>> arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 36 ++++++++++++++++++++++++++++++
>> arch/arm/mach-omap2/prcm43xx.h | 1 +
>> 2 files changed, 37 insertions(+)
>>
>> diff --git a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
>> index 8eb85925e444..d4f1df28475c 100644
>> --- a/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
>> +++ b/arch/arm/mach-omap2/omap_hwmod_43xx_data.c
>> @@ -20,6 +20,7 @@
>> #include "omap_hwmod_33xx_43xx_common_data.h"
>> #include "prcm43xx.h"
>> #include "omap_hwmod_common_data.h"
>> +#include "hdq1w.h"
>>
>>
>> /* IP blocks */
>> @@ -516,6 +517,33 @@ static struct omap_hwmod am43xx_dss_rfbi_hwmod = {
>> .parent_hwmod = &am43xx_dss_core_hwmod,
>> };
>>
>> +/* HDQ1W */
>> +static struct omap_hwmod_class_sysconfig am43xx_hdq1w_sysc = {
>> + .rev_offs = 0x0000,
>> + .sysc_offs = 0x0014,
>> + .syss_offs = 0x0018,
>> + .sysc_flags = (SYSC_HAS_SOFTRESET),
>
> This is missing the SYSC_HAS_AUTOIDLE bit. Is this intentional?
Sorry.. my bad.. I didn't observe this while porting the patch.
I will fix this and repost.
Regards
Vignesh
>
>> + .sysc_fields = &omap_hwmod_sysc_type1,
>> +};
>> +
>> +static struct omap_hwmod_class am43xx_hdq1w_hwmod_class = {
>> + .name = "hdq1w",
>> + .sysc = &am43xx_hdq1w_sysc,
>> + .reset = &omap_hdq1w_reset,
>> +};
>> +
>> +static struct omap_hwmod am43xx_hdq1w_hwmod = {
>> + .name = "hdq1w",
>> + .class = &am43xx_hdq1w_hwmod_class,
>> + .clkdm_name = "l4ls_clkdm",
>> + .prcm = {
>> + .omap4 = {
>> + .clkctrl_offs = AM43XX_CM_PER_HDQ1W_CLKCTRL_OFFSET,
>> + .modulemode = MODULEMODE_SWCTRL,
>> + },
>> + },
>> +};
>> +
>> /* Interfaces */
>> static struct omap_hwmod_ocp_if am43xx_l3_main__l4_hs = {
>> .master = &am33xx_l3_main_hwmod,
>> @@ -790,6 +818,13 @@ static struct omap_hwmod_ocp_if am43xx_l4_ls__dss_rfbi = {
>> .user = OCP_USER_MPU | OCP_USER_SDMA,
>> };
>>
>> +static struct omap_hwmod_ocp_if am43xx_l4_ls__hdq1w = {
>> + .master = &am33xx_l4_ls_hwmod,
>> + .slave = &am43xx_hdq1w_hwmod,
>> + .clk = "l4ls_gclk",
>> + .user = OCP_USER_MPU | OCP_USER_SDMA,
>> +};
>> +
>> static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
>> &am33xx_l4_wkup__synctimer,
>> &am43xx_l4_ls__timer8,
>> @@ -889,6 +924,7 @@ static struct omap_hwmod_ocp_if *am43xx_hwmod_ocp_ifs[] __initdata = {
>> &am43xx_l4_ls__dss,
>> &am43xx_l4_ls__dss_dispc,
>> &am43xx_l4_ls__dss_rfbi,
>> + &am43xx_l4_ls__hdq1w,
>> NULL,
>> };
>>
>> diff --git a/arch/arm/mach-omap2/prcm43xx.h b/arch/arm/mach-omap2/prcm43xx.h
>> index ad7b3e9977f8..48df3b55057e 100644
>> --- a/arch/arm/mach-omap2/prcm43xx.h
>> +++ b/arch/arm/mach-omap2/prcm43xx.h
>> @@ -143,5 +143,6 @@
>> #define AM43XX_CM_PER_USB_OTG_SS1_CLKCTRL_OFFSET 0x0268
>> #define AM43XX_CM_PER_USBPHYOCP2SCP1_CLKCTRL_OFFSET 0x05C0
>> #define AM43XX_CM_PER_DSS_CLKCTRL_OFFSET 0x0a20
>> +#define AM43XX_CM_PER_HDQ1W_CLKCTRL_OFFSET 0x04a0
>>
>> #endif
>> --
>> 1.9.1
>>
>
>
> - Paul
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
