diff options
| author | Andy Green <andy.green@linaro.org> | 2011-04-13 11:32:00 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-13 11:32:00 +0100 |
| commit | e623403fb8655b96cc25a52e6d74e1944d191ece (patch) | |
| tree | f450639d8868804e99c756ae0127587f7aba598b | |
| parent | 5d4e09b19b5298bb9d20896ec7e90792275095b7 (diff) | |
omap2 hwmod 44xx neutral reordering
Signed-off-by: Andy Green <andy.green@linaro.org>
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 717230f8b00..782745fca62 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -321,14 +321,6 @@ static struct omap_hwmod_ocp_if omap44xx_fdif__l3_main_2 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; -/* iss -> l3_main_2 */ -static struct omap_hwmod_ocp_if omap44xx_iss__l3_main_2 = { - .master = &omap44xx_iss_hwmod, - .slave = &omap44xx_l3_main_2_hwmod, - .clk = "l3_div_ck", - .user = OCP_USER_MPU | OCP_USER_SDMA, -}; - /* l3_main_2 interface data */ /* dma_system -> l3_main_2 */ @@ -362,6 +354,14 @@ static struct omap_hwmod_ocp_if omap44xx_iva__l3_main_2 = { .user = OCP_USER_MPU | OCP_USER_SDMA, }; +/* iss -> l3_main_2 */ +static struct omap_hwmod_ocp_if omap44xx_iss__l3_main_2 = { + .master = &omap44xx_iss_hwmod, + .slave = &omap44xx_l3_main_2_hwmod, + .clk = "l3_div_ck", + .user = OCP_USER_MPU | OCP_USER_SDMA, +}; + /* ipu -> l3_main_2 */ static struct omap_hwmod_ocp_if omap44xx_ipu__l3_main_2 = { .master = &omap44xx_ipu_hwmod, @@ -412,8 +412,8 @@ static struct omap_hwmod_ocp_if *omap44xx_l3_main_2_slaves[] = { &omap44xx_iss__l3_main_2, &omap44xx_iva__l3_main_2, &omap44xx_l3_main_1__l3_main_2, - &omap44xx_fdif__l3_main_2, &omap44xx_gpu__l3_main_2, + &omap44xx_fdif__l3_main_2, &omap44xx_l4_cfg__l3_main_2, &omap44xx_usb_otg_hs__l3_main_2, }; @@ -653,7 +653,6 @@ static struct omap_hwmod omap44xx_mpu_private_hwmod = { * elm * emif1 * emif2 - * fdif * gpmc * gpu * hdq1w |