Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9557fe40 authored by Fabio Estevam's avatar Fabio Estevam Committed by Shawn Guo
Browse files

ARM: mx25: Remove platform code support files 



As mx25 is a dt-only platform, we can get rid of platform code support files,
which are unused now.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
parent 11b05d60

arch/arm/mach-imx/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-y := time.o cpu.o system.o irq-common.o 
obj-$(CONFIG_SOC_IMX1) += clk-imx1.o mm-imx1.o

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



obj-$(CONFIG_SOC_IMX25) += clk-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o mach-imx25.o

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



obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o

obj-$(CONFIG_SOC_IMX27) += clk-imx27.o mm-imx27.o ehci-imx27.o

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

deleted100644 → 0
+0 −85
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_fec_data imx25_fec_data;

#define imx25_add_fec(pdata)	\

	imx_add_fec(&imx25_fec_data, pdata)



extern const struct imx_flexcan_data imx25_flexcan_data[];

#define imx25_add_flexcan(id)	\

	imx_add_flexcan(&imx25_flexcan_data[id])

#define imx25_add_flexcan0()		imx25_add_flexcan(0)

#define imx25_add_flexcan1()		imx25_add_flexcan(1)



extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data;

#define imx25_add_fsl_usb2_udc(pdata)	\

	imx_add_fsl_usb2_udc(&imx25_fsl_usb2_udc_data, pdata)



extern struct imx_imxdi_rtc_data imx25_imxdi_rtc_data;

#define imx25_add_imxdi_rtc()	\

	imx_add_imxdi_rtc(&imx25_imxdi_rtc_data)



extern const struct imx_imx2_wdt_data imx25_imx2_wdt_data;

#define imx25_add_imx2_wdt()	\

	imx_add_imx2_wdt(&imx25_imx2_wdt_data)



extern const struct imx_imx_fb_data imx25_imx_fb_data;

#define imx25_add_imx_fb(pdata)	\

	imx_add_imx_fb(&imx25_imx_fb_data, pdata)



extern const struct imx_imx_i2c_data imx25_imx_i2c_data[];

#define imx25_add_imx_i2c(id, pdata)	\

	imx_add_imx_i2c(&imx25_imx_i2c_data[id], pdata)

#define imx25_add_imx_i2c0(pdata)	imx25_add_imx_i2c(0, pdata)

#define imx25_add_imx_i2c1(pdata)	imx25_add_imx_i2c(1, pdata)

#define imx25_add_imx_i2c2(pdata)	imx25_add_imx_i2c(2, pdata)



extern const struct imx_imx_keypad_data imx25_imx_keypad_data;

#define imx25_add_imx_keypad(pdata)	\

	imx_add_imx_keypad(&imx25_imx_keypad_data, pdata)



extern const struct imx_imx_ssi_data imx25_imx_ssi_data[];

#define imx25_add_imx_ssi(id, pdata)	\

	imx_add_imx_ssi(&imx25_imx_ssi_data[id], pdata)



extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[];

#define imx25_add_imx_uart(id, pdata)	\

	imx_add_imx_uart_1irq(&imx25_imx_uart_data[id], pdata)

#define imx25_add_imx_uart0(pdata)	imx25_add_imx_uart(0, pdata)

#define imx25_add_imx_uart1(pdata)	imx25_add_imx_uart(1, pdata)

#define imx25_add_imx_uart2(pdata)	imx25_add_imx_uart(2, pdata)

#define imx25_add_imx_uart3(pdata)	imx25_add_imx_uart(3, pdata)

#define imx25_add_imx_uart4(pdata)	imx25_add_imx_uart(4, pdata)



extern const struct imx_mx2_camera_data imx25_mx2_camera_data;

#define imx25_add_mx2_camera(pdata)	\

	imx_add_mx2_camera(&imx25_mx2_camera_data, pdata)



extern const struct imx_mxc_ehci_data imx25_mxc_ehci_otg_data;

#define imx25_add_mxc_ehci_otg(pdata)	\

	imx_add_mxc_ehci(&imx25_mxc_ehci_otg_data, pdata)

extern const struct imx_mxc_ehci_data imx25_mxc_ehci_hs_data;

#define imx25_add_mxc_ehci_hs(pdata)	\

	imx_add_mxc_ehci(&imx25_mxc_ehci_hs_data, pdata)



extern const struct imx_mxc_nand_data imx25_mxc_nand_data;

#define imx25_add_mxc_nand(pdata)	\

	imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)



extern const struct imx_sdhci_esdhc_imx_data imx25_sdhci_esdhc_imx_data[];

#define imx25_add_sdhci_esdhc_imx(id, pdata)	\

	imx_add_sdhci_esdhc_imx(&imx25_sdhci_esdhc_imx_data[id], pdata)



