[PATCH] i.MX23/STM: Continue improving this architecture

[PATCH] i.MX23/STM: Continue improving this architecture

[Juergen Beisert]

Some things to improve the i.MX23 architecture and also some things to prepare
it for i.MX28 inclusion.


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

[PATCH 1/6] Remove variable size restrictions in i.MX23's gpio managing routines

[Juergen Beisert]

There is no really need for restricted variable types for the parameters.
Replace them by standard C types with the same behaviour. Only imx_gpio_mode()
need it, to ensure GPIO's bit settings.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 arch/arm/mach-stm/iomux-imx23.c |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-stm/iomux-imx23.c b/arch/arm/mach-stm/iomux-imx23.c
index b0f4046..b50aac3 100644
--- a/arch/arm/mach-stm/iomux-imx23.c
+++ b/arch/arm/mach-stm/iomux-imx23.c
@@ -31,42 +31,49 @@
 #define HW_PINCTRL_DIN0 0x600
 #define HW_PINCTRL_DOE0 0x700
 
-static uint32_t calc_mux_reg(uint32_t no)
+static unsigned calc_mux_reg(unsigned no)
 {
 	/* each register controls 16 pads */
 	return ((no >> 4) << 4) + HW_PINCTRL_MUXSEL0;
 }
 
-static uint32_t calc_strength_reg(uint32_t no)
+static unsigned calc_strength_reg(unsigned no)
 {
 	/* each register controls 8 pads */
 	return  ((no >> 3) << 4) + HW_PINCTRL_DRIVE0;
 }
 
-static uint32_t calc_pullup_reg(uint32_t no)
+static unsigned calc_pullup_reg(unsigned no)
 {
 	/* each register controls 32 pads */
 	return  ((no >> 5) << 4) + HW_PINCTRL_PULL0;
 }
 
-static uint32_t calc_output_enable_reg(uint32_t no)
+static unsigned calc_output_enable_reg(unsigned no)
 {
 	/* each register controls 32 pads */
 	return  ((no >> 5) << 4) + HW_PINCTRL_DOE0;
 }
 
-static uint32_t calc_output_reg(uint32_t no)
+static unsigned calc_output_reg(unsigned no)
 {
 	/* each register controls 32 pads */
 	return  ((no >> 5) << 4) + HW_PINCTRL_DOUT0;
 }
 
+static unsigned calc_input_reg(unsigned no)
+{
+	/* each register controls 32 pads */
+	return  ((no >> 5) << 4) + HW_PINCTRL_DIN0;
+}
+
 /**
  * @param[in] m One of the defines from iomux-mx23.h to configure *one* pin
  */
-void imx_gpio_mode(unsigned m)
+void imx_gpio_mode(uint32_t m)
 {
-	uint32_t reg_offset, gpio_pin, reg;
+	uint32_t reg;
+	unsigned gpio_pin, reg_offset;
 
 	gpio_pin = GET_GPIO_NO(m);
 
-- 
1.7.2.3


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

[PATCH 2/6] Simplify test for the max. possible GPIO number.

[Juergen Beisert]

This is only for easier integration of the i.MX28 architecture.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 arch/arm/mach-stm/iomux-imx23.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-stm/iomux-imx23.c b/arch/arm/mach-stm/iomux-imx23.c
index b50aac3..55e7798 100644
--- a/arch/arm/mach-stm/iomux-imx23.c
+++ b/arch/arm/mach-stm/iomux-imx23.c
@@ -31,6 +31,8 @@
 #define HW_PINCTRL_DIN0 0x600
 #define HW_PINCTRL_DOE0 0x700
 
+#define MAX_GPIO_NO 95
+
 static unsigned calc_mux_reg(unsigned no)
 {
 	/* each register controls 16 pads */
@@ -84,7 +86,7 @@ void imx_gpio_mode(uint32_t m)
 	writel(reg, IMX_IOMUXC_BASE + reg_offset);
 
 	/* some pins are disabled when configured for GPIO */
-	if ((gpio_pin > 95) && (GET_FUNC(m) == IS_GPIO)) {
+	if ((gpio_pin > MAX_GPIO_NO) && (GET_FUNC(m) == IS_GPIO)) {
 		printf("Cannot configure pad %d to GPIO\n", gpio_pin);
 		return;
 	}
-- 
1.7.2.3


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

[PATCH 3/6] i.MX23: Add support for the gpio commands

[Juergen Beisert]

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 arch/arm/mach-stm/iomux-imx23.c |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-stm/iomux-imx23.c b/arch/arm/mach-stm/iomux-imx23.c
index 55e7798..88e0218 100644
--- a/arch/arm/mach-stm/iomux-imx23.c
+++ b/arch/arm/mach-stm/iomux-imx23.c
@@ -20,6 +20,7 @@
 #include <common.h>
 #include <init.h>
 #include <gpio.h>
+#include <errno.h>
 #include <asm/io.h>
 #include <mach/imx-regs.h>
 
@@ -124,3 +125,40 @@ void imx_gpio_mode(uint32_t m)
 		}
 	}
 }
