summaryrefslogtreecommitdiffstats
path: root/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch')
-rw-r--r--target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch36
1 files changed, 15 insertions, 21 deletions
diff --git a/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch b/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch
index a0b6174cd0..fa03b76096 100644
--- a/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch
+++ b/target/linux/omap/patches-3.12/200-ARM-OMAP2-hwmod-cleanup-HWMOD_INIT_NO_RESET-usage.patch
@@ -16,11 +16,9 @@ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 18 +++++++++---------
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
-diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
-index 215894f..2815a91 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
-@@ -52,7 +52,7 @@ static struct omap_hwmod am33xx_emif_hwmod = {
+@@ -52,7 +52,7 @@ static struct omap_hwmod am33xx_emif_hwm
.name = "emif",
.class = &am33xx_emif_hwmod_class,
.clkdm_name = "l3_clkdm",
@@ -29,7 +27,7 @@ index 215894f..2815a91 100644
.main_clk = "dpll_ddr_m2_div2_ck",
.prcm = {
.omap4 = {
-@@ -74,7 +74,7 @@ static struct omap_hwmod am33xx_l3_main_hwmod = {
+@@ -74,7 +74,7 @@ static struct omap_hwmod am33xx_l3_main_
.name = "l3_main",
.class = &am33xx_l3_hwmod_class,
.clkdm_name = "l3_clkdm",
@@ -38,7 +36,7 @@ index 215894f..2815a91 100644
.main_clk = "l3_gclk",
.prcm = {
.omap4 = {
-@@ -96,7 +96,7 @@ static struct omap_hwmod am33xx_l3_instr_hwmod = {
+@@ -96,7 +96,7 @@ static struct omap_hwmod am33xx_l3_instr
.name = "l3_instr",
.class = &am33xx_l3_hwmod_class,
.clkdm_name = "l3_clkdm",
@@ -47,7 +45,7 @@ index 215894f..2815a91 100644
.main_clk = "l3_gclk",
.prcm = {
.omap4 = {
-@@ -119,7 +119,7 @@ static struct omap_hwmod am33xx_l4_ls_hwmod = {
+@@ -119,7 +119,7 @@ static struct omap_hwmod am33xx_l4_ls_hw
.name = "l4_ls",
.class = &am33xx_l4_hwmod_class,
.clkdm_name = "l4ls_clkdm",
@@ -56,7 +54,7 @@ index 215894f..2815a91 100644
.main_clk = "l4ls_gclk",
.prcm = {
.omap4 = {
-@@ -134,7 +134,7 @@ static struct omap_hwmod am33xx_l4_hs_hwmod = {
+@@ -134,7 +134,7 @@ static struct omap_hwmod am33xx_l4_hs_hw
.name = "l4_hs",
.class = &am33xx_l4_hwmod_class,
.clkdm_name = "l4hs_clkdm",
@@ -65,7 +63,7 @@ index 215894f..2815a91 100644
.main_clk = "l4hs_gclk",
.prcm = {
.omap4 = {
-@@ -150,7 +150,7 @@ static struct omap_hwmod am33xx_l4_wkup_hwmod = {
+@@ -150,7 +150,7 @@ static struct omap_hwmod am33xx_l4_wkup_
.name = "l4_wkup",
.class = &am33xx_l4_hwmod_class,
.clkdm_name = "l4_wkup_clkdm",
@@ -74,7 +72,7 @@ index 215894f..2815a91 100644
.prcm = {
.omap4 = {
.clkctrl_offs = AM33XX_CM_WKUP_L4WKUP_CLKCTRL_OFFSET,
-@@ -170,7 +170,7 @@ static struct omap_hwmod am33xx_mpu_hwmod = {
+@@ -170,7 +170,7 @@ static struct omap_hwmod am33xx_mpu_hwmo
.name = "mpu",
.class = &am33xx_mpu_hwmod_class,
.clkdm_name = "mpu_clkdm",
@@ -83,7 +81,7 @@ index 215894f..2815a91 100644
.main_clk = "dpll_mpu_m2_ck",
.prcm = {
.omap4 = {
-@@ -450,7 +450,7 @@ static struct omap_hwmod am33xx_ocmcram_hwmod = {
+@@ -450,7 +450,7 @@ static struct omap_hwmod am33xx_ocmcram_
.name = "ocmcram",
.class = &am33xx_ocmcram_hwmod_class,
.clkdm_name = "l3_clkdm",
@@ -92,7 +90,7 @@ index 215894f..2815a91 100644
.main_clk = "l3_gclk",
.prcm = {
.omap4 = {
-@@ -532,7 +532,7 @@ static struct omap_hwmod am33xx_control_hwmod = {
+@@ -532,7 +532,7 @@ static struct omap_hwmod am33xx_control_
.name = "control",
.class = &am33xx_control_hwmod_class,
.clkdm_name = "l4_wkup_clkdm",
@@ -101,11 +99,9 @@ index 215894f..2815a91 100644
.main_clk = "dpll_core_m4_div2_ck",
.prcm = {
.omap4 = {
-diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-index 9c3b504..1e5b12c 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
-@@ -914,7 +914,7 @@ static struct omap_hwmod omap44xx_emif1_hwmod = {
+@@ -914,7 +914,7 @@ static struct omap_hwmod omap44xx_emif1_
.name = "emif1",
.class = &omap44xx_emif_hwmod_class,
.clkdm_name = "l3_emif_clkdm",
@@ -114,7 +110,7 @@ index 9c3b504..1e5b12c 100644
.main_clk = "ddrphy_ck",
.prcm = {
.omap4 = {
-@@ -930,7 +930,7 @@ static struct omap_hwmod omap44xx_emif2_hwmod = {
+@@ -930,7 +930,7 @@ static struct omap_hwmod omap44xx_emif2_
.name = "emif2",
.class = &omap44xx_emif_hwmod_class,
.clkdm_name = "l3_emif_clkdm",
@@ -123,7 +119,7 @@ index 9c3b504..1e5b12c 100644
.main_clk = "ddrphy_ck",
.prcm = {
.omap4 = {
-@@ -2193,7 +2193,7 @@ static struct omap_hwmod omap44xx_mpu_hwmod = {
+@@ -2193,7 +2193,7 @@ static struct omap_hwmod omap44xx_mpu_hw
.name = "mpu",
.class = &omap44xx_mpu_hwmod_class,
.clkdm_name = "mpuss_clkdm",
@@ -132,11 +128,9 @@ index 9c3b504..1e5b12c 100644
.main_clk = "dpll_mpu_m2_ck",
.prcm = {
.omap4 = {
-diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-index cde4155..e3caee1 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
-@@ -352,7 +352,7 @@ static struct omap_hwmod omap54xx_emif1_hwmod = {
+@@ -352,7 +352,7 @@ static struct omap_hwmod omap54xx_emif1_
.name = "emif1",
.class = &omap54xx_emif_hwmod_class,
.clkdm_name = "emif_clkdm",
@@ -145,7 +139,7 @@ index cde4155..e3caee1 100644
.main_clk = "dpll_core_h11x2_ck",
.prcm = {
.omap4 = {
-@@ -368,7 +368,7 @@ static struct omap_hwmod omap54xx_emif2_hwmod = {
+@@ -368,7 +368,7 @@ static struct omap_hwmod omap54xx_emif2_
.name = "emif2",
.class = &omap54xx_emif_hwmod_class,
.clkdm_name = "emif_clkdm",
@@ -154,7 +148,7 @@ index cde4155..e3caee1 100644
.main_clk = "dpll_core_h11x2_ck",
.prcm = {
.omap4 = {
-@@ -1135,7 +1135,7 @@ static struct omap_hwmod omap54xx_mpu_hwmod = {
+@@ -1135,7 +1135,7 @@ static struct omap_hwmod omap54xx_mpu_hw
.name = "mpu",
.class = &omap54xx_mpu_hwmod_class,
.clkdm_name = "mpu_clkdm",