Re: [PATCH 1/5 v2] omap2/3/4: mailbox: remove compiler warning
From: ext Tony Lindgren Subject: Re: [PATCH 1/5 v2] omap2/3/4: mailbox: remove compiler warning Date: Thu, 25 Feb 2010 23:34:14 +0100 > * Anna, Suman [100223 07:57]: >> From 02c45559105c62343e31226fe67117231ea10c35 Mon Sep 17 00:00:00 2001 >> From: Suman Anna >> Date: Mon, 25 Jan 2010 18:27:21 -0600 >> Subject: [PATCH] omap2/3/4: mailbox: remove compiler warning >> >> Remove a compiler warning in device-specific >> mailbox module. >> >> Signed-off-by: Suman Anna > > Hiroshi, do you want me to queue this? If so, please respond > with your ack. OK for me. In any case, these should be revisited later. -- 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] board-n8x0: add USB initialization
Hi,
On Sat, Feb 27, 2010 at 09:50:31PM -0400, Francisco Alecrim wrote:
> +static struct musb_hdrc_eps_bits musb_eps[] = {
this structure is being removed from current code, it's
not used anywhere. You can drop it.
> + { "ep1_tx", 5,},
> + { "ep1_rx", 5,},
> + { "ep2_tx", 5,},
> + { "ep2_rx", 5,},
> + { "ep3_tx", 3,},
> + { "ep3_rx", 3,},
> + { "ep4_tx", 3,},
> + { "ep4_rx", 3,},
> + { "ep5_tx", 2,},
> + { "ep5_rx", 2,},
> + { "ep6_tx", 2,},
> + { "ep6_rx", 2,},
> + { "ep7_tx", 2,},
> + { "ep7_rx", 2,},
> + { "ep8_tx", 2,},
> + { "ep8_rx", 2,},
> + { "ep9_tx", 2,},
> + { "ep9_rx", 2,},
> + { "ep10_tx", 2, },
> + { "ep10_rx", 2, },
> + { "ep11_tx", 2, },
> + { "ep11_rx", 2, },
> + { "ep12_tx", 2, },
> + { "ep12_rx", 2, },
> + { "ep13_tx", 2, },
> + { "ep13_rx", 2, },
> + { "ep14_tx", 2, },
> + { "ep14_rx", 2, },
> + { "ep15_tx", 2, },
> + { "ep15_rx", 2, },
> +};
> +
> +static struct musb_hdrc_config musb_config = {
> + .multipoint = 1,
> + .dyn_fifo = 1,
> + .soft_con = 1,
> + .dma= 1,
> + .num_eps= 16,
> + .dma_channels = 7,
> + .ram_bits = 12,
> + .eps_bits = musb_eps,
also few fields from here were droped but I can't recall without looking
at my code. Will only be able to do so tomorrow though.
> @@ -1841,6 +1841,7 @@ static struct omap_clk omap2420_clks[] = {
> CLK(NULL, "aes_ick", &aes_ick, CK_242X),
> CLK(NULL, "pka_ick", &pka_ick, CK_242X),
> CLK(NULL, "usb_fck", &usb_fck, CK_242X),
> + CLK("musb_hdrc","fck", &osc_ck,CK_242X),
it's called ick on other archs, let's keep consistency so we can stop
passing clock names soon.
Unless Tony are Paul have a reason not to do so.
--
balbi
--
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 2/4] USB: MUSB: Enable MUSB for OMAP4 in Kconfig
> Olof, > > We have such an option "USB_MUSB_SOC" that takes care of all platforms where > MUSB is present. But the Inventra DMA case is typical. Not all architectures > that have MUSB use Inventra DMA for e.g Davinci uses CPPI DMA. >>Yeah, sorry. I didn't mean the INVENTRA_DMA config option as much as the >>top >>MUSB one. So you should be able to switch to that instead of adding a >>check for >>OMAP4 there then? Olof, So you suggest adding something like below for OMAP4 and all others as well right? comment "OMAP 44xx high speed USB support" depends on USB_MUSB_HDRC && USB_MUSB_SOC Regards, Maulik -- 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] board-n8x0: add USB initialization
On Sun, Feb 28, 2010 at 2:57 PM, Kalle Valo wrote: > > Hi Francisco, > > Francisco Alecrim writes: > > > From: Francisco Alecrim > > > > Signed-off-by: Kalle Valo > > Signed-off-by: Francisco Alecrim > > Signed-off-by: Tony Lindgren > > Please do not add my Signed-off-by unless I have explicitly added it. > And I don't recall giving it to this patch, so it can be removed. I got the initial code from http://www.valot.fi/kalle/n8x0/patches/n8x0-add/2009-07-31-12:15/07-n8x0-add-usb-support.patch . I just re-organized some variables. So I didn't remove your Signed-off-by. And I merged your patch to Tony's code http://www.mail-archive.com/linux-omap@vger.kernel.org/msg21443.html . So I kept his Signed-off-by. > > Removing the line doesn't change anything from technical point of > view, this is just a little bit of legalise we have to deal with. Sorry! I was not sure about keep or not these Signed-off-by. Do you want me to re-send it without your Signed-off-by? Regards, Alecrim. -- 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
linux-next: manual merge of the omap tree with the tree
Hi all,
Today's linux-next merge of the omap tree got a conflict in
arch/arm/plat-omap/Kconfig between commit
d6d502fa4be1acd01971476fc732c95a4da16d90 ("ARM: 5952/1: ARM: MM: Add
ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig") from the arm
tree and commits 56213ca4e440c0b6e56a48f5901c55c4ce3cf1ba ("omap2/3:
Multiboot compile fixes to compile in omap2 and omap3") and
a8eb7ca0cbb41c9cd379b8d2a2a5efb503aa65e9 ("omap3: Replace ARCH_OMAP34XX
with ARCH_OMAP3") from the omap tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/arm/plat-omap/Kconfig
index 2e3eec6,be9484a..000
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -19,10 -28,9 +28,10 @@@ config ARCH_OMAP
config ARCH_OMAP3
bool "TI OMAP3"
+ depends on ARCH_OMAP2PLUS
select CPU_V7
- select COMMON_CLKDEV
+ select ARM_L1_CACHE_SHIFT_6
+ select USB_ARCH_HAS_EHCI
config ARCH_OMAP4
bool "TI OMAP4"
--
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] MFD: TWL4030: introduce remove_script function
Hi Mike,
On Mon, Feb 22, 2010 at 11:16:30AM -0600, mturque...@gmail.com wrote:
> From: Mike Turquette
>
> New function twl4030_remove_script(u8 flags) takes a script type as
> defined in twl.h and prevents any script already loaded in that position
> from running. This is accomplished by programming SEQ_ADD_* to 0x3f,
> the END_OF_SCRIPT value, where SEQ_ADD_* is determined by flags.
Patch applied, thanks a lot.
Cheers,
Samuel.
> Signed-off-by: Mike Turquette
> ---
>
> Based on MFD for-next branch.
>
> Future users of this function include OMAP board files for machines
> facing a race condition between sleep and warm reset.
>
> drivers/mfd/twl4030-power.c | 50
> +++
> include/linux/i2c/twl.h |1 +
> 2 files changed, 51 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index 5b045ff..7efa878 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -461,6 +461,56 @@ out:
> return err;
> }
>
> +int twl4030_remove_script(u8 flags)
> +{
> + int err = 0;
> +
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_1,
> + R_PROTECT_KEY);
> + if (err) {
> + pr_err("twl4030: unable to unlock PROTECT_KEY\n");
> + return err;
> + }
> +
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, R_KEY_2,
> + R_PROTECT_KEY);
> + if (err) {
> + pr_err("twl4030: unable to unlock PROTECT_KEY\n");
> + return err;
> + }
> +
> + if (flags & TWL4030_WRST_SCRIPT) {
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
> + R_SEQ_ADD_WARM);
> + if (err)
> + return err;
> + }
> + if (flags & TWL4030_WAKEUP12_SCRIPT) {
> + if (err)
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
> + R_SEQ_ADD_S2A12);
> + return err;
> + }
> + if (flags & TWL4030_WAKEUP3_SCRIPT) {
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
> + R_SEQ_ADD_S2A3);
> + if (err)
> + return err;
> + }
> + if (flags & TWL4030_SLEEP_SCRIPT) {
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
> + R_SEQ_ADD_A2S);
> + if (err)
> + return err;
> + }
> +
> + err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, 0, R_PROTECT_KEY);
> + if (err)
> + pr_err("TWL4030 Unable to relock registers\n");
> +
> + return err;
> +}
> +
> void __init twl4030_power_init(struct twl4030_power_data *twl4030_scripts)
> {
> int err = 0;
> diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h
> index 33d9d5c..d4baff8 100644
> --- a/include/linux/i2c/twl.h
> +++ b/include/linux/i2c/twl.h
> @@ -550,6 +550,7 @@ struct twl4030_power_data {
> };
>
> extern void twl4030_power_init(struct twl4030_power_data *triton2_scripts);
> +extern int twl4030_remove_script(u8 flags);
>
> struct twl4030_codec_audio_data {
> unsigned intaudio_mclk;
> --
> 1.6.3.2
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
--
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] board-n8x0: add USB initialization
Hi Francisco, Francisco Alecrim writes: > From: Francisco Alecrim > > Signed-off-by: Kalle Valo > Signed-off-by: Francisco Alecrim > Signed-off-by: Tony Lindgren Please do not add my Signed-off-by unless I have explicitly added it. And I don't recall giving it to this patch, so it can be removed. Removing the line doesn't change anything from technical point of view, this is just a little bit of legalise we have to deal with. -- Kalle Valo -- 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
