Merge tag 'omap-for-v3.20/drop-legacy-3517-v2' of... (03773a4c) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mach-omap2/Kconfig

+0 −12

Original line number	Diff line number	Diff line
		@@ -217,12 +217,6 @@ config MACH_OMAP3517EVM
		bool "OMAP3517/ AM3517 EVM board"
		depends on ARCH_OMAP3
		default y
		select OMAP_PACKAGE_CBB

		config MACH_CRANEBOARD
		bool "AM3517/05 CRANE board"
		depends on ARCH_OMAP3
		select OMAP_PACKAGE_CBB

		config MACH_OMAP3_PANDORA
		bool "OMAP3 Pandora"
		@@ -263,12 +257,6 @@ config MACH_CM_T35
		select MACH_CM_T3730
		select OMAP_PACKAGE_CUS

		config MACH_CM_T3517
		bool "CompuLab CM-T3517 module"
		depends on ARCH_OMAP3
		default y
		select OMAP_PACKAGE_CBB

		config MACH_CM_T3730
		bool

arch/arm/mach-omap2/Makefile

+0 −8

Original line number	Diff line number	Diff line
		@@ -249,13 +249,8 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o sdram-nokia.o
		obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51-peripherals.o
		obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51-video.o
		obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o
		obj-$(CONFIG_MACH_CM_T3517) += board-cm-t3517.o
		obj-$(CONFIG_MACH_TOUCHBOOK) += board-omap3touchbook.o

		obj-$(CONFIG_MACH_OMAP3517EVM) += board-am3517evm.o

		obj-$(CONFIG_MACH_CRANEBOARD) += board-am3517crane.o

		obj-$(CONFIG_MACH_SBC3530) += board-omap3stalker.o

		# Platform specific device init code
		@@ -285,7 +280,4 @@ ifneq ($(CONFIG_HWSPINLOCK_OMAP),)
		obj-y += hwspinlock.o
		endif

		emac-$(CONFIG_TI_DAVINCI_EMAC) := am35xx-emac.o
		obj-y += $(emac-m) $(emac-y)

		obj-y += common-board-devices.o twl-common.o dss-common.o

arch/arm/mach-omap2/am35xx-emac.c

deleted100644 → 0

+0 −114

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 Ilya Yanok, Emcraft Systems
		*
		* Based on mach-omap2/board-am3517evm.c
		* Copyright (C) 2009 Texas Instruments Incorporated
		* Author: Ranjith Lohithakshan <ranjithl@ti.com>
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2
		* published by the Free Software Foundation.
		*
		* This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
		* whether express or implied; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* General Public License for more details.
		*/

		#include <linux/err.h>
		#include <linux/davinci_emac.h>
		#include "omap_device.h"
		#include "am35xx.h"
		#include "control.h"
		#include "am35xx-emac.h"

		static void am35xx_enable_emac_int(void)
		{
		u32 v;

		v = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
		v \|= (AM35XX_CPGMAC_C0_RX_PULSE_CLR \| AM35XX_CPGMAC_C0_TX_PULSE_CLR \|
		AM35XX_CPGMAC_C0_MISC_PULSE_CLR \| AM35XX_CPGMAC_C0_RX_THRESH_CLR);
		omap_ctrl_writel(v, AM35XX_CONTROL_LVL_INTR_CLEAR);
		omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR); /* OCP barrier */
		}

		static void am35xx_disable_emac_int(void)
		{
		u32 v;

		v = omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR);
		v \|= (AM35XX_CPGMAC_C0_RX_PULSE_CLR \| AM35XX_CPGMAC_C0_TX_PULSE_CLR);
		omap_ctrl_writel(v, AM35XX_CONTROL_LVL_INTR_CLEAR);
		omap_ctrl_readl(AM35XX_CONTROL_LVL_INTR_CLEAR); /* OCP barrier */
		}

		static struct emac_platform_data am35xx_emac_pdata = {
		.ctrl_reg_offset = AM35XX_EMAC_CNTRL_OFFSET,
		.ctrl_mod_reg_offset = AM35XX_EMAC_CNTRL_MOD_OFFSET,
		.ctrl_ram_offset = AM35XX_EMAC_CNTRL_RAM_OFFSET,
		.ctrl_ram_size = AM35XX_EMAC_CNTRL_RAM_SIZE,
		.hw_ram_addr = AM35XX_EMAC_HW_RAM_ADDR,
		.version = EMAC_VERSION_2,
		.interrupt_enable = am35xx_enable_emac_int,
		.interrupt_disable = am35xx_disable_emac_int,
		};

		static struct mdio_platform_data am35xx_mdio_pdata;

		static int __init omap_davinci_emac_dev_init(struct omap_hwmod *oh,
		void *pdata, int pdata_len)
		{
		struct platform_device *pdev;

		pdev = omap_device_build(oh->class->name, 0, oh, pdata, pdata_len);
		if (IS_ERR(pdev)) {
		WARN(1, "Can't build omap_device for %s:%s.\n",
		oh->class->name, oh->name);
		return PTR_ERR(pdev);
		}

		return 0;
		}

		void __init am35xx_emac_init(unsigned long mdio_bus_freq, u8 rmii_en)
		{
		struct omap_hwmod *oh;
		u32 v;
		int ret;

		oh = omap_hwmod_lookup("davinci_mdio");
		if (!oh) {
		pr_err("Could not find davinci_mdio hwmod\n");
		return;
		}

		am35xx_mdio_pdata.bus_freq = mdio_bus_freq;

		ret = omap_davinci_emac_dev_init(oh, &am35xx_mdio_pdata,
		sizeof(am35xx_mdio_pdata));
		if (ret) {
		pr_err("Could not build davinci_mdio hwmod device\n");
		return;
		}

		oh = omap_hwmod_lookup("davinci_emac");
		if (!oh) {
		pr_err("Could not find davinci_emac hwmod\n");
		return;
		}

		am35xx_emac_pdata.rmii_en = rmii_en;

		ret = omap_davinci_emac_dev_init(oh, &am35xx_emac_pdata,
		sizeof(am35xx_emac_pdata));
		if (ret) {
		pr_err("Could not build davinci_emac hwmod device\n");
		return;
		}

		v = omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET);
		v &= ~AM35XX_CPGMACSS_SW_RST;
		omap_ctrl_writel(v, AM35XX_CONTROL_IP_SW_RESET);
		omap_ctrl_readl(AM35XX_CONTROL_IP_SW_RESET); /* OCP barrier */
		}

