diff options
| author | Doug Zobel <dzobel1@motorola.com> | 2014-02-26 17:42:15 -0600 |
|---|---|---|
| committer | James Wylder <jwylder@motorola.com> | 2014-03-05 17:47:28 -0600 |
| commit | a4bc17668abc8c7ba0e6f2726f4bbd1efd457c19 (patch) | |
| tree | 5e655aaffacae551eab44ef9933b42e8029a8f87 /arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | |
| parent | 825e4f504a8dab917327962995f19c8bc1aecd39 (diff) | |
| download | olio-linux-3.10-a4bc17668abc8c7ba0e6f2726f4bbd1efd457c19.tar.xz olio-linux-3.10-a4bc17668abc8c7ba0e6f2726f4bbd1efd457c19.zip | |
IKXCLOCK-338 omap2: Don't reset GPIO banks
The GPIO banks were being reset at initialization. This looses the
value configured by bootloader and causes unpredictable behavior
on the system.
Change-Id: Ia41286f6b557e5c3e78745899db4231a9844abb0
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_3xxx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 31c7126eb3b..6c3851c960c 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -916,7 +916,8 @@ static struct omap_hwmod_opt_clk gpio1_opt_clks[] = { static struct omap_hwmod omap3xxx_gpio1_hwmod = { .name = "gpio1", - .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, + .flags = (HWMOD_CONTROL_OPT_CLKS_IN_RESET | + HWMOD_INIT_NO_RESET), .mpu_irqs = omap2_gpio1_irqs, .main_clk = "gpio1_ick", .opt_clks = gpio1_opt_clks, @@ -941,7 +942,8 @@ static struct omap_hwmod_opt_clk gpio2_opt_clks[] = { static struct omap_hwmod omap3xxx_gpio2_hwmod = { .name = "gpio2", - .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, + .flags = (HWMOD_CONTROL_OPT_CLKS_IN_RESET | + HWMOD_INIT_NO_RESET), .mpu_irqs = omap2_gpio2_irqs, .main_clk = "gpio2_ick", .opt_clks = gpio2_opt_clks, @@ -966,7 +968,8 @@ static struct omap_hwmod_opt_clk gpio3_opt_clks[] = { static struct omap_hwmod omap3xxx_gpio3_hwmod = { .name = "gpio3", - .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, + .flags = (HWMOD_CONTROL_OPT_CLKS_IN_RESET | + HWMOD_INIT_NO_RESET), .mpu_irqs = omap2_gpio3_irqs, .main_clk = "gpio3_ick", .opt_clks = gpio3_opt_clks, @@ -991,7 +994,8 @@ static struct omap_hwmod_opt_clk gpio4_opt_clks[] = { static struct omap_hwmod omap3xxx_gpio4_hwmod = { .name = "gpio4", - .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, + .flags = (HWMOD_CONTROL_OPT_CLKS_IN_RESET | + HWMOD_INIT_NO_RESET), .mpu_irqs = omap2_gpio4_irqs, .main_clk = "gpio4_ick", .opt_clks = gpio4_opt_clks, @@ -1021,7 +1025,8 @@ static struct omap_hwmod_opt_clk gpio5_opt_clks[] = { static struct omap_hwmod omap3xxx_gpio5_hwmod = { .name = "gpio5", - .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, + .flags = (HWMOD_CONTROL_OPT_CLKS_IN_RESET | + HWMOD_INIT_NO_RESET), .mpu_irqs = omap3xxx_gpio5_irqs, .main_clk = "gpio5_ick", .opt_clks = gpio5_opt_clks, @@ -1051,7 +1056,8 @@ static struct omap_hwmod_opt_clk gpio6_opt_clks[] = { static struct omap_hwmod omap3xxx_gpio6_hwmod = { .name = "gpio6", - .flags = HWMOD_CONTROL_OPT_CLKS_IN_RESET, + .flags = (HWMOD_CONTROL_OPT_CLKS_IN_RESET | + HWMOD_INIT_NO_RESET), .mpu_irqs = omap3xxx_gpio6_irqs, .main_clk = "gpio6_ick", .opt_clks = gpio6_opt_clks, |