aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGraeme Smecher <gsmecher@threespeedlogic.com>2019-01-03 15:16:26 -0800
committerTony Lindgren <tony@atomide.com>2019-01-24 08:28:48 -0800
commitfee3b67480360c5a3d54c7f11c6ef8f6d30b76fe (patch)
treedd72fc8b8e9ca444ee1a1ba32aae46c407fef837
parentLinux 5.0-rc1 (diff)
downloadlinux-dev-fee3b67480360c5a3d54c7f11c6ef8f6d30b76fe.tar.xz
linux-dev-fee3b67480360c5a3d54c7f11c6ef8f6d30b76fe.zip
ARM: ti81xx: Move I2C entries in omap_hwmod_81xx to maintain grouping
There is no functional change here; the I2C and ELM entries leaked into each other and this separates them again. Signed-off-by: Graeme Smecher <gsmecher@threespeedlogic.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_81xx_data.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
index 8e44e2728620..1ca8710ff29e 100644
--- a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
@@ -432,6 +432,13 @@ static struct omap_hwmod dm81xx_i2c2_hwmod = {
.class = &i2c_class,
};
+static struct omap_hwmod_ocp_if dm81xx_l4_ls__i2c2 = {
+ .master = &dm81xx_l4_ls_hwmod,
+ .slave = &dm81xx_i2c2_hwmod,
+ .clk = "sysclk6_ck",
+ .user = OCP_USER_MPU,
+};
+
static struct omap_hwmod_class_sysconfig dm81xx_elm_sysc = {
.rev_offs = 0x0000,
.sysc_offs = 0x0010,
@@ -443,13 +450,6 @@ static struct omap_hwmod_class_sysconfig dm81xx_elm_sysc = {
.sysc_fields = &omap_hwmod_sysc_type1,
};
-static struct omap_hwmod_ocp_if dm81xx_l4_ls__i2c2 = {
- .master = &dm81xx_l4_ls_hwmod,
- .slave = &dm81xx_i2c2_hwmod,
- .clk = "sysclk6_ck",
- .user = OCP_USER_MPU,
-};
-
static struct omap_hwmod_class dm81xx_elm_hwmod_class = {
.name = "elm",
.sysc = &dm81xx_elm_sysc,