ARM: imx: fix/define clocks and create devices for imx dma
Subsystems (3)
PATCH 1/3 ARM: imx: fix/define clocks and create devices for imx dma
--- arch/arm/mach-mx3/clock-imx31.c | 4 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- arch/arm/mach-mx5/clock-mx51.c | 5 + arch/arm/plat-mxc/devices/Makefile | 1 + arch/arm/plat-mxc/devices/platform-imx-dma.c | 128 ++++++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/mx51.h | 2 +- 6 files changed, 138 insertions(+), 4 deletions(-) create mode 100644 arch/arm/plat-mxc/devices/platform-imx-dma.c
arch/arm/mach-mx3/clock-imx31.c +2 -2
@@ -477,7 +477,7 @@ DEFINE_CLOCK(epit1_clk, 0, MXC_CCM_CGR0, 6, NULL, NULL, &perclk_clk);DEFINE_CLOCK (epit2_clk,1 ,MXC_CCM_CGR0 ,8 ,NULL ,NULL , &perclk_clk);DEFINE_CLOCK (iim_clk,0 ,MXC_CCM_CGR0 ,10 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (ata_clk,0 ,MXC_CCM_CGR0 ,12 ,NULL ,NULL , &ipg_clk); -DEFINE_CLOCK (sdma_clk1,0 ,MXC_CCM_CGR0 ,14 ,NULL , &sdma_clk1, &ahb_clk); +DEFINE_CLOCK (sdma_clk1,0 ,MXC_CCM_CGR0 ,14 ,NULL ,NULL , &ahb_clk);DEFINE_CLOCK (cspi3_clk,2 ,MXC_CCM_CGR0 ,16 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (rng_clk,0 ,MXC_CCM_CGR0 ,18 ,NULL ,NULL , &ipg_clk);DEFINE_CLOCK (uart1_clk,0 ,MXC_CCM_CGR0 ,20 ,NULL ,NULL , &perclk_clk);
@@ -564,7 +564,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "ata", ata_clk) _REGISTER_CLOCK(NULL, "rtic", rtic_clk) _REGISTER_CLOCK(NULL, "rng", rng_clk) - _REGISTER_CLOCK(NULL, "sdma_ahb", sdma_clk1) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk1) _REGISTER_CLOCK(NULL, "sdma_ipg", sdma_clk2) _REGISTER_CLOCK(NULL, "mstick", mstick1_clk)_REGISTER_CLOCK (NULL ,"mstick" , mstick2_clk)
arch/arm/mach-mx3/clock-imx35.c +1 -1
@@ -482,7 +482,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK(NULL, "rtc", rtc_clk) _REGISTER_CLOCK(NULL, "rtic", rtic_clk) _REGISTER_CLOCK(NULL, "scc", scc_clk) - _REGISTER_CLOCK(NULL, "sdma", sdma_clk) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk) _REGISTER_CLOCK(NULL, "spba", spba_clk) _REGISTER_CLOCK(NULL, "spdif", spdif_clk)_REGISTER_CLOCK ("imx-ssi.0" ,NULL , ssi1_clk)
arch/arm/mach-mx5/clock-mx51.c +5 -0
@@ -977,6 +977,10 @@ DEFINE_CLOCK(cspi_ipg_clk, 0, MXC_CCM_CCGR4, MXC_CCM_CCGRx_CG9_OFFSET,DEFINE_CLOCK (cspi_clk,0 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG13_OFFSET,NULL ,NULL , &ipg_clk, &cspi_ipg_clk); +/* SDMA */ +DEFINE_CLOCK (sdma_clk,1 ,MXC_CCM_CCGR4 , MXC_CCM_CCGRx_CG15_OFFSET, +NULL ,NULL , &ahb_clk,NULL ); +#define _REGISTER_CLOCK (d, n, c) \ { \ .dev_id = d, \
@@ -1003,6 +1007,7 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("mxc_nand", NULL, nfc_clk) _REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk) _REGISTER_CLOCK("imx-ssi.1", NULL, ssi2_clk) + _REGISTER_CLOCK("imx-sdma", NULL, sdma_clk) _REGISTER_CLOCK(NULL, "ckih", ckih_clk) _REGISTER_CLOCK(NULL, "ckih2", ckih2_clk)_REGISTER_CLOCK (NULL ,"gpt_32k" , gpt_32k_clk)
arch/arm/plat-mxc/devices/Makefile +1 -0
@@ -1,4 +1,5 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o +obj-y += platform-imx-dma.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o
arch/arm/plat-mxc/devices/platform-imx-dma.c new file +128 -0
128 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/mx51.h +1 -1
@@ -285,7 +285,7 @@#define MX51_MXC_INT_MMC_SDHC3 3#define MX51_MXC_INT_MMC_SDHC4 4#define MX51_MXC_INT_RESV5 5 -#define MX51_MXC_INT_SDMA 6 +#define MX51_INT_SDMA 6#define MX51_MXC_INT_IOMUX 7#define MX51_INT_NFC 8#define MX51_MXC_INT_VPU 9
Signature · 1 line
1.7.2.3
PATCH 2/3 ARM: imx: dynamically register fec devices
--- arch/arm/mach-imx/devices-imx27.h | 4 ++ arch/arm/mach-imx/devices.c | 21 -------- arch/arm/mach-imx/devices.h | 1 - arch/arm/mach-imx/mach-cpuimx27.c | 2 +- arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +- arch/arm/mach-imx/mach-imx27lite.c | 6 +-- arch/arm/mach-imx/mach-mx27_3ds.c | 6 +-- arch/arm/mach-imx/mach-mx27ads.c | 2 +- arch/arm/mach-imx/mach-mxt_td60.c | 7 +-- arch/arm/mach-imx/mach-pca100.c | 2 +- arch/arm/mach-imx/mach-pcm038.c | 2 +- arch/arm/mach-mx25/devices-imx25.h | 4 ++ arch/arm/mach-mx25/devices.c | 20 -------- arch/arm/mach-mx25/devices.h | 1 - arch/arm/mach-mx25/mach-cpuimx25.c | 5 +- arch/arm/mach-mx25/mach-mx25_3ds.c | 5 +- arch/arm/mach-mx3/devices-imx35.h | 4 ++ arch/arm/mach-mx3/devices.c | 21 -------- arch/arm/mach-mx3/devices.h | 1 - arch/arm/mach-mx3/mach-cpuimx35.c | 2 +- arch/arm/mach-mx3/mach-mx35_3ds.c | 2 +- arch/arm/mach-mx3/mach-pcm043.c | 2 +- arch/arm/mach-mx5/board-cpuimx51.c | 2 +- arch/arm/mach-mx5/board-mx51_babbage.c | 6 +-- arch/arm/mach-mx5/devices-imx51.h | 4 ++ arch/arm/mach-mx5/devices.c | 19 ------- arch/arm/mach-mx5/devices.h | 1 - arch/arm/plat-mxc/devices/Kconfig | 4 ++ arch/arm/plat-mxc/devices/Makefile | 1 + arch/arm/plat-mxc/devices/platform-fec.c | 58 +++++++++++++++++++++++ arch/arm/plat-mxc/include/mach/devices-common.h | 9 ++++ arch/arm/plat-mxc/include/mach/mx51.h | 4 +- 32 files changed, 107 insertions(+), 123 deletions(-) create mode 100644 arch/arm/plat-mxc/devices/platform-fec.c
arch/arm/mach-imx/devices-imx27.h +4 -0
@@ -9,6 +9,10 @@#include <mach/mx27.h> #include <mach/devices-common.h> +extern const struct imx_fec_data imx27_fec_data__initconst ; +#define imx27_add_fec (pdata) \ + imx_add_fec(&imx27_fec_data, pdata) +extern const struct imx_imx_i2c_data imx27_imx_i2c_data[]__initconst ;#define imx27_add_imx_i2c (id, pdata) \ imx_add_imx_i2c(&imx27_imx_i2c_data[id], pdata)
arch/arm/mach-imx/devices.c +0 -21
@@ -314,27 +314,6 @@ struct platform_device mxc_fb_device = { }, }; -#ifdef CONFIG_MACH_MX27 -static struct resource mxc_fec_resources[] = { - { - .start =MX27_FEC_BASE_ADDR , - .end =MX27_FEC_BASE_ADDR +SZ_4K -1 , - .flags =IORESOURCE_MEM , - }, { - .start =MX27_INT_FEC , - .end =MX27_INT_FEC , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device mxc_fec_device = { - .name ="fec" , - .id =0 , - .num_resources =ARRAY_SIZE (mxc_fec_resources), - .resource = mxc_fec_resources, -}; -#endif -static struct resource mxc_pwm_resources[] = { { .start = MX2x_PWM_BASE_ADDR,
arch/arm/mach-imx/devices.h +0 -1
@@ -16,7 +16,6 @@ extern struct platform_device mxc_gpt5;extern struct platform_device mxc_wdt;extern struct platform_device mxc_w1_master_device;extern struct platform_device mxc_fb_device; -extern struct platform_device mxc_fec_device;extern struct platform_device mxc_pwm_device;extern struct platform_device mxc_sdhc_device0;extern struct platform_device mxc_sdhc_device1;
arch/arm/mach-imx/mach-cpuimx27.c +1 -1
@@ -157,7 +157,6 @@ cpuimx27_nand_board_info __initconst = {static struct platform_device *platform_devices[]__initdata = { &eukrea_cpuimx27_nor_mtd_device, - &mxc_fec_device, &mxc_wdt, &mxc_w1_master_device, };
@@ -261,6 +260,7 @@ static void __init eukrea_cpuimx27_init(void)imx27_add_imx_i2c (1 , &cpuimx27_i2c1_data); +imx27_add_fec (NULL );platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices));#if defined(CONFIG_MACH_EUKREA_CPUIMX27_USESDHC2 )
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1 -1
@@ -185,7 +185,6 @@ static struct platform_device visstrim_m10_nor_mtd_device = {static struct platform_device *platform_devices[]__initdata = { &visstrim_gpio_keys_device, &visstrim_m10_nor_mtd_device, - &mxc_fec_device, };/* Visstrim_M10 uses UART0 as console */
@@ -240,6 +239,7 @@ static void __init visstrim_m10_board_init(void)imx27_add_imx_i2c (1 , &visstrim_m10_i2c_data);mxc_register_device (&mxc_sdhc_device0, &visstrim_m10_sdhc_pdata);mxc_register_device (&mxc_otg_host, &visstrim_m10_usbotg_pdata); +imx27_add_fec (NULL );platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices)); }
arch/arm/mach-imx/mach-imx27lite.c +1 -5
@@ -58,16 +58,12 @@ static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; -static struct platform_device *platform_devices[]__initdata = { - &mxc_fec_device, -}; -static void __init mx27lite_init (void ) {mxc_gpio_setup_multiple_pins (mx27lite_pins,ARRAY_SIZE (mx27lite_pins),"imx27lite" );imx27_add_imx_uart0 (&uart_pdata); -platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices)); +imx27_add_fec (NULL ); }static void __init mx27lite_timer_init (void )
arch/arm/mach-imx/mach-mx27_3ds.c +1 -5
@@ -64,10 +64,6 @@ static const struct imxuart_platform_data uart_pdata __initconst = { .flags = IMXUART_HAVE_RTSCTS, }; -static struct platform_device *platform_devices[]__initdata = { - &mxc_fec_device, -}; -/* * Matrix keyboard */
@@ -94,7 +90,7 @@ static void __init mx27pdk_init(void)mxc_gpio_setup_multiple_pins (mx27pdk_pins,ARRAY_SIZE (mx27pdk_pins),"mx27pdk" );imx27_add_imx_uart0 (&uart_pdata); -platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices)); +imx27_add_fec (NULL );mxc_register_device (&imx_kpp_device, &mx27_3ds_keymap_data); }
arch/arm/mach-imx/mach-mx27ads.c +1 -1
@@ -284,7 +284,6 @@ static struct imxmmc_platform_data sdhc2_pdata = {static struct platform_device *platform_devices[]__initdata = { &mx27ads_nor_mtd_device, - &mxc_fec_device, &mxc_w1_master_device, };
@@ -313,6 +312,7 @@ static void __init mx27ads_board_init(void)mxc_register_device (&mxc_sdhc_device0, &sdhc1_pdata);mxc_register_device (&mxc_sdhc_device1, &sdhc2_pdata); +imx27_add_fec (NULL );platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices)); }
arch/arm/mach-imx/mach-mxt_td60.c +1 -6
@@ -231,10 +231,6 @@ static struct imxmmc_platform_data sdhc1_pdata = { .exit = mxt_td60_sdhc1_exit, }; -static struct platform_device *platform_devices[]__initdata = { - &mxc_fec_device, -}; -static const struct imxuart_platform_data uart_pdata__initconst = { .flags =IMXUART_HAVE_RTSCTS , };
@@ -259,8 +255,7 @@ static void __init mxt_td60_board_init(void)imx27_add_imx_i2c (1 , &mxt_td60_i2c1_data);mxc_register_device (&mxc_fb_device, &mxt_td60_fb_data);mxc_register_device (&mxc_sdhc_device0, &sdhc1_pdata); - -platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices)); +imx27_add_fec (NULL ); }static void __init mxt_td60_timer_init (void )
arch/arm/mach-imx/mach-pca100.c +1 -1
@@ -173,7 +173,6 @@ pca100_nand_board_info __initconst = {static struct platform_device *platform_devices[]__initdata = { &mxc_w1_master_device, - &mxc_fec_device, &mxc_wdt, };
@@ -433,6 +432,7 @@ static void __init pca100_init(void)mxc_register_device (&mxc_fb_device, &pca100_fb_data); +imx27_add_fec (NULL );platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices)); }
arch/arm/mach-imx/mach-pcm038.c +1 -1
@@ -173,7 +173,6 @@ pcm038_nand_board_info __initconst = {static struct platform_device *platform_devices[]__initdata = { &pcm038_nor_mtd_device, &mxc_w1_master_device, - &mxc_fec_device, &pcm038_sram_mtd_device, &mxc_wdt, };
@@ -325,6 +324,7 @@ static void __init pcm038_init(void)mxc_register_device (&mxc_usbh2, &usbh2_pdata); +imx27_add_fec (NULL );platform_add_devices (platform_devices,ARRAY_SIZE (platform_devices));#ifdef CONFIG_MACH_PCM970_BASEBOARD
arch/arm/mach-mx25/devices-imx25.h +4 -0
@@ -9,6 +9,10 @@#include <mach/mx25.h> #include <mach/devices-common.h> +extern const struct imx_fec_data imx25_fec_data__initconst ; +#define imx25_add_fec (pdata) \ + imx_add_fec(&imx25_fec_data, pdata) +#define imx25_add_flexcan0 (pdata) \ imx_add_flexcan(0, MX25_CAN1_BASE_ADDR, SZ_16K, MX25_INT_CAN1, pdata)#define imx25_add_flexcan1 (pdata) \
arch/arm/mach-mx25/devices.c +0 -20
@@ -208,26 +208,6 @@ int __init imx25_register_gpios(void)return mxc_gpio_init (imx_gpio_ports,ARRAY_SIZE (imx_gpio_ports)); } -static struct resource mx25_fec_resources[] = { - { - .start =MX25_FEC_BASE_ADDR , - .end =MX25_FEC_BASE_ADDR +0xfff , - .flags =IORESOURCE_MEM , - }, - { - .start =MX25_INT_FEC , - .end =MX25_INT_FEC , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device mx25_fec_device = { - .name ="fec" , - .id =0 , - .num_resources =ARRAY_SIZE (mx25_fec_resources), - .resource = mx25_fec_resources, -}; -static struct resource mx25_rtc_resources[] = { { .start =MX25_DRYICE_BASE_ADDR ,
arch/arm/mach-mx25/devices.h +0 -1
@@ -6,7 +6,6 @@ extern struct platform_device mxc_pwm_device1;extern struct platform_device mxc_pwm_device2;extern struct platform_device mxc_pwm_device3;extern struct platform_device mxc_keypad_device; -extern struct platform_device mx25_fec_device;extern struct platform_device mx25_rtc_device;extern struct platform_device mx25_fb_device;extern struct platform_device mxc_wdt;
arch/arm/mach-mx25/mach-cpuimx25.c +2 -3
@@ -23,7 +23,6 @@#include <linux/clk.h> #include <linux/irq.h> #include <linux/gpio.h> -#include <linux/fec.h> #include <linux/platform_device.h> #include <linux/usb/otg.h> #include <linux/usb/ulpi.h>
@@ -67,7 +66,7 @@ static struct pad_desc eukrea_cpuimx25_pads[] = { MX25_PAD_I2C1_DAT__I2C1_DAT, }; -static struct fec_platform_data mx25_fec_pdata = { +static const struct fec_platform_data mx25_fec_pdata__initconst = { .phy =PHY_INTERFACE_MODE_RMII , };
@@ -129,7 +128,7 @@ static void __init eukrea_cpuimx25_init(void)imx25_add_imx_uart0 (&uart_pdata);imx25_add_mxc_nand (&eukrea_cpuimx25_nand_board_info);mxc_register_device (&mx25_rtc_device,NULL ); -mxc_register_device (&mx25_fec_device, &mx25_fec_pdata); +imx25_add_fec (&mx25_fec_pdata);i2c_register_board_info (0 , eukrea_cpuimx25_i2c_devices,ARRAY_SIZE (eukrea_cpuimx25_i2c_devices));
arch/arm/mach-mx25/mach-mx25_3ds.c +2 -3
@@ -28,7 +28,6 @@#include <linux/clk.h> #include <linux/irq.h> #include <linux/gpio.h> -#include <linux/fec.h> #include <linux/platform_device.h> #include <linux/input/matrix_keypad.h>
@@ -99,7 +98,7 @@ static struct pad_desc mx25pdk_pads[] = { MX25_PAD_KPP_COL3__KPP_COL3, }; -static struct fec_platform_data mx25_fec_pdata = { +static const struct fec_platform_data mx25_fec_pdata__initconst = { .phy =PHY_INTERFACE_MODE_RMII , };
@@ -192,7 +191,7 @@ static void __init mx25pdk_init(void)mxc_register_device (&mxc_wdt,NULL );mx25pdk_fec_reset (); -mxc_register_device (&mx25_fec_device, &mx25_fec_pdata); +imx25_add_fec (&mx25_fec_pdata);mxc_register_device (&mx25_kpp_device, &mx25pdk_keymap_data); }
arch/arm/mach-mx3/devices-imx35.h +4 -0
@@ -9,6 +9,10 @@#include <mach/mx35.h> #include <mach/devices-common.h> +extern const struct imx_fec_data imx35_fec_data__initconst ; +#define imx35_add_fec (pdata) \ + imx_add_fec(&imx35_fec_data, pdata) +#define imx35_add_flexcan0 (pdata) \ imx_add_flexcan(0, MX35_CAN1_BASE_ADDR, SZ_16K, MX35_INT_CAN1, pdata)#define imx35_add_flexcan1 (pdata) \
arch/arm/mach-mx3/devices.c +0 -21
@@ -281,27 +281,6 @@ struct platform_device mxc_usbh2 = { .num_resources = ARRAY_SIZE(mxc_usbh2_resources), }; -#if defined(CONFIG_ARCH_MX35 ) -static struct resource mxc_fec_resources[] = { - { - .start =MXC_FEC_BASE_ADDR , - .end =MXC_FEC_BASE_ADDR +0xfff , - .flags =IORESOURCE_MEM , - }, { - .start =MXC_INT_FEC , - .end =MXC_INT_FEC , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device mxc_fec_device = { - .name ="fec" , - .id =0 , - .num_resources =ARRAY_SIZE (mxc_fec_resources), - .resource = mxc_fec_resources, -}; -#endif -static struct resource imx_wdt_resources[] = { { .flags =IORESOURCE_MEM ,
arch/arm/mach-mx3/devices.h +0 -1
@@ -2,7 +2,6 @@ extern struct platform_device mxc_w1_master_device;extern struct platform_device mx3_ipu;extern struct platform_device mx3_fb;extern struct platform_device mx3_camera; -extern struct platform_device mxc_fec_device;extern struct platform_device mxcsdhc_device0;extern struct platform_device mxcsdhc_device1;extern struct platform_device mxc_otg_udc_device;
arch/arm/mach-mx3/mach-cpuimx35.c +1 -1
@@ -98,7 +98,6 @@ static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = { };static struct platform_device *devices[]__initdata = { - &mxc_fec_device, &imx_wdt_device0, };
@@ -180,6 +179,7 @@ static void __init mxc_board_init(void)mxc_iomux_v3_setup_multiple_pads (eukrea_cpuimx35_pads,ARRAY_SIZE (eukrea_cpuimx35_pads)); +imx35_add_fec (NULL );platform_add_devices (devices,ARRAY_SIZE (devices));imx35_add_imx_uart0 (&uart_pdata);
arch/arm/mach-mx3/mach-mx35_3ds.c +1 -1
@@ -74,7 +74,6 @@ static const struct mxc_nand_platform_data mx35pdk_nand_board_info __initconst = };static struct platform_device *devices[]__initdata = { - &mxc_fec_device, &mx35pdk_flash, };
@@ -131,6 +130,7 @@ static void __init mxc_board_init(void) {mxc_iomux_v3_setup_multiple_pads (mx35pdk_pads,ARRAY_SIZE (mx35pdk_pads)); +imx35_add_fec (NULL );platform_add_devices (devices,ARRAY_SIZE (devices));imx35_add_imx_uart0 (&uart_pdata);
arch/arm/mach-mx3/mach-pcm043.c +1 -1
@@ -140,7 +140,6 @@ static struct i2c_board_info pcm043_i2c_devices[] = {static struct platform_device *devices[]__initdata = { &pcm043_flash, - &mxc_fec_device, &imx_wdt_device0, };
@@ -356,6 +355,7 @@ static void __init mxc_board_init(void)MXC_AUDMUX_V2_PTCR_TCLKDIR ,/* clock is output */ MXC_AUDMUX_V2_PDCR_RXDSEL(3)); +imx35_add_fec (NULL );platform_add_devices (devices,ARRAY_SIZE (devices));imx35_add_imx_uart0 (&uart_pdata);
arch/arm/mach-mx5/board-cpuimx51.c +1 -1
@@ -108,7 +108,6 @@ static struct platform_device serial_device = {#endif static struct platform_device *devices[] __initdata = { - &mxc_fec_device,#if defined(CONFIG_SERIAL_8250 ) || defined(CONFIG_SERIAL_8250_MODULE ) &serial_device,#endif
@@ -253,6 +252,7 @@ static void __init eukrea_cpuimx51_init(void)gpio_direction_input (CPUIMX51_QUARTD_GPIO );gpio_free (CPUIMX51_QUARTD_GPIO ); +imx51_add_fec (NULL );platform_add_devices (devices,ARRAY_SIZE (devices));imx51_add_imx_i2c (1 , &eukrea_cpuimx51_i2c_data);
arch/arm/mach-mx5/board-mx51_babbage.c +1 -5
@@ -46,10 +46,6 @@#define MX51_USB_PLL_DIV_19_2_MHZ 0x01#define MX51_USB_PLL_DIV_24_MHZ 0x02 -static struct platform_device *devices[]__initdata = { - &mxc_fec_device, -}; -static struct pad_desc mx51babbage_pads[] = {/* UART1 */ MX51_PAD_UART1_RXD__UART1_RXD ,
@@ -290,7 +286,7 @@ static void __init mxc_board_init(void) ARRAY_SIZE(mx51babbage_pads));mxc_init_imx_uart ();babbage_fec_reset (); -platform_add_devices (devices,ARRAY_SIZE (devices)); +imx51_add_fec (NULL );imx51_add_imx_i2c (0 , &babbage_i2c_data);imx51_add_imx_i2c (1 , &babbage_i2c_data);
arch/arm/mach-mx5/devices-imx51.h +4 -0
@@ -9,6 +9,10 @@#include <mach/mx51.h> #include <mach/devices-common.h> +extern const struct imx_fec_data imx51_fec_data__initconst ; +#define imx51_add_fec (pdata) \ + imx_add_fec(&imx51_fec_data, pdata) +extern const struct imx_imx_i2c_data imx51_imx_i2c_data[]__initconst ;#define imx51_add_imx_i2c (id, pdata) \ imx_add_imx_i2c(&imx51_imx_i2c_data[id], pdata)
arch/arm/mach-mx5/devices.c +0 -19
@@ -17,25 +17,6 @@#include <mach/imx-uart.h> #include <mach/irqs.h> -static struct resource mxc_fec_resources[] = { - { - .start =MX51_MXC_FEC_BASE_ADDR , - .end =MX51_MXC_FEC_BASE_ADDR +0xfff , - .flags =IORESOURCE_MEM , - }, { - .start =MX51_MXC_INT_FEC , - .end =MX51_MXC_INT_FEC , - .flags =IORESOURCE_IRQ , - }, -}; - -struct platform_device mxc_fec_device = { - .name ="fec" , - .id =0 , - .num_resources =ARRAY_SIZE (mxc_fec_resources), - .resource = mxc_fec_resources, -}; -static struct resource mxc_hsi2c_resources[] = { { .start =MX51_HSI2C_DMA_BASE_ADDR ,
arch/arm/mach-mx5/devices.h +0 -1
@@ -1,4 +1,3 @@ -extern struct platform_device mxc_fec_device;extern struct platform_device mxc_usbdr_host_device;extern struct platform_device mxc_usbh1_device;extern struct platform_device mxc_usbdr_udc_device;
arch/arm/plat-mxc/devices/Kconfig +4 -0
@@ -1,3 +1,7 @@ +config IMX_HAVE_PLATFORM_FEC + bool + default y if ARCH_MX25 || SOC_IMX27 || ARCH_MX35 || ARCH_MX51 + config IMX_HAVE_PLATFORM_FLEXCAN select HAVE_CAN_FLEXCAN bool
arch/arm/plat-mxc/devices/Makefile +1 -0
@@ -1,3 +1,4 @@ +obj-$(CONFIG_IMX_HAVE_PLATFORM_FEC) += platform-fec.o obj-$(CONFIG_IMX_HAVE_PLATFORM_FLEXCAN) += platform-flexcan.o obj-y += platform-imx-dma.o obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o
arch/arm/plat-mxc/devices/platform-fec.c new file +58 -0
58 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/devices-common.h +9 -0
@@ -14,6 +14,15 @@ struct platform_device *imx_add_platform_device(const char *name, int id, const struct resource *res, unsigned int num_resources, const void *data, size_t size_data); +#include <linux/fec.h> +struct imx_fec_data { +resource_size_t iobase; +resource_size_t irq; +}; +struct platform_device *__init imx_add_fec ( +const struct imx_fec_data *data, +const struct fec_platform_data *pdata); +#include <linux/can/platform/flexcan.h> struct platform_device *__init imx_add_flexcan(int id, resource_size_t iobase, resource_size_t iosize,
arch/arm/plat-mxc/include/mach/mx51.h +2 -2
@@ -140,7 +140,7 @@#define MX51_ATA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe0000)#define MX51_SIM_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe4000)#define MX51_SSI3BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xe8000) -#define MX51_MXC_FEC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xec000) +#define MX51_FEC_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xec000)#define MX51_TVE_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xf0000)#define MX51_VPU_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xf4000)#define MX51_SAHARA_BASE_ADDR (MX51_AIPS2_BASE_ADDR + 0xf8000)
@@ -366,7 +366,7 @@#define MX51_MXC_INT_GPU2_IRQ 84#define MX51_MXC_INT_GPU2_BUSY 85#define MX51_MXC_INT_RESV86 86 -#define MX51_MXC_INT_FEC 87 +#define MX51_INT_FEC 87#define MX51_MXC_INT_OWIRE 88#define MX51_MXC_INT_CTI1_TG2 89#define MX51_MXC_INT_SJC 90
Signature · 1 line
1.7.2.3
PATCH 3/3 ARM: mx3/cpuimx35: mark otg_pdata and usbh1_pdata as maybe unused
In reply to Uwe Kleine-KönigThis fixes
arch/arm/mach-mx3/mach-cpuimx35.c:143: warning: 'otg_pdata' defined but not used arch/arm/mach-mx3/mach-cpuimx35.c:148: warning: 'usbh1_pdata' defined but not used
when USB_ULPI is not selected.
--- arch/arm/mach-mx3/mach-cpuimx35.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-mx3/mach-cpuimx35.c +2 -2
@@ -140,12 +140,12 @@ eukrea_cpuimx35_nand_board_info __initconst = { .flash_bbt = 1, }; -static struct mxc_usbh_platform_data otg_pdata = { +static struct mxc_usbh_platform_data __maybe_unused otg_pdata = { .portsc =MXC_EHCI_MODE_UTMI , .flags =MXC_EHCI_INTERFACE_DIFF_UNI , }; -static struct mxc_usbh_platform_data usbh1_pdata = { +static struct mxc_usbh_platform_data __maybe_unused usbh1_pdata = { .portsc =MXC_EHCI_MODE_SERIAL , .flags =MXC_EHCI_INTERFACE_SINGLE_UNI |MXC_EHCI_INTERNAL_PHY |MXC_EHCI_IPPUE_DOWN ,
Signature · 1 line
1.7.2.3
PATCH 1/3 ARM: imx: fix/define clocks and create devices for imx dma
In reply to Uwe Kleine-KönigHi Uwe,
Quoted 4 lines · Uwe Kleine-K?nig
+#if
defined(CONFIG_ARCH_MX35)
+??? if (cpu_is_mx35())
+??? ??? ret =imx_add_imx_sdma(&imx35_imx_sdma_data); +??? else
Shouldn't you check the MX35 silicon version like you did for MX31?
If not checked this would fail for the old MX35 silicon. I understand that MX31 has mx31_revision() function, but there is no mx35_revision() currently.
Regards,
Fabio Estevam
Sascha Hauer
maintainerPATCH 1/3 ARM: imx: fix/define clocks and create devices for imx dma
Hi Fabio,
Quoted 9 lines · Fabio Estevam
Hi Uwe,
Quoted 4 lines · Uwe Kleine-K?nig
+#if
defined(CONFIG_ARCH_MX35)
+??? if (cpu_is_mx35())
+??? ??? ret =imx_add_imx_sdma(&imx35_imx_sdma_data); +??? else
Quoted 5 lines
Shouldn't you check the MX35 silicon version like you did for MX31?
If not checked this would fail for the old MX35 silicon. I understand that MX31 has
mx31_revision()function, but there is nomx35_revision()currently.
You are right. I will add a mx35_revision function.
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 |