arch/arm/mach-omap2/am35xx-emac.h

deleted100644 → 0

+0 −15

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 Ilya Yanok, Emcraft Systems
		*
		* 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.
		*/

		#define AM35XX_DEFAULT_MDIO_FREQUENCY 1000000

		#if defined(CONFIG_TI_DAVINCI_EMAC) \|\| defined(CONFIG_TI_DAVINCI_EMAC_MODULE)
		void am35xx_emac_init(unsigned long mdio_bus_freq, u8 rmii_en);
		#else
		static inline void am35xx_emac_init(unsigned long mdio_bus_freq, u8 rmii_en) {}
		#endif

arch/arm/mach-omap2/am35xx.h

deleted100644 → 0

+0 −46

Original line number	Diff line number	Diff line
		/*:
		* Address mappings and base address for AM35XX specific interconnects
		* and peripherals.
		*
		* Copyright (C) 2009 Texas Instruments
		*
		* Author: Sriramakrishnan <srk@ti.com>
		* Vaibhav Hiremath <hvaibhav@ti.com>
		*
		* 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_AM35XX_H
		#define __ASM_ARCH_AM35XX_H

		/*
		* Base addresses
		* Note: OMAP3430 IVA2 memory space is being used for AM35xx IPSS modules
		*/
		#define AM35XX_IPSS_EMAC_BASE 0x5C000000
		#define AM35XX_IPSS_USBOTGSS_BASE 0x5C040000
		#define AM35XX_IPSS_HECC_BASE 0x5C050000
		#define AM35XX_IPSS_VPFE_BASE 0x5C060000


		/* HECC module specifc offset definitions */
		#define AM35XX_HECC_SCC_HECC_OFFSET (0x0)
		#define AM35XX_HECC_SCC_RAM_OFFSET (0x3000)
		#define AM35XX_HECC_RAM_OFFSET (0x3000)
		#define AM35XX_HECC_MBOX_OFFSET (0x2000)
		#define AM35XX_HECC_INT_LINE (0x0)
		#define AM35XX_HECC_VERSION (0x1)

		#define AM35XX_EMAC_CNTRL_OFFSET (0x10000)
		#define AM35XX_EMAC_CNTRL_MOD_OFFSET (0x0)
		#define AM35XX_EMAC_CNTRL_RAM_OFFSET (0x20000)
		#define AM35XX_EMAC_MDIO_OFFSET (0x30000)
		#define AM35XX_IPSS_MDIO_BASE (AM35XX_IPSS_EMAC_BASE + \
		AM35XX_EMAC_MDIO_OFFSET)
		#define AM35XX_EMAC_CNTRL_RAM_SIZE (0x2000)
		#define AM35XX_EMAC_RAM_ADDR (AM3517_EMAC_BASE + \
		AM3517_EMAC_CNTRL_RAM_OFFSET)
		#define AM35XX_EMAC_HW_RAM_ADDR (0x01E20000)

		#endif /* __ASM_ARCH_AM35XX_H */