Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6398613 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.2/ti-sysc-signed' of... 

Merge tag 'omap-for-v5.2/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

Driver changes for ti-sysc for v5.2 merge window

This series of changes for ti-sysc interconnect target module driver
gets us to the point where we can actually drop legacy platform data
for many devices in favor of device tree data.

To do this, we improve ti-sysc driver not to rely on platform data
callbacks to manage module clocks, and handle more quirks needed for
some devices. Also few minor fixes are needed, but were considered
not needed to be sent separately as they only show up with this series.

Then we drop several thousands of lines of legacy platform data for
omap4, omap5, dra7, am335x and am437x. We drop platform data for mmc,
i2c, gpio and uart devices to start with as those are typically
easily tested on all devices. In case of unexpected issues, we can just
add back the legacy platform data for a single device type if needed.

Finally we add initial support for enabling and disabling some devices
without legacy platform data callbacks. I was planning on sending the
dropping of legacy platform data as a separate series, but already
applied Roger's patch on top and pushed it out.

Note that this series depends on related SoC and is based on those.

* tag 'omap-for-v5.2/ti-sysc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (33 commits)
  bus: ti-sysc: Add generic enable/disable functions
  ARM: OMAP2+: Drop mcspi platform data for omap4
  ARM: OMAP2+: Drop uart platform data for dra7
  ARM: OMAP2+: Drop gpio platform data for dra7
  ARM: OMAP2+: Drop i2c platform data for dra7
  ARM: OMAP2+: Drop mmc platform data for dra7
  ARM: OMAP2+: Drop uart platform data for omap5
  ARM: OMAP2+: Drop gpio platform data for omap5
  ARM: OMAP2+: Drop i2c platform data for omap5
  ARM: OMAP2+: Drop mmc platform data for omap5
  ARM: OMAP2+: Drop uart platform data for am33xx and am43xx
  ARM: OMAP2+: Drop gpio platform data for am33xx and am43xx
  ARM: OMAP2+: Drop i2c platform data for am33xx and am43xx
  ARM: OMAP2+: Drop mmc platform data for am330x and am43xx
  ARM: OMAP2+: Drop uart platform data for omap4
  ARM: OMAP2+: Drop gpio platform data for omap4
  ARM: OMAP2+: Drop i2c platform data for omap4
  ARM: OMAP2+: Drop mmc platform data for omap4
  Documentation: bus: ti-sysc: fix spelling mistakes "multipe" and "interconnet"
  bus: ti-sysc: Detect DMIC for debugging
  ...

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 29104e01 d59b6056

Documentation/devicetree/bindings/bus/ti-sysc.txt

+4 −2
Original line number Diff line number Diff line
@@ -94,6 +94,8 @@ Optional properties: 


- ti,no-idle-on-init	interconnect target module should not be idled at init



- ti,no-idle		interconnect target module should not be idled



Example: Single instance of MUSB controller on omap4 using interconnect ranges

using offsets from l4_cfg second segment (0x4a000000 + 0x80000 = 0x4a0ab000):
@@ -131,6 +133,6 @@ using offsets from l4_cfg second segment (0x4a000000 + 0x80000 = 0x4a0ab000): 
		};

	};



Note that other SoCs, such as am335x can have multipe child devices. On am335x

Note that other SoCs, such as am335x can have multiple child devices. On am335x

there are two MUSB instances, two USB PHY instances, and a single CPPI41 DMA

instance as children of a single interconnet target module.
 
instance as children of a single interconnect target module.

arch/arm/mach-omap2/omap_hwmod.c

