Continue the mx31_3ds machine support
Subsystems (3)
cover Continue the mx31_3ds machine support
Hello,
this series on top of Sascha's imx-for-2.6.39 branch continue the support of peripherals for the machine mx31_3ds.
The first one fix also a kernel NULL pointer error introduced by 4d2f13be1e370a670c1cae20c194d5ce961e0fa5
Best regards,
Signature · 4 lines
| Alberto Panizzo Amarula Solutions BV | | CTO - Founder Cruquiuskade 47 | | T. +31(0)851119171 Amsterdam 1018 AM NL | | F. +31(0)204106211 www.amarulasolutions.com |
PATCH 1/4 spi_imx: Fix misspelled configuration variable SOC_IMX31
--- drivers/spi/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/spi/Kconfig +1 -1
@@ -161,7 +161,7 @@ config SPI_IMX_VER_0_0 def_bool y if SOC_IMX21 || SOC_IMX27 config SPI_IMX_VER_0_4 - def_bool y if SOC_MX31 + def_bool y if SOC_IMX31 config SPI_IMX_VER_0_7 def_bool y if ARCH_MX25 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
Signature · 1 line
1.7.1
PATCH 1/4 spi_imx: Fix misspelled configuration variable SOC_IMX31
Quoted 1 line · Alberto Panizzo
Signed-off-by Alberto Panizzo <[email protected]>
Quoted 17 lines
--- drivers/spi/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/spi/Kconfig +1
-1@@ -161,7 +161,7 @@ config SPI_IMX_VER_0_0 def_bool y if SOC_IMX21 || SOC_IMX27 config SPI_IMX_VER_0_4 - def_bool y if SOC_MX31 + def_bool y if SOC_IMX31 config SPI_IMX_VER_0_7 def_bool y if ARCH_MX25 || SOC_IMX35 || SOC_IMX51 || SOC_IMX53
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 2/4 mach-mx31_3ds: Add support for the MMC slot of the personality board
In reply to Alberto Panizzo--- arch/arm/mach-mx3/mach-mx31_3ds.c | 116 ++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 2 deletions(-)
arch/arm/mach-mx3/mach-mx31_3ds.c +114 -2
@@ -35,6 +35,7 @@#include <mach/iomux-mx3.h> #include <mach/3ds_debugboard.h> #include <mach/ulpi.h> +#include <mach/mmc.h> #include "devices-imx31.h" #include "devices.h"
@@ -99,6 +100,98 @@ static int mx31_3ds_pins[] = {/* I2C1 */ MX31_PIN_I2C_CLK__I2C1_SCL ,MX31_PIN_I2C_DAT__I2C1_SDA , +/* SDHC1 */ +MX31_PIN_SD1_DATA3__SD1_DATA3 , +MX31_PIN_SD1_DATA2__SD1_DATA2 , +MX31_PIN_SD1_DATA1__SD1_DATA1 , +MX31_PIN_SD1_DATA0__SD1_DATA0 , +MX31_PIN_SD1_CLK__SD1_CLK , +MX31_PIN_SD1_CMD__SD1_CMD , +MX31_PIN_GPIO3_1__GPIO3_1 ,/* Card detect */ + MX31_PIN_GPIO3_0__GPIO3_0, /* OE */ +}; + +/* +* Support for SD card slot in personality board +*/ +static int mx31_3ds_sdhc1_init (struct device *dev,irq_handler_t detect_irq, +void *data) +{ +int ret; +int gpio_det, gpio_bus_en; + + gpio_det =IOMUX_TO_GPIO (MX31_PIN_GPIO3_1 ); + gpio_bus_en =IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ); + + ret =gpio_request (gpio_det,"sdhc1-card-detect" ); +if (ret) { +pr_warning ("Unable to request the SD/MMC card-detect GPIO.\n" ); +return ret; + } + + ret =gpio_request (gpio_bus_en,"sdhc1-bus-enable" ); +if (ret) { +pr_warning ("Unable to request the SD/MMC bus enable GPIO.\n" ); + goto gpio_free_be; + } + + ret =gpio_direction_input (gpio_det); +if (ret) { +pr_warning ("Unable to manage the SD/MMC card-detect GPIO.\n" ); + goto gpio_free_all; + } + + ret =gpio_direction_output (gpio_bus_en,0 ); +if (ret) { +pr_warning ("Unable to manage the SD/MMC bus enable GPIO.\n" ); + goto gpio_free_all; + } + + ret =request_irq (IOMUX_TO_IRQ (MX31_PIN_GPIO3_1 ), + detect_irq,IRQF_DISABLED | +IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING , +"sdhc1-detect" , data); +if (ret) { +pr_warning ("Unable to request the SD/MMC card-detect IRQ.\n" ); + goto gpio_free_all; + } + +return 0 ; + +gpio_free_all: +gpio_free (gpio_bus_en); +gpio_free_be: +gpio_free (gpio_det); +return ret; +} + +static void mx31_3ds_sdhc1_exit (struct device *dev,void *data) +{ +free_irq (IOMUX_TO_IRQ (MX31_PIN_GPIO3_1 ), data); +gpio_free (IOMUX_TO_GPIO (MX31_PIN_GPIO3_1 )); +gpio_free (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 )); +} + +static void mx31_3ds_sdhc1_setpower (struct device *dev,unsigned int vdd) +{ +/* +* While the voltage stuff is done by the driver, activate the +* Buffer Enable Pin only if there is a card in slot to fix the card +* voltage issue caused by bi-directional chip TXB0108 on 3Stack. +* Done here because at this stage we have for sure a debounced value +* of the presence of the card, showed by the value of vdd. +* 7 == ilog2(MMC_VDD_165_195) +*/ +if (vdd >7 ) +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ),1 ); +else +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ),0 ); +} + +static struct imxmmc_platform_data sdhc1_pdata = { + .init = mx31_3ds_sdhc1_init, + .exit = mx31_3ds_sdhc1_exit, + .setpower = mx31_3ds_sdhc1_setpower, };/*
@@ -132,11 +225,26 @@ static struct regulator_init_data pwgtx_init = {static struct regulator_init_data gpo_init = { .constraints = { - .boot_on =1 , - .always_on =1 , + .boot_on =1 , + .always_on =1 , } }; +static struct regulator_consumer_supply vmmc2_consumers[] = { +REGULATOR_SUPPLY ("vmmc" ,"mxc-mmc.0" ), +}; + +static struct regulator_init_data vmmc2_init = { + .constraints = { + .min_uV =3000000 , + .max_uV =3000000 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (vmmc2_consumers), + .consumer_supplies = vmmc2_consumers, +}; +static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { { .id =MC13783_REG_PWGT1SPI ,/* Power Gate for ARM core. */
@@ -151,6 +259,9 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { }, { .id = MC13783_REG_GPO3, /* Turn on 3.3V */ .init_data = &gpo_init, + }, { + .id = MC13783_REG_VMMC2, /* Power MMC/SD, WiFi/Bluetooth. */ + .init_data = &vmmc2_init, }, };
@@ -362,6 +473,7 @@ static void __init mx31_3ds_init(void) "devices on the debug board are unusable.\n");imx31_add_imx2_wdt (NULL );imx31_add_imx_i2c0 (&mx31_3ds_i2c0_data); +imx31_add_mxc_mmc (0 , &sdhc1_pdata); }static void __init mx31_3ds_timer_init (void )
Signature · 1 line
1.7.1
PATCH 2/4 mach-mx31_3ds: Add support for the MMC slot of the personality board
Quoted 59 lines · Alberto Panizzo
Signed-off-by Alberto Panizzo <[email protected]>--- arch/arm/mach-mx3/mach-mx31_3ds.c | 116 ++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 2 deletions(-)arch/arm/mach-mx3/mach-mx31_3ds.c +37
-0@@ -35,6 +35,7 @@#include <mach/iomux-mx3.h> #include <mach/3ds_debugboard.h> #include <mach/ulpi.h> +#include <mach/mmc.h> #include "devices-imx31.h" #include "devices.h" @@ -99,6 +100,98 @@ static int mx31_3ds_pins[] = {/* I2C1 */ MX31_PIN_I2C_CLK__I2C1_SCL ,MX31_PIN_I2C_DAT__I2C1_SDA , +/* SDHC1 */ +MX31_PIN_SD1_DATA3__SD1_DATA3 , +MX31_PIN_SD1_DATA2__SD1_DATA2 , +MX31_PIN_SD1_DATA1__SD1_DATA1 , +MX31_PIN_SD1_DATA0__SD1_DATA0 , +MX31_PIN_SD1_CLK__SD1_CLK , +MX31_PIN_SD1_CMD__SD1_CMD , +MX31_PIN_GPIO3_1__GPIO3_1 ,/* Card detect */ + MX31_PIN_GPIO3_0__GPIO3_0, /* OE */ +}; + +/* +* Support for SD card slot in personality board +*/ +static int mx31_3ds_sdhc1_init (struct device *dev,irq_handler_t detect_irq, +void *data) +{ +int ret; +int gpio_det, gpio_bus_en; + + gpio_det =IOMUX_TO_GPIO (MX31_PIN_GPIO3_1 ); + gpio_bus_en =IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ); + + ret =gpio_request (gpio_det,"sdhc1-card-detect" ); +if (ret) { +pr_warning ("Unable to request the SD/MMC card-detect GPIO.\n" ); +return ret; + } + + ret =gpio_request (gpio_bus_en,"sdhc1-bus-enable" ); +if (ret) { +pr_warning ("Unable to request the SD/MMC bus enable GPIO.\n" ); + goto gpio_free_be; + } + + ret =gpio_direction_input (gpio_det);
arch/arm/mach-mx3/mach-mx31_3ds.c static int mx31_3ds_pins[] = { · line 148
Quoted 10 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +10
-0+if (ret) { +pr_warning ("Unable to manage the SD/MMC card-detect GPIO.\n" ); + goto gpio_free_all; + } + + ret =gpio_direction_output (gpio_bus_en,0 ); +if (ret) { +pr_warning ("Unable to manage the SD/MMC bus enable GPIO.\n" ); + goto gpio_free_all; + }
Wolfram just arrived, so I probably have some moments left before he says it: You should use gpio_request_array here.
Quoted 50 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +46
-0+ + ret =request_irq (IOMUX_TO_IRQ (MX31_PIN_GPIO3_1 ), + detect_irq,IRQF_DISABLED | +IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING , +"sdhc1-detect" , data); +if (ret) { +pr_warning ("Unable to request the SD/MMC card-detect IRQ.\n" ); + goto gpio_free_all; + } + +return 0 ; + +gpio_free_all: +gpio_free (gpio_bus_en); +gpio_free_be: +gpio_free (gpio_det); +return ret; +} + +static void mx31_3ds_sdhc1_exit (struct device *dev,void *data) +{ +free_irq (IOMUX_TO_IRQ (MX31_PIN_GPIO3_1 ), data); +gpio_free (IOMUX_TO_GPIO (MX31_PIN_GPIO3_1 )); +gpio_free (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 )); +} + +static void mx31_3ds_sdhc1_setpower (struct device *dev,unsigned int vdd) +{ +/* +* While the voltage stuff is done by the driver, activate the +* Buffer Enable Pin only if there is a card in slot to fix the card +* voltage issue caused by bi-directional chip TXB0108 on 3Stack. +* Done here because at this stage we have for sure a debounced value +* of the presence of the card, showed by the value of vdd. +* 7 == ilog2(MMC_VDD_165_195) +*/ +if (vdd >7 ) +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ),1 ); +else +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ),0 ); +} + +static struct imxmmc_platform_data sdhc1_pdata = { + .init = mx31_3ds_sdhc1_init, + .exit = mx31_3ds_sdhc1_exit, + .setpower = mx31_3ds_sdhc1_setpower, };/*
arch/arm/mach-mx3/mach-mx31_3ds.c static struct regulator_init_data pwgtx_init = { · line 231
Quoted 9 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +2
-2@@ -132,11 +225,26 @@ static struct regulator_init_data pwgtx_init = {static struct regulator_init_data gpo_init = { .constraints = { - .boot_on =1 , - .always_on =1 , + .boot_on =1 , + .always_on =1 , } };
Please just keep it as it is. Some people like the initializers vertically aligned, others prefer spaces here. But if someone made a decision, don't change it to increase the chance that git blame shows something useful.
Sascha
Signature · 4 lines
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 2/4 mach-mx31_3ds: Add support for the MMC slot of the personality board
Quoted 65 lines · Sascha Hauer
Quoted 64 lines · Alberto Panizzo
Signed-off-by Alberto Panizzo <[email protected]>--- arch/arm/mach-mx3/mach-mx31_3ds.c | 116 ++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 2 deletions(-)arch/arm/mach-mx3/mach-mx31_3ds.c +42
-0@@ -35,6 +35,7 @@#include <mach/iomux-mx3.h> #include <mach/3ds_debugboard.h> #include <mach/ulpi.h> +#include <mach/mmc.h> #include "devices-imx31.h" #include "devices.h" @@ -99,6 +100,98 @@ static int mx31_3ds_pins[] = {/* I2C1 */ MX31_PIN_I2C_CLK__I2C1_SCL ,MX31_PIN_I2C_DAT__I2C1_SDA , +/* SDHC1 */ +MX31_PIN_SD1_DATA3__SD1_DATA3 , +MX31_PIN_SD1_DATA2__SD1_DATA2 , +MX31_PIN_SD1_DATA1__SD1_DATA1 , +MX31_PIN_SD1_DATA0__SD1_DATA0 , +MX31_PIN_SD1_CLK__SD1_CLK , +MX31_PIN_SD1_CMD__SD1_CMD , +MX31_PIN_GPIO3_1__GPIO3_1 ,/* Card detect */ + MX31_PIN_GPIO3_0__GPIO3_0, /* OE */ +}; + +/* +* Support for SD card slot in personality board +*/ +static int mx31_3ds_sdhc1_init (struct device *dev,irq_handler_t detect_irq, +void *data) +{ +int ret; +int gpio_det, gpio_bus_en; + + gpio_det =IOMUX_TO_GPIO (MX31_PIN_GPIO3_1 ); + gpio_bus_en =IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ); + + ret =gpio_request (gpio_det,"sdhc1-card-detect" ); +if (ret) { +pr_warning ("Unable to request the SD/MMC card-detect GPIO.\n" ); +return ret; + } + + ret =gpio_request (gpio_bus_en,"sdhc1-bus-enable" ); +if (ret) { +pr_warning ("Unable to request the SD/MMC bus enable GPIO.\n" ); + goto gpio_free_be; + } + + ret =gpio_direction_input (gpio_det); +if (ret) { +pr_warning ("Unable to manage the SD/MMC card-detect GPIO.\n" ); + goto gpio_free_all; + } +
Quoted 8 lines
arch/arm/mach-mx3/mach-mx31_3ds.c static int mx31_3ds_pins[] = { · line 148
Quoted 5 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +5
-0+ ret =gpio_direction_output (gpio_bus_en,0 ); +if (ret) { +pr_warning ("Unable to manage the SD/MMC bus enable GPIO.\n" ); + goto gpio_free_all; + }Wolfram just arrived, so I probably have some moments left before he says it: You should use
gpio_request_arrayhere.
Ok I'll check the API.
Quoted 52 lines
Quoted 52 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +46
-0+ + ret =request_irq (IOMUX_TO_IRQ (MX31_PIN_GPIO3_1 ), + detect_irq,IRQF_DISABLED | +IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING , +"sdhc1-detect" , data); +if (ret) { +pr_warning ("Unable to request the SD/MMC card-detect IRQ.\n" ); + goto gpio_free_all; + } + +return 0 ; + +gpio_free_all: +gpio_free (gpio_bus_en); +gpio_free_be: +gpio_free (gpio_det); +return ret; +} + +static void mx31_3ds_sdhc1_exit (struct device *dev,void *data) +{ +free_irq (IOMUX_TO_IRQ (MX31_PIN_GPIO3_1 ), data); +gpio_free (IOMUX_TO_GPIO (MX31_PIN_GPIO3_1 )); +gpio_free (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 )); +} + +static void mx31_3ds_sdhc1_setpower (struct device *dev,unsigned int vdd) +{ +/* +* While the voltage stuff is done by the driver, activate the +* Buffer Enable Pin only if there is a card in slot to fix the card +* voltage issue caused by bi-directional chip TXB0108 on 3Stack. +* Done here because at this stage we have for sure a debounced value +* of the presence of the card, showed by the value of vdd. +* 7 == ilog2(MMC_VDD_165_195) +*/ +if (vdd >7 ) +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ),1 ); +else +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_GPIO3_0 ),0 ); +} + +static struct imxmmc_platform_data sdhc1_pdata = { + .init = mx31_3ds_sdhc1_init, + .exit = mx31_3ds_sdhc1_exit, + .setpower = mx31_3ds_sdhc1_setpower, };/* @@ -132,11 +225,26 @@ static struct regulator_init_data pwgtx_init = {
Quoted 14 lines
arch/arm/mach-mx3/mach-mx31_3ds.c static struct regulator_init_data pwgtx_init = { · line 231
Quoted 8 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +2
-2static struct regulator_init_data gpo_init = { .constraints = { - .boot_on =1 , - .always_on =1 , + .boot_on =1 , + .always_on =1 , } };Please just keep it as it is. Some people like the initializers vertically aligned, others prefer spaces here. But if someone made a decision, don't change it to increase the chance that git blame shows something useful.
OK but indeed I've done it for consistency with all the rest of the file.
A new version soon.
Alberto!
Signature · 4 lines
| Alberto Panizzo Amarula Solutions BV | | CTO - Founder Cruquiuskade 47 | | T. +31(0)851119171 Amsterdam 1018 AM NL | | F. +31(0)204106211 www.amarulasolutions.com |
PATCH 3/4 mach-mx31_3ds: Add support for framebuffer and LCD
In reply to Alberto Panizzo--- arch/arm/mach-mx3/mach-mx31_3ds.c | 130 +++++++++++++++++++++++++++++++++++++ 1 files changed, 130 insertions(+), 0 deletions(-)
arch/arm/mach-mx3/mach-mx31_3ds.c +130 -0
@@ -21,6 +21,7 @@#include <linux/platform_device.h> #include <linux/mfd/mc13783.h> #include <linux/spi/spi.h> +#include <linux/spi/l4f00242t03.h> #include <linux/regulator/machine.h> #include <linux/usb/otg.h> #include <linux/usb/ulpi.h>
@@ -36,6 +37,8 @@#include <mach/3ds_debugboard.h> #include <mach/ulpi.h> #include <mach/mmc.h> +#include <mach/ipu.h> +#include <mach/mx3fb.h> #include "devices-imx31.h" #include "devices.h"
@@ -50,6 +53,12 @@ static int mx31_3ds_pins[] = {MX31_PIN_TXD1__TXD1 ,MX31_PIN_RXD1__RXD1 ,IOMUX_MODE (MX31_PIN_GPIO1_1 ,IOMUX_CONFIG_GPIO ), +/*SPI0*/ +MX31_PIN_CSPI1_SCLK__SCLK , +MX31_PIN_CSPI1_MOSI__MOSI , +MX31_PIN_CSPI1_MISO__MISO , +MX31_PIN_CSPI1_SPI_RDY__SPI_RDY , +MX31_PIN_CSPI1_SS2__SS2 ,/* CS for LCD */ /* SPI 1 */ MX31_PIN_CSPI2_SCLK__SCLK , MX31_PIN_CSPI2_MOSI__MOSI,
@@ -109,6 +118,70 @@ static int mx31_3ds_pins[] = {MX31_PIN_SD1_CMD__SD1_CMD ,MX31_PIN_GPIO3_1__GPIO3_1 ,/* Card detect */ MX31_PIN_GPIO3_0__GPIO3_0 ,/* OE */ +/* Framebuffer */ +MX31_PIN_LD0__LD0 , +MX31_PIN_LD1__LD1 , +MX31_PIN_LD2__LD2 , +MX31_PIN_LD3__LD3 , +MX31_PIN_LD4__LD4 , +MX31_PIN_LD5__LD5 , +MX31_PIN_LD6__LD6 , +MX31_PIN_LD7__LD7 , +MX31_PIN_LD8__LD8 , +MX31_PIN_LD9__LD9 , +MX31_PIN_LD10__LD10 , +MX31_PIN_LD11__LD11 , +MX31_PIN_LD12__LD12 , +MX31_PIN_LD13__LD13 , +MX31_PIN_LD14__LD14 , +MX31_PIN_LD15__LD15 , +MX31_PIN_LD16__LD16 , +MX31_PIN_LD17__LD17 , +MX31_PIN_VSYNC3__VSYNC3 , +MX31_PIN_HSYNC__HSYNC , +MX31_PIN_FPSHIFT__FPSHIFT , + MX31_PIN_CONTRAST__CONTRAST, +}; + +/* +* FB support +*/ +static const struct fb_videomode fb_modedb[] = { + {/* 480x640 @ 60 Hz */ + .name ="Epson-VGA" , + .refresh =60 , + .xres =480 , + .yres =640 , + .pixclock =41701 , + .left_margin =20 , + .right_margin =41 , + .upper_margin =10 , + .lower_margin =5 , + .hsync_len =20 , + .vsync_len =10 , + .sync =FB_SYNC_OE_ACT_HIGH |FB_SYNC_CLK_INVERT , + .vmode =FB_VMODE_NONINTERLACED , + .flag =0 , + }, +}; + +static struct ipu_platform_data mx3_ipu_data = { + .irq_base =MXC_IPU_IRQ_START , +}; + +static struct mx3fb_platform_data mx3fb_pdata = { + .dma_dev = &mx3_ipu.dev, + .name ="Epson-VGA" , + .mode = fb_modedb, + .num_modes =ARRAY_SIZE (fb_modedb), +}; + +/* LCD */ +static struct l4f00242t03_pdata mx31_3ds_l4f00242t03_pdata = { + .reset_gpio =IOMUX_TO_GPIO (MX31_PIN_LCS1 ), + .data_enable_gpio =IOMUX_TO_GPIO (MX31_PIN_SER_RS ), + .core_supply ="lcd_2v8" , + .io_supply ="vdd_lcdio" , };/*
@@ -245,6 +318,38 @@ static struct regulator_init_data vmmc2_init = { .consumer_supplies = vmmc2_consumers, }; +static struct regulator_consumer_supply vmmc1_consumers[] = { +REGULATOR_SUPPLY ("lcd_2v8" ,NULL ), +}; + +static struct regulator_init_data vmmc1_init = { + .constraints = { + .min_uV =2800000 , + .max_uV =2800000 , + .apply_uV =1 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (vmmc1_consumers), + .consumer_supplies = vmmc1_consumers, +}; + +static struct regulator_consumer_supply vgen_consumers[] = { +REGULATOR_SUPPLY ("vdd_lcdio" ,NULL ), +}; + +static struct regulator_init_data vgen_init = { + .constraints = { + .min_uV =1800000 , + .max_uV =1800000 , + .apply_uV =1 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (vgen_consumers), + .consumer_supplies = vgen_consumers, +}; +static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { { .id =MC13783_REG_PWGT1SPI ,/* Power Gate for ARM core. */
@@ -262,6 +367,12 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { }, { .id = MC13783_REG_VMMC2, /* Power MMC/SD, WiFi/Bluetooth. */ .init_data = &vmmc2_init, + }, { + .id = MC13783_REG_VMMC1, /* Power LCD, CMOS, FM, GPS, Accel. */ + .init_data = &vmmc1_init, + }, { + .id = MC13783_REG_VGEN, /* Power LCD */ + .init_data = &vgen_init, }, };
@@ -273,6 +384,15 @@ static struct mc13xxx_platform_data mc13783_pdata __initdata = { };/* SPI */ +static int spi0_internal_chipselect[] = { +MXC_SPI_CS (2 ), +}; + +static const struct spi_imx_master spi0_pdata__initconst = { + .chipselect = spi0_internal_chipselect, + .num_chipselect =ARRAY_SIZE (spi0_internal_chipselect), +}; +static int spi1_internal_chipselect[] = {MXC_SPI_CS (0 ),MXC_SPI_CS (2 ),
@@ -292,6 +412,12 @@ static struct spi_board_info mx31_3ds_spi_devs[] __initdata = { .platform_data = &mc13783_pdata, .irq = IOMUX_TO_IRQ(MX31_PIN_GPIO1_3), .mode = SPI_CS_HIGH, + }, { + .modalias = "l4f00242t03", + .max_speed_hz = 5000000, + .bus_num = 0, + .chip_select = 0, /* SS2 */ + .platform_data = &mx31_3ds_l4f00242t03_pdata, }, };
@@ -474,6 +600,10 @@ static void __init mx31_3ds_init(void)imx31_add_imx2_wdt (NULL );imx31_add_imx_i2c0 (&mx31_3ds_i2c0_data);imx31_add_mxc_mmc (0 , &sdhc1_pdata); + +imx31_add_spi_imx0 (&spi0_pdata); +mxc_register_device (&mx3_ipu, &mx3_ipu_data); +mxc_register_device (&mx3_fb, &mx3fb_pdata); }static void __init mx31_3ds_timer_init (void )
Signature · 1 line
1.7.1
PATCH 4/4 mx31_3ds: Add support for the camera device on the personality board
In reply to Alberto Panizzo--- arch/arm/mach-mx3/mach-mx31_3ds.c | 157 +++++++++++++++++++++++++++++++++++++ 1 files changed, 157 insertions(+), 0 deletions(-)
arch/arm/mach-mx3/mach-mx31_3ds.c +157 -0
@@ -25,6 +25,9 @@#include <linux/regulator/machine.h> #include <linux/usb/otg.h> #include <linux/usb/ulpi.h> +#include <linux/memblock.h> + +#include <media/soc_camera.h> #include <mach/hardware.h> #include <asm/mach-types.h>
@@ -39,6 +42,7 @@#include <mach/mmc.h> #include <mach/ipu.h> #include <mach/mx3fb.h> +#include <mach/mx3_camera.h> #include "devices-imx31.h" #include "devices.h"
@@ -141,6 +145,98 @@ static int mx31_3ds_pins[] = {MX31_PIN_HSYNC__HSYNC ,MX31_PIN_FPSHIFT__FPSHIFT ,MX31_PIN_CONTRAST__CONTRAST , +/* CSI */ +MX31_PIN_CSI_D6__CSI_D6 , +MX31_PIN_CSI_D7__CSI_D7 , +MX31_PIN_CSI_D8__CSI_D8 , +MX31_PIN_CSI_D9__CSI_D9 , +MX31_PIN_CSI_D10__CSI_D10 , +MX31_PIN_CSI_D11__CSI_D11 , +MX31_PIN_CSI_D12__CSI_D12 , +MX31_PIN_CSI_D13__CSI_D13 , +MX31_PIN_CSI_D14__CSI_D14 , +MX31_PIN_CSI_D15__CSI_D15 , +MX31_PIN_CSI_HSYNC__CSI_HSYNC , +MX31_PIN_CSI_MCLK__CSI_MCLK , +MX31_PIN_CSI_PIXCLK__CSI_PIXCLK , +MX31_PIN_CSI_VSYNC__CSI_VSYNC , +MX31_PIN_CSI_D5__GPIO3_5 ,/* CMOS PWDN */ + IOMUX_MODE(MX31_PIN_RI_DTE1, IOMUX_CONFIG_GPIO), /* CMOS reset */ +}; + +/* +* Camera support +*/ +static phys_addr_t mx3_camera_base__initdata ; +#define MX3_CAMERA_BUF_SIZE SZ_8M + +static int __init mx31_3ds_camera_alloc_dma (void ) +{ +int dma; + +if (!mx3_camera_base) +return -ENOMEM ; + + dma =dma_declare_coherent_memory (&mx3_camera.dev, + mx3_camera_base, mx3_camera_base, +MX3_CAMERA_BUF_SIZE , +DMA_MEMORY_MAP |DMA_MEMORY_EXCLUSIVE ); + +if (!(dma &DMA_MEMORY_MAP )) +return -ENOMEM ; + +return 0 ; +} + +static int mx31_3ds_camera_power (struct device *dev,int on) +{ +/* enable or disable the camera */ +pr_debug ("%s: %s the camera\n" , __func__, on ?"ENABLE" :"DISABLE" ); +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_CSI_D5 ), on ?0 :1 ); + +if (!on) + goto out; + +/* If enabled, give a reset impulse */ +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_RI_DTE1 ),0 ); +msleep (20 ); +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_RI_DTE1 ),1 ); +msleep (100 ); + +out: +return 0 ; +} + +static struct i2c_board_info mx31_3ds_i2c_camera = { +I2C_BOARD_INFO ("ov2640" ,0x30 ), +}; + +static struct regulator_bulk_data mx31_3ds_camera_regs[] = { + { .supply ="cmos_vcore" }, + { .supply ="cmos_2v8" }, +}; + +static struct soc_camera_link iclink_ov2640 = { + .bus_id =0 , + .board_info = &mx31_3ds_i2c_camera, + .i2c_adapter_id =0 , + .power = mx31_3ds_camera_power, + .regulators = mx31_3ds_camera_regs, + .num_regulators =ARRAY_SIZE (mx31_3ds_camera_regs), +}; + +static struct platform_device mx31_3ds_ov2640 = { + .name ="soc-camera-pdrv" , + .id =0 , + .dev = { + .platform_data = &iclink_ov2640, + }, +}; + +struct mx3_camera_pdata mx31_3ds_camera_pdata = { + .dma_dev = &mx3_ipu.dev, + .flags =MX3_CAMERA_DATAWIDTH_10 , + .mclk_10khz =2600 , };/*
@@ -320,6 +416,7 @@ static struct regulator_init_data vmmc2_init = {static struct regulator_consumer_supply vmmc1_consumers[] = {REGULATOR_SUPPLY ("lcd_2v8" ,NULL ), +REGULATOR_SUPPLY ("cmos_2v8" ,"soc-camera-pdrv.0" ), };static struct regulator_init_data vmmc1_init = {
@@ -350,6 +447,22 @@ static struct regulator_init_data vgen_init = { .consumer_supplies = vgen_consumers, }; +static struct regulator_consumer_supply vvib_consumers[] = { +REGULATOR_SUPPLY ("cmos_vcore" ,"soc-camera-pdrv.0" ), +}; + +static struct regulator_init_data vvib_init = { + .constraints = { + .min_uV =1300000 , + .max_uV =1300000 , + .apply_uV =1 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (vvib_consumers), + .consumer_supplies = vvib_consumers, +}; +static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { { .id =MC13783_REG_PWGT1SPI ,/* Power Gate for ARM core. */
@@ -373,6 +486,9 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { }, { .id = MC13783_REG_VGEN, /* Power LCD */ .init_data = &vgen_init, + }, { + .id = MC13783_REG_VVIB, /* Power CMOS */ + .init_data = &vvib_init, }, };
@@ -565,8 +681,14 @@ static const struct imxi2c_platform_data mx31_3ds_i2c0_data __initconst = { .bitrate = 100000, }; +static struct platform_device *devices[]__initdata = { + &mx31_3ds_ov2640, +}; +static void __init mx31_3ds_init (void ) { +int ret; +mxc_iomux_setup_multiple_pins (mx31_3ds_pins,ARRAY_SIZE (mx31_3ds_pins),"mx31_3ds" );
@@ -577,6 +699,8 @@ static void __init mx31_3ds_init(void)spi_register_board_info (mx31_3ds_spi_devs,ARRAY_SIZE (mx31_3ds_spi_devs)); +platform_add_devices (devices,ARRAY_SIZE (devices)); +imx31_add_imx_keypad (&mx31_3ds_keymap_data);mx31_3ds_usbotg_init ();
@@ -604,6 +728,29 @@ static void __init mx31_3ds_init(void)imx31_add_spi_imx0 (&spi0_pdata);mxc_register_device (&mx3_ipu, &mx3_ipu_data);mxc_register_device (&mx3_fb, &mx3fb_pdata); + +/* CSI */ +/* Camera power: default - off */ + ret =gpio_request (IOMUX_TO_GPIO (MX31_PIN_CSI_D5 ), +"camera-power" ); +if (!ret) { +gpio_direction_output (IOMUX_TO_GPIO (MX31_PIN_CSI_D5 ),1 ); + }else { +pr_err ("Failed to request the camera-power gpio" ); + iclink_ov2640.power =NULL ; + } + + ret =gpio_request (IOMUX_TO_GPIO (MX31_PIN_RI_DTE1 ), +"camera-reset" ); +if (!ret) +gpio_direction_output (IOMUX_TO_GPIO (MX31_PIN_RI_DTE1 ),1 ); +else +pr_err ("Failed to request the camera-reset gpio" ); + +if (!mx31_3ds_camera_alloc_dma ()) +mxc_register_device (&mx3_camera, &mx31_3ds_camera_pdata); +else +pr_err ("Failed to allocate dma memory for camera" ); }static void __init mx31_3ds_timer_init (void )
@@ -615,6 +762,15 @@ static struct sys_timer mx31_3ds_timer = { .init = mx31_3ds_timer_init, }; +static void __init mx31_3ds_reserve (void ) +{ +/* reserve MX3_CAMERA_BUF_SIZE bytes for mx3-camera */ + mx3_camera_base =memblock_alloc (MX3_CAMERA_BUF_SIZE , +MX3_CAMERA_BUF_SIZE ); +memblock_free (mx3_camera_base,MX3_CAMERA_BUF_SIZE ); +memblock_remove (mx3_camera_base,MX3_CAMERA_BUF_SIZE ); +} +MACHINE_START (MX31_3DS ,"Freescale MX31PDK (3DS)" )/* Maintainer: Freescale Semiconductor, Inc. */ .boot_params = MX3x_PHYS_OFFSET + 0x100,
@@ -623,4 +779,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") .init_irq = mx31_init_irq, .timer = &mx31_3ds_timer, .init_machine = mx31_3ds_init, + .reserve = mx31_3ds_reserve,MACHINE_END
Signature · 1 line
1.7.1
PATCH 4/4 mx31_3ds: Add support for the camera device on the personality board
Hello Alberto,
Quoted 57 lines · Alberto Panizzo
Signed-off-by Alberto Panizzo <[email protected]>--- arch/arm/mach-mx3/mach-mx31_3ds.c | 157 +++++++++++++++++++++++++++++++++++++ 1 files changed, 157 insertions(+), 0 deletions(-)arch/arm/mach-mx3/mach-mx31_3ds.c +30
-0@@ -25,6 +25,9 @@#include <linux/regulator/machine.h> #include <linux/usb/otg.h> #include <linux/usb/ulpi.h> +#include <linux/memblock.h> + +#include <media/soc_camera.h> #include <mach/hardware.h> #include <asm/mach-types.h> @@ -39,6 +42,7 @@#include <mach/mmc.h> #include <mach/ipu.h> #include <mach/mx3fb.h> +#include <mach/mx3_camera.h> #include "devices-imx31.h" #include "devices.h" @@ -141,6 +145,98 @@ static int mx31_3ds_pins[] = {MX31_PIN_HSYNC__HSYNC ,MX31_PIN_FPSHIFT__FPSHIFT ,MX31_PIN_CONTRAST__CONTRAST , +/* CSI */ +MX31_PIN_CSI_D6__CSI_D6 , +MX31_PIN_CSI_D7__CSI_D7 , +MX31_PIN_CSI_D8__CSI_D8 , +MX31_PIN_CSI_D9__CSI_D9 , +MX31_PIN_CSI_D10__CSI_D10 , +MX31_PIN_CSI_D11__CSI_D11 , +MX31_PIN_CSI_D12__CSI_D12 , +MX31_PIN_CSI_D13__CSI_D13 , +MX31_PIN_CSI_D14__CSI_D14 , +MX31_PIN_CSI_D15__CSI_D15 , +MX31_PIN_CSI_HSYNC__CSI_HSYNC , +MX31_PIN_CSI_MCLK__CSI_MCLK , +MX31_PIN_CSI_PIXCLK__CSI_PIXCLK , +MX31_PIN_CSI_VSYNC__CSI_VSYNC , +MX31_PIN_CSI_D5__GPIO3_5 ,/* CMOS PWDN */ + IOMUX_MODE(MX31_PIN_RI_DTE1, IOMUX_CONFIG_GPIO), /* CMOS reset */ +}; + +/* +* Camera support +*/ +static phys_addr_t mx3_camera_base__initdata ; +#define MX3_CAMERA_BUF_SIZE SZ_8M + +static int __init mx31_3ds_camera_alloc_dma (void )
arch/arm/mach-mx3/mach-mx31_3ds.c static int mx31_3ds_pins[] = { · line 183
Quoted 10 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +10
-0+{ +int dma; + +if (!mx3_camera_base) +return -ENOMEM ; + + dma =dma_declare_coherent_memory (&mx3_camera.dev, + mx3_camera_base, mx3_camera_base, +MX3_CAMERA_BUF_SIZE , +DMA_MEMORY_MAP |DMA_MEMORY_EXCLUSIVE );
This conflicts with the series I sent end of last week. Sascha didn't comment yet.
Quoted 41 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +41
-0+ +if (!(dma &DMA_MEMORY_MAP )) +return -ENOMEM ; + +return 0 ; +} + +static int mx31_3ds_camera_power (struct device *dev,int on) +{ +/* enable or disable the camera */ +pr_debug ("%s: %s the camera\n" , __func__, on ?"ENABLE" :"DISABLE" ); +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_CSI_D5 ), on ?0 :1 ); + +if (!on) + goto out; + +/* If enabled, give a reset impulse */ +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_RI_DTE1 ),0 ); +msleep (20 ); +gpio_set_value (IOMUX_TO_GPIO (MX31_PIN_RI_DTE1 ),1 ); +msleep (100 ); + +out: +return 0 ; +} + +static struct i2c_board_info mx31_3ds_i2c_camera = { +I2C_BOARD_INFO ("ov2640" ,0x30 ), +}; + +static struct regulator_bulk_data mx31_3ds_camera_regs[] = { + { .supply ="cmos_vcore" }, + { .supply ="cmos_2v8" }, +}; + +static struct soc_camera_link iclink_ov2640 = { + .bus_id =0 , + .board_info = &mx31_3ds_i2c_camera, + .i2c_adapter_id =0 , + .power = mx31_3ds_camera_power, + .regulators = mx31_3ds_camera_regs,
arch/arm/mach-mx3/mach-mx31_3ds.c static int mx31_3ds_pins[] = { · line 234
Quoted 10 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +10
-0+ .num_regulators = ARRAY_SIZE(mx31_3ds_camera_regs), +}; + +static struct platform_device mx31_3ds_ov2640 = { + .name ="soc-camera-pdrv" , + .id =0 , + .dev = { + .platform_data = &iclink_ov2640, + }, +};
for a few extra points you could dynamically allocate this device.
Quoted 90 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +46
-0+ +struct mx3_camera_pdata mx31_3ds_camera_pdata = { + .dma_dev = &mx3_ipu.dev, + .flags =MX3_CAMERA_DATAWIDTH_10 , + .mclk_10khz =2600 , };/* @@ -320,6 +416,7 @@ static struct regulator_init_data vmmc2_init = {static struct regulator_consumer_supply vmmc1_consumers[] = {REGULATOR_SUPPLY ("lcd_2v8" ,NULL ), +REGULATOR_SUPPLY ("cmos_2v8" ,"soc-camera-pdrv.0" ), };static struct regulator_init_data vmmc1_init = {@@ -350,6 +447,22 @@ static struct regulator_init_data vgen_init = { .consumer_supplies = vgen_consumers, }; +static struct regulator_consumer_supply vvib_consumers[] = { +REGULATOR_SUPPLY ("cmos_vcore" ,"soc-camera-pdrv.0" ), +}; + +static struct regulator_init_data vvib_init = { + .constraints = { + .min_uV =1300000 , + .max_uV =1300000 , + .apply_uV =1 , + .valid_ops_mask =REGULATOR_CHANGE_VOLTAGE | +REGULATOR_CHANGE_STATUS , + }, + .num_consumer_supplies =ARRAY_SIZE (vvib_consumers), + .consumer_supplies = vvib_consumers, +}; +static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { { .id =MC13783_REG_PWGT1SPI ,/* Power Gate for ARM core. */ @@ -373,6 +486,9 @@ static struct mc13xxx_regulator_init_data mx31_3ds_regulators[] = { }, { .id = MC13783_REG_VGEN, /* Power LCD */ .init_data = &vgen_init, + }, { + .id = MC13783_REG_VVIB, /* Power CMOS */ + .init_data = &vvib_init, }, };@@ -565,8 +681,14 @@ static const struct imxi2c_platform_data mx31_3ds_i2c0_data __initconst = { .bitrate = 100000, }; +static struct platform_device *devices[]__initdata = { + &mx31_3ds_ov2640, +}; +static void __init mx31_3ds_init (void ) { +int ret; +mxc_iomux_setup_multiple_pins (mx31_3ds_pins,ARRAY_SIZE (mx31_3ds_pins),"mx31_3ds" );@@ -577,6 +699,8 @@ static void __init mx31_3ds_init(void)spi_register_board_info (mx31_3ds_spi_devs,ARRAY_SIZE (mx31_3ds_spi_devs)); +platform_add_devices (devices,ARRAY_SIZE (devices)); +imx31_add_imx_keypad (&mx31_3ds_keymap_data);mx31_3ds_usbotg_init ();@@ -604,6 +728,29 @@ static void __init mx31_3ds_init(void)imx31_add_spi_imx0 (&spi0_pdata);mxc_register_device (&mx3_ipu, &mx3_ipu_data);mxc_register_device (&mx3_fb, &mx3fb_pdata); + +/* CSI */ +/* Camera power: default - off */ + ret =gpio_request (IOMUX_TO_GPIO (MX31_PIN_CSI_D5 ), +"camera-power" ); +if (!ret) { +gpio_direction_output (IOMUX_TO_GPIO (MX31_PIN_CSI_D5 ),1 ); + }else { +pr_err ("Failed to request the camera-power gpio" ); + iclink_ov2640.power =NULL ; + } + + ret = gpio_request(IOMUX_TO_GPIO(MX31_PIN_RI_DTE1),
arch/arm/mach-mx3/mach-mx31_3ds.c static void __init mx31_3ds_init(void) · line 753
Quoted 10 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +10
-0+ "camera-reset"); +if (!ret) +gpio_direction_output (IOMUX_TO_GPIO (MX31_PIN_RI_DTE1 ),1 ); +else +pr_err ("Failed to request the camera-reset gpio" ); + +if (!mx31_3ds_camera_alloc_dma ()) +mxc_register_device (&mx3_camera, &mx31_3ds_camera_pdata); +else +pr_err ("Failed to allocate dma memory for camera" );
Do you really want to continue registering the camera if the gpio_request above failed?
Quoted 20 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +9
-0}static void __init mx31_3ds_timer_init (void )@@ -615,6 +762,15 @@ static struct sys_timer mx31_3ds_timer = { .init = mx31_3ds_timer_init, }; +static void __init mx31_3ds_reserve (void ) +{ +/* reserve MX3_CAMERA_BUF_SIZE bytes for mx3-camera */ + mx3_camera_base =memblock_alloc (MX3_CAMERA_BUF_SIZE , +MX3_CAMERA_BUF_SIZE ); +memblock_free (mx3_camera_base,MX3_CAMERA_BUF_SIZE ); +memblock_remove (mx3_camera_base,MX3_CAMERA_BUF_SIZE ); +} +MACHINE_START (MX31_3DS ,"Freescale MX31PDK (3DS)" )/* Maintainer: Freescale Semiconductor, Inc. */ .boot_params = MX3x_PHYS_OFFSET + 0x100,
arch/arm/mach-mx3/mach-mx31_3ds.c MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") · line 783
Quoted 5 lines
arch/arm/mach-mx3/mach-mx31_3ds.c +1
-0@@ -623,4 +779,5 @@ MACHINE_START(MX31_3DS, "Freescale MX31PDK (3DS)") .init_irq = mx31_init_irq, .timer = &mx31_3ds_timer, .init_machine = mx31_3ds_init, + .reserve = mx31_3ds_reserve,MACHINE_END
Russell wants a different ordering here, see
http://article.gmane.org/gmane.linux.ports.arm.omap/50721/match=russell+init_early+reserve+map_io
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |