From: Paul Walmsley <paul@pwsan.com> To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: "Péter Ujfalusi" <peter.ujfalusi@ti.com>, "Benoît Cousson" <b-cousson@ti.com> Subject: [PATCH 02/11] ARM: OMAP4+: AESS: enable internal auto-gating during initial setup Date: Thu, 07 Jun 2012 00:13:07 -0600 [thread overview] Message-ID: <20120607061306.25532.59488.stgit@dusk> (raw) In-Reply-To: <20120607060901.25532.68354.stgit@dusk> Enable the AESS auto-gating control bit during AESS hwmod setup. This fixes the following boot warning on OMAP4: omap_hwmod: aess: _wait_target_disable failed Without this patch, the AESS IP block does not indicate to the PRCM that it is idle after it is reset. This prevents some types of SoC power management until something sets the auto-gating control bit. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Benoît Cousson <b-cousson@ti.com> Cc: Péter Ujfalusi <peter.ujfalusi@ti.com> --- arch/arm/mach-omap2/Makefile | 2 + arch/arm/mach-omap2/aess.c | 55 ++++++++++++++++++++++++++++ arch/arm/mach-omap2/common.h | 2 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-omap2/aess.c diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index fa742f3..bc2ac4f 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ - common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o + common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o aess.o omap-2-3-common = irq.o sdrc.o hwmod-common = omap_hwmod.o \ diff --git a/arch/arm/mach-omap2/aess.c b/arch/arm/mach-omap2/aess.c new file mode 100644 index 0000000..d5ca3d2 --- /dev/null +++ b/arch/arm/mach-omap2/aess.c @@ -0,0 +1,55 @@ +/* + * AESS IP block integration + * + * Copyright (C) 2012 Texas Instruments, Inc. + * Paul Walmsley + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include <linux/kernel.h> + +#include <plat/omap_hwmod.h> + +#include "common.h" + +/* + * AESS_AUTO_GATING_ENABLE_OFFSET: offset in bytes of the AESS IP + * block's AESS_AUTO_GATING_ENABLE__1 register from the IP block's + * base address + */ +#define AESS_AUTO_GATING_ENABLE_OFFSET 0x07c + +/* Register bitfields in the AESS_AUTO_GATING_ENABLE__1 register */ +#define AESS_AUTO_GATING_ENABLE_SHIFT 0 + +/** + * omap_aess_preprogram - enable AESS internal autogating + * @oh: struct omap_hwmod * + * + * Since the AESS will not IdleAck to the PRCM until its internal + * autogating is enabled, we must enable autogating during the initial + * AESS hwmod setup. Returns 0. + */ +int omap_aess_preprogram(struct omap_hwmod *oh) +{ + u32 v; + + /* Set AESS_AUTO_GATING_ENABLE__1.ENABLE to allow idle entry */ + v = 1 << AESS_AUTO_GATING_ENABLE_SHIFT; + omap_hwmod_write(v, oh, AESS_AUTO_GATING_ENABLE_OFFSET); + + return 0; +} diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index be9dfd1..d9b8b06 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -304,5 +304,7 @@ extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap2_hsmmc_info; extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers); +extern int omap_aess_preprogram(struct omap_hwmod *oh); + #endif /* __ASSEMBLER__ */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 950454a..4a2f2cc 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -39,6 +39,7 @@ #include "prm44xx.h" #include "prm-regbits-44xx.h" #include "wd_timer.h" +#include "common.h" /* Base offset for all OMAP4 interrupts external to MPUSS */ #define OMAP44XX_IRQ_GIC_START 32 @@ -313,6 +314,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_aess_sysc = { static struct omap_hwmod_class omap44xx_aess_hwmod_class = { .name = "aess", .sysc = &omap44xx_aess_sysc, + .setup_preprogram = omap_aess_preprogram, }; /* aess */ -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: paul@pwsan.com (Paul Walmsley) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 02/11] ARM: OMAP4+: AESS: enable internal auto-gating during initial setup Date: Thu, 07 Jun 2012 00:13:07 -0600 [thread overview] Message-ID: <20120607061306.25532.59488.stgit@dusk> (raw) In-Reply-To: <20120607060901.25532.68354.stgit@dusk> Enable the AESS auto-gating control bit during AESS hwmod setup. This fixes the following boot warning on OMAP4: omap_hwmod: aess: _wait_target_disable failed Without this patch, the AESS IP block does not indicate to the PRCM that it is idle after it is reset. This prevents some types of SoC power management until something sets the auto-gating control bit. Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Beno?t Cousson <b-cousson@ti.com> Cc: P?ter Ujfalusi <peter.ujfalusi@ti.com> --- arch/arm/mach-omap2/Makefile | 2 + arch/arm/mach-omap2/aess.c | 55 ++++++++++++++++++++++++++++ arch/arm/mach-omap2/common.h | 2 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 + 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-omap2/aess.c diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index fa742f3..bc2ac4f 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -4,7 +4,7 @@ # Common support obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \ - common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o + common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o aess.o omap-2-3-common = irq.o sdrc.o hwmod-common = omap_hwmod.o \ diff --git a/arch/arm/mach-omap2/aess.c b/arch/arm/mach-omap2/aess.c new file mode 100644 index 0000000..d5ca3d2 --- /dev/null +++ b/arch/arm/mach-omap2/aess.c @@ -0,0 +1,55 @@ +/* + * AESS IP block integration + * + * Copyright (C) 2012 Texas Instruments, Inc. + * Paul Walmsley + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA + */ + +#include <linux/kernel.h> + +#include <plat/omap_hwmod.h> + +#include "common.h" + +/* + * AESS_AUTO_GATING_ENABLE_OFFSET: offset in bytes of the AESS IP + * block's AESS_AUTO_GATING_ENABLE__1 register from the IP block's + * base address + */ +#define AESS_AUTO_GATING_ENABLE_OFFSET 0x07c + +/* Register bitfields in the AESS_AUTO_GATING_ENABLE__1 register */ +#define AESS_AUTO_GATING_ENABLE_SHIFT 0 + +/** + * omap_aess_preprogram - enable AESS internal autogating + * @oh: struct omap_hwmod * + * + * Since the AESS will not IdleAck to the PRCM until its internal + * autogating is enabled, we must enable autogating during the initial + * AESS hwmod setup. Returns 0. + */ +int omap_aess_preprogram(struct omap_hwmod *oh) +{ + u32 v; + + /* Set AESS_AUTO_GATING_ENABLE__1.ENABLE to allow idle entry */ + v = 1 << AESS_AUTO_GATING_ENABLE_SHIFT; + omap_hwmod_write(v, oh, AESS_AUTO_GATING_ENABLE_OFFSET); + + return 0; +} diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h index be9dfd1..d9b8b06 100644 --- a/arch/arm/mach-omap2/common.h +++ b/arch/arm/mach-omap2/common.h @@ -304,5 +304,7 @@ extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, struct omap2_hsmmc_info; extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers); +extern int omap_aess_preprogram(struct omap_hwmod *oh); + #endif /* __ASSEMBLER__ */ #endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */ diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 950454a..4a2f2cc 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -39,6 +39,7 @@ #include "prm44xx.h" #include "prm-regbits-44xx.h" #include "wd_timer.h" +#include "common.h" /* Base offset for all OMAP4 interrupts external to MPUSS */ #define OMAP44XX_IRQ_GIC_START 32 @@ -313,6 +314,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_aess_sysc = { static struct omap_hwmod_class omap44xx_aess_hwmod_class = { .name = "aess", .sysc = &omap44xx_aess_sysc, + .setup_preprogram = omap_aess_preprogram, }; /* aess */
next prev parent reply other threads:[~2012-06-07 6:21 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-06-07 6:13 [PATCH 00/11] ARM: OMAP: core/hwmod: first set of fixes for 3.5-rc Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 01/11] ARM: OMAP2+: hwmod: add setup_preprogram hook Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley [this message] 2012-06-07 6:13 ` [PATCH 02/11] ARM: OMAP4+: AESS: enable internal auto-gating during initial setup Paul Walmsley 2012-06-07 7:19 ` Tony Lindgren 2012-06-07 7:19 ` Tony Lindgren 2012-06-07 7:31 ` Paul Walmsley 2012-06-07 7:31 ` Paul Walmsley 2012-06-07 7:48 ` Tony Lindgren 2012-06-07 7:48 ` Tony Lindgren 2012-06-07 10:45 ` Paul Walmsley 2012-06-07 10:45 ` Paul Walmsley 2012-06-07 11:08 ` Tony Lindgren 2012-06-07 11:08 ` Tony Lindgren 2012-06-07 6:13 ` [PATCH 03/11] ARM: OMAP4: hwmod data: add SL2IF hardreset line Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 04/11] ARM: OMAP2+: usb_host_fs: add custom reset for usb_host_fs (fsusb) Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 7:31 ` Tony Lindgren 2012-06-07 7:31 ` Tony Lindgren 2012-06-07 7:33 ` Felipe Balbi 2012-06-07 7:33 ` Felipe Balbi 2012-06-07 8:00 ` Tony Lindgren 2012-06-07 8:00 ` Tony Lindgren 2012-06-07 7:40 ` Paul Walmsley 2012-06-07 7:40 ` Paul Walmsley 2012-06-07 7:51 ` Tony Lindgren 2012-06-07 7:51 ` Tony Lindgren 2012-06-07 7:55 ` Felipe Balbi 2012-06-07 7:55 ` Felipe Balbi 2012-06-07 8:02 ` Cousson, Benoit 2012-06-07 8:02 ` Cousson, Benoit 2012-06-07 8:10 ` Tony Lindgren 2012-06-07 8:10 ` Tony Lindgren 2012-06-07 8:14 ` Felipe Balbi 2012-06-07 8:14 ` Felipe Balbi 2012-06-07 10:52 ` Paul Walmsley 2012-06-07 10:52 ` Paul Walmsley 2012-06-07 12:30 ` Cousson, Benoit 2012-06-07 12:30 ` Cousson, Benoit 2012-06-08 1:11 ` Paul Walmsley 2012-06-08 1:11 ` Paul Walmsley 2012-06-08 13:13 ` Cousson, Benoit 2012-06-08 13:13 ` Cousson, Benoit 2012-06-08 13:28 ` Paul Walmsley 2012-06-08 13:28 ` Paul Walmsley 2012-06-08 19:32 ` Hiremath, Vaibhav 2012-06-08 19:32 ` Hiremath, Vaibhav 2012-06-08 23:10 ` AM335x CPSW reset (was "RE: [PATCH 04/11] ARM: OMAP2+: usb_host_fs: add custom reset for usb_host_fs (fsusb)") Paul Walmsley 2012-06-08 23:10 ` Paul Walmsley 2012-06-09 8:39 ` Hiremath, Vaibhav 2012-06-09 8:39 ` Hiremath, Vaibhav 2012-06-09 16:05 ` Paul Walmsley 2012-06-09 16:05 ` Paul Walmsley 2012-06-11 6:15 ` [PATCH 04/11] ARM: OMAP2+: usb_host_fs: add custom reset for usb_host_fs (fsusb) Tony Lindgren 2012-06-11 6:15 ` Tony Lindgren 2012-06-11 8:04 ` Paul Walmsley 2012-06-11 8:04 ` Paul Walmsley 2012-06-11 9:24 ` Cousson, Benoit 2012-06-11 9:24 ` Cousson, Benoit 2012-06-11 16:20 ` Paul Walmsley 2012-06-11 16:20 ` Paul Walmsley 2012-06-07 10:20 ` Paul Walmsley 2012-06-07 10:20 ` Paul Walmsley 2012-06-07 10:52 ` Tony Lindgren 2012-06-07 10:52 ` Tony Lindgren 2012-06-07 22:05 ` Paul Walmsley 2012-06-07 22:05 ` Paul Walmsley 2012-06-08 6:38 ` Tony Lindgren 2012-06-08 6:38 ` Tony Lindgren 2012-06-09 1:31 ` Paul Walmsley 2012-06-09 1:31 ` Paul Walmsley 2012-06-11 6:21 ` Tony Lindgren 2012-06-11 6:21 ` Tony Lindgren 2012-06-07 6:13 ` [PATCH 05/11] ARM: OMAP2+: hwmod code/data: fix 32K sync timer Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:59 ` Hiremath, Vaibhav 2012-06-07 6:59 ` Hiremath, Vaibhav 2012-06-07 7:08 ` Paul Walmsley 2012-06-07 7:08 ` Paul Walmsley 2012-06-07 18:09 ` Hiremath, Vaibhav 2012-06-07 18:09 ` Hiremath, Vaibhav 2012-06-07 20:03 ` Paul Walmsley 2012-06-07 20:03 ` Paul Walmsley 2012-06-08 19:10 ` Hiremath, Vaibhav 2012-06-08 19:10 ` Hiremath, Vaibhav 2012-06-11 9:12 ` Cousson, Benoit 2012-06-11 9:12 ` Cousson, Benoit 2012-06-08 13:22 ` Tero Kristo 2012-06-08 13:22 ` Tero Kristo 2012-06-08 23:18 ` Paul Walmsley 2012-06-08 23:18 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 06/11] ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 07/11] ARM: OMAP: PM: Lock clocks list while generating summary Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 08/11] ARM: OMAP2+: CM: increase the module disable timeout Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 10/11] ARM: OMAP2+: hwmod: add flag to prevent hwmod code from touching IP block during init Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:13 ` [PATCH 09/11] ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-07 6:39 ` Rajendra Nayak 2012-06-07 6:39 ` Rajendra Nayak 2012-06-18 17:41 ` Paul Walmsley 2012-06-18 17:41 ` Paul Walmsley 2012-06-19 5:15 ` Rajendra Nayak 2012-06-19 5:15 ` Rajendra Nayak 2012-06-07 6:13 ` [PATCH 11/11] ARM: OMAP4: hwmod data: do not enable or reset the McPDM during kernel init Paul Walmsley 2012-06-07 6:13 ` Paul Walmsley 2012-06-08 13:30 ` [PATCH 00/11] ARM: OMAP: core/hwmod: first set of fixes for 3.5-rc Tero Kristo 2012-06-08 13:30 ` Tero Kristo 2012-06-09 1:15 ` Paul Walmsley 2012-06-09 1:15 ` Paul Walmsley 2012-06-13 23:55 ` Paul Walmsley 2012-06-13 23:55 ` Paul Walmsley 2012-06-14 7:36 ` Tero Kristo 2012-06-14 7:36 ` Tero Kristo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20120607061306.25532.59488.stgit@dusk \ --to=paul@pwsan.com \ --cc=b-cousson@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=peter.ujfalusi@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.