+10 −0
Original line number Diff line number Diff line
@@ -3675,10 +3675,20 @@ int omap_hwmod_init_module(struct device *dev, 
	if (error)

		return error;



	if (data->cfg->quirks & SYSC_QUIRK_NO_IDLE)

		oh->flags |= HWMOD_NO_IDLE;

	if (data->cfg->quirks & SYSC_QUIRK_NO_IDLE_ON_INIT)

		oh->flags |= HWMOD_INIT_NO_IDLE;

	if (data->cfg->quirks & SYSC_QUIRK_NO_RESET_ON_INIT)

		oh->flags |= HWMOD_INIT_NO_RESET;

	if (data->cfg->quirks & SYSC_QUIRK_USE_CLOCKACT)

		oh->flags |= HWMOD_SET_DEFAULT_CLOCKACT;

	if (data->cfg->quirks & SYSC_QUIRK_SWSUP_SIDLE)

		oh->flags |= HWMOD_SWSUP_SIDLE;

	if (data->cfg->quirks & SYSC_QUIRK_SWSUP_SIDLE_ACT)

		oh->flags |= HWMOD_SWSUP_SIDLE_ACT;

	if (data->cfg->quirks & SYSC_QUIRK_SWSUP_MSTANDBY)

		oh->flags |= HWMOD_SWSUP_MSTANDBY;



	error = omap_hwmod_check_module(dev, oh, data, sysc_fields,

					rev_offs, sysc_offs, syss_offs,

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h

+0 −29
Original line number Diff line number Diff line
@@ -30,24 +30,16 @@ extern struct omap_hwmod_ocp_if am33xx_l3_main__gfx; 
extern struct omap_hwmod_ocp_if am33xx_l4_wkup__rtc;

extern struct omap_hwmod_ocp_if am33xx_l4_per__dcan0;

extern struct omap_hwmod_ocp_if am33xx_l4_per__dcan1;

extern struct omap_hwmod_ocp_if am33xx_l4_per__gpio1;

extern struct omap_hwmod_ocp_if am33xx_l4_per__gpio2;

extern struct omap_hwmod_ocp_if am33xx_l4_per__gpio3;

extern struct omap_hwmod_ocp_if am33xx_cpgmac0__mdio;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__elm;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss0;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss1;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__epwmss2;

extern struct omap_hwmod_ocp_if am33xx_l3_s__gpmc;

extern struct omap_hwmod_ocp_if am33xx_l4_per__i2c2;

extern struct omap_hwmod_ocp_if am33xx_l4_per__i2c3;

extern struct omap_hwmod_ocp_if am33xx_l4_per__mailbox;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__spinlock;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp0;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp1;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__mmc0;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__mmc1;

extern struct omap_hwmod_ocp_if am33xx_l3_s__mmc2;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi0;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi1;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__timer2;
@@ -60,11 +52,6 @@ extern struct omap_hwmod_ocp_if am33xx_l3_main__tpcc; 
extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc0;

extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc1;

extern struct omap_hwmod_ocp_if am33xx_l3_main__tptc2;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart2;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart3;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart4;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart5;

extern struct omap_hwmod_ocp_if am33xx_l4_ls__uart6;

extern struct omap_hwmod_ocp_if am33xx_l3_main__ocmc;

extern struct omap_hwmod_ocp_if am33xx_l3_main__sha0;

extern struct omap_hwmod_ocp_if am33xx_l3_main__aes0;
@@ -93,19 +80,10 @@ extern struct omap_hwmod am33xx_elm_hwmod; 
extern struct omap_hwmod am33xx_epwmss0_hwmod;

extern struct omap_hwmod am33xx_epwmss1_hwmod;

extern struct omap_hwmod am33xx_epwmss2_hwmod;

extern struct omap_hwmod am33xx_gpio1_hwmod;

extern struct omap_hwmod am33xx_gpio2_hwmod;

extern struct omap_hwmod am33xx_gpio3_hwmod;

extern struct omap_hwmod am33xx_gpmc_hwmod;

extern struct omap_hwmod am33xx_i2c1_hwmod;

extern struct omap_hwmod am33xx_i2c2_hwmod;

extern struct omap_hwmod am33xx_i2c3_hwmod;

extern struct omap_hwmod am33xx_mailbox_hwmod;

extern struct omap_hwmod am33xx_mcasp0_hwmod;

extern struct omap_hwmod am33xx_mcasp1_hwmod;

extern struct omap_hwmod am33xx_mmc0_hwmod;

extern struct omap_hwmod am33xx_mmc1_hwmod;

extern struct omap_hwmod am33xx_mmc2_hwmod;

extern struct omap_hwmod am33xx_rtc_hwmod;

extern struct omap_hwmod am33xx_spi0_hwmod;

extern struct omap_hwmod am33xx_spi1_hwmod;
@@ -121,19 +99,12 @@ extern struct omap_hwmod am33xx_tpcc_hwmod; 
extern struct omap_hwmod am33xx_tptc0_hwmod;

extern struct omap_hwmod am33xx_tptc1_hwmod;

extern struct omap_hwmod am33xx_tptc2_hwmod;

extern struct omap_hwmod am33xx_uart1_hwmod;

extern struct omap_hwmod am33xx_uart2_hwmod;

extern struct omap_hwmod am33xx_uart3_hwmod;

extern struct omap_hwmod am33xx_uart4_hwmod;

extern struct omap_hwmod am33xx_uart5_hwmod;

extern struct omap_hwmod am33xx_uart6_hwmod;

extern struct omap_hwmod am33xx_wd_timer1_hwmod;



extern struct omap_hwmod_class am33xx_emif_hwmod_class;

extern struct omap_hwmod_class am33xx_l4_hwmod_class;

extern struct omap_hwmod_class am33xx_wkup_m3_hwmod_class;

extern struct omap_hwmod_class am33xx_control_hwmod_class;

extern struct omap_hwmod_class am33xx_gpio_hwmod_class;

extern struct omap_hwmod_class am33xx_timer_hwmod_class;

extern struct omap_hwmod_class am33xx_epwmss_hwmod_class;

extern struct omap_hwmod_class am33xx_ehrpwm_hwmod_class;

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c

+0 −103
Original line number Diff line number Diff line
@@ -122,30 +122,6 @@ struct omap_hwmod_ocp_if am33xx_l4_per__dcan1 = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l4 per/ls -> GPIO2 */

struct omap_hwmod_ocp_if am33xx_l4_per__gpio1 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_gpio1_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l4 per/ls -> gpio3 */

struct omap_hwmod_ocp_if am33xx_l4_per__gpio2 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_gpio2_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l4 per/ls -> gpio4 */

struct omap_hwmod_ocp_if am33xx_l4_per__gpio3 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_gpio3_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



struct omap_hwmod_ocp_if am33xx_cpgmac0__mdio = {

	.master		= &am33xx_cpgmac0_hwmod,

	.slave		= &am33xx_mdio_hwmod,
@@ -188,21 +164,6 @@ struct omap_hwmod_ocp_if am33xx_l3_s__gpmc = { 
	.user		= OCP_USER_MPU,

};



/* i2c2 */

struct omap_hwmod_ocp_if am33xx_l4_per__i2c2 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_i2c2_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



struct omap_hwmod_ocp_if am33xx_l4_per__i2c3 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_i2c3_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



/* l4 ls -> mailbox */

struct omap_hwmod_ocp_if am33xx_l4_per__mailbox = {

	.master		= &am33xx_l4_ls_hwmod,
@@ -235,30 +196,6 @@ struct omap_hwmod_ocp_if am33xx_l4_ls__mcasp1 = { 
	.user		= OCP_USER_MPU,

};



/* l4 ls -> mmc0 */

struct omap_hwmod_ocp_if am33xx_l4_ls__mmc0 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_mmc0_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



/* l4 ls -> mmc1 */

struct omap_hwmod_ocp_if am33xx_l4_ls__mmc1 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_mmc1_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



/* l3 s -> mmc2 */

struct omap_hwmod_ocp_if am33xx_l3_s__mmc2 = {

	.master		= &am33xx_l3_s_hwmod,

	.slave		= &am33xx_mmc2_hwmod,

	.clk		= "l3s_gclk",

	.user		= OCP_USER_MPU,

};



/* l4 ls -> mcspi0 */

struct omap_hwmod_ocp_if am33xx_l4_ls__mcspi0 = {

	.master		= &am33xx_l4_ls_hwmod,
@@ -355,46 +292,6 @@ struct omap_hwmod_ocp_if am33xx_l3_main__tptc2 = { 
	.user		= OCP_USER_MPU,

};



/* l4 ls -> uart2 */

struct omap_hwmod_ocp_if am33xx_l4_ls__uart2 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_uart2_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



/* l4 ls -> uart3 */

struct omap_hwmod_ocp_if am33xx_l4_ls__uart3 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_uart3_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



/* l4 ls -> uart4 */

struct omap_hwmod_ocp_if am33xx_l4_ls__uart4 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_uart4_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



/* l4 ls -> uart5 */

struct omap_hwmod_ocp_if am33xx_l4_ls__uart5 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_uart5_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



/* l4 ls -> uart6 */

struct omap_hwmod_ocp_if am33xx_l4_ls__uart6 = {

	.master		= &am33xx_l4_ls_hwmod,

	.slave		= &am33xx_uart6_hwmod,

	.clk		= "l4ls_gclk",

	.user		= OCP_USER_MPU,

};



/* l3 main -> ocmc */

struct omap_hwmod_ocp_if am33xx_l3_main__ocmc = {

	.master		= &am33xx_l3_main_hwmod,

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c

+0 −253
Original line number Diff line number Diff line
@@ -16,9 +16,7 @@ 


#include <linux/types.h>



#include <linux/platform_data/hsmmc-omap.h>

#include "omap_hwmod.h"

#include "i2c.h"

#include "wd_timer.h"

#include "cm33xx.h"

#include "prm33xx.h"
@@ -626,67 +624,6 @@ struct omap_hwmod am33xx_gpmc_hwmod = { 
	},

};



/* 'i2c' class */

static struct omap_hwmod_class_sysconfig am33xx_i2c_sysc = {

	.rev_offs	= 0,

	.sysc_offs	= 0x0010,

	.syss_offs	= 0x0090,

	.sysc_flags	= (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |

			  SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE |

			  SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |

			  SIDLE_SMART_WKUP),

	.sysc_fields	= &omap_hwmod_sysc_type1,

};



static struct omap_hwmod_class i2c_class = {

	.name		= "i2c",

	.sysc		= &am33xx_i2c_sysc,

	.reset		= &omap_i2c_reset,

};



/* i2c1 */

struct omap_hwmod am33xx_i2c1_hwmod = {

	.name		= "i2c1",

	.class		= &i2c_class,

	.clkdm_name	= "l4_wkup_clkdm",

	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,

	.main_clk	= "dpll_per_m2_div4_wkupdm_ck",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/* i2c1 */

struct omap_hwmod am33xx_i2c2_hwmod = {

	.name		= "i2c2",

	.class		= &i2c_class,

	.clkdm_name	= "l4ls_clkdm",

	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,

	.main_clk	= "dpll_per_m2_div4_ck",

	.prcm		= {

		.omap4 = {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/* i2c3 */

struct omap_hwmod am33xx_i2c3_hwmod = {

	.name		= "i2c3",

	.class		= &i2c_class,

	.clkdm_name	= "l4ls_clkdm",

	.flags		= HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,

	.main_clk	= "dpll_per_m2_div4_ck",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/*

 * 'mailbox' class

 * mailbox module allowing communication between the on-chip processors using a
@@ -760,76 +697,6 @@ struct omap_hwmod am33xx_mcasp1_hwmod = { 
	},

};



/* 'mmc' class */

static struct omap_hwmod_class_sysconfig am33xx_mmc_sysc = {

	.rev_offs	= 0x2fc,

	.sysc_offs	= 0x110,

	.syss_offs	= 0x114,

	.sysc_flags	= (SYSC_HAS_CLOCKACTIVITY | SYSC_HAS_SIDLEMODE |

			  SYSC_HAS_ENAWAKEUP | SYSC_HAS_SOFTRESET |

			  SYSC_HAS_AUTOIDLE | SYSS_HAS_RESET_STATUS),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),

	.sysc_fields	= &omap_hwmod_sysc_type1,

};



static struct omap_hwmod_class am33xx_mmc_hwmod_class = {

	.name		= "mmc",

	.sysc		= &am33xx_mmc_sysc,

};



/* mmc0 */

static struct omap_hsmmc_dev_attr am33xx_mmc0_dev_attr = {

	.flags		= OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};



struct omap_hwmod am33xx_mmc0_hwmod = {

	.name		= "mmc1",

	.class		= &am33xx_mmc_hwmod_class,

	.clkdm_name	= "l4ls_clkdm",

	.main_clk	= "mmc_clk",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &am33xx_mmc0_dev_attr,

};



/* mmc1 */

static struct omap_hsmmc_dev_attr am33xx_mmc1_dev_attr = {

	.flags		= OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};



struct omap_hwmod am33xx_mmc1_hwmod = {

	.name		= "mmc2",

	.class		= &am33xx_mmc_hwmod_class,

	.clkdm_name	= "l4ls_clkdm",

	.main_clk	= "mmc_clk",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &am33xx_mmc1_dev_attr,

};



/* mmc2 */

static struct omap_hsmmc_dev_attr am33xx_mmc2_dev_attr = {

	.flags		= OMAP_HSMMC_SUPPORTS_DUAL_VOLT,

};

struct omap_hwmod am33xx_mmc2_hwmod = {

	.name		= "mmc3",

	.class		= &am33xx_mmc_hwmod_class,

	.clkdm_name	= "l3s_clkdm",

	.main_clk	= "mmc_clk",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

	.dev_attr	= &am33xx_mmc2_dev_attr,

};



/*

 * 'rtc' class

 * rtc subsystem
@@ -1130,102 +997,6 @@ struct omap_hwmod am33xx_tptc2_hwmod = { 
	},

};



/* 'uart' class */

static struct omap_hwmod_class_sysconfig uart_sysc = {

	.rev_offs	= 0x50,

	.sysc_offs	= 0x54,

	.syss_offs	= 0x58,

	.sysc_flags	= (SYSC_HAS_SIDLEMODE | SYSC_HAS_ENAWAKEUP |

			  SYSC_HAS_SOFTRESET | SYSC_HAS_AUTOIDLE),

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |

			  SIDLE_SMART_WKUP),

	.sysc_fields	= &omap_hwmod_sysc_type1,

};



static struct omap_hwmod_class uart_class = {

	.name		= "uart",

	.sysc		= &uart_sysc,

};



struct omap_hwmod am33xx_uart1_hwmod = {

	.name		= "uart1",

	.class		= &uart_class,

	.clkdm_name	= "l4_wkup_clkdm",

	.flags		= DEBUG_AM33XXUART1_FLAGS | HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "dpll_per_m2_div4_wkupdm_ck",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



struct omap_hwmod am33xx_uart2_hwmod = {

	.name		= "uart2",

	.class		= &uart_class,

	.clkdm_name	= "l4ls_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "dpll_per_m2_div4_ck",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/* uart3 */

struct omap_hwmod am33xx_uart3_hwmod = {

	.name		= "uart3",

	.class		= &uart_class,

	.clkdm_name	= "l4ls_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "dpll_per_m2_div4_ck",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



struct omap_hwmod am33xx_uart4_hwmod = {

	.name		= "uart4",

	.class		= &uart_class,

	.clkdm_name	= "l4ls_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "dpll_per_m2_div4_ck",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



struct omap_hwmod am33xx_uart5_hwmod = {

	.name		= "uart5",

	.class		= &uart_class,

	.clkdm_name	= "l4ls_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "dpll_per_m2_div4_ck",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



struct omap_hwmod am33xx_uart6_hwmod = {

	.name		= "uart6",

	.class		= &uart_class,

	.clkdm_name	= "l4ls_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "dpll_per_m2_div4_ck",

	.prcm		= {

		.omap4	= {

			.modulemode	= MODULEMODE_SWCTRL,

		},

	},

};



/* 'wd_timer' class */

static struct omap_hwmod_class_sysconfig wdt_sysc = {

	.rev_offs	= 0x0,
@@ -1263,11 +1034,6 @@ struct omap_hwmod am33xx_wd_timer1_hwmod = { 


static void omap_hwmod_am33xx_clkctrl(void)

{

	CLKCTRL(am33xx_uart2_hwmod, AM33XX_CM_PER_UART1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart3_hwmod, AM33XX_CM_PER_UART2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart4_hwmod, AM33XX_CM_PER_UART3_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart5_hwmod, AM33XX_CM_PER_UART4_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart6_hwmod, AM33XX_CM_PER_UART5_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_dcan0_hwmod, AM33XX_CM_PER_DCAN0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_dcan1_hwmod, AM33XX_CM_PER_DCAN1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_elm_hwmod, AM33XX_CM_PER_ELM_CLKCTRL_OFFSET);
@@ -1277,13 +1043,9 @@ static void omap_hwmod_am33xx_clkctrl(void) 
	CLKCTRL(am33xx_gpio1_hwmod, AM33XX_CM_PER_GPIO1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_gpio2_hwmod, AM33XX_CM_PER_GPIO2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_gpio3_hwmod, AM33XX_CM_PER_GPIO3_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_i2c2_hwmod, AM33XX_CM_PER_I2C1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_i2c3_hwmod, AM33XX_CM_PER_I2C2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mailbox_hwmod, AM33XX_CM_PER_MAILBOX0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mcasp0_hwmod, AM33XX_CM_PER_MCASP0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mcasp1_hwmod, AM33XX_CM_PER_MCASP1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mmc0_hwmod, AM33XX_CM_PER_MMC0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mmc1_hwmod, AM33XX_CM_PER_MMC1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_spi0_hwmod, AM33XX_CM_PER_SPI0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_spi1_hwmod, AM33XX_CM_PER_SPI1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_spinlock_hwmod, AM33XX_CM_PER_SPINLOCK_CLKCTRL_OFFSET);
@@ -1297,13 +1059,10 @@ static void omap_hwmod_am33xx_clkctrl(void) 
		AM33XX_CM_WKUP_SMARTREFLEX0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_smartreflex1_hwmod,

		AM33XX_CM_WKUP_SMARTREFLEX1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart1_hwmod, AM33XX_CM_WKUP_UART0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_timer1_hwmod, AM33XX_CM_WKUP_TIMER1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_i2c1_hwmod, AM33XX_CM_WKUP_I2C0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_wd_timer1_hwmod, AM33XX_CM_WKUP_WDT1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_rtc_hwmod, AM33XX_CM_RTC_RTC_CLKCTRL_OFFSET);

	PRCM_FLAGS(am33xx_rtc_hwmod, HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mmc2_hwmod, AM33XX_CM_PER_MMC2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_gpmc_hwmod, AM33XX_CM_PER_GPMC_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l4_ls_hwmod, AM33XX_CM_PER_L4LS_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l4_wkup_hwmod, AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);
@@ -1338,11 +1097,6 @@ void omap_hwmod_am33xx_reg(void) 


static void omap_hwmod_am43xx_clkctrl(void)

{

	CLKCTRL(am33xx_uart2_hwmod, AM43XX_CM_PER_UART1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart3_hwmod, AM43XX_CM_PER_UART2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart4_hwmod, AM43XX_CM_PER_UART3_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart5_hwmod, AM43XX_CM_PER_UART4_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart6_hwmod, AM43XX_CM_PER_UART5_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_dcan0_hwmod, AM43XX_CM_PER_DCAN0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_dcan1_hwmod, AM43XX_CM_PER_DCAN1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_elm_hwmod, AM43XX_CM_PER_ELM_CLKCTRL_OFFSET);
@@ -1352,13 +1106,9 @@ static void omap_hwmod_am43xx_clkctrl(void) 
	CLKCTRL(am33xx_gpio1_hwmod, AM43XX_CM_PER_GPIO1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_gpio2_hwmod, AM43XX_CM_PER_GPIO2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_gpio3_hwmod, AM43XX_CM_PER_GPIO3_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_i2c2_hwmod, AM43XX_CM_PER_I2C1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_i2c3_hwmod, AM43XX_CM_PER_I2C2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mailbox_hwmod, AM43XX_CM_PER_MAILBOX0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mcasp0_hwmod, AM43XX_CM_PER_MCASP0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mcasp1_hwmod, AM43XX_CM_PER_MCASP1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mmc0_hwmod, AM43XX_CM_PER_MMC0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mmc1_hwmod, AM43XX_CM_PER_MMC1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_spi0_hwmod, AM43XX_CM_PER_SPI0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_spi1_hwmod, AM43XX_CM_PER_SPI1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_spinlock_hwmod, AM43XX_CM_PER_SPINLOCK_CLKCTRL_OFFSET);
@@ -1372,12 +1122,9 @@ static void omap_hwmod_am43xx_clkctrl(void) 
		AM43XX_CM_WKUP_SMARTREFLEX0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_smartreflex1_hwmod,

		AM43XX_CM_WKUP_SMARTREFLEX1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_uart1_hwmod, AM43XX_CM_WKUP_UART0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_timer1_hwmod, AM43XX_CM_WKUP_TIMER1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_i2c1_hwmod, AM43XX_CM_WKUP_I2C0_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_wd_timer1_hwmod, AM43XX_CM_WKUP_WDT1_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_rtc_hwmod, AM43XX_CM_RTC_RTC_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_mmc2_hwmod, AM43XX_CM_PER_MMC2_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_gpmc_hwmod, AM43XX_CM_PER_GPMC_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l4_ls_hwmod, AM43XX_CM_PER_L4LS_CLKCTRL_OFFSET);

	CLKCTRL(am33xx_l4_wkup_hwmod, AM43XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET);