mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/3] i.MX51: Use register names for imx_gpio_base
@ 2012-04-03 17:16 Alexander Shiyan
  2012-04-03 17:16 ` [PATCH 2/3] i.MX51: Removed 1000 MHz pll definition Alexander Shiyan
  2012-04-03 17:16 ` [PATCH 3/3] i.MX5x: Unused pll definitions removed Alexander Shiyan
  0 siblings, 2 replies; 4+ messages in thread
From: Alexander Shiyan @ 2012-04-03 17:16 UTC (permalink / raw)
  To: barebox


Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-imx/imx51.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c
index 40f4b1e..43cd45d 100644
--- a/arch/arm/mach-imx/imx51.c
+++ b/arch/arm/mach-imx/imx51.c
@@ -27,10 +27,10 @@
 #include "gpio.h"
 
 void *imx_gpio_base[] = {
-	(void *)0x73f84000,
-	(void *)0x73f88000,
-	(void *)0x73f8c000,
-	(void *)0x73f90000,
+	(void *)MX51_GPIO1_BASE_ADDR,
+	(void *)MX51_GPIO2_BASE_ADDR,
+	(void *)MX51_GPIO3_BASE_ADDR,
+	(void *)MX51_GPIO4_BASE_ADDR,
 };
 
 int imx_gpio_count = ARRAY_SIZE(imx_gpio_base) * 32;
-- 
1.7.3.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH 2/3] i.MX51: Removed 1000 MHz pll definition
  2012-04-03 17:16 [PATCH 1/3] i.MX51: Use register names for imx_gpio_base Alexander Shiyan
@ 2012-04-03 17:16 ` Alexander Shiyan
  2012-04-04  8:58   ` Sascha Hauer
  2012-04-03 17:16 ` [PATCH 3/3] i.MX5x: Unused pll definitions removed Alexander Shiyan
  1 sibling, 1 reply; 4+ messages in thread
From: Alexander Shiyan @ 2012-04-03 17:16 UTC (permalink / raw)
  To: barebox

i.MX51 operates at speeds up to 800 MHz.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-imx/imx51.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c
index 43cd45d..fb89199 100644
--- a/arch/arm/mach-imx/imx51.c
+++ b/arch/arm/mach-imx/imx51.c
@@ -179,13 +179,12 @@ static int imx51_boot_save_loc(void)
 
 coredevice_initcall(imx51_boot_save_loc);
 
-#define setup_pll_1000(base)	imx5_setup_pll((base), 1000, ((10 << 4) + ((1 - 1) << 0)), (12 - 1),  5)
-#define setup_pll_800(base)	imx5_setup_pll((base), 800,  (( 8 << 4) + ((1 - 1) << 0)), ( 3 - 1),  1)
-#define setup_pll_665(base)	imx5_setup_pll((base), 665,  (( 6 << 4) + ((1 - 1) << 0)), (96 - 1), 89)
-#define setup_pll_600(base)	imx5_setup_pll((base), 600,  (( 6 << 4) + ((1 - 1) << 0)), ( 4 - 1),  1)
-#define setup_pll_400(base)	imx5_setup_pll((base), 400,  (( 8 << 4) + ((2 - 1) << 0)), ( 3 - 1),  1)
-#define setup_pll_455(base)	imx5_setup_pll((base), 455,  (( 9 << 4) + ((2 - 1) << 0)), (48 - 1), 23)
-#define setup_pll_216(base)	imx5_setup_pll((base), 216,  (( 6 << 4) + ((3 - 1) << 0)), ( 4 - 1),  3)
+#define setup_pll_800(base)	imx5_setup_pll((base), 800, (( 8 << 4) + ((1 - 1) << 0)), ( 3 - 1),  1)
+#define setup_pll_665(base)	imx5_setup_pll((base), 665, (( 6 << 4) + ((1 - 1) << 0)), (96 - 1), 89)
+#define setup_pll_600(base)	imx5_setup_pll((base), 600, (( 6 << 4) + ((1 - 1) << 0)), ( 4 - 1),  1)
+#define setup_pll_400(base)	imx5_setup_pll((base), 400, (( 8 << 4) + ((2 - 1) << 0)), ( 3 - 1),  1)
+#define setup_pll_455(base)	imx5_setup_pll((base), 455, (( 9 << 4) + ((2 - 1) << 0)), (48 - 1), 23)
+#define setup_pll_216(base)	imx5_setup_pll((base), 216, (( 6 << 4) + ((3 - 1) << 0)), ( 4 - 1),  3)
 
 void imx51_init_lowlevel(void)
 {
-- 
1.7.3.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH 3/3] i.MX5x: Unused pll definitions removed
  2012-04-03 17:16 [PATCH 1/3] i.MX51: Use register names for imx_gpio_base Alexander Shiyan
  2012-04-03 17:16 ` [PATCH 2/3] i.MX51: Removed 1000 MHz pll definition Alexander Shiyan
