* [PATCH 2/8] ARM: etm: Don't limit tracing to only non-secure code.
From: Arve Hjønnevåg @ 2011-02-15 6:11 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1296701663-12168-1-git-send-email-arve@android.com>
On some systems kernel code is considered secure, and this code
already limits tracing to the kernel text segment which results
in no trace data.
Signed-off-by: Arve Hj?nnev?g <arve@android.com>
---
arch/arm/kernel/etm.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index d4ec368..6e15c48 100644
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -55,7 +55,7 @@ static inline bool trace_isrunning(struct tracectx *t)
static int etm_setup_address_range(struct tracectx *t, int n,
unsigned long start, unsigned long end, int exclude, int data)
{
- u32 flags = ETMAAT_ARM | ETMAAT_IGNCONTEXTID | ETMAAT_NSONLY | \
+ u32 flags = ETMAAT_ARM | ETMAAT_IGNCONTEXTID | ETMAAT_IGNSECURITY |
ETMAAT_NOVALCMP;
if (n < 1 || n > t->ncmppairs)
--
1.7.3.1
^ permalink raw reply related
* [PATCH 1/8] ARM: etm: Don't require clock control
From: Arve Hjønnevåg @ 2011-02-15 6:11 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1296701663-12168-1-git-send-email-arve@android.com>
If clk_get fail, assume the etb does not need a separate clock.
Signed-off-by: Arve Hj?nnev?g <arve@android.com>
---
arch/arm/kernel/etm.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 11db628..d4ec368 100644
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -361,13 +361,12 @@ static int __init etb_probe(struct amba_device *dev, struct amba_id *id)
if (ret)
goto out_unmap;
+ /* Get optional clock. Currently used to select clock source on omap3 */
t->emu_clk = clk_get(&dev->dev, "emu_src_ck");
- if (IS_ERR(t->emu_clk)) {
+ if (IS_ERR(t->emu_clk))
dev_dbg(&dev->dev, "Failed to obtain emu_src_ck.\n");
- return -EFAULT;
- }
-
- clk_enable(t->emu_clk);
+ else
+ clk_enable(t->emu_clk);
etb_unlock(t);
t->etb_bufsz = etb_readl(t, ETBR_DEPTH);
@@ -402,8 +401,10 @@ static int etb_remove(struct amba_device *dev)
iounmap(t->etb_regs);
t->etb_regs = NULL;
- clk_disable(t->emu_clk);
- clk_put(t->emu_clk);
+ if (!IS_ERR(t->emu_clk)) {
+ clk_disable(t->emu_clk);
+ clk_put(t->emu_clk);
+ }
amba_release_regions(dev);
--
1.7.3.1
^ permalink raw reply related
* [PATCH v2] ARM: S5PV210: Add GONI board setup for CIF camera support
From: Kukjin Kim @ 2011-02-15 5:50 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1297445273-3829-1-git-send-email-s.nawrocki@samsung.com>
Sylwester Nawrocki wrote:
>
> Hello,
>
Hi,
> the following patch series introduces changes in GONI board setup file
> required for the CIF camera sensor driver.
> The first patch adds the I2C0 bus driver, the second one adds the
regulator
> supply definitions and the third one just increases virtual size
> of the framebuffer window 0 to enable double-buffering.
> The added regulator supplies are also a subset of the supplies of the high
> resolution camera which that reference board is equipped with.
>
> Changes since v1:
> - removed unnecessary "select CONFIG_S3C_DEV_I2C0"
>
>
> The patch series contains:
>
> [PATCH 1/3] ARM: S5PV210: Enable I2C0 bus on GONI board
> [PATCH 2/3] ARM: S5PV210: Add supplies for CIF camera on GONI board
> [PATCH 3/3] ARM: S5PV210: Change framebuffer window 0 size on GONI
>
> Created against for-next branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
>
Hmm...looks you don't want to follow my suggestion on 2nd patch.
I'm still wondering why array is needed for just one member in
regulator_consumer_supply structure now even though other something will be
added later.
Nevertheless will apply your 3 patches but if not required array will be
removed later.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply
* [RFC,PATCH 1/3] Add a common struct clk
From: Saravana Kannan @ 2011-02-15 5:33 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <201102151041.40655.jeremy.kerr@canonical.com>
Russell, A question for you further down this email. Please take a look.
On 02/14/2011 06:41 PM, Jeremy Kerr wrote:
> Hi Saravana,
>
>> Shouldn't you be grabbing the prepare_lock here?
>
> This depends on semantics that (as far as I can tell) aren't defined yet.
Sure, one could argue that in some archs for a certain set of clocks the
slow stuff in prepare/unprepare won't need to be done during set rate --
say, a simple clock that always runs off the same PLL but just has a
integer divider to change the rate.
In those cases, not grabbing the prepare_lock would make the code less
"locky".
> We
> may even want to disallow set_rate (and set_parent) when prepare_count is non-
> zero.
This is definitely not right. Changing the rate of a clock when it's
already enabled/prepared is a very reasonable thing to do. It's only
doing a set rate at the "same time" as a prepare/unprepare that's wrong
for some clocks. We could have the specific implementation deal with the
locking internally.
So essentially, the prepare_lock is just for the prepare_cnt and the
call to the corresponding ops.
> Ideally, we should work out what the semantics are with regards to changing a
> clock's rate when it has multiple users and/or is enabled or prepared, but
> that's a separate issue, and we should *definitely* implement that as a
> separate change.
Agreed about having the semantics defined for setting the rate when
there are multiple users. As for "is already enabled/prepared", I think
clear that it needs to be supported/allowed. MSM drivers definitely do
it all the time.
> I'd prefer to enforce the 'sleepability' with might_sleep instead.
Yeah, I realized this option after sending out my previous email. Please
do add a might_sleep(). It will actually point out errors (per the new
clarification) in some serial drivers.
>> You should probably rename the lock to something else since it's not
>> limited to prepare/unprepare. How about resource_lock?
>
> It's not, but that's the only thing it's protecting in the common code. I'm
> open for better names, but resource_lock is too generic.
We can get back to this later after we settle on the stuff below.
>>> +int clk_set_parent(struct clk *clk, struct clk *parent)
>>> +{
>>> + if (clk->ops->set_parent)
>>> + return clk->ops->set_parent(clk, parent);
>>
>> I'm not sure on this one. If the prepare ops for a clock also calls the
>> prepare ops on the parent, shouldn't we prevent changing the parent
>> while the prepare/unprepare is going on?
>
> Again, this is related to set_rate during enable/disable or prepare/unprepare;
> we don't have defined semantics for this at present.
After thinking about this the past couple of days, this looks like a
location where the locking is more necessary than inside set rate. I
always saw the parent clock as the clock that generates the clock signal
from which this clock derives (divide, etc) it's clock signal from.
Assuming Russell and/or the community agrees on the semantics of
"parent", without the generic implementation grabbing the prepare_lock
while setting the parent, there is no way for the specific clock driver
implementations to cleanly ensure correctness. The only option for them
would be to peek into the generic clock struct and grab the prepare lock
-- to me that would be an ugly hack and/or layering violation that would
cause problems later on.
Russell/All,
What's the meaning of a parent clock? Do you agree with my definition --
"the parent clock is the clock that generates the clock signal from
which the child clock derives (divide, etc) it's clock signal from."? Or
is it open to interpretation by each implementation?
>>> +
>>> +/* static initialiser for clocks */
>>> +#define INIT_CLK(name, o) { \
>>> + .ops =&o, \
>>> + .enable_count = 0, \
>>> + .prepare_count = 0, \
>>
>> Do we need these inits? Doesn't check patch complain about initing
>> static/global to 0? If it's generally frowned upon, why the exception
>> here. I realize that checkpatch won't catch this, but still...
>
> This took some reading through c99, but yes, it looks like we can drop these
> zero initialisations.
>
> However, the coding style convention for the implicit zeroing of static
> variables is to allow these variables to be put into the .bss section,
> reducing object size. In this case, the clock will never be able to go into
> .bss (it has non-zero elements too), and so this will have no change on object
> size. I prefer to be explicit here, and show that the counts are initialised
> to zero.
I don't think the coding style convention was to make sure the variables
end up in the BSS. I would be surprised if GCC wasn't intelligent enough
to notice that we are initing a variable with zero and hence it can be
safely put in the BSS. It think the coding style convention was chosen
just to ensure "don't be redundant and add 'noisy' code".
> I'm happy to go either way. I have a preference for the explicit
> initialisation, but that may not be general style.
I don't have a strong opinion, but I thought I should point out the
deviation from the usual coding style.
>>
>>> + .enable_lock = __SPIN_LOCK_UNLOCKED(name.enable_lock), \
>>> + .prepare_lock = __MUTEX_INITIALIZER(name.prepare_lock), \
>>
>> After a long day, I'm not able to wrap my head around this. Probably a
>> stupid question, but will this name.xxx thing prevent using this
>> INIT_CLK macro to initialize an array of clocks? More specifically,
>> prevent the sub class macro (like INIT_CLK_FIXED) from being used to
>> initialize an array of clocks?
>
> That's correct. For an array of clocks, you'll have to use a different
> initialiser. We can add helpers for that that when (and if) the need arises.
Would it even be possible to get this to work for an array? You don't
have to change this in the patch, but I'm curious to know how to get
this to work for an array without doing a run time init of the lock.
>>> + * The clk_enable/clk_disable and clk_prepare/clk_unprepare pairs allow
>>> + * implementations to split any work between atomic (enable) and
>>> sleepable + * (prepare) contexts. If a clock requires blocking code to
>>> be turned on, this
>>
>> Aren't all locks blocking? Shouldn't it be, "If turning on a clock
>> requires code that might sleep, it should be done in clk_prepare"?
>> Replace all "blocking" with "sleepable" or "sleeping" in the comments?
>
> I think "blocking" is generally accepted as is intended in this case, but it's
> probably better to be explicit here.
I obviously think what I suggested is clearer, but no strong opinion here.
Cheers,
Saravana
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply
* [RFC,PATCH 2/3] clk: Generic support for fixed-rate clocks
From: Saravana Kannan @ 2011-02-15 4:51 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <201102150941.00668.jeremy.kerr@canonical.com>
On 02/14/2011 05:41 PM, Jeremy Kerr wrote:
> Hi Ryan,
>
>> A fixed clock may still have other operations such as enable/disable.
>
> Then it's not a fixed clock; I'd prefer this to be a separate type, as it's
> now hardware dependent.
>
I'm confused. If a clock's rate can't be changed and it can't be enabled
or disabled, then what's the point of representing that clock
signal/line as a clock in the driver. Seems like a "nothing to see here,
move along" type of clock. To express it differently, I find this
similar to "if (1) { ... }". Obviously I'm missing something here. What
is it?
-Saravana
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply
* [PATCH 0/11] ARM: EXYNOS4: Change ARCH name, ARCH_EXYNOS4 from ARCH_S5PV310
From: Kyungmin Park @ 2011-02-15 4:39 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <003301cbccb2$f8511720$e8f34560$@com>
On Tue, Feb 15, 2011 at 10:52 AM, Sangbeom Kim <sbkim73@samsung.com> wrote:
> Hi,
>
> On Monday, February 14, 2011 8:16 PM, Kyungmin Park wrote:
>> > Hi,
>> > I answer your questions in detail.
>> >
>> >> On Monday, February 14, 2011 8:16 PM, Kyungmin Park wrote:
>> >>
>> >> Hi,
>> >>
>> >> Wow, fast move, but need to more explanation.
>> >> what's the exact meaning of exynos4210?
>> >> Exynos4 is prefix and remaining are variants?
>> >
>> > Exynos4210 means below.
>> >
>> > 1st digit means ARM core version. In this case, 4 means Cortex A9.
>> > (If we release cortex A15, it will be Exynos5xxx)
>> > 2nd digit means number of core. ?2 mean dual core.
>> > 3rd digit means application category(LSI internal category).
>> > 4th digit means design rule (generation or shrink version)
>>
>> Nice, I want these rules.
>> >
>> >> Now you changed all s5pv310 to exynos4. if new exynos4xxx chip are
>> >> comes then how to handle this one?
>> >> e.g., exynos4220 or later.
>> >> it's also conflict with mach-exynos4. do you handle all exynos4 series
>> >> at this mach directory?
>> >> historically there's no rules of the base RAM address at least samsung
>> >> chips.
>> >
>> > Yes, we will handle all exynos4 series at mach-exynos4 directory.
>> > In the past, there is no rule.
>> > But now, we are making consistent rules with AP design team.
>> > So, new version of exynos4 series will have same base RAM address.
>>
>> Okay, no problem with base ram address,
>>
>> Another one is how do you handle the GPIOs?
>> Now it's also changed as EXYNOS4_GPXX, I think it's difficult to use
>> the same banks as exynos4210 has if new chips are introduced.
>> maybe IRQ also has similar issue.
>
> We already had reviewed your concern before.
> S5P6450 and S5P6440 is basically same processor.
> But GPIO, IRQ and some peripheral is little different.
> We can handle that by checking each processors chipid.
>
> Please check the below patch.
> http://www.spinics.net/lists/linux-samsung-soc/msg03530.html
Right, in this patch it used the S5P64XX, S5P6440, and S5P6450 is used.
but EXYNOS patches used the EXYNOS4 prefix instead of EXYNOS4210 at
least at GPIO patch.
maybe you will rename it as EXYNOS4210 and use the EXYNOS4 as
representative prefix.
Anyway it means it will use the cpu_is_exynos4210 or similar style to
detect each cpu. and assign proper data structure
Then I recommend that create the cpu.h header file as other SOC does
and use a common macro if new one comes.
Thank you,
Kyungmin Park
>
> Thanks and regards,
> Sangbeom Kim
>>
>> Now these patches assumes all exynos4 has same gpios, irqs and so on.
>>
>> How do you think about it?
>>
>> Thank you,
>> Kyungmin Park
>> >
>> > Thanks and regards,
>> > Sangbeom Kim
>> >
>> >>
>> >> Thank you,
>> >> Kyungmin Park
>> >>
>> >> On Mon, Feb 14, 2011 at 5:22 PM, Kukjin Kim <kgene.kim@samsung.com>
>> wrote:
>> >> > This patch set changes to ARCH_EXYNOS4 from ARCH_S5PV310 for
>> supporting
>> >> Samsung's
>> >> > new brand name EXYNOS. Samsung officially announced about the brand
>> name
>> >> of EXYNOS
>> >> > at MWC 2011 and The EXYNOS4 integrates a ARM Cortex A9 microporcessor
>> >> with several
>> >> > other peripherals to support features such as multimedai, storage,
>> >> graphics and gaming.
>> >> > Especially, the EXYNOS4210 CPU which is one of EXYNOS4 SoC series can
>> be
>> >> used in
>> >> > products such as Mobile devices.
>> >> >
>> >> > This patch set consists of the following patches.
>> >> >
>> >> > [PATCH 01/11] ARM: EXYNOS4: Add EXYNOS4 CPU initialization support
>> >> > [PATCH 02/11] ARM: EXYNOS4: Update Clock part
>> >> > [PATCH 03/11] ARM: EXYNOS4: Update IRQ part
>> >> > [PATCH 04/11] ARM: EXYNOS4: Update Timer part
>> >> > [PATCH 05/11] ARM: EXYNOS4: Update device support
>> >> > [PATCH 06/11] ARM: EXYNOS4: Moved board support files
>> >> > [PATCH 07/11] ARM: EXYNOS4: Update Kconfig and Makefile for the new
>> >> ARCH_EXYNOS4
>> >> > [PATCH 08/11] ARM: exynos4_defconfig: Add defconfig for EXYNOS4
>> >> > [PATCH 09/11] mtd: OneNAND: Change dependency of ARCH_EXYNOS4
>> >> > [PATCH 10/11] ASoC: Change dependency of ARCH_EXYNOS4
>> >> > [PATCH 11/11] tty: Change dependency of ARCH_EXYNOS4
>> >> >
>> >> > _______________________________________________
>> >> > linux-arm-kernel mailing list
>> >> > linux-arm-kernel at lists.infradead.org
>> >> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>> >> >
>> >> --
>> >> To unsubscribe from this list: send the line "unsubscribe linux-
>> samsung-
>> >> soc" in
>> >> the body of a message to majordomo at vger.kernel.org
>> >> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>> >
>> > --
>> > To unsubscribe from this list: send the line "unsubscribe linux-samsung-
>> soc" in
>> > the body of a message to majordomo at vger.kernel.org
>> > More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>> >
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-
>> soc" in
>> the body of a message to majordomo at vger.kernel.org
>> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* [PATCH 1/5] ARM: smp: Select local timers vs dummy timer support runtime
From: David Brown @ 2011-02-15 4:15 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1297510187-31547-2-git-send-email-santosh.shilimkar@ti.com>
Let's try this again from the correct email address...
On Sat, Feb 12 2011, Santosh Shilimkar wrote:
> The current code support of dummy timers in absence of local
> timer is compile time. This is an attempt to convert it to runtime
> so that on few SOC version if the local timers aren't supported
> kernel can switch to dummy timers. OMAP4430 ES1.0 does suffer from
> this limitation.
>
> This patch should not have any functional impact on affected
> files.
>
> arch/arm/mach-msm/timer.c | 3 ++-
Acked-by: David Brown <davidb@codeaurora.org>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply
* [PATCH 1/5] ARM: smp: Select local timers vs dummy timer support runtime
From: David Brown @ 2011-02-15 4:13 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1297510187-31547-2-git-send-email-santosh.shilimkar@ti.com>
On Sat, Feb 12 2011, Santosh Shilimkar wrote:
> The current code support of dummy timers in absence of local
> timer is compile time. This is an attempt to convert it to runtime
> so that on few SOC version if the local timers aren't supported
> kernel can switch to dummy timers. OMAP4430 ES1.0 does suffer from
> this limitation.
>
> This patch should not have any functional impact on affected
> files.
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> ---
> arch/arm/mach-msm/timer.c | 3 ++-
Acked-By: David Brown <davidb@codeaurora.org>
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply
* [PATCH 2/6] ARM: pm: add generic CPU suspend/resume support
From: Colin Cross @ 2011-02-15 4:11 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <AANLkTi=6zLxGxabBE4-+qGyRt7-219KE=4CB0jf9D=LG@mail.gmail.com>
On Mon, Feb 14, 2011 at 5:21 PM, Colin Cross <ccross@google.com> wrote:
> On Fri, Feb 11, 2011 at 8:17 AM, Russell King - ARM Linux
> <linux@arm.linux.org.uk> wrote:
>> This adds core support for saving and restoring CPU coprocessor
>> registers for suspend/resume support. ?This contains support for suspend
>> with ARM920, ARM926, SA11x0, PXA25x, PXA27x, PXA3xx, V6 and V7 CPUs.
>
> I would like to use cpu_suspend in a case where the L2 is still
> enabled. ?When cpu_resume is called, the MMU and cache bits in SCTLR
> are disabled, so the reads skip the L2 cache, and the data that was
> saved (sleep_save_sp and *sleep_save_sp) is not read back.
>
> Is it possible to call the outer_cache functions from cpu_suspend to
> flush sleep_save_sp and the saved data?
Even with a cache flush, cpu_resume_turn_on_mmu fails because the page
table modification, done with the cache off, ends up in memory, but
the L2 contains the old value. When the MMU and cache are enabled,
the 1:1 mapping disappears. The page table would need to be
invalidated during suspend.
I can avoid the problem entirely by leaving the MMU on and skipping
cpu_resume when the CPU does not go through reset.
^ permalink raw reply
* [RFC,PATCH 1/3] Add a common struct clk
From: Jeremy Kerr @ 2011-02-15 2:41 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <4D53749B.6010102@codeaurora.org>
Hi Saravana,
> Shouldn't you be grabbing the prepare_lock here?
This depends on semantics that (as far as I can tell) aren't defined yet. We
may even want to disallow set_rate (and set_parent) when prepare_count is non-
zero.
Ideally, we should work out what the semantics are with regards to changing a
clock's rate when it has multiple users and/or is enabled or prepared, but
that's a separate issue, and we should *definitely* implement that as a
separate change.
I'd prefer to enforce the 'sleepability' with might_sleep instead.
> You should probably rename the lock to something else since it's not
> limited to prepare/unprepare. How about resource_lock?
It's not, but that's the only thing it's protecting in the common code. I'm
open for better names, but resource_lock is too generic.
> > +int clk_set_parent(struct clk *clk, struct clk *parent)
> > +{
> > + if (clk->ops->set_parent)
> > + return clk->ops->set_parent(clk, parent);
>
> I'm not sure on this one. If the prepare ops for a clock also calls the
> prepare ops on the parent, shouldn't we prevent changing the parent
> while the prepare/unprepare is going on?
Again, this is related to set_rate during enable/disable or prepare/unprepare;
we don't have defined semantics for this at present.
> > +
> > +/* static initialiser for clocks */
> > +#define INIT_CLK(name, o) { \
> > + .ops =&o, \
> > + .enable_count = 0, \
> > + .prepare_count = 0, \
>
> Do we need these inits? Doesn't check patch complain about initing
> static/global to 0? If it's generally frowned upon, why the exception
> here. I realize that checkpatch won't catch this, but still...
This took some reading through c99, but yes, it looks like we can drop these
zero initialisations.
However, the coding style convention for the implicit zeroing of static
variables is to allow these variables to be put into the .bss section,
reducing object size. In this case, the clock will never be able to go into
.bss (it has non-zero elements too), and so this will have no change on object
size. I prefer to be explicit here, and show that the counts are initialised
to zero.
I'm happy to go either way. I have a preference for the explicit
initialisation, but that may not be general style.
>
> > + .enable_lock = __SPIN_LOCK_UNLOCKED(name.enable_lock), \
> > + .prepare_lock = __MUTEX_INITIALIZER(name.prepare_lock), \
>
> After a long day, I'm not able to wrap my head around this. Probably a
> stupid question, but will this name.xxx thing prevent using this
> INIT_CLK macro to initialize an array of clocks? More specifically,
> prevent the sub class macro (like INIT_CLK_FIXED) from being used to
> initialize an array of clocks?
That's correct. For an array of clocks, you'll have to use a different
initialiser. We can add helpers for that that when (and if) the need arises.
> > + * The clk_enable/clk_disable and clk_prepare/clk_unprepare pairs allow
> > + * implementations to split any work between atomic (enable) and
> > sleepable + * (prepare) contexts. If a clock requires blocking code to
> > be turned on, this
>
> Aren't all locks blocking? Shouldn't it be, "If turning on a clock
> requires code that might sleep, it should be done in clk_prepare"?
> Replace all "blocking" with "sleepable" or "sleeping" in the comments?
I think "blocking" is generally accepted as is intended in this case, but it's
probably better to be explicit here.
>
> > + * should be done in clk_prepare. Switching that will not block should
> > be done + * in clk_enable.
> > + *
> > + * Typically, drivers will call clk_prepare when a clock may be needed
> > later + * (eg. when a device is opened), and clk_enable when the clock
> > is actually + * required (eg. from an interrupt). Note that clk_prepare
> > *must* have been + * called before clk_enable.
> > + *
> > + * For other callbacks, see the corresponding clk_* functions.
> > Parameters and + * return values are passed directly from/to these API
> > functions, or + * -ENOSYS (or zero, in the case of clk_get_rate) is
> > returned if the callback + * is NULL, see kernel/clk.c for
> > implementation details. All are optional.
>
> is NULL. See kernel... ?
Ah, yes, I'll update this.
Cheers,
Jeremy
^ permalink raw reply
* [RFC, PATCH 3/3] clk: add warnings for incorrect enable/prepare semantics
From: Jeremy Kerr @ 2011-02-15 2:00 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20110210093756.GA24710@b20223-02.ap.freescale.net>
Hi Richard,
> > void clk_unprepare(struct clk *clk)
> > {
> >
> > + WARN_ON(clk->enable_count != 0);
> > +
>
> Other drivers may be using the clock and increased the enable_count.
> This check may be moved to where we actually do unprepare.
Of course, thanks. Will update the series.
Jeremy
^ permalink raw reply
* [PATCH] omap: Move omap2_check_revision and omap_sram_init out of map_io
From: Tony Lindgren @ 2011-02-15 1:53 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20110214235238.GU20795@atomide.com>
* Tony Lindgren <tony@atomide.com> [110214 15:51]:
> With the early init changes we just want to map IO in map_io.
> Both omap2_check_revision and omap_sram_init can be moved to
> happen later in omap2_init_common_infrastructure.
>
> Note that now we can now remove _omap2_map_common_io and remove
> the extra flushes too as devicemaps_init will take care of it.
Hmm this one seems to need a bit more work, won't work on 2420.
Tony
^ permalink raw reply
* [PATCH 0/11] ARM: EXYNOS4: Change ARCH name, ARCH_EXYNOS4 from ARCH_S5PV310
From: Sangbeom Kim @ 2011-02-15 1:52 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <AANLkTimOqg4XGMv+Gsarpa9U56MB3hxewhZxznHpx4-u@mail.gmail.com>
Hi,
On Monday, February 14, 2011 8:16 PM, Kyungmin Park wrote:
> > Hi,
> > I answer your questions in detail.
> >
> >> On Monday, February 14, 2011 8:16 PM, Kyungmin Park wrote:
> >>
> >> Hi,
> >>
> >> Wow, fast move, but need to more explanation.
> >> what's the exact meaning of exynos4210?
> >> Exynos4 is prefix and remaining are variants?
> >
> > Exynos4210 means below.
> >
> > 1st digit means ARM core version. In this case, 4 means Cortex A9.
> > (If we release cortex A15, it will be Exynos5xxx)
> > 2nd digit means number of core. ?2 mean dual core.
> > 3rd digit means application category(LSI internal category).
> > 4th digit means design rule (generation or shrink version)
>
> Nice, I want these rules.
> >
> >> Now you changed all s5pv310 to exynos4. if new exynos4xxx chip are
> >> comes then how to handle this one?
> >> e.g., exynos4220 or later.
> >> it's also conflict with mach-exynos4. do you handle all exynos4 series
> >> at this mach directory?
> >> historically there's no rules of the base RAM address at least samsung
> >> chips.
> >
> > Yes, we will handle all exynos4 series at mach-exynos4 directory.
> > In the past, there is no rule.
> > But now, we are making consistent rules with AP design team.
> > So, new version of exynos4 series will have same base RAM address.
>
> Okay, no problem with base ram address,
>
> Another one is how do you handle the GPIOs?
> Now it's also changed as EXYNOS4_GPXX, I think it's difficult to use
> the same banks as exynos4210 has if new chips are introduced.
> maybe IRQ also has similar issue.
We already had reviewed your concern before.
S5P6450 and S5P6440 is basically same processor.
But GPIO, IRQ and some peripheral is little different.
We can handle that by checking each processors chipid.
Please check the below patch.
http://www.spinics.net/lists/linux-samsung-soc/msg03530.html
Thanks and regards,
Sangbeom Kim
>
> Now these patches assumes all exynos4 has same gpios, irqs and so on.
>
> How do you think about it?
>
> Thank you,
> Kyungmin Park
> >
> > Thanks and regards,
> > Sangbeom Kim
> >
> >>
> >> Thank you,
> >> Kyungmin Park
> >>
> >> On Mon, Feb 14, 2011 at 5:22 PM, Kukjin Kim <kgene.kim@samsung.com>
> wrote:
> >> > This patch set changes to ARCH_EXYNOS4 from ARCH_S5PV310 for
> supporting
> >> Samsung's
> >> > new brand name EXYNOS. Samsung officially announced about the brand
> name
> >> of EXYNOS
> >> > at MWC 2011 and The EXYNOS4 integrates a ARM Cortex A9 microporcessor
> >> with several
> >> > other peripherals to support features such as multimedai, storage,
> >> graphics and gaming.
> >> > Especially, the EXYNOS4210 CPU which is one of EXYNOS4 SoC series can
> be
> >> used in
> >> > products such as Mobile devices.
> >> >
> >> > This patch set consists of the following patches.
> >> >
> >> > [PATCH 01/11] ARM: EXYNOS4: Add EXYNOS4 CPU initialization support
> >> > [PATCH 02/11] ARM: EXYNOS4: Update Clock part
> >> > [PATCH 03/11] ARM: EXYNOS4: Update IRQ part
> >> > [PATCH 04/11] ARM: EXYNOS4: Update Timer part
> >> > [PATCH 05/11] ARM: EXYNOS4: Update device support
> >> > [PATCH 06/11] ARM: EXYNOS4: Moved board support files
> >> > [PATCH 07/11] ARM: EXYNOS4: Update Kconfig and Makefile for the new
> >> ARCH_EXYNOS4
> >> > [PATCH 08/11] ARM: exynos4_defconfig: Add defconfig for EXYNOS4
> >> > [PATCH 09/11] mtd: OneNAND: Change dependency of ARCH_EXYNOS4
> >> > [PATCH 10/11] ASoC: Change dependency of ARCH_EXYNOS4
> >> > [PATCH 11/11] tty: Change dependency of ARCH_EXYNOS4
> >> >
> >> > _______________________________________________
> >> > linux-arm-kernel mailing list
> >> > linux-arm-kernel at lists.infradead.org
> >> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >> >
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe linux-
> samsung-
> >> soc" in
> >> the body of a message to majordomo at vger.kernel.org
> >> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-samsung-
> soc" in
> > the body of a message to majordomo at vger.kernel.org
> > More majordomo info at ?http://vger.kernel.org/majordomo-info.html
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-
> soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [RFC,PATCH 1/3] Add a common struct clk
From: Ryan Mallon @ 2011-02-15 1:43 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <201102150936.26110.jeremy.kerr@canonical.com>
On 02/15/2011 02:36 PM, Jeremy Kerr wrote:
> Hi Ryan,
>
>>> +int clk_enable(struct clk *clk)
>>> +{
>>> + unsigned long flags;
>>> + int ret = 0;
>>> +
>>> + spin_lock_irqsave(&clk->enable_lock, flags);
>>
>> WARN_ON(clk->prepare_count == 0); ?
>
> Added later, but yes.
Okay, but still failing to understand why this isn't it the first patch.
You are introducing a new file after all.
>>
>>> + if (clk->enable_count == 0 && clk->ops->enable)
>>> + ret = clk->ops->enable(clk);
>>
>> Does it make sense to have a clock with no enable function which still
>> returns success from clk_enable? Do we have any platforms which have
>> NULL clk_enable functions?
>
> It does, yes. Driver code should be always be calling clk_enable before using
> a clock, regardless of the implementation (which it shouldn't have to care
> abut), and should abort their initialisation if the clk_enable() fails.
>
> Some clocks are always running, so the enable op will be empty. This is not an
> error, so the driver is free to continue.
>
>> I think that for enable/disable at least we should require platforms to
>> provide functions and oops if they have failed to do so. In the rare
>> case that a platform doesn't need to do anything for enable/disable they
>> can just supply empty functions.
>
> Sounds like useless boilerplate - it's not an error to not need
> enable/disable, so I don't see why we need to add extra effort to handle this
> case.
I have been convinced that enable/prepare potentially being NULL
callbacks is valid :-).
>
>>> +/**
>>> + * __clk_get - acquire a reference to a clock
>>> + *
>>> + * @clk: The clock to refcount
>>> + *
>>> + * Before a clock is returned from clk_get, this function should be
>>> called + * to update any clock-specific refcounting.
>>
>> This is a bit misleading. It's not "should be called", it "is called". I
>> think you should just remove the documentation for __clk_get/__clk_put
>> or move it into clk.c since the functions are only used internally by
>> the common clock code.
>
> It'd be nice to remove this from the header, but this means we'll need extern
> prototypes in clkdev.c. Might be a reasonable compromise though.
That's probably a better approach anyway, since that makes it blatantly
obvious that the __clk_get and __clk_put functions should not be called
from anywhere except clkdev.c.
>
>>> +/**
>>> + * clk_prepare - prepare clock for atomic enabling.
>>> + *
>>> + * @clk: The clock to prepare
>>> + *
>>> + * Do any blocking initialisation on @clk, allowing the clock to be
>>> later + * enabled atomically (via clk_enable). This function may sleep.
>>
>> "Possibly blocking" as below?
>
> Yep, will unify these (and spell "possibly" correctly :) )
:-)
~Ryan
--
Bluewater Systems Ltd - ARM Technology Solution Centre
Ryan Mallon 5 Amuri Park, 404 Barbadoes St
ryan at bluewatersys.com PO Box 13 889, Christchurch 8013
http://www.bluewatersys.com New Zealand
Phone: +64 3 3779127 Freecall: Australia 1800 148 751
Fax: +64 3 3779135 USA 1800 261 2934
^ permalink raw reply
* [RFC,PATCH 2/3] clk: Generic support for fixed-rate clocks
From: Jeremy Kerr @ 2011-02-15 1:41 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <4D54738C.80900@bluewatersys.com>
Hi Ryan,
> A fixed clock may still have other operations such as enable/disable.
Then it's not a fixed clock; I'd prefer this to be a separate type, as it's
now hardware dependent.
> Maybe do something like this instead:
> #define INIT_CLK_FIXED(name, ops, r) { \
> .clk = INIT_CLK(name.clk, ops, rate), \
> .clk.ops.get_rate = clk_fixed_get_rate, \
> .rate = (r), \
> }
>
> That's untested though. I'm not sure if you can reliably assign
> something twice in a struct initialiser?
also, clk->ops is a const.
Cheers,
Jeremy
^ permalink raw reply
* [RFC,PATCH 1/3] Add a common struct clk
From: Jeremy Kerr @ 2011-02-15 1:36 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <4D52F73A.4010707@bluewatersys.com>
Hi Ryan,
> > +int clk_enable(struct clk *clk)
> > +{
> > + unsigned long flags;
> > + int ret = 0;
> > +
> > + spin_lock_irqsave(&clk->enable_lock, flags);
>
> WARN_ON(clk->prepare_count == 0); ?
Added later, but yes.
>
> > + if (clk->enable_count == 0 && clk->ops->enable)
> > + ret = clk->ops->enable(clk);
>
> Does it make sense to have a clock with no enable function which still
> returns success from clk_enable? Do we have any platforms which have
> NULL clk_enable functions?
It does, yes. Driver code should be always be calling clk_enable before using
a clock, regardless of the implementation (which it shouldn't have to care
abut), and should abort their initialisation if the clk_enable() fails.
Some clocks are always running, so the enable op will be empty. This is not an
error, so the driver is free to continue.
> I think that for enable/disable at least we should require platforms to
> provide functions and oops if they have failed to do so. In the rare
> case that a platform doesn't need to do anything for enable/disable they
> can just supply empty functions.
Sounds like useless boilerplate - it's not an error to not need
enable/disable, so I don't see why we need to add extra effort to handle this
case.
> > +/**
> > + * __clk_get - acquire a reference to a clock
> > + *
> > + * @clk: The clock to refcount
> > + *
> > + * Before a clock is returned from clk_get, this function should be
> > called + * to update any clock-specific refcounting.
>
> This is a bit misleading. It's not "should be called", it "is called". I
> think you should just remove the documentation for __clk_get/__clk_put
> or move it into clk.c since the functions are only used internally by
> the common clock code.
It'd be nice to remove this from the header, but this means we'll need extern
prototypes in clkdev.c. Might be a reasonable compromise though.
> > +/**
> > + * clk_prepare - prepare clock for atomic enabling.
> > + *
> > + * @clk: The clock to prepare
> > + *
> > + * Do any blocking initialisation on @clk, allowing the clock to be
> > later + * enabled atomically (via clk_enable). This function may sleep.
>
> "Possibly blocking" as below?
Yep, will unify these (and spell "possibly" correctly :) )
Cheers,
Jeremy
^ permalink raw reply
* [PATCH 2/6] ARM: pm: add generic CPU suspend/resume support
From: Colin Cross @ 2011-02-15 1:21 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <E1Pnvgw-0002yZ-M0@rmk-PC.arm.linux.org.uk>
On Fri, Feb 11, 2011 at 8:17 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> This adds core support for saving and restoring CPU coprocessor
> registers for suspend/resume support. ?This contains support for suspend
> with ARM920, ARM926, SA11x0, PXA25x, PXA27x, PXA3xx, V6 and V7 CPUs.
I would like to use cpu_suspend in a case where the L2 is still
enabled. When cpu_resume is called, the MMU and cache bits in SCTLR
are disabled, so the reads skip the L2 cache, and the data that was
saved (sleep_save_sp and *sleep_save_sp) is not read back.
Is it possible to call the outer_cache functions from cpu_suspend to
flush sleep_save_sp and the saved data?
^ permalink raw reply
* [PATCH RESEND v6 2/4] TI816X: Update common OMAP machine specific sources
From: Pedanekar, Hemant @ 2011-02-15 1:09 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <87tyg6xkm0.fsf@ti.com>
Hilman, Kevin wrote on Tuesday, February 15, 2011 4:58 AM:
> Hemant Pedanekar <hemantp@ti.com> writes:
>
> [...]
>
>> @@ -402,7 +422,7 @@ void __init
> omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
>>
>> omap_hwmod_late_init();
>>
>> - if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
>> + if (omap3_has_sdrc()) {
>> omap2_sdrc_init(sdrc_cs0, sdrc_cs1);
>> _omap2_init_reprogram_sdrc();
>> }
>
> At first glance, this one doesn't look quite right. Will
> omap3_has_sdrc() be true on 24xx? Please confirm.
>
> Kevin
You are right, this is incorrect as there is no 'features' set for
omap24xx. I will send new version with cpu_is_omap24xx() check retained.
Thanks.
Hemant
^ permalink raw reply
* [PATCH 0/11] ARM: EXYNOS4: Change ARCH name, ARCH_EXYNOS4 from ARCH_S5PV310
From: Kyungmin Park @ 2011-02-15 0:18 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <002d01cbcca2$5900e430$0b02ac90$@com>
On Tue, Feb 15, 2011 at 8:53 AM, Sangbeom Kim <sbkim73@samsung.com> wrote:
> Hi,
> I answer your questions in detail.
>
>> On Monday, February 14, 2011 8:16 PM, Kyungmin Park wrote:
>>
>> Hi,
>>
>> Wow, fast move, but need to more explanation.
>> what's the exact meaning of exynos4210?
>> Exynos4 is prefix and remaining are variants?
>
> Exynos4210 means below.
>
> 1st digit means ARM core version. In this case, 4 means Cortex A9.
> (If we release cortex A15, it will be Exynos5xxx)
> 2nd digit means number of core. ?2 mean dual core.
> 3rd digit means application category(LSI internal category).
> 4th digit means design rule (generation or shrink version)
Nice, I want these rules.
>
>> Now you changed all s5pv310 to exynos4. if new exynos4xxx chip are
>> comes then how to handle this one?
>> e.g., exynos4220 or later.
>> it's also conflict with mach-exynos4. do you handle all exynos4 series
>> at this mach directory?
>> historically there's no rules of the base RAM address at least samsung
>> chips.
>
> Yes, we will handle all exynos4 series at mach-exynos4 directory.
> In the past, there is no rule.
> But now, we are making consistent rules with AP design team.
> So, new version of exynos4 series will have same base RAM address.
Okay, no problem with base ram address,
Another one is how do you handle the GPIOs?
Now it's also changed as EXYNOS4_GPXX, I think it's difficult to use
the same banks as exynos4210 has if new chips are introduced.
maybe IRQ also has similar issue.
Now these patches assumes all exynos4 has same gpios, irqs and so on.
How do you think about it?
Thank you,
Kyungmin Park
>
> Thanks and regards,
> Sangbeom Kim
>
>>
>> Thank you,
>> Kyungmin Park
>>
>> On Mon, Feb 14, 2011 at 5:22 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>> > This patch set changes to ARCH_EXYNOS4 from ARCH_S5PV310 for supporting
>> Samsung's
>> > new brand name EXYNOS. Samsung officially announced about the brand name
>> of EXYNOS
>> > at MWC 2011 and The EXYNOS4 integrates a ARM Cortex A9 microporcessor
>> with several
>> > other peripherals to support features such as multimedai, storage,
>> graphics and gaming.
>> > Especially, the EXYNOS4210 CPU which is one of EXYNOS4 SoC series can be
>> used in
>> > products such as Mobile devices.
>> >
>> > This patch set consists of the following patches.
>> >
>> > [PATCH 01/11] ARM: EXYNOS4: Add EXYNOS4 CPU initialization support
>> > [PATCH 02/11] ARM: EXYNOS4: Update Clock part
>> > [PATCH 03/11] ARM: EXYNOS4: Update IRQ part
>> > [PATCH 04/11] ARM: EXYNOS4: Update Timer part
>> > [PATCH 05/11] ARM: EXYNOS4: Update device support
>> > [PATCH 06/11] ARM: EXYNOS4: Moved board support files
>> > [PATCH 07/11] ARM: EXYNOS4: Update Kconfig and Makefile for the new
>> ARCH_EXYNOS4
>> > [PATCH 08/11] ARM: exynos4_defconfig: Add defconfig for EXYNOS4
>> > [PATCH 09/11] mtd: OneNAND: Change dependency of ARCH_EXYNOS4
>> > [PATCH 10/11] ASoC: Change dependency of ARCH_EXYNOS4
>> > [PATCH 11/11] tty: Change dependency of ARCH_EXYNOS4
>> >
>> > _______________________________________________
>> > linux-arm-kernel mailing list
>> > linux-arm-kernel at lists.infradead.org
>> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>> >
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-
>> soc" in
>> the body of a message to majordomo at vger.kernel.org
>> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply
* [PATCH v2 2/2] msm: Use explicit GPLv2 licenses
From: David Brown @ 2011-02-15 0:15 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1297208593-16368-2-git-send-email-davidb@codeaurora.org>
Replace a BSD-style license in Code Aurora Forum authored files with
an explicit GPLv2.
Signed-off-by: David Brown <davidb@codeaurora.org>
---
v2: Remove FSF address block
arch/arm/mach-msm/clock-7x30.h | 31 ++++++---------------------
arch/arm/mach-msm/clock-pcom.h | 31 ++++++---------------------
arch/arm/mach-msm/include/mach/clk.h | 31 ++++++---------------------
arch/arm/mach-msm/include/mach/irqs-7x30.h | 31 ++++++---------------------
arch/arm/mach-msm/include/mach/irqs-8960.h | 30 ++++++--------------------
arch/arm/mach-msm/include/mach/irqs-8x50.h | 31 ++++++---------------------
arch/arm/mach-msm/include/mach/sirc.h | 31 ++++++---------------------
arch/arm/mach-msm/include/mach/smp.h | 30 ++++++--------------------
arch/arm/mach-msm/scm-boot.h | 30 ++++++--------------------
arch/arm/mach-msm/scm.h | 30 ++++++--------------------
10 files changed, 70 insertions(+), 236 deletions(-)
diff --git a/arch/arm/mach-msm/clock-7x30.h b/arch/arm/mach-msm/clock-7x30.h
index e16f72f..da8e1c6 100644
--- a/arch/arm/mach-msm/clock-7x30.h
+++ b/arch/arm/mach-msm/clock-7x30.h
@@ -1,30 +1,13 @@
/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef __ARCH_ARM_MACH_MSM_CLOCK_7X30_H
diff --git a/arch/arm/mach-msm/clock-pcom.h b/arch/arm/mach-msm/clock-pcom.h
index 2c813f1..53dea61 100644
--- a/arch/arm/mach-msm/clock-pcom.h
+++ b/arch/arm/mach-msm/clock-pcom.h
@@ -1,30 +1,13 @@
/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef __ARCH_ARM_MACH_MSM_CLOCK_PCOM_H
diff --git a/arch/arm/mach-msm/include/mach/clk.h b/arch/arm/mach-msm/include/mach/clk.h
index c05ca40..e8d3842 100644
--- a/arch/arm/mach-msm/include/mach/clk.h
+++ b/arch/arm/mach-msm/include/mach/clk.h
@@ -1,30 +1,13 @@
/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef __MACH_CLK_H
#define __MACH_CLK_H
diff --git a/arch/arm/mach-msm/include/mach/irqs-7x30.h b/arch/arm/mach-msm/include/mach/irqs-7x30.h
index 67c5396..1f15902 100644
--- a/arch/arm/mach-msm/include/mach/irqs-7x30.h
+++ b/arch/arm/mach-msm/include/mach/irqs-7x30.h
@@ -1,30 +1,13 @@
/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef __ASM_ARCH_MSM_IRQS_7X30_H
diff --git a/arch/arm/mach-msm/include/mach/irqs-8960.h b/arch/arm/mach-msm/include/mach/irqs-8960.h
index c7f083c..81ab2a6 100644
--- a/arch/arm/mach-msm/include/mach/irqs-8960.h
+++ b/arch/arm/mach-msm/include/mach/irqs-8960.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2011 Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef __ASM_ARCH_MSM_IRQS_8960_H
diff --git a/arch/arm/mach-msm/include/mach/irqs-8x50.h b/arch/arm/mach-msm/include/mach/irqs-8x50.h
index de3d8fe..26adbe0 100644
--- a/arch/arm/mach-msm/include/mach/irqs-8x50.h
+++ b/arch/arm/mach-msm/include/mach/irqs-8x50.h
@@ -1,30 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef __ASM_ARCH_MSM_IRQS_8XXX_H
diff --git a/arch/arm/mach-msm/include/mach/sirc.h b/arch/arm/mach-msm/include/mach/sirc.h
index 7281337..ef55868 100644
--- a/arch/arm/mach-msm/include/mach/sirc.h
+++ b/arch/arm/mach-msm/include/mach/sirc.h
@@ -1,30 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef __ASM_ARCH_MSM_SIRC_H
diff --git a/arch/arm/mach-msm/include/mach/smp.h b/arch/arm/mach-msm/include/mach/smp.h
index a95f7b9..3c01000 100644
--- a/arch/arm/mach-msm/include/mach/smp.h
+++ b/arch/arm/mach-msm/include/mach/smp.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef __ASM_ARCH_MSM_SMP_H
diff --git a/arch/arm/mach-msm/scm-boot.h b/arch/arm/mach-msm/scm-boot.h
index 68f9b61..7be32ff 100644
--- a/arch/arm/mach-msm/scm-boot.h
+++ b/arch/arm/mach-msm/scm-boot.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
*
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*/
#ifndef __MACH_SCM_BOOT_H
#define __MACH_SCM_BOOT_H
diff --git a/arch/arm/mach-msm/scm.h b/arch/arm/mach-msm/scm.h
index 261786b..00b31ea 100644
--- a/arch/arm/mach-msm/scm.h
+++ b/arch/arm/mach-msm/scm.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
*
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 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.
*/
#ifndef __MACH_SCM_H
#define __MACH_SCM_H
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related
* [PATCH v2 1/2] staging: msm: Use explicit GPLv2 licenses
From: David Brown @ 2011-02-15 0:15 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1297208593-16368-1-git-send-email-davidb@codeaurora.org>
Replace a BSD-style license in Code Aurora Forum authored files with
an explicit GPLv2.
Signed-off-by: David Brown <davidb@codeaurora.org>
---
v2: Remove FSF address block
drivers/staging/msm/mddi_toshiba.h | 30 +++++++-----------------------
drivers/staging/msm/mddihost.h | 30 +++++++-----------------------
drivers/staging/msm/mddihosti.h | 30 +++++++-----------------------
drivers/staging/msm/mdp.h | 30 +++++++-----------------------
drivers/staging/msm/mdp4.h | 30 +++++++-----------------------
drivers/staging/msm/mdp_ppp_dq.h | 31 +++++++------------------------
drivers/staging/msm/msm_fb.h | 30 +++++++-----------------------
drivers/staging/msm/msm_fb_def.h | 30 +++++++-----------------------
drivers/staging/msm/msm_fb_panel.h | 30 +++++++-----------------------
drivers/staging/msm/tvenc.h | 30 +++++++-----------------------
10 files changed, 70 insertions(+), 231 deletions(-)
diff --git a/drivers/staging/msm/mddi_toshiba.h b/drivers/staging/msm/mddi_toshiba.h
index 2d22b9a..cbeea0a 100644
--- a/drivers/staging/msm/mddi_toshiba.h
+++ b/drivers/staging/msm/mddi_toshiba.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MDDI_TOSHIBA_H
diff --git a/drivers/staging/msm/mddihost.h b/drivers/staging/msm/mddihost.h
index c46f24a..8f532d0 100644
--- a/drivers/staging/msm/mddihost.h
+++ b/drivers/staging/msm/mddihost.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MDDIHOST_H
diff --git a/drivers/staging/msm/mddihosti.h b/drivers/staging/msm/mddihosti.h
index 7b26a42..79eb399 100644
--- a/drivers/staging/msm/mddihosti.h
+++ b/drivers/staging/msm/mddihosti.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MDDIHOSTI_H
diff --git a/drivers/staging/msm/mdp.h b/drivers/staging/msm/mdp.h
index 0a5d6ac..44b1147 100644
--- a/drivers/staging/msm/mdp.h
+++ b/drivers/staging/msm/mdp.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MDP_H
diff --git a/drivers/staging/msm/mdp4.h b/drivers/staging/msm/mdp4.h
index 26ec8f1..96997d9 100644
--- a/drivers/staging/msm/mdp4.h
+++ b/drivers/staging/msm/mdp4.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MDP4_H
diff --git a/drivers/staging/msm/mdp_ppp_dq.h b/drivers/staging/msm/mdp_ppp_dq.h
index 03e4e9a..759abc2 100644
--- a/drivers/staging/msm/mdp_ppp_dq.h
+++ b/drivers/staging/msm/mdp_ppp_dq.h
@@ -1,30 +1,13 @@
/* Copyright (c) 2009-2010, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MDP_PPP_DQ_H
diff --git a/drivers/staging/msm/msm_fb.h b/drivers/staging/msm/msm_fb.h
index f939138..4bca6d2 100644
--- a/drivers/staging/msm/msm_fb.h
+++ b/drivers/staging/msm/msm_fb.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MSM_FB_H
diff --git a/drivers/staging/msm/msm_fb_def.h b/drivers/staging/msm/msm_fb_def.h
index c5f9e9e..bc7f256 100644
--- a/drivers/staging/msm/msm_fb_def.h
+++ b/drivers/staging/msm/msm_fb_def.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MSM_FB_DEF_H
diff --git a/drivers/staging/msm/msm_fb_panel.h b/drivers/staging/msm/msm_fb_panel.h
index ab45831..6375976 100644
--- a/drivers/staging/msm/msm_fb_panel.h
+++ b/drivers/staging/msm/msm_fb_panel.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef MSM_FB_PANEL_H
diff --git a/drivers/staging/msm/tvenc.h b/drivers/staging/msm/tvenc.h
index a682dbe..6bb375d 100644
--- a/drivers/staging/msm/tvenc.h
+++ b/drivers/staging/msm/tvenc.h
@@ -1,29 +1,13 @@
/* Copyright (c) 2008-2009, Code Aurora Forum. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Code Aurora nor
- * the names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only 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.
*/
#ifndef TVENC_H
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
^ permalink raw reply related
* [PATCH] omap3: pm: Use exported set_cr() instead of a custom one.
From: Kevin Hilman @ 2011-02-15 0:08 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1297437132-1005-1-git-send-email-santosh.shilimkar@ti.com>
Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
> Remove the custom restore_control_register() and use the exported
> set_cr() instead to set the system control register(SCTRL) value.
>
> No functional change.
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Kevin Hilman <khilman@ti.com>
Tested/validated on ?
Kevin
> ---
> arch/arm/mach-omap2/pm34xx.c | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
> index 2f864e4..63a3e1d 100644
> --- a/arch/arm/mach-omap2/pm34xx.c
> +++ b/arch/arm/mach-omap2/pm34xx.c
> @@ -311,11 +311,6 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id)
> return IRQ_HANDLED;
> }
>
> -static void restore_control_register(u32 val)
> -{
> - __asm__ __volatile__ ("mcr p15, 0, %0, c1, c0, 0" : : "r" (val));
> -}
> -
> /* Function to restore the table entry that was modified for enabling MMU */
> static void restore_table_entry(void)
> {
> @@ -337,7 +332,7 @@ static void restore_table_entry(void)
> control_reg_value = __raw_readl(scratchpad_address
> + OMAP343X_CONTROL_REG_VALUE_OFFSET);
> /* This will enable caches and prediction */
> - restore_control_register(control_reg_value);
> + set_cr(control_reg_value);
> }
>
> void omap_sram_idle(void)
^ permalink raw reply
* [PATCH 0/11] ARM: EXYNOS4: Change ARCH name, ARCH_EXYNOS4 from ARCH_S5PV310
From: Sangbeom Kim @ 2011-02-14 23:53 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <AANLkTim49dpC_r4BcK7tqo9wmu8W=qMDZE5szDUja6Wo@mail.gmail.com>
Hi,
I answer your questions in detail.
> On Monday, February 14, 2011 8:16 PM, Kyungmin Park wrote:
>
> Hi,
>
> Wow, fast move, but need to more explanation.
> what's the exact meaning of exynos4210?
> Exynos4 is prefix and remaining are variants?
Exynos4210 means below.
1st digit means ARM core version. In this case, 4 means Cortex A9.
(If we release cortex A15, it will be Exynos5xxx)
2nd digit means number of core. 2 mean dual core.
3rd digit means application category(LSI internal category).
4th digit means design rule (generation or shrink version)
> Now you changed all s5pv310 to exynos4. if new exynos4xxx chip are
> comes then how to handle this one?
> e.g., exynos4220 or later.
> it's also conflict with mach-exynos4. do you handle all exynos4 series
> at this mach directory?
> historically there's no rules of the base RAM address at least samsung
> chips.
Yes, we will handle all exynos4 series at mach-exynos4 directory.
In the past, there is no rule.
But now, we are making consistent rules with AP design team.
So, new version of exynos4 series will have same base RAM address.
Thanks and regards,
Sangbeom Kim
>
> Thank you,
> Kyungmin Park
>
> On Mon, Feb 14, 2011 at 5:22 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > This patch set changes to ARCH_EXYNOS4 from ARCH_S5PV310 for supporting
> Samsung's
> > new brand name EXYNOS. Samsung officially announced about the brand name
> of EXYNOS
> > at MWC 2011 and The EXYNOS4 integrates a ARM Cortex A9 microporcessor
> with several
> > other peripherals to support features such as multimedai, storage,
> graphics and gaming.
> > Especially, the EXYNOS4210 CPU which is one of EXYNOS4 SoC series can be
> used in
> > products such as Mobile devices.
> >
> > This patch set consists of the following patches.
> >
> > [PATCH 01/11] ARM: EXYNOS4: Add EXYNOS4 CPU initialization support
> > [PATCH 02/11] ARM: EXYNOS4: Update Clock part
> > [PATCH 03/11] ARM: EXYNOS4: Update IRQ part
> > [PATCH 04/11] ARM: EXYNOS4: Update Timer part
> > [PATCH 05/11] ARM: EXYNOS4: Update device support
> > [PATCH 06/11] ARM: EXYNOS4: Moved board support files
> > [PATCH 07/11] ARM: EXYNOS4: Update Kconfig and Makefile for the new
> ARCH_EXYNOS4
> > [PATCH 08/11] ARM: exynos4_defconfig: Add defconfig for EXYNOS4
> > [PATCH 09/11] mtd: OneNAND: Change dependency of ARCH_EXYNOS4
> > [PATCH 10/11] ASoC: Change dependency of ARCH_EXYNOS4
> > [PATCH 11/11] tty: Change dependency of ARCH_EXYNOS4
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-
> soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* [PATCH] omap: Move omap2_check_revision and omap_sram_init out of map_io
From: Tony Lindgren @ 2011-02-14 23:52 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20110214234520.GT20795@atomide.com>
With the early init changes we just want to map IO in map_io.
Both omap2_check_revision and omap_sram_init can be moved to
happen later in omap2_init_common_infrastructure.
Note that now we can now remove _omap2_map_common_io and remove
the extra flushes too as devicemaps_init will take care of it.
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
This is on top of the other early init related patches:
omap: hwmod: Populate _mpu_rt_va later on in omap_hwmod_late_init
omap2+: Fix omap_serial_early_init to work with init_early hook
omap2+: Make omap_hwmod_late_init into core_initcall
ARM: OMAP2: use early init hook
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -228,25 +228,11 @@ static struct map_desc omap44xx_io_desc[] __initdata = {
};
#endif
-static void __init _omap2_map_common_io(void)
-{
- /* Normally devicemaps_init() would flush caches and tlb after
- * mdesc->map_io(), but we must also do it here because of the CPU
- * revision check below.
- */
- local_flush_tlb_all();
- flush_cache_all();
-
- omap2_check_revision();
- omap_sram_init();
-}
-
#ifdef CONFIG_ARCH_OMAP2420
void __init omap242x_map_common_io(void)
{
iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
iotable_init(omap242x_io_desc, ARRAY_SIZE(omap242x_io_desc));
- _omap2_map_common_io();
}
#endif
@@ -255,7 +241,6 @@ void __init omap243x_map_common_io(void)
{
iotable_init(omap24xx_io_desc, ARRAY_SIZE(omap24xx_io_desc));
iotable_init(omap243x_io_desc, ARRAY_SIZE(omap243x_io_desc));
- _omap2_map_common_io();
}
#endif
@@ -263,7 +248,6 @@ void __init omap243x_map_common_io(void)
void __init omap34xx_map_common_io(void)
{
iotable_init(omap34xx_io_desc, ARRAY_SIZE(omap34xx_io_desc));
- _omap2_map_common_io();
}
#endif
@@ -271,7 +255,6 @@ void __init omap34xx_map_common_io(void)
void __init omap44xx_map_common_io(void)
{
iotable_init(omap44xx_io_desc, ARRAY_SIZE(omap44xx_io_desc));
- _omap2_map_common_io();
}
#endif
@@ -335,6 +318,9 @@ void __init omap2_init_common_infrastructure(void)
{
u8 postsetup_state;
+ omap2_check_revision();
+ omap_sram_init();
+
if (cpu_is_omap242x()) {
omap2xxx_powerdomains_init();
omap2_clockdomains_init();
^ permalink raw reply
* [PATCH] ARM: OMAP2: use early init hook
From: Tony Lindgren @ 2011-02-14 23:45 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <20110124201731.GC13589@atomide.com>
* Tony Lindgren <tony@atomide.com> [110124 12:16]:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [110123 09:47]:
> > On Sun, Jan 23, 2011 at 05:13:44PM +0000, Russell King - ARM Linux wrote:
> > > Move non-mapping and non-irq initialization code out of .map_io and
> > > .init_irq respectively into the new init_early hook.
> > >
> > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
> > > ---
> > > I think I've updated this patch correctly for the new platforms merged
> > > into mainline.
> >
> > Grr, this breaks on OMAP because some of this stuff wants to do ioremap()
> > and therefore wants the kmem allocators initialized. That's rather
> > annoying...
>
> So far tested on zoom3 only, but the following gets it booting
> on top of your patch.
>
> Want to take this one into your series?
Russell, I'll queue your patch for the upcoming merge window into
devel-early-init branch along with my changes.
Will also post one more clean-up patch.
Regards,
Tony
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox