Merge branch 'features/cs89x0' of git://git.pengutronix.de/git/imx/linux-2.6 into next/drivers (afde9626) · Commits · 戴 / test

arch/arm/configs/imx_v4_v5_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,8 @@ CONFIG_MISC_DEVICES=y
		CONFIG_EEPROM_AT24=y
		CONFIG_EEPROM_AT25=y
		CONFIG_NETDEVICES=y
		CONFIG_CS89x0=y
		CONFIG_CS89x0_PLATFORM=y
		CONFIG_DM9000=y
		CONFIG_SMC91X=y
		CONFIG_SMC911X=y

arch/arm/configs/imx_v6_v7_defconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ CONFIG_MACH_ARMADILLO5X0=y
		CONFIG_MACH_KZM_ARM11_01=y
		CONFIG_MACH_PCM043=y
		CONFIG_MACH_MX35_3DS=y
		CONFIG_MACH_EUKREA_CPUIMX35=y
		CONFIG_MACH_VPR200=y
		CONFIG_MACH_IMX51_DT=y
		CONFIG_MACH_MX51_3DS=y
		@@ -82,8 +81,9 @@ CONFIG_PATA_IMX=y
		CONFIG_NETDEVICES=y
		# CONFIG_NET_VENDOR_BROADCOM is not set
		# CONFIG_NET_VENDOR_CHELSIO is not set
		CONFIG_CS89x0=y
		CONFIG_CS89x0_PLATFORM=y
		# CONFIG_NET_VENDOR_FARADAY is not set
		CONFIG_FEC=y
		# CONFIG_NET_VENDOR_INTEL is not set
		# CONFIG_NET_VENDOR_MARVELL is not set
		# CONFIG_NET_VENDOR_MICREL is not set

arch/arm/mach-imx/mach-mx21ads.c

+15 −1

Original line number	Diff line number	Diff line
		@@ -37,8 +37,8 @@
		#define MX21ADS_REG_ADDR(offset) (void __force __iomem *) \
		(MX21ADS_MMIO_BASE_ADDR + (offset))

		#define MX21ADS_CS8900A_MMIO_SIZE 0x200000
		#define MX21ADS_CS8900A_IRQ IRQ_GPIOE(11)
		#define MX21ADS_CS8900A_IOBASE_REG MX21ADS_REG_ADDR(0x000000)
		#define MX21ADS_ST16C255_IOBASE_REG MX21ADS_REG_ADDR(0x200000)
		#define MX21ADS_VERSION_REG MX21ADS_REG_ADDR(0x400000)
		#define MX21ADS_IO_REG MX21ADS_REG_ADDR(0x800000)
		@@ -159,6 +159,18 @@ static struct platform_device mx21ads_nor_mtd_device = {
		.resource = &mx21ads_flash_resource,
		};

		static const struct resource mx21ads_cs8900_resources[] __initconst = {
		DEFINE_RES_MEM(MX21_CS1_BASE_ADDR, MX21ADS_CS8900A_MMIO_SIZE),
		DEFINE_RES_IRQ(MX21ADS_CS8900A_IRQ),
		};

		static const struct platform_device_info mx21ads_cs8900_devinfo __initconst = {
		.name = "cs89x0",
		.id = 0,
		.res = mx21ads_cs8900_resources,
		.num_res = ARRAY_SIZE(mx21ads_cs8900_resources),
		};

		static const struct imxuart_platform_data uart_pdata_rts __initconst = {
		.flags = IMXUART_HAVE_RTSCTS,
		};
		@@ -292,6 +304,8 @@ static void __init mx21ads_board_init(void)
		imx21_add_mxc_nand(&mx21ads_nand_board_info);

		platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
		platform_device_register_full(
		(struct platform_device_info *)&mx21ads_cs8900_devinfo);
		}

		static void __init mx21ads_timer_init(void)

arch/arm/mach-imx/mach-mx31ads.c

