It seems that some errors where made when affecting some functionalies to SoCs.
Please review this quickly as I do want to send these fixes for next merge
window with will open soon.
Best regards,
Nicolas Ferre (3):
ARM: at91/PMC: sama5d3 family doesn't have a PLLB
ARM: at91/PMC: at91sam9n12 family have a PLLB
ARM: at91/PMC: at91sam9n12 family has USB HS feature
arch/arm/mach-at91/clock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
1.8.2.2
Signed-off-by: Nicolas Ferre <[email protected]>
---
arch/arm/mach-at91/clock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index da84188..085a79d 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -75,7 +75,8 @@ EXPORT_SYMBOL_GPL(at91_pmc_base);
#define cpu_has_pllb() (!(cpu_is_at91sam9rl() \
|| cpu_is_at91sam9g45() \
|| cpu_is_at91sam9x5() \
- || cpu_is_at91sam9n12()))
+ || cpu_is_at91sam9n12() \
+ || cpu_is_sama5d3()))
#define cpu_has_upll() (cpu_is_at91sam9g45() \
|| cpu_is_at91sam9x5() \
--
1.8.2.2
Signed-off-by: Nicolas Ferre <[email protected]>
---
arch/arm/mach-at91/clock.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 085a79d..978de42 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -75,7 +75,6 @@ EXPORT_SYMBOL_GPL(at91_pmc_base);
#define cpu_has_pllb() (!(cpu_is_at91sam9rl() \
|| cpu_is_at91sam9g45() \
|| cpu_is_at91sam9x5() \
- || cpu_is_at91sam9n12() \
|| cpu_is_sama5d3()))
#define cpu_has_upll() (cpu_is_at91sam9g45() \
--
1.8.2.2
Signed-off-by: Nicolas Ferre <[email protected]>
---
arch/arm/mach-at91/clock.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
index 978de42..1b9bbba 100644
--- a/arch/arm/mach-at91/clock.c
+++ b/arch/arm/mach-at91/clock.c
@@ -88,6 +88,7 @@ EXPORT_SYMBOL_GPL(at91_pmc_base);
#define cpu_has_udpfs() (!(cpu_is_at91sam9rl() \
|| cpu_is_at91sam9g45() \
|| cpu_is_at91sam9x5() \
+ || cpu_is_at91sam9n12() \
|| cpu_is_sama5d3()))
#define cpu_has_plladiv2() (cpu_is_at91sam9g45() \
--
1.8.2.2
Hi Nicolas,
On 06/24/2013 05:08 PM, Nicolas Ferre wrote:
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> arch/arm/mach-at91/clock.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> index 978de42..1b9bbba 100644
> --- a/arch/arm/mach-at91/clock.c
> +++ b/arch/arm/mach-at91/clock.c
> @@ -88,6 +88,7 @@ EXPORT_SYMBOL_GPL(at91_pmc_base);
> #define cpu_has_udpfs() (!(cpu_is_at91sam9rl() \
> || cpu_is_at91sam9g45() \
> || cpu_is_at91sam9x5() \
> + || cpu_is_at91sam9n12() \
> || cpu_is_sama5d3()))
The at91sam9n12 don't have USB HS device port feature. It only has USB
FS device port feature.
> #define cpu_has_plladiv2() (cpu_is_at91sam9g45() \
>
Best Regards,
Bo Shen
On 24/06/2013 12:46, Bo Shen :
> Hi Nicolas,
>
> On 06/24/2013 05:08 PM, Nicolas Ferre wrote:
>> Signed-off-by: Nicolas Ferre <[email protected]>
>> ---
>> arch/arm/mach-at91/clock.c | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
>> index 978de42..1b9bbba 100644
>> --- a/arch/arm/mach-at91/clock.c
>> +++ b/arch/arm/mach-at91/clock.c
>> @@ -88,6 +88,7 @@ EXPORT_SYMBOL_GPL(at91_pmc_base);
>> #define cpu_has_udpfs() (!(cpu_is_at91sam9rl() \
>> || cpu_is_at91sam9g45() \
>> || cpu_is_at91sam9x5() \
>> + || cpu_is_at91sam9n12() \
>> || cpu_is_sama5d3()))
>
> The at91sam9n12 don't have USB HS device port feature. It only has USB
> FS device port feature.
OMG! sure ;-)
So I remove this patch from my series (sorry for the noise ;-))
>
>> #define cpu_has_plladiv2() (cpu_is_at91sam9g45() \
>>
>
> Best Regards,
> Bo Shen
Thanks! bye.
--
Nicolas Ferre
On 06/24/2013 05:08 PM, Nicolas Ferre wrote:
> Signed-off-by: Nicolas Ferre <[email protected]>
Acked-by: Bo Shen <[email protected]>
> ---
> arch/arm/mach-at91/clock.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mach-at91/clock.c b/arch/arm/mach-at91/clock.c
> index 085a79d..978de42 100644
> --- a/arch/arm/mach-at91/clock.c
> +++ b/arch/arm/mach-at91/clock.c
> @@ -75,7 +75,6 @@ EXPORT_SYMBOL_GPL(at91_pmc_base);
> #define cpu_has_pllb() (!(cpu_is_at91sam9rl() \
> || cpu_is_at91sam9g45() \
> || cpu_is_at91sam9x5() \
> - || cpu_is_at91sam9n12() \
> || cpu_is_sama5d3()))
>
> #define cpu_has_upll() (cpu_is_at91sam9g45() \
>