[PATCH v2] ARM: mx31pdk: Add MC13783 RTC support

[PATCH v2] ARM: mx31pdk: Add MC13783 RTC support

[Fabio Estevam]

MX31PDK board has a MC13783 PMIC, which provides RTC functionality.

Add support for it.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:

- Rebased on top of 3.2-rc2

 arch/arm/mach-imx/mach-mx31_3ds.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index b8c54b8..00bb308 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -492,7 +492,7 @@ static struct mc13xxx_platform_data mc13783_pdata = {
 		.regulators = mx31_3ds_regulators,
 		.num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
 	},
-	.flags  = MC13XXX_USE_TOUCHSCREEN,
+	.flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,
 };
 
 /* SPI */
-- 
1.7.1

[PATCH] ARM: mx5: Fix checkpatch warnings in cpu-imx5.c

[Fabio Estevam]

Fix the following warnings reported by checkpatch:

WARNING: Use #include <linux/io.h> instead of <asm/io.h>
#19: FILE: arm/mach-imx/cpu-imx5.c:19:
+#include <asm/io.h>

WARNING: line over 80 characters
#70: FILE: arm/mach-imx/cpu-imx5.c:70:
+	if (mx51_revision() < IMX_CHIP_REVISION_3_0 && (elf_hwcap & HWCAP_NEON)) {

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---

This is based on Sascha's mx5-merge tree.

 arch/arm/mach-imx/cpu-imx5.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c
index 5c53282..8bbeb2a 100644
--- a/arch/arm/mach-imx/cpu-imx5.c
+++ b/arch/arm/mach-imx/cpu-imx5.c
@@ -16,7 +16,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <mach/hardware.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 static int mx5_cpu_rev = -1;
 
@@ -67,7 +67,8 @@ static int __init mx51_neon_fixup(void)
 	if (!cpu_is_mx51())
 		return 0;
 
-	if (mx51_revision() < IMX_CHIP_REVISION_3_0 && (elf_hwcap & HWCAP_NEON)) {
+	if (mx51_revision() < IMX_CHIP_REVISION_3_0 &&
+					(elf_hwcap & HWCAP_NEON)) {
 		elf_hwcap &= ~HWCAP_NEON;
 		pr_info("Turning off NEON support, detected broken NEON implementation\n");
 	}
-- 
1.7.1

[PATCH] ARM: mx5: Fix checkpatch warnings in cpu-imx5.c

[Joe Perches]

On Mon, 2011-11-21 at 16:26 -0200, Fabio Estevam wrote:
> WARNING: line over 80 characters

Trivia...

> #70: FILE: arm/mach-imx/cpu-imx5.c:70:
> +	if (mx51_revision() < IMX_CHIP_REVISION_3_0 && (elf_hwcap & HWCAP_NEON)) {
[]
> diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c
[]
> @@ -67,7 +67,8 @@ static int __init mx51_neon_fixup(void)
>  	if (!cpu_is_mx51())
>  		return 0;
>  
> -	if (mx51_revision() < IMX_CHIP_REVISION_3_0 && (elf_hwcap & HWCAP_NEON)) {
> +	if (mx51_revision() < IMX_CHIP_REVISION_3_0 &&
> +					(elf_hwcap & HWCAP_NEON)) {
>  		elf_hwcap &= ~HWCAP_NEON;
>  		pr_info("Turning off NEON support, detected broken NEON implementation\n");
>  	}

Perhaps more readable as:

	if (elf_hwcap & HWCAP_NEON &&
	    mx51_revision() < IMX_CIP_REVISION_3_0) {
		elf_hwcap &= ~HWCAP_NEON;
		etc...
		

[PATCH v2] ARM: mx31pdk: Add MC13783 RTC support

[Sascha Hauer]

Hi Fabio,

On Mon, Nov 21, 2011 at 04:26:51PM -0200, Fabio Estevam wrote:
> MX31PDK board has a MC13783 PMIC, which provides RTC functionality.
> 
> Add support for it.

Added both. Please base your patches on mainline. I collect them as
branches descending from mainline anyway.

Sascha

> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> 
> - Rebased on top of 3.2-rc2
> 
>  arch/arm/mach-imx/mach-mx31_3ds.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
> index b8c54b8..00bb308 100644
> --- a/arch/arm/mach-imx/mach-mx31_3ds.c
> +++ b/arch/arm/mach-imx/mach-mx31_3ds.c
> @@ -492,7 +492,7 @@ static struct mc13xxx_platform_data mc13783_pdata = {
>  		.regulators = mx31_3ds_regulators,
>  		.num_regulators = ARRAY_SIZE(mx31_3ds_regulators),
>  	},
> -	.flags  = MC13XXX_USE_TOUCHSCREEN,
> +	.flags  = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,
>  };
>  
>  /* SPI */
> -- 
> 1.7.1
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |