Commit e1291cff authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Shawn Guo
Browse files

ARM: i.MX: Remove i.MX1 non-DT support 



This patch removes registration helpers and support files,
used for non-DT i.MX1 targets.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent de2d6662

arch/arm/mach-imx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ config ARCH_MXC_IOMUX_V3 
config SOC_IMX1

	bool

	select CPU_ARM920T

	select IMX_HAVE_IOMUX_V1

	select MXC_AVIC

	select PINCTRL_IMX1

arch/arm/mach-imx/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-y := cpu.o system.o irq-common.o



obj-$(CONFIG_SOC_IMX1) += mm-imx1.o

obj-$(CONFIG_SOC_IMX21) += mm-imx21.o



obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o pm-imx25.o

arch/arm/mach-imx/common.h

+0 −5
Original line number Diff line number Diff line
@@ -21,29 +21,24 @@ struct device_node; 
enum mxc_cpu_pwr_mode;

struct of_device_id;



void mx1_map_io(void);

void mx21_map_io(void);

void mx27_map_io(void);

void mx31_map_io(void);

void mx35_map_io(void);

void imx1_init_early(void);

void imx21_init_early(void);

void imx27_init_early(void);

void imx31_init_early(void);

void imx35_init_early(void);

void mxc_init_irq(void __iomem *);

void mx1_init_irq(void);

void mx21_init_irq(void);

void mx27_init_irq(void);

void mx31_init_irq(void);

void mx35_init_irq(void);

void imx1_soc_init(void);

void imx21_soc_init(void);

void imx27_soc_init(void);

void imx31_soc_init(void);

void imx35_soc_init(void);

void epit_timer_init(void __iomem *base, int irq);

int mx1_clocks_init(unsigned long fref);

int mx21_clocks_init(unsigned long lref, unsigned long fref);

int mx27_clocks_init(unsigned long fref);

int mx31_clocks_init(unsigned long fref);

arch/arm/mach-imx/devices-imx1.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 Pengutronix

 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>

 *

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

 */

#include "devices/devices-common.h"



extern const struct imx_imx_fb_data imx1_imx_fb_data;

#define imx1_add_imx_fb(pdata) \

    imx_add_imx_fb(&imx1_imx_fb_data, pdata)



extern const struct imx_imx_i2c_data imx1_imx_i2c_data;

#define imx1_add_imx_i2c(pdata)		\

	imx_add_imx_i2c(&imx1_imx_i2c_data, pdata)



extern const struct imx_imx_uart_3irq_data imx1_imx_uart_data[];

#define imx1_add_imx_uart(id, pdata)	\

	imx_add_imx_uart_3irq(&imx1_imx_uart_data[id], pdata)

#define imx1_add_imx_uart0(pdata)	imx1_add_imx_uart(0, pdata)

#define imx1_add_imx_uart1(pdata)	imx1_add_imx_uart(1, pdata)



extern const struct imx_spi_imx_data imx1_cspi_data[];

#define imx1_add_cspi(id, pdata)   \

	imx_add_spi_imx(&imx1_cspi_data[id], pdata)



#define imx1_add_spi_imx0(pdata) imx1_add_cspi(0, pdata)

#define imx1_add_spi_imx1(pdata) imx1_add_cspi(1, pdata)

arch/arm/mach-imx/devices/devices-common.h

+0 −12
Original line number Diff line number Diff line
@@ -154,18 +154,6 @@ struct platform_device *__init imx_add_imx_ssi( 
		const struct imx_ssi_platform_data *pdata);



#include <linux/platform_data/serial-imx.h>

struct imx_imx_uart_3irq_data {

	int id;

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irqrx;

	resource_size_t irqtx;

	resource_size_t irqrts;

};

struct platform_device *__init imx_add_imx_uart_3irq(

		const struct imx_imx_uart_3irq_data *data,

		const struct imxuart_platform_data *pdata);



struct imx_imx_uart_1irq_data {

	int id;

	resource_size_t iobase;