[patch 0/5] Genesi Efika MX/SB support improvements

[patch 0/5] Genesi Efika MX/SB support improvements

[Arnaud Patard (Rtp)]

Hi,

This patch series aims at improving current efika mx support and adds support
for efika smartbook. Given the similarities between the two systems, the first
patch moves mx some code into a new file which will contain code shared by both
systems and the last patch adds support for efika smartbook.


Arnaud

[patch 1/5] Introduce EFIKA_COMMON

[Arnaud Patard (Rtp)]

An embedded and charset-unspecified text was scrubbed...
Name: introduce_efika_common.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110202/fd032363/attachment.ksh>

[patch 1/5] Introduce EFIKA_COMMON

[Sascha Hauer]

On Wed, Feb 02, 2011 at 12:21:05PM +0100, Arnaud Patard wrote:
> The Genesi EFIKA MX and EFIKA Smartbook are sharing a lot of things
> so it makes sense to create a common file for both devices and a specific
> file for each. No functionnal change except dropping uart 1 & 2.
> 
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> 
> +
> +/* Serial ports */
> +#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
> +static const struct imxuart_platform_data uart_pdata = {
> +	.flags = IMXUART_HAVE_RTSCTS,
> +};
> +
> +static inline void mxc_init_imx_uart(void)
> +{
> +	imx51_add_imx_uart(0, &uart_pdata);
> +	imx51_add_imx_uart(1, &uart_pdata);
> +	imx51_add_imx_uart(2, &uart_pdata);
> +}
> +#else /* !SERIAL_IMX */
> +static inline void mxc_init_imx_uart(void)
> +{
> +}
> +#endif /* SERIAL_IMX */

Please remove the ifdefs around the serial port initialization. Also, I
remember that the efikamx only has one serial port connected.

> +
> +/* This function is board specific as the bit mask for the plldiv will also
> + * be different for other Freescale SoCs, thus a common bitmask is not
> + * possible and cannot get place in /plat-mxc/ehci.c.
> + */
> +static int initialize_otg_port(struct platform_device *pdev)
> +{
> +	u32 v;
> +	void __iomem *usb_base;
> +	void __iomem *usbother_base;
> +	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
> +	if (!usb_base)
> +		return -ENOMEM;
> +	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
> +
> +	/* Set the PHY clock to 19.2MHz */
> +	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
> +	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
> +	v |= MX51_USB_PLL_DIV_24_MHZ;
> +	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
> +	iounmap(usb_base);
> +	return 0;
> +}
> +
> +static struct mxc_usbh_platform_data dr_utmi_config = {
> +	.init   = initialize_otg_port,
> +	.portsc = MXC_EHCI_UTMI_16BIT,
> +	.flags  = MXC_EHCI_INTERNAL_PHY,
> +};

Could you rebase this on the ehci cleanup patches I recently sent and
thereby also test the patches for your board?

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 |

[patch 1/5] Introduce EFIKA_COMMON

[Arnaud Patard (Rtp)]

Sascha Hauer <s.hauer@pengutronix.de> writes:

> On Wed, Feb 02, 2011 at 12:21:05PM +0100, Arnaud Patard wrote:
>> The Genesi EFIKA MX and EFIKA Smartbook are sharing a lot of things
>> so it makes sense to create a common file for both devices and a specific
>> file for each. No functionnal change except dropping uart 1 & 2.
>> 
>> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
>> 
>> +
>> +/* Serial ports */
>> +#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
>> +static const struct imxuart_platform_data uart_pdata = {
>> +	.flags = IMXUART_HAVE_RTSCTS,
>> +};
>> +
>> +static inline void mxc_init_imx_uart(void)
>> +{
>> +	imx51_add_imx_uart(0, &uart_pdata);
>> +	imx51_add_imx_uart(1, &uart_pdata);
>> +	imx51_add_imx_uart(2, &uart_pdata);
>> +}
>> +#else /* !SERIAL_IMX */
>> +static inline void mxc_init_imx_uart(void)
>> +{
>> +}
>> +#endif /* SERIAL_IMX */
>
> Please remove the ifdefs around the serial port initialization. Also, I
> remember that the efikamx only has one serial port connected.
>

