Re: [PATCH 3/5] ARM: omap3evm: enable VBUS switch for EHCI tranceiver
于 2012年07月06日 16:41, Tony Lindgren 写道:
* Sergei Shtylyovsshtyl...@mvista.com [120620 05:10]:
On 20-06-2012 13:14, Zumeng Chen wrote:
This will set TWL4030.GPIO2 as output pin to drive EHCI tranceiver.
...
+ /* Enable VBUS switch by setting TWL4030.GPIO2DIR as output
+* for starting USB tranceiver
+*/
+ if (get_omap3_evm_rev()= OMAP3EVM_BOARD_GEN_2) {
+ u8 val;
Empty line after declaration block wouldn't hurt...
I'll apply these into devel-board branch with the extra line
added. Not taking the clock related patch 4/5 as that's something
Paul should queue.
Also note that the board-*.c files are being phased out with
devicetree support.
Thanks Tony for your comments, I understand all of them.
Regards,
Zumeng
Regards,
Tony
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] hwspinlock fix for 3.5
Hi Linus, The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git tags/hwspinlock-3.5-fixes for you to fetch changes up to 476a7eeb60e70ddab138e7cb4bc44ef5ac20782e: hwspinlock/core: use global ID to register hwspinlocks on multiple devices (2012-07-07 22:35:30 +0300) A single hwspinlock core fix for multiple hwspinlock devices scenarios, from Shinya Kuribayashi. Shinya Kuribayashi (1): hwspinlock/core: use global ID to register hwspinlocks on multiple devices drivers/hwspinlock/hwspinlock_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] remoteproc fixes for 3.5
Hi Linus, The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git tags/remoteproc-3.5-fixes for you to fetch changes up to e121aefa7d9f10eee5cf26ed47129237a05d940b: remoteproc: fix missing CONFIG_FW_LOADER configurations (2012-07-04 11:01:12 +0300) Two build-related remoteproc fixes for 3.5. Ohad Ben-Cohen (2): remoteproc/omap: fix randconfig unmet direct dependencies remoteproc: fix missing CONFIG_FW_LOADER configurations drivers/remoteproc/Kconfig | 2 ++ 1 file changed, 2 insertions(+) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[GIT PULL] rpmsg fixes for 3.5
Hi Linus, The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678: Linux 3.5-rc5 (2012-06-30 16:08:57 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git tags/rpmsg-3.5-fixes for you to fetch changes up to 15fd943af50dbc5f7f4de33835795c72595f7bf4: rpmsg: make sure inflight messages don't invoke just-removed callbacks (2012-07-04 11:51:59 +0300) Fixing two (somewhat rare) endpoint-related race issues, both of which were reported by Fernando Guzman Lugo. Ohad Ben-Cohen (2): rpmsg: avoid premature deallocation of endpoints rpmsg: make sure inflight messages don't invoke just-removed callbacks drivers/rpmsg/virtio_rpmsg_bus.c | 55 include/linux/rpmsg.h| 6 + 2 files changed, 56 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/2] OMAPDSS: PM runtime fixes for 3.5-rc
Hi Archit, On 07/04/2012 12:43 PM, Archit Taneja wrote: Hi Florian, These are 2 fixes which Tomi had intended to push for the coming rcs. He is currently on vacation and asked me to post the patches on his behalf. The first patch ensures that system suspend doesn't break on OMAP if DSS is enabled. The second patch prevents some warning backtraces when the kernel is not built with PM runtime. Could you please queue these for the upcoming rc? as you sent me those patches you should have added your Signed-off-by as well, I added it. Also the first patch of this series contained 2 coding style issues related to braces that checkpatch complained about and also differed from the coding style used in those files, I fixed those as well. I applied both patches. Thanks, Florian Tobias Schandinat Thanks, Archit Tomi Valkeinen (2): OMAPDSS: Use PM notifiers for system suspend OMAPDSS: fix warnings if CONFIG_PM_RUNTIME=n drivers/video/omap2/dss/core.c | 45 +-- drivers/video/omap2/dss/dispc.c |2 +- drivers/video/omap2/dss/dsi.c |2 +- drivers/video/omap2/dss/dss.c |2 +- drivers/video/omap2/dss/hdmi.c |2 +- drivers/video/omap2/dss/rfbi.c |2 +- drivers/video/omap2/dss/venc.c |2 +- 7 files changed, 35 insertions(+), 22 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
dtb for pandaboard
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi does anyone happen to have a working dtb file for the pandaboard? trying to test booting the fedora rawhide kernel which is 3.5.0-rc5 with a dtb file I made from the matching sources I dont get past decompressing the kernel. if i dont use a dtb file the system boots further but it i'm unable to find the root filesystem since it seems that the platform data has been messed up. modprobing omap results in no registration of the mmc block devices. i've not tested on a pandaboard ES or beagleboard yet or any other type of omap system. Dennis -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.18 (GNU/Linux) iEYEARECAAYFAk/6CpsACgkQkSxm47BaWfepcACgq8zhbeyYz+BiiJ8//KTjQmMU qIkAoIDB6BuDfqJYv8UOnu+qiZOYVhAf =Hbwe -END PGP SIGNATURE-
The linux-input mailing list has been moved
The linux-input mailing list has been moved to vger.kernel.org. See http://vger.kernel.org/vger-lists.html for information on the new list server (or consult your local oracle). Yours virtually, Martin Mares -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/3] Watchdog: Omap: Changes for the new watchdog framework
This patch implements the current watchdog framework for OMAP WDTimer,
which factored out the common components, so the driver can just focus
on the hardware related parts.
Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
---
drivers/watchdog/omap_wdt.c | 338 ---
drivers/watchdog/omap_wdt.h |5 +
2 files changed, 128 insertions(+), 215 deletions(-)
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 8285d65..df9ed78 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -24,6 +24,9 @@
*
* Copyright (c) 2005 David Brownell
* Use the driver model and standard identifiers; handle bigger timeouts.
+ *
+ * Copyright (c) 2012 WindRiver
+ * Changes cater for the current watchdog framework.
*/
#define pr_fmt(fmt) KBUILD_MODNAME : fmt
@@ -33,7 +36,6 @@
#include linux/kernel.h
#include linux/fs.h
#include linux/mm.h
-#include linux/miscdevice.h
#include linux/watchdog.h
#include linux/reboot.h
#include linux/init.h
@@ -50,8 +52,6 @@
#include omap_wdt.h
-static struct platform_device *omap_wdt_dev;
-
static unsigned timer_margin;
module_param(timer_margin, uint, 0);
MODULE_PARM_DESC(timer_margin, initial watchdog timeout (in seconds));
@@ -59,32 +59,14 @@ MODULE_PARM_DESC(timer_margin, initial watchdog timeout
(in seconds));
static unsigned int wdt_trgr_pattern = 0x1234;
static DEFINE_SPINLOCK(wdt_lock);
-struct omap_wdt_dev {
+struct omap_wdt_drvdata {
+ struct watchdog_device wdt;
void __iomem*base; /* physical */
struct device *dev;
- int omap_wdt_users;
struct resource *mem;
- struct miscdevice omap_wdt_miscdev;
};
-static void omap_wdt_ping(struct omap_wdt_dev *wdev)
-{
- void __iomem*base = wdev-base;
-
- /* wait for posted write to complete */
- while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) 0x08)
- cpu_relax();
-
- wdt_trgr_pattern = ~wdt_trgr_pattern;
- __raw_writel(wdt_trgr_pattern, (base + OMAP_WATCHDOG_TGR));
-
- /* wait for posted write to complete */
- while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) 0x08)
- cpu_relax();
- /* reloaded WCRR from WLDR */
-}
-
-static void omap_wdt_enable(struct omap_wdt_dev *wdev)
+static void omap_wdt_enable(struct omap_wdt_drvdata *wdev)
{
void __iomem *base = wdev-base;
@@ -98,7 +80,7 @@ static void omap_wdt_enable(struct omap_wdt_dev *wdev)
cpu_relax();
}
-static void omap_wdt_disable(struct omap_wdt_dev *wdev)
+static void omap_wdt_disable(struct omap_wdt_drvdata *wdev)
{
void __iomem *base = wdev-base;
@@ -121,12 +103,19 @@ static void omap_wdt_adjust_timeout(unsigned new_timeout)
timer_margin = new_timeout;
}
-static void omap_wdt_set_timeout(struct omap_wdt_dev *wdev)
+static int omap_wdt_set_timeout(struct watchdog_device *wdt_dev,
+ unsigned int new_timeout)
{
- u32 pre_margin = GET_WLDR_VAL(timer_margin);
- void __iomem *base = wdev-base;
+ u32 pre_margin;
+ struct omap_wdt_drvdata *omap_wdev = watchdog_get_drvdata(wdt_dev);
+ void __iomem *base = omap_wdev-base;
+
+ pm_runtime_get_sync(omap_wdev-dev);
+ omap_wdt_disable(omap_wdev);
- pm_runtime_get_sync(wdev-dev);
+ /* adjust timeout based on the new timeout */
+ omap_wdt_adjust_timeout(new_timeout);
+ pre_margin = GET_WLDR_VAL(timer_margin);
/* just count up at 32 KHz */
while (__raw_readl(base + OMAP_WATCHDOG_WPS) 0x04)
@@ -136,147 +125,87 @@ static void omap_wdt_set_timeout(struct omap_wdt_dev
*wdev)
while (__raw_readl(base + OMAP_WATCHDOG_WPS) 0x04)
cpu_relax();
- pm_runtime_put_sync(wdev-dev);
+ pm_runtime_put_sync(omap_wdev-dev);
+ return 0;
}
-/*
- * Allow only one task to hold it open
- */
-static int omap_wdt_open(struct inode *inode, struct file *file)
+static int omap_wdt_ping(struct watchdog_device *wdt_dev)
{
- struct omap_wdt_dev *wdev = platform_get_drvdata(omap_wdt_dev);
- void __iomem *base = wdev-base;
-
- if (test_and_set_bit(1, (unsigned long *)(wdev-omap_wdt_users)))
- return -EBUSY;
+ struct omap_wdt_drvdata *omap_wdev = watchdog_get_drvdata(wdt_dev);
+ void __iomem*base = omap_wdev-base;
- pm_runtime_get_sync(wdev-dev);
-
- /* initialize prescaler */
- while (__raw_readl(base + OMAP_WATCHDOG_WPS) 0x01)
- cpu_relax();
+ pm_runtime_get_sync(omap_wdev-dev);
+ spin_lock(wdt_lock);
- __raw_writel((1 5) | (PTV 2), base + OMAP_WATCHDOG_CNTRL);
- while (__raw_readl(base + OMAP_WATCHDOG_WPS) 0x01)
+ /* wait for posted write to complete */
+ while ((__raw_readl(base + OMAP_WATCHDOG_WPS)) 0x08)
cpu_relax();
- file-private_data = (void *)
[PATCH v2 0/2] Watchdog: OMAP: bootstatus fix for omap3 and changes for the current watchdog framework
Hello, The following patches based on the 3.5-rc6 from Wim, which are based on: 1 ) bootstatus fix for omap3, 2 ) omap-wdt framework update cater for the current framework as Shubhrajyoti comments mentioned. Regards, Zumeng Linux 3.5-rc6 (2012-07-07 17:23:56 -0700) Zumeng Chen (3): Watchdog: Omap: Changes for the new watchdog framework Watchdog: Omap: select watchdog core for framework change Watchdog: Omap: get the bootstatus for OMAP2Plus arch/arm/mach-omap2/prcm.c |5 +- drivers/watchdog/Kconfig|1 + drivers/watchdog/omap_wdt.c | 338 --- drivers/watchdog/omap_wdt.h |5 + 4 files changed, 133 insertions(+), 216 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/3] Watchdog: Omap: select watchdog core for framework change
Since the currrent watchdog framework depends on the watchdog core so select it in Kconfig. Signed-off-by: Zumeng Chen zumeng.c...@windriver.com --- drivers/watchdog/Kconfig |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index fe819b7..fb5b108 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -232,6 +232,7 @@ config EP93XX_WATCHDOG config OMAP_WATCHDOG tristate OMAP Watchdog depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS + select WATCHDOG_CORE help Support for TI OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog. Say 'Y' here to enable the OMAP1610/OMAP1710/OMAP2420/OMAP3430/OMAP4430 watchdog timer. -- 1.7.5.4 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] Watchdog: Omap: get the bootstatus for OMAP2Plus
The offset of WKUP_MOD is not right for the PRM_RSTST of OMAP3. So here
put the right one to match to the actual physical addr 0x48307258, which
defined in PRCM Registers section.
And there is a MPU_WD_RST bit in PRM_RSTST(0x48307258) holding the signal
from omap-wdt reboot, so that we can return WDIOF_CARDRESET if the board
wakes up from omap-wdt reboot for WDIOC_GETBOOTSTATUS ioctl.
Signed-off-by: Zumeng Chen zumeng.c...@windriver.com
---
arch/arm/mach-omap2/prcm.c |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 480f40a..4dcc706 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -49,8 +49,11 @@ void __iomem *prcm_mpu_base;
u32 omap_prcm_get_reset_sources(void)
{
/* XXX This presumably needs modification for 34XX */
- if (cpu_is_omap24xx() || cpu_is_omap34xx())
+ if (cpu_is_omap24xx())
return omap2_prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) 0x7f;
+ if (cpu_is_omap34xx())
+ return omap2_prm_read_mod_reg(OMAP3430_GR_MOD, OMAP2_RM_RSTST)
+ 0x7f;
if (cpu_is_omap44xx())
return omap2_prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) 0x7f;
--
1.7.5.4
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/2] Watchdog: OMAP: bootstatus fix for omap3 and changes for the current watchdog framework
The changes have been validated on omap3530evm Normal reboot root@ti-omap3:~# dmesg|grep WDT omap_wdt: OMAP WDTimer Rev 0x31: Initial timeout 0sec status= 0x0 root@ti-omap3:~# root@ti-omap3:~# echo 1 /dev/watchdog Boot from WDT root@ti-omap3:~# dmesg|grep WDT omap_wdt: OMAP WDTimer Rev 0x31: Initial timeout 0sec status= 0x1 root@ti-omap3:~# Regards, zumeng 于 2012年07月09日 12:39, Zumeng Chen 写道: Hello, The following patches based on the 3.5-rc6 from Wim, which are based on: 1 ) bootstatus fix for omap3, 2 ) omap-wdt framework update cater for the current framework as Shubhrajyoti comments mentioned. Regards, Zumeng Linux 3.5-rc6 (2012-07-07 17:23:56 -0700) Zumeng Chen (3): Watchdog: Omap: Changes for the new watchdog framework Watchdog: Omap: select watchdog core for framework change Watchdog: Omap: get the bootstatus for OMAP2Plus arch/arm/mach-omap2/prcm.c |5 +- drivers/watchdog/Kconfig|1 + drivers/watchdog/omap_wdt.c | 338 --- drivers/watchdog/omap_wdt.h |5 + 4 files changed, 133 insertions(+), 216 deletions(-) -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