@ 2012-04-03 17:16 ` Alexander Shiyan
  1 sibling, 0 replies; 4+ messages in thread
From: Alexander Shiyan @ 2012-04-03 17:16 UTC (permalink / raw)
  To: barebox


Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 arch/arm/mach-imx/include/mach/clock-imx51_53.h |   39 -----------------------
 1 files changed, 0 insertions(+), 39 deletions(-)

diff --git a/arch/arm/mach-imx/include/mach/clock-imx51_53.h b/arch/arm/mach-imx/include/mach/clock-imx51_53.h
index 2525ccd..6004a6d 100644
--- a/arch/arm/mach-imx/include/mach/clock-imx51_53.h
+++ b/arch/arm/mach-imx/include/mach/clock-imx51_53.h
@@ -584,45 +584,6 @@
 #define MX5_SRPGC_EMI_PUPSCR	(MX5_SRPGC_EMI_BASE + 0x4)
 #define MX5_SRPGC_EMI_PDNSCR	(MX5_SRPGC_EMI_BASE + 0x8)
 
-
-/* Assuming 24MHz input clock with doubler ON */
-/*                            MFI         PDF */
-#define MX5_PLL_DP_OP_1000	((10 << 4) + ((1 - 1)  << 0))
-#define MX5_PLL_DP_MFD_1000	(12 - 1)
-#define MX5_PLL_DP_MFN_1000	5
-
-#define MX5_PLL_DP_OP_850	((8 << 4) + ((1 - 1)  << 0))
-#define MX5_PLL_DP_MFD_850	(48 - 1)
-#define MX5_PLL_DP_MFN_850	41
-
-#define MX5_PLL_DP_OP_800	((8 << 4) + ((1 - 1)  << 0))
-#define MX5_PLL_DP_MFD_800	(3 - 1)
-#define MX5_PLL_DP_MFN_800	1
-
-#define MX5_PLL_DP_OP_700	((7 << 4) + ((1 - 1)  << 0))
-#define MX5_PLL_DP_MFD_700	(24 - 1)
-#define MX5_PLL_DP_MFN_700	7
-
-#define MX5_PLL_DP_OP_665	((6 << 4) + ((1 - 1)  << 0))
-#define MX5_PLL_DP_MFD_665	(96 - 1)
-#define MX5_PLL_DP_MFN_665	89
-
-#define MX5_PLL_DP_OP_600	((6 << 4) + ((1 - 1)  << 0))
-#define MX5_PLL_DP_MFD_600	(4 - 1)
-#define MX5_PLL_DP_MFN_600	1
-
-#define MX5_PLL_DP_OP_532	((5 << 4) + ((1 - 1)  << 0))
-#define MX5_PLL_DP_MFD_532	(24 - 1)
-#define MX5_PLL_DP_MFN_532	13
-
-#define MX5_PLL_DP_OP_400	((8 << 4) + ((2 - 1)  << 0))
-#define MX5_PLL_DP_MFD_400	(3 - 1)
-#define MX5_PLL_DP_MFN_400	1
-
-#define MX5_PLL_DP_OP_216	((6 << 4) + ((3 - 1)  << 0))
-#define MX5_PLL_DP_MFD_216	(4 - 1)
-#define MX5_PLL_DP_MFN_216	3
-
 #endif				/* __ARCH_ARM_MACH_MX51_CRM_REGS_H__ */
 
 
-- 
1.7.3.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH 2/3] i.MX51: Removed 1000 MHz pll definition
  2012-04-03 17:16 ` [PATCH 2/3] i.MX51: Removed 1000 MHz pll definition Alexander Shiyan