+
+void gpio_set_value(unsigned gpio, int val)
+{
+	unsigned reg_offset;
+
+	reg_offset = calc_output_reg(gpio);
+	pr_debug("%u: Accessing %X+%X with value %X\n", gpio, IMX_IOMUXC_BASE,
+		reg_offset, 0x1 << (gpio % 32));
+	writel(0x1 << (gpio % 32),
+		IMX_IOMUXC_BASE + reg_offset + (val != 0 ? 4 : 8));
+}
+
+int gpio_direction_input(unsigned gpio)
+{
+	pr_err("Not yet supported\n");
+	return -EINVAL;
+}
+
+int gpio_direction_output(unsigned gpio, int val)
+{
+	pr_err("Not yet supported\n");
+	return -EINVAL;
+}
+
+int gpio_get_value(unsigned gpio)
+{
+	uint32_t reg;
+	unsigned reg_offset;
+
+	reg_offset = calc_input_reg(gpio);
+	reg = readl(IMX_IOMUXC_BASE + reg_offset);
+	pr_debug("%u: Accessing %X+%X with value %X->%X\n", gpio, IMX_IOMUXC_BASE,
+		reg_offset, 0x1 << (gpio % 32), reg & (0x1 << (gpio % 32)));
+	if (reg & (0x1 << (gpio % 32)))
+		return 1;
+	return 0;
+}
-- 
1.7.2.3


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

[PATCH 4/6] i.MX23: Add pixel clock calculation routine for framebuffer support

[Juergen Beisert]

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 arch/arm/mach-stm/include/mach/clock.h |    2 +
 arch/arm/mach-stm/speed-imx23.c        |  100 +++++++++++++++++++++++++++++++-
 2 files changed, 101 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-stm/include/mach/clock.h b/arch/arm/mach-stm/include/mach/clock.h
index 0e1a6d6..99b0d99 100644
--- a/arch/arm/mach-stm/include/mach/clock.h
+++ b/arch/arm/mach-stm/include/mach/clock.h
@@ -29,6 +29,8 @@ unsigned imx_get_xclk(void);
 unsigned imx_get_sspclk(unsigned);
 unsigned imx_set_sspclk(unsigned, unsigned, int);
 unsigned imx_set_ioclk(unsigned);
+unsigned imx_set_lcdifclk(unsigned);
+unsigned imx_get_lcdifclk(void);
 
 #endif /* ASM_ARCH_CLOCK_IMX23_H */
 
diff --git a/arch/arm/mach-stm/speed-imx23.c b/arch/arm/mach-stm/speed-imx23.c
index 7418ad5..0f68f7d 100644
--- a/arch/arm/mach-stm/speed-imx23.c
+++ b/arch/arm/mach-stm/speed-imx23.c
@@ -39,7 +39,11 @@
 #define HW_CLKCTRL_HBUS 0x30
 #define HW_CLKCTRL_XBUS 0x40
 #define HW_CLKCTRL_XTAL 0x050