doh. It's dead code. I've modified the code in init() to use only one
uart but forgot to kill that :(

>> +
>> +/* This function is board specific as the bit mask for the plldiv will also
>> + * be different for other Freescale SoCs, thus a common bitmask is not
>> + * possible and cannot get place in /plat-mxc/ehci.c.
>> + */
>> +static int initialize_otg_port(struct platform_device *pdev)
>> +{
>> +	u32 v;
>> +	void __iomem *usb_base;
>> +	void __iomem *usbother_base;
>> +	usb_base = ioremap(MX51_OTG_BASE_ADDR, SZ_4K);
>> +	if (!usb_base)
>> +		return -ENOMEM;
>> +	usbother_base = (void __iomem *)(usb_base + MX5_USBOTHER_REGS_OFFSET);
>> +
>> +	/* Set the PHY clock to 19.2MHz */
>> +	v = __raw_readl(usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
>> +	v &= ~MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK;
>> +	v |= MX51_USB_PLL_DIV_24_MHZ;
>> +	__raw_writel(v, usbother_base + MXC_USB_PHY_CTR_FUNC2_OFFSET);
>> +	iounmap(usb_base);
>> +	return 0;
>> +}
>> +
>> +static struct mxc_usbh_platform_data dr_utmi_config = {
>> +	.init   = initialize_otg_port,
>> +	.portsc = MXC_EHCI_UTMI_16BIT,
>> +	.flags  = MXC_EHCI_INTERNAL_PHY,
>> +};
>
> Could you rebase this on the ehci cleanup patches I recently sent and
> thereby also test the patches for your board?

I was wondering how to handle my patches vs your ehci cleanup. Nice to
know how you want to handle it. Will test and report if anything goes
wrong.


Arnaud

[patch 2/5] efikamx: add usb h1 support

[Arnaud Patard (Rtp)]

An embedded and charset-unspecified text was scrubbed...
Name: usb.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110202/0c1cd119/attachment.ksh>

[patch 3/5] efikamx: add mc13892 support / implement power off

[Arnaud Patard (Rtp)]

An embedded and charset-unspecified text was scrubbed...
Name: efikamx_add_mc13892.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110202/a96d694c/attachment.ksh>

[patch 3/5] efikamx: add mc13892 support / implement power off

[Sascha Hauer]

Hi Arnaud,

On Wed, Feb 02, 2011 at 12:21:07PM +0100, Arnaud Patard wrote:
> This patch declares regulators for the efikamx. Use it also to power off the
> efikamx.
> Unfortunately, on the efikamx to2 boards, this doesn't work but they allow to
> power off by setting GPIO 4 13 to high level instead of powering off through
> the mc13892.
> 
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> 

[...]

> Index: linux-2.6-submit/arch/arm/mach-mx5/board-mx51_efikamx.c
> ===================================================================
> --- linux-2.6-submit.orig/arch/arm/mach-mx5/board-mx51_efikamx.c	2011-02-02 09:57:51.000000000 +0100
> +++ linux-2.6-submit/arch/arm/mach-mx5/board-mx51_efikamx.c	2011-02-02 09:59:43.000000000 +0100
> @@ -25,6 +25,9 @@
>  #include <linux/fsl_devices.h>
>  #include <linux/spi/flash.h>
>  #include <linux/spi/spi.h>
> +#include <linux/mfd/mc13892.h>
> +#include <linux/regulator/machine.h>
> +#include <linux/regulator/consumer.h>
>  
>  #include <mach/common.h>
>  #include <mach/hardware.h>
> @@ -56,6 +59,10 @@
>  #define EFIKAMX_RESET1_1	IMX_GPIO_NR(3, 2)
>  #define EFIKAMX_RESET		IMX_GPIO_NR(1, 4)
>  
> +#define EFIKAMX_POWEROFF	IMX_GPIO_NR(4, 13)
> +
> +#define EFIKAMX_PMIC		IMX_GPIO_NR(1, 6)
> +
>  /* the pci ids pin have pull up. they're driven low according to board id */
>  #define MX51_PAD_PCBID0	IOMUX_PAD(0x518, 0x130, 3, 0x0,   0, PAD_CTL_PUS_100K_UP)
>  #define MX51_PAD_PCBID1	IOMUX_PAD(0x51C, 0x134, 3, 0x0,   0, PAD_CTL_PUS_100K_UP)
> @@ -79,6 +86,9 @@
>  	/* reset */
>  	MX51_PAD_DI1_PIN13__GPIO3_2,
>  	MX51_PAD_GPIO1_4__GPIO1_4,
> +
> +	/* power off */
> +	MX51_PAD_CSI2_VSYNC__GPIO4_13,
>  };
>  
>  /*   PCBID2  PCBID1 PCBID0  STATE
> @@ -187,6 +197,44 @@
>  		gpio_direction_output(EFIKAMX_RESET, 0);
>  }
>  
> +static struct regulator *pwgt1, *pwgt2, *coincell;
> +
> +static void mx51_efikamx_power_off(void)
> +{
> +	if (!IS_ERR(coincell))
> +		regulator_disable(coincell);
> +
> +	if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
> +		regulator_disable(pwgt2);
> +		regulator_disable(pwgt1);
> +	}
> +	gpio_direction_output(EFIKAMX_POWEROFF, 1);
> +}
> +
> +static int __init mx51_efikamx_power_init(void)
> +{
> +	pwgt1 = regulator_get(NULL, "pwgt1");
> +	pwgt2 = regulator_get(NULL, "pwgt2");
> +	if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
> +		regulator_enable(pwgt1);
> +		regulator_enable(pwgt2);
> +	}
> +	gpio_request(EFIKAMX_POWEROFF, "poweroff");
> +	pm_power_off = mx51_efikamx_power_off;
> +
> +	/* enable coincell charger. maybe need a small power driver ? */
> +	coincell = regulator_get(NULL, "coincell");
> +	if (!IS_ERR(coincell)) {
> +		regulator_set_voltage(coincell, 3000000, 3000000);
> +		regulator_enable(coincell);
> +	}
> +
> +	regulator_has_full_constraints();
> +
> +	return 0;
> +}
> +late_initcall(mx51_efikamx_power_init);