@ 2012-04-04  8:58   ` Sascha Hauer
  0 siblings, 0 replies; 4+ messages in thread
From: Sascha Hauer @ 2012-04-04  8:58 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: barebox

Hi Alexander,

Applied the whole series, thanks.

On Tue, Apr 03, 2012 at 09:16:23PM +0400, Alexander Shiyan wrote:
> i.MX51 operates at speeds up to 800 MHz.
> 
> Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
> ---
>  arch/arm/mach-imx/imx51.c |   13 ++++++-------
>  1 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c
> index 43cd45d..fb89199 100644
> --- a/arch/arm/mach-imx/imx51.c
> +++ b/arch/arm/mach-imx/imx51.c
> @@ -179,13 +179,12 @@ static int imx51_boot_save_loc(void)
>  
>  coredevice_initcall(imx51_boot_save_loc);
>  
> -#define setup_pll_1000(base)	imx5_setup_pll((base), 1000, ((10 << 4) + ((1 - 1) << 0)), (12 - 1),  5)
> -#define setup_pll_800(base)	imx5_setup_pll((base), 800,  (( 8 << 4) + ((1 - 1) << 0)), ( 3 - 1),  1)
> -#define setup_pll_665(base)	imx5_setup_pll((base), 665,  (( 6 << 4) + ((1 - 1) << 0)), (96 - 1), 89)
> -#define setup_pll_600(base)	imx5_setup_pll((base), 600,  (( 6 << 4) + ((1 - 1) << 0)), ( 4 - 1),  1)
> -#define setup_pll_400(base)	imx5_setup_pll((base), 400,  (( 8 << 4) + ((2 - 1) << 0)), ( 3 - 1),  1)
> -#define setup_pll_455(base)	imx5_setup_pll((base), 455,  (( 9 << 4) + ((2 - 1) << 0)), (48 - 1), 23)
> -#define setup_pll_216(base)	imx5_setup_pll((base), 216,  (( 6 << 4) + ((3 - 1) << 0)), ( 4 - 1),  3)
> +#define setup_pll_800(base)	imx5_setup_pll((base), 800, (( 8 << 4) + ((1 - 1) << 0)), ( 3 - 1),  1)
> +#define setup_pll_665(base)	imx5_setup_pll((base), 665, (( 6 << 4) + ((1 - 1) << 0)), (96 - 1), 89)
> +#define setup_pll_600(base)	imx5_setup_pll((base), 600, (( 6 << 4) + ((1 - 1) << 0)), ( 4 - 1),  1)
> +#define setup_pll_400(base)	imx5_setup_pll((base), 400, (( 8 << 4) + ((2 - 1) << 0)), ( 3 - 1),  1)
> +#define setup_pll_455(base)	imx5_setup_pll((base), 455, (( 9 << 4) + ((2 - 1) << 0)), (48 - 1), 23)
> +#define setup_pll_216(base)	imx5_setup_pll((base), 216, (( 6 << 4) + ((3 - 1) << 0)), ( 4 - 1),  3)

You shouldn't change the indention of the unaffected pll settings here.
The indention you chose is correct, but it's better when people using
'git blame' are seeing the commit that introduced (or really changed)
these lines.
I changed this while committing your patch.

Sascha


-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-04-04  8:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-03 17:16 [PATCH 1/3] i.MX51: Use register names for imx_gpio_base Alexander Shiyan
2012-04-03 17:16 ` [PATCH 2/3] i.MX51: Removed 1000 MHz pll definition Alexander Shiyan
2012-04-04  8:58   ` Sascha Hauer
2012-04-03 17:16 ` [PATCH 3/3] i.MX5x: Unused pll definitions removed Alexander Shiyan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox