OSDN Git Service

ARM: ti81xx: Move I2C entries in omap_hwmod_81xx to maintain grouping
authorGraeme Smecher <gsmecher@threespeedlogic.com>
Thu, 3 Jan 2019 23:16:26 +0000 (15:16 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 24 Jan 2019 16:28:48 +0000 (08:28 -0800)
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>
arch/arm/mach-omap2/omap_hwmod_81xx_data.c

index 8e44e27..1ca8710 100644 (file)
@@ -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,