Please always protect these board specific initcalls with a
machine_is_*. Just because efikamx support is compiled into the kernel
doesn't mean it's the only machine this kernel will run on.


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

[patch 3/5] efikamx: add mc13892 support / implement power off

[Arnaud Patard (Rtp)]

Sascha Hauer <s.hauer@pengutronix.de> writes:

> Hi Arnaud,
>
> On Wed, Feb 02, 2011 at 12:21:07PM +0100, Arnaud Patard wrote:
>> This patch declares regulators for the efikamx. Use it also to power off the
>> efikamx.
>> Unfortunately, on the efikamx to2 boards, this doesn't work but they allow to
>> power off by setting GPIO 4 13 to high level instead of powering off through
>> the mc13892.
>> 
>> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
>> 
>
> [...]
>
>> Index: linux-2.6-submit/arch/arm/mach-mx5/board-mx51_efikamx.c
>> ===================================================================
>> --- linux-2.6-submit.orig/arch/arm/mach-mx5/board-mx51_efikamx.c	2011-02-02 09:57:51.000000000 +0100
>> +++ linux-2.6-submit/arch/arm/mach-mx5/board-mx51_efikamx.c	2011-02-02 09:59:43.000000000 +0100
>> @@ -25,6 +25,9 @@
>>  #include <linux/fsl_devices.h>
>>  #include <linux/spi/flash.h>
>>  #include <linux/spi/spi.h>
>> +#include <linux/mfd/mc13892.h>
>> +#include <linux/regulator/machine.h>
>> +#include <linux/regulator/consumer.h>
>>  
>>  #include <mach/common.h>
>>  #include <mach/hardware.h>
>> @@ -56,6 +59,10 @@
>>  #define EFIKAMX_RESET1_1	IMX_GPIO_NR(3, 2)
>>  #define EFIKAMX_RESET		IMX_GPIO_NR(1, 4)
>>  
>> +#define EFIKAMX_POWEROFF	IMX_GPIO_NR(4, 13)
>> +
>> +#define EFIKAMX_PMIC		IMX_GPIO_NR(1, 6)
>> +
>>  /* the pci ids pin have pull up. they're driven low according to board id */
>>  #define MX51_PAD_PCBID0	IOMUX_PAD(0x518, 0x130, 3, 0x0,   0, PAD_CTL_PUS_100K_UP)
>>  #define MX51_PAD_PCBID1	IOMUX_PAD(0x51C, 0x134, 3, 0x0,   0, PAD_CTL_PUS_100K_UP)
>> @@ -79,6 +86,9 @@
>>  	/* reset */
>>  	MX51_PAD_DI1_PIN13__GPIO3_2,
>>  	MX51_PAD_GPIO1_4__GPIO1_4,
>> +
>> +	/* power off */
>> +	MX51_PAD_CSI2_VSYNC__GPIO4_13,
>>  };
>>  
>>  /*   PCBID2  PCBID1 PCBID0  STATE
>> @@ -187,6 +197,44 @@
>>  		gpio_direction_output(EFIKAMX_RESET, 0);
>>  }
>>  
>> +static struct regulator *pwgt1, *pwgt2, *coincell;
>> +
>> +static void mx51_efikamx_power_off(void)
>> +{
>> +	if (!IS_ERR(coincell))
>> +		regulator_disable(coincell);
>> +
>> +	if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
>> +		regulator_disable(pwgt2);
>> +		regulator_disable(pwgt1);
>> +	}
>> +	gpio_direction_output(EFIKAMX_POWEROFF, 1);
>> +}
>> +
>> +static int __init mx51_efikamx_power_init(void)
>> +{
>> +	pwgt1 = regulator_get(NULL, "pwgt1");
>> +	pwgt2 = regulator_get(NULL, "pwgt2");
>> +	if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
>> +		regulator_enable(pwgt1);
>> +		regulator_enable(pwgt2);
>> +	}
>> +	gpio_request(EFIKAMX_POWEROFF, "poweroff");
>> +	pm_power_off = mx51_efikamx_power_off;
>> +
>> +	/* enable coincell charger. maybe need a small power driver ? */
>> +	coincell = regulator_get(NULL, "coincell");
>> +	if (!IS_ERR(coincell)) {
>> +		regulator_set_voltage(coincell, 3000000, 3000000);
>> +		regulator_enable(coincell);
>> +	}
>> +
>> +	regulator_has_full_constraints();
>> +
>> +	return 0;
>> +}
>> +late_initcall(mx51_efikamx_power_init);
>
> Please always protect these board specific initcalls with a
> machine_is_*. Just because efikamx support is compiled into the kernel
> doesn't mean it's the only machine this kernel will run on.

ok. fixed here and in sb code. I'm using the same kernel on sb & mx but
the diff are small in this part so I didn't notice. I'm going to test if
things are still ok with the proper checks.

Arnaud

[patch 4/5] efika: enable cpufreq

[Arnaud Patard (Rtp)]

An embedded and charset-unspecified text was scrubbed...
Name: efikamx_tst_cpufreq.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110202/310b716d/attachment.ksh>

[patch 5/5] mx51: add support for efika smartbook

[Arnaud Patard (Rtp)]

An embedded and charset-unspecified text was scrubbed...
Name: efikasb.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20110202/ce016653/attachment.ksh>

[patch 5/5] mx51: add support for efika smartbook

[Sascha Hauer]

On Wed, Feb 02, 2011 at 12:21:09PM +0100, Arnaud Patard wrote:
> Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
> Index: linux-2.6-submit/arch/arm/mach-mx5/board-mx51_efikasb.c
> ===================================================================
> --- /dev/null	1970-01-01 00:00:00.000000000 +0000
> +++ linux-2.6-submit/arch/arm/mach-mx5/board-mx51_efikasb.c	2011-02-02 12:10:03.000000000 +0100

[...]

> +
> +static int __init mx51_efikasb_power_init(void)
> +{
> +	pwgt1 = regulator_get(NULL, "pwgt1");
> +	pwgt2 = regulator_get(NULL, "pwgt2");
> +	if (!IS_ERR(pwgt1) && !IS_ERR(pwgt2)) {
> +		regulator_enable(pwgt1);
> +		regulator_enable(pwgt2);
> +	}
> +	gpio_request(EFIKASB_POWEROFF, "poweroff");
> +	pm_power_off = mx51_efikasb_power_off;
> +
> +	regulator_has_full_constraints();
> +
> +	return 0;
> +}
> +late_initcall(mx51_efikasb_power_init);

This also needs protection against other machines.

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 |