ARM: i.MX: Remove i.MX1 ADS board support (13758c52) · Commits · 戴 / test

arch/arm/configs/imx_v4_v5_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ CONFIG_ARCH_MULTI_V5=y
		# CONFIG_ARCH_MULTI_V7 is not set
		CONFIG_ARCH_MXC=y
		CONFIG_MXC_IRQ_PRIOR=y
		CONFIG_ARCH_MX1ADS=y
		CONFIG_MACH_SCB9328=y
		CONFIG_MACH_APF9328=y
		CONFIG_MACH_MX21ADS=y

arch/arm/mach-imx/Kconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -108,17 +108,6 @@ config SOC_IMX35
		if ARCH_MULTI_V4T

		comment "MX1 platforms:"
		config MACH_MXLADS
		bool

		config ARCH_MX1ADS
		bool "MX1ADS platform"
		select IMX_HAVE_PLATFORM_IMX_I2C
		select IMX_HAVE_PLATFORM_IMX_UART
		select MACH_MXLADS
		select SOC_IMX1
		help
		Say Y here if you are using Motorola MX1ADS/MXLADS boards

		config MACH_SCB9328
		bool "Synertronixx scb9328"

arch/arm/mach-imx/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ obj-y += ssi-fiq-ksym.o
		endif

		# i.MX1 based machines
		obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o
		obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
		obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o

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

deleted100644 → 0

+0 −154

Original line number	Diff line number	Diff line
		/*
		* arch/arm/mach-imx/mach-mx1ads.c
		*
		* Initially based on:
		* linux-2.6.7-imx/arch/arm/mach-imx/scb9328.c
		* Copyright (c) 2004 Sascha Hauer <sascha@saschahauer.de>
		*
		* 2004 (c) MontaVista Software, Inc.
		*
		* This file is licensed under the terms of the GNU General Public
		* License version 2. This program is licensed "as is" without any
		* warranty of any kind, whether express or implied.
		*/

		#include <linux/i2c.h>
		#include <linux/i2c/pcf857x.h>
		#include <linux/init.h>
		#include <linux/kernel.h>
		#include <linux/platform_device.h>
		#include <linux/mtd/physmap.h>

		#include <asm/mach-types.h>
		#include <asm/mach/arch.h>
		#include <asm/mach/time.h>

		#include "common.h"
		#include "devices-imx1.h"
		#include "hardware.h"
		#include "iomux-mx1.h"

		static const int mx1ads_pins[] __initconst = {
		/* UART1 */
		PC9_PF_UART1_CTS,
		PC10_PF_UART1_RTS,
		PC11_PF_UART1_TXD,
		PC12_PF_UART1_RXD,
		/* UART2 */
		PB28_PF_UART2_CTS,
		PB29_PF_UART2_RTS,
		PB30_PF_UART2_TXD,
		PB31_PF_UART2_RXD,
		/* I2C */
		PA15_PF_I2C_SDA,
		PA16_PF_I2C_SCL,
		/* SPI */
		PC13_PF_SPI1_SPI_RDY,
		PC14_PF_SPI1_SCLK,
		PC15_PF_SPI1_SS,
		PC16_PF_SPI1_MISO,
		PC17_PF_SPI1_MOSI,
		};

		/*
		* UARTs platform data
		*/

		static const struct imxuart_platform_data uart0_pdata __initconst = {
		.flags = IMXUART_HAVE_RTSCTS,
		};

		static const struct imxuart_platform_data uart1_pdata __initconst = {
		.flags = IMXUART_HAVE_RTSCTS,
		};

		/*
		* Physmap flash
		*/

		static const struct physmap_flash_data mx1ads_flash_data __initconst = {
		.width = 4, /* bankwidth in bytes */
		};

		static const struct resource flash_resource __initconst = {
		.start = MX1_CS0_PHYS,
		.end = MX1_CS0_PHYS + SZ_32M - 1,
		.flags = IORESOURCE_MEM,
		};

		/*
		* I2C
		*/
		static struct pcf857x_platform_data pcf857x_data[] = {
		{
		.gpio_base = 4 * 32,
		}, {
		.gpio_base = 4 * 32 + 16,
		}
		};

		static const struct imxi2c_platform_data mx1ads_i2c_data __initconst = {
		.bitrate = 100000,
		};

		static struct i2c_board_info mx1ads_i2c_devices[] = {
		{
		I2C_BOARD_INFO("pcf8575", 0x22),
		.platform_data = &pcf857x_data[0],
		}, {
		I2C_BOARD_INFO("pcf8575", 0x24),
		.platform_data = &pcf857x_data[1],
		},
		};

		/*
		* Board init
		*/
		static void __init mx1ads_init(void)
		{
		imx1_soc_init();

		mxc_gpio_setup_multiple_pins(mx1ads_pins,
		ARRAY_SIZE(mx1ads_pins), "mx1ads");

		/* UART */
		imx1_add_imx_uart0(&uart0_pdata);
		imx1_add_imx_uart1(&uart1_pdata);

		/* Physmap flash */
		platform_device_register_resndata(NULL, "physmap-flash", 0,
		&flash_resource, 1,
		&mx1ads_flash_data, sizeof(mx1ads_flash_data));

		/* I2C */
		i2c_register_board_info(0, mx1ads_i2c_devices,
		ARRAY_SIZE(mx1ads_i2c_devices));

		imx1_add_imx_i2c(&mx1ads_i2c_data);
		}

		static void __init mx1ads_timer_init(void)
		{
		mx1_clocks_init(32000);
		}

		MACHINE_START(MX1ADS, "Freescale MX1ADS")
		/* Maintainer: Sascha Hauer, Pengutronix */
		.atag_offset = 0x100,
		.map_io = mx1_map_io,
		.init_early = imx1_init_early,
		.init_irq = mx1_init_irq,
		.init_time = mx1ads_timer_init,
		.init_machine = mx1ads_init,
		.restart = mxc_restart,
		MACHINE_END

		MACHINE_START(MXLADS, "Freescale MXLADS")
		.atag_offset = 0x100,
		.map_io = mx1_map_io,
		.init_early = imx1_init_early,
		.init_irq = mx1_init_irq,
		.init_time = mx1ads_timer_init,
		.init_machine = mx1ads_init,
		.restart = mxc_restart,
		MACHINE_END

Admin message