extern const struct imx_spi_imx_data imx25_cspi_data[];

#define imx25_add_spi_imx(id, pdata)	\

	imx_add_spi_imx(&imx25_cspi_data[id], pdata)

#define imx25_add_spi_imx0(pdata)	imx25_add_spi_imx(0, pdata)

#define imx25_add_spi_imx1(pdata)	imx25_add_spi_imx(1, pdata)

#define imx25_add_spi_imx2(pdata)	imx25_add_spi_imx(2, pdata)

arch/arm/mach-imx/ehci-imx25.c

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

 * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>

 * Copyright (C) 2010 Freescale Semiconductor, Inc.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License as published by the

 * Free Software Foundation; either version 2 of the License, or (at your

 * option) any later version.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY

 * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

 * for more details.

 */



#include <linux/platform_device.h>

#include <linux/io.h>

#include <linux/platform_data/usb-ehci-mxc.h>



#include "ehci.h"

#include "hardware.h"



#define USBCTRL_OTGBASE_OFFSET	0x600



#define MX25_OTG_SIC_SHIFT	29

#define MX25_OTG_SIC_MASK	(0x3 << MX25_OTG_SIC_SHIFT)

#define MX25_OTG_PM_BIT		(1 << 24)

#define MX25_OTG_PP_BIT		(1 << 11)

#define MX25_OTG_OCPOL_BIT	(1 << 3)



#define MX25_H1_SIC_SHIFT	21

#define MX25_H1_SIC_MASK	(0x3 << MX25_H1_SIC_SHIFT)

#define MX25_H1_PP_BIT		(1 << 18)

#define MX25_H1_PM_BIT		(1 << 16)

#define MX25_H1_IPPUE_UP_BIT	(1 << 7)

#define MX25_H1_IPPUE_DOWN_BIT	(1 << 6)

#define MX25_H1_TLL_BIT		(1 << 5)

#define MX25_H1_USBTE_BIT	(1 << 4)

#define MX25_H1_OCPOL_BIT	(1 << 2)



int mx25_initialize_usb_hw(int port, unsigned int flags)

{

	unsigned int v;



	v = readl(MX25_IO_ADDRESS(MX25_USB_BASE_ADDR + USBCTRL_OTGBASE_OFFSET));



	switch (port) {

	case 0:	/* OTG port */

		v &= ~(MX25_OTG_SIC_MASK | MX25_OTG_PM_BIT | MX25_OTG_PP_BIT |

			MX25_OTG_OCPOL_BIT);

		v |= (flags & MXC_EHCI_INTERFACE_MASK) << MX25_OTG_SIC_SHIFT;



		if (!(flags & MXC_EHCI_POWER_PINS_ENABLED))

			v |= MX25_OTG_PM_BIT;



		if (flags & MXC_EHCI_PWR_PIN_ACTIVE_HIGH)

			v |= MX25_OTG_PP_BIT;



		if (!(flags & MXC_EHCI_OC_PIN_ACTIVE_LOW))

			v |= MX25_OTG_OCPOL_BIT;



		break;

	case 1: /* H1 port */

		v &= ~(MX25_H1_SIC_MASK | MX25_H1_PM_BIT | MX25_H1_PP_BIT |

			MX25_H1_OCPOL_BIT | MX25_H1_TLL_BIT | MX25_H1_USBTE_BIT |

			MX25_H1_IPPUE_DOWN_BIT | MX25_H1_IPPUE_UP_BIT);

		v |= (flags & MXC_EHCI_INTERFACE_MASK) << MX25_H1_SIC_SHIFT;



		if (!(flags & MXC_EHCI_POWER_PINS_ENABLED))

			v |= MX25_H1_PM_BIT;



		if (flags & MXC_EHCI_PWR_PIN_ACTIVE_HIGH)

			v |= MX25_H1_PP_BIT;



		if (!(flags & MXC_EHCI_OC_PIN_ACTIVE_LOW))

			v |= MX25_H1_OCPOL_BIT;



		if (!(flags & MXC_EHCI_TTL_ENABLED))

			v |= MX25_H1_TLL_BIT;



		if (flags & MXC_EHCI_INTERNAL_PHY)

			v |= MX25_H1_USBTE_BIT;



		if (flags & MXC_EHCI_IPPUE_DOWN)

			v |= MX25_H1_IPPUE_DOWN_BIT;



		if (flags & MXC_EHCI_IPPUE_UP)

			v |= MX25_H1_IPPUE_UP_BIT;



		break;

	default:

		return -EINVAL;

	}



	writel(v, MX25_IO_ADDRESS(MX25_USB_BASE_ADDR + USBCTRL_OTGBASE_OFFSET));



	return 0;

}