diff options
| author | Lokesh Vutla <lokeshvutla@ti.com> | 2017-07-31 11:22:28 +0530 |
|---|---|---|
| committer | David Huang <d-huang@ti.com> | 2017-10-30 15:26:21 -0600 |
| commit | 348009f16ab770b7af22b91c151a6f468a4a5edc (patch) | |
| tree | 8f01e8e23809f16555fdf1a20a327f7974845531 | |
| parent | c6ee02150cf24e398adf7562068109e78dbdfa52 (diff) | |
| download | omap-omapzoom-348009f16ab770b7af22b91c151a6f468a4a5edc.tar.gz | |
ARM: dra762: hwmod: Add MCAN support
commit d28d665d21d6 ("ARM: dra762: hwmod: Add MCAN support") branch ti-linux-4.9.y
Add MCAN hwmod data and register it for dra762 silicons.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Conflicts:
arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Change-Id: I8243fd02df7793a8703dc0860aa3d368cd2d2df2
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c index 7bc25d3bc449..38c42a163510 100644 --- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c @@ -1667,6 +1667,29 @@ static struct omap_hwmod dra7xx_mailbox13_hwmod = { }; /* + * 'mcan' class + * + */ +static struct omap_hwmod_class dra76x_mcan_hwmod_class = { + .name = "mcan", +}; + +/* mcan */ +static struct omap_hwmod dra76x_mcan_hwmod = { + .name = "mcan", + .class = &dra76x_mcan_hwmod_class, + .clkdm_name = "wkupaon_clkdm", + .main_clk = "mcan_clk", + .prcm = { + .omap4 = { + .clkctrl_offs = DRA7XX_CM_WKUPAON_ADC_CLKCTRL_OFFSET, + .context_offs = DRA7XX_RM_WKUPAON_ADC_CONTEXT_OFFSET, + .modulemode = MODULEMODE_SWCTRL, + }, + }, +}; + +/* * 'mcspi' class * */ @@ -3295,29 +3318,6 @@ static struct omap_hwmod dra7xx_wd_timer2_hwmod = { }; /* - * 'mcan' class - * - */ -static struct omap_hwmod_class dra76x_mcan_hwmod_class = { - .name = "mcan", -}; - -/* mcan */ -static struct omap_hwmod dra76x_mcan_hwmod = { - .name = "mcan", - .class = &dra76x_mcan_hwmod_class, - .clkdm_name = "wkupaon_clkdm", - .main_clk = "mcan_clk", - .prcm = { - .omap4 = { - .clkctrl_offs = DRA7XX_CM_WKUPAON_ADC_CLKCTRL_OFFSET, - .context_offs = DRA7XX_RM_WKUPAON_ADC_CONTEXT_OFFSET, - .modulemode = MODULEMODE_SWCTRL, - }, - }, -}; - -/* * Interfaces */ |