+32 −3

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@
		#include <asm/memory.h>
		#include <asm/mach/map.h>
		#include <mach/common.h>
		#include <mach/board-mx31ads.h>
		#include <mach/iomux-mx3.h>

		#ifdef CONFIG_MACH_MX31ADS_WM1133_EV1
		@@ -39,6 +38,9 @@

		#include "devices-imx31.h"

		/* Base address of PBC controller */
		#define PBC_BASE_ADDRESS MX31_CS4_BASE_ADDR_VIRT

		/* PBC Board interrupt status register */
		#define PBC_INTSTATUS 0x000016

		@@ -62,6 +64,7 @@
		#define PBC_INTMASK_CLEAR_REG (PBC_INTMASK_CLEAR + PBC_BASE_ADDRESS)
		#define EXPIO_PARENT_INT IOMUX_TO_IRQ(MX31_PIN_GPIO1_4)

		#define MXC_EXP_IO_BASE MXC_BOARD_IRQ_START
		#define MXC_IRQ_TO_EXPIO(irq) ((irq) - MXC_EXP_IO_BASE)

		#define EXPIO_INT_XUART_INTA (MXC_EXP_IO_BASE + 10)
		@@ -69,6 +72,10 @@

		#define MXC_MAX_EXP_IO_LINES 16

		/* CS8900 */
		#define EXPIO_INT_ENET_INT (MXC_EXP_IO_BASE + 8)
		#define CS4_CS8900_MMIO_START 0x20000

		/*
		* The serial port definition structure.
		*/
		@@ -101,11 +108,29 @@ static struct platform_device serial_device = {
		},
		};

		static const struct resource mx31ads_cs8900_resources[] __initconst = {
		DEFINE_RES_MEM(MX31_CS4_BASE_ADDR + CS4_CS8900_MMIO_START, SZ_64K),
		DEFINE_RES_IRQ(EXPIO_INT_ENET_INT),
		};

		static const struct platform_device_info mx31ads_cs8900_devinfo __initconst = {
		.name = "cs89x0",
		.id = 0,
		.res = mx31ads_cs8900_resources,
		.num_res = ARRAY_SIZE(mx31ads_cs8900_resources),
		};

		static int __init mxc_init_extuart(void)
		{
		return platform_device_register(&serial_device);
		}

		static void __init mxc_init_ext_ethernet(void)
		{
		platform_device_register_full(
		(struct platform_device_info *)&mx31ads_cs8900_devinfo);
		}

		static const struct imxuart_platform_data uart_pdata __initconst = {
		.flags = IMXUART_HAVE_RTSCTS,
		};
		@@ -492,12 +517,15 @@ static void __init mxc_init_audio(void)
		mxc_iomux_setup_multiple_pins(ssi_pins, ARRAY_SIZE(ssi_pins), "ssi");
		}

		/* static mappings */
		/*
		* Static mappings, starting from the CS4 start address up to the start address
		* of the CS8900.
		*/
		static struct map_desc mx31ads_io_desc[] __initdata = {
		{
		.virtual = MX31_CS4_BASE_ADDR_VIRT,
		.pfn = __phys_to_pfn(MX31_CS4_BASE_ADDR),
		.length = MX31_CS4_SIZE / 2,
		.length = CS4_CS8900_MMIO_START,
		.type = MT_DEVICE
		},
		};
		@@ -522,6 +550,7 @@ static void __init mx31ads_init(void)
		mxc_init_imx_uart();
		mxc_init_i2c();
		mxc_init_audio();
		mxc_init_ext_ethernet();
		}

		static void __init mx31ads_timer_init(void)

arch/arm/plat-mxc/include/mach/board-mx31ads.h

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		/*
		* Copyright 2005-2007 Freescale Semiconductor, Inc. All Rights Reserved.
		*/

		/*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		#ifndef __ASM_ARCH_MXC_BOARD_MX31ADS_H__
		#define __ASM_ARCH_MXC_BOARD_MX31ADS_H__

		#include <mach/hardware.h>

		/*
		* These symbols are used by drivers/net/cs89x0.c.
		* This is ugly as hell, but we have to provide them until
		* someone fixed the driver.
		*/

		/* Base address of PBC controller */
		#define PBC_BASE_ADDRESS MX31_CS4_BASE_ADDR_VIRT
		/* Offsets for the PBC Controller register */

		/* Ethernet Controller IO base address */
		#define PBC_CS8900A_IOBASE 0x020000

		#define MXC_EXP_IO_BASE (MXC_BOARD_IRQ_START)

		#define EXPIO_INT_ENET_INT (MXC_EXP_IO_BASE + 8)

		#endif /* __ASM_ARCH_MXC_BOARD_MX31ADS_H__ */

Admin message