-#define HW_CLKCTRL_PIX 0x060
+#define HW_CLKCTRL_DIS_LCDIF 0x060
+# define CLKCTRL_DIS_LCDIF_GATE (1 << 31)
+# define CLKCTRL_DIS_LCDIF_BUSY (1 << 29)
+# define SET_DIS_LCDIF_DIV(x) ((x) & 0xfff)
+# define GET_DIS_LCDIF_DIV(x) ((x) & 0xfff)
 /* note: no set/clear register! */
 #define HW_CLKCTRL_SSP 0x070
 /* note: no set/clear register! */
@@ -66,6 +70,7 @@
 # define SET_IOFRAC(x) (((x) & 0x3f) << 24)
 # define CLKCTRL_FRAC_CLKGATEPIX (1 << 23)
 # define GET_PIXFRAC(x) (((x) >> 16) & 0x3f)
+# define SET_PIXFRAC(x) (((x) & 0x3f) << 16)
 # define CLKCTRL_FRAC_CLKGATEEMI (1 << 15)
 # define GET_EMIFRAC(x) (((x) >> 8) & 0x3f)
 # define CLKCTRL_FRAC_CLKGATECPU (1 << 7)
@@ -77,6 +82,7 @@
 # define CLKCTRL_CLKSEQ_BYPASS_EMI (1 << 6)
 # define CLKCTRL_CLKSEQ_BYPASS_SSP (1 << 5)
 # define CLKCTRL_CLKSEQ_BYPASS_GPMI (1 << 4)
+# define CLKCTRL_CLKSEQ_BYPASS_DIS_LCDIF (1 << 1)
 #define HW_CLKCTRL_RESET 0x120
 #define HW_CLKCTRL_STATUS 0x130
 #define HW_CLKCTRL_VERSION 0x140
@@ -268,6 +274,97 @@ unsigned imx_set_sspclk(unsigned index, unsigned nc, int high)
 	return imx_get_sspclk(index);
 }
 
+unsigned imx_get_lcdifclk(void)
+{
+	unsigned rate = imx_get_mpllclk() * 18U;
+	unsigned div;
+
+	div = GET_PIXFRAC(readl(IMX_CCM_BASE + HW_CLKCTRL_FRAC));
+	if (div != 0U) {
+		rate /= div;
+		div = GET_DIS_LCDIF_DIV(readl(IMX_CCM_BASE + HW_CLKCTRL_DIS_LCDIF));
+		if (div != 0U)
+			rate /= div;
+		else
+			pr_debug("LCDIF clock has divisor 0!\n");
+	} else
+		pr_debug("LCDIF clock has frac divisor 0!\n");
+
+	return rate;
+}
+
+/**
+ * @param nc Pixel clock in [kHz]
+ *
+ * Calculate the best settings for the fractional and integer divider to match
+ * the requested pixel clock as close as possible.
+ *
+ * pixel clock = 480 MHz * 18 / frac_div / int_div
+ */
+unsigned imx_set_lcdifclk(unsigned nc)
+{
+	unsigned frac, best_frac = 0, div, best_div = 0, result;
+	int delta, best_delta = 0xffffff;
+	unsigned i, parent_rate = imx_get_mpllclk();
+	uint32_t reg;
+
+#define DIV(NOM, DEN) (((NOM) + (DEN) / 2) / (DEN))
+#define SH_DIV(NOM, DEN, LSH) \
+	((((NOM) / (DEN)) << (LSH)) + DIV(((NOM) % (DEN)) << (LSH), DEN))
+#define ABS(x) (((x) < 0) ? (-(x)) : (x))
+#define SHIFT 4
+
+	nc <<= SHIFT;
+
+	for (frac = 18; frac <= 35; ++frac) {
+		for (div = 1; div <= 255; ++div) {
+			result = DIV(parent_rate * SH_DIV(18U, frac, SHIFT), div);
+			delta = nc - result;
+			if (ABS(delta) < ABS(best_delta)) {
+				best_delta = delta;
+				best_frac = frac;
+				best_div = div;
+			}
+		}
+	}
+
+	if (best_delta == 0xffffff) {
+		pr_debug("Unable to match the pixelclock\n");
+		return 0;
+	}
+
+	pr_debug("Programming PFD=%u,DIV=%u ref_pix=%u MHz PIXCLK=%u MHz\n",
+			best_frac, best_div, 480 * 18 / best_frac,
+			480 * 18 / best_frac / best_div);
+
+	reg = readl(IMX_CCM_BASE + HW_CLKCTRL_FRAC) & ~0x003f0000;
+	reg |= SET_PIXFRAC(best_frac);
+	writel(reg, IMX_CCM_BASE + HW_CLKCTRL_FRAC);
+	writel(reg & ~CLKCTRL_FRAC_CLKGATEPIX, IMX_CCM_BASE + HW_CLKCTRL_FRAC);
+
+	reg = readl(IMX_CCM_BASE + HW_CLKCTRL_DIS_LCDIF) & ~0x1fff;
+	reg &= ~CLKCTRL_DIS_LCDIF_GATE;
+	reg |= SET_DIS_LCDIF_DIV(best_div);
+	writel(reg, IMX_CCM_BASE + HW_CLKCTRL_DIS_LCDIF);
+
+	/* Wait for divider update */
+	for (i = 0; i < 10000; i++) {
+		if (!(readl(IMX_CCM_BASE + HW_CLKCTRL_DIS_LCDIF) &
+						CLKCTRL_DIS_LCDIF_BUSY))
+			break;
+	}
+
+	if (i >= 10000) {
+		pr_debug("Setting LCD clock failed\n");
+		return 0;
+	}
+
+	writel(CLKCTRL_CLKSEQ_BYPASS_DIS_LCDIF,
+				IMX_CCM_BASE + HW_CLKCTRL_CLKSEQ + 8);
+
+	return imx_get_lcdifclk();
+}
+
 void imx_dump_clocks(void)
 {
 	printf("mpll:    %10u kHz\n", imx_get_mpllclk());
@@ -277,4 +374,5 @@ void imx_dump_clocks(void)
 	printf("hclk:    %10u kHz\n", imx_get_hclk());
 	printf("xclk:    %10u kHz\n", imx_get_xclk());
 	printf("ssp:     %10u kHz\n", imx_get_sspclk(0));
+	printf("lcdif:   %10u kHz\n", imx_get_lcdifclk());
 }
-- 
1.7.2.3


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

[PATCH 5/6] i.MX23: Add framebuffer device support

[Juergen Beisert]

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 arch/arm/mach-stm/include/mach/imx23-regs.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-stm/include/mach/imx23-regs.h b/arch/arm/mach-stm/include/mach/imx23-regs.h
index 89ca453..caac19b 100644
--- a/arch/arm/mach-stm/include/mach/imx23-regs.h
+++ b/arch/arm/mach-stm/include/mach/imx23-regs.h
@@ -36,6 +36,7 @@
 #define IMX_CCM_BASE		0x80040000
 #define IMX_I2C1_BASE		0x80058000
 #define IMX_SSP1_BASE		0x80010000
+#define IMX_FB_BASE		0x80030000
 #define IMX_SSP2_BASE		0x80034000
 
 #endif /* __ASM_ARCH_MX23_REGS_H */
-- 
1.7.2.3


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

[PATCH 6/6] Separate i.MX23 clock handling

[Juergen Beisert]

Separate i.MX23 clock handling to simplify the addition of the upcoming i.MX28.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
 arch/arm/mach-stm/include/mach/clock-imx23.h |   36 ++++++++++++++++++++++++++
 arch/arm/mach-stm/include/mach/clock.h       |   23 ++++------------
 2 files changed, 42 insertions(+), 17 deletions(-)
 create mode 100644 arch/arm/mach-stm/include/mach/clock-imx23.h

diff --git a/arch/arm/mach-stm/include/mach/clock-imx23.h b/arch/arm/mach-stm/include/mach/clock-imx23.h
new file mode 100644
index 0000000..99b0d99
--- /dev/null
+++ b/arch/arm/mach-stm/include/mach/clock-imx23.h
@@ -0,0 +1,36 @@
+/*
+ * (C) Copyright 2010 Juergen Beisert - Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef ASM_ARCH_CLOCK_IMX23_H
+#define ASM_ARCH_CLOCK_IMX23_H
+
+unsigned imx_get_mpllclk(void);
+unsigned imx_get_emiclk(void);
+unsigned imx_get_ioclk(void);
+unsigned imx_get_armclk(void);
+unsigned imx_get_hclk(void);
+unsigned imx_get_xclk(void);
+unsigned imx_get_sspclk(unsigned);
+unsigned imx_set_sspclk(unsigned, unsigned, int);
+unsigned imx_set_ioclk(unsigned);
+unsigned imx_set_lcdifclk(unsigned);
+unsigned imx_get_lcdifclk(void);
+
+#endif /* ASM_ARCH_CLOCK_IMX23_H */
+
diff --git a/arch/arm/mach-stm/include/mach/clock.h b/arch/arm/mach-stm/include/mach/clock.h
index 99b0d99..4d74e74 100644
--- a/arch/arm/mach-stm/include/mach/clock.h
+++ b/arch/arm/mach-stm/include/mach/clock.h
@@ -1,6 +1,4 @@
 /*
- * (C) Copyright 2010 Juergen Beisert - Pengutronix
- *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
@@ -17,20 +15,11 @@
  * MA 02111-1307 USA
  */
 
-#ifndef ASM_ARCH_CLOCK_IMX23_H
-#define ASM_ARCH_CLOCK_IMX23_H
-
-unsigned imx_get_mpllclk(void);
-unsigned imx_get_emiclk(void);
-unsigned imx_get_ioclk(void);
-unsigned imx_get_armclk(void);
-unsigned imx_get_hclk(void);
-unsigned imx_get_xclk(void);
-unsigned imx_get_sspclk(unsigned);
-unsigned imx_set_sspclk(unsigned, unsigned, int);
-unsigned imx_set_ioclk(unsigned);
-unsigned imx_set_lcdifclk(unsigned);
-unsigned imx_get_lcdifclk(void);
+#ifndef __ASM_MACH_CLOCK_H
+#define __ASM_MACH_CLOCK_H
 
-#endif /* ASM_ARCH_CLOCK_IMX23_H */
+#if defined CONFIG_ARCH_IMX23
+# include <mach/clock-imx23.h>
+#endif
 
+#endif /* __ASM_MACH_CLOCK_H */
-- 
1.7.2.3


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

Re: [PATCH] i.MX23/STM: Continue improving this architecture

[Juergen Beisert]

Juergen Beisert wrote:
> Some things to improve the i.MX23 architecture and also some things to
> prepare it for i.MX28 inclusion.

Ups, forgotten:

The following changes since commit 53dbaf3fc7b8371ed1e24ef96715e41d60b8ebc3:

  Merge branch 'master' into next (2010-11-19 09:35:15 +0100)

are available in the git repository at:

  http://git.pengutronix.de/git/jbe/for_barebox_next improve_imx23

Juergen Beisert (6):
      Remove variable size restrictions in i.MX23's gpio managing routines
      Simplify test for the max. possible GPIO number.
      i.MX23: Add support for the gpio commands
      i.MX23: Add pixel clock calculation routine for framebuffer support
      i.MX23: Add framebuffer device support
      Separate i.MX23 clock handling

 arch/arm/mach-stm/include/mach/clock-imx23.h |   36 +++++++++
 arch/arm/mach-stm/include/mach/clock.h       |   21 ++----
 arch/arm/mach-stm/include/mach/imx23-regs.h  |    1 +
 arch/arm/mach-stm/iomux-imx23.c              |   63 ++++++++++++++--
 arch/arm/mach-stm/speed-imx23.c              |  100 
+++++++++++++++++++++++++-
 5 files changed, 197 insertions(+), 24 deletions(-)
 create mode 100644 arch/arm/mach-stm/include/mach/clock-imx23.h

jbe

-- 
Pengutronix e.K.                              | Juergen Beisert             |
Linux Solutions for Science and Industry      | Phone: +49-8766-939 228     |
Vertretung Sued/Muenchen, Germany             | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686              | http://www.pengutronix.de/  |

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