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

Commit f17a1f06 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 5636/1: Move vendor enum to AMBA include 



This moves the primecell vendor enum definition inside vic.c
out to linux/amba/bus.h where it belongs and replace any
occurances of specific vendor ID:s with the respective enums
instead.

Signed-off-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 70103814

arch/arm/common/vic.c

+4 −8
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/list.h>

#include <linux/io.h>

#include <linux/sysdev.h>

#include <linux/amba/bus.h>



#include <asm/mach/irq.h>

#include <asm/hardware/vic.h>
@@ -272,11 +273,6 @@ static struct irq_chip vic_chip = { 
static void vik_init_st(void __iomem *base, unsigned int irq_start,

			 u32 vic_sources);



enum vic_vendor {

	VENDOR_ARM = 0x41,

	VENDOR_ST = 0x80,

};



/**

 * vic_init - initialise a vectored interrupt controller

 * @base: iomem base address
@@ -289,7 +285,7 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, 
{

	unsigned int i;

	u32 cellid = 0;

	enum vic_vendor vendor;

	enum amba_vendor vendor;



	/* Identify which VIC cell this one is, by reading the ID */

	for (i = 0; i < 4; i++) {
@@ -301,13 +297,13 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, 
	       base, cellid, vendor);



	switch(vendor) {

	case VENDOR_ST:

	case AMBA_VENDOR_ST:

		vik_init_st(base, irq_start, vic_sources);

		return;

	default:

		printk(KERN_WARNING "VIC: unknown vendor, continuing anyways\n");

		/* fall through */

	case VENDOR_ARM:

	case AMBA_VENDOR_ARM:

		break;

	}

drivers/mmc/host/mmci.c

+3 −3
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
				clk = 255;

			host->cclk = host->mclk / (2 * (clk + 1));

		}

		if (host->hw_designer == 0x80)

		if (host->hw_designer == AMBA_VENDOR_ST)

			clk |= MCI_FCEN; /* Bug fix in ST IP block */

		clk |= MCI_CLK_ENABLE;

	}
@@ -443,7 +443,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
		break;

	case MMC_POWER_UP:

		/* The ST version does not have this, fall through to POWER_ON */

		if (host->hw_designer != 0x80) {

		if (host->hw_designer != AMBA_VENDOR_ST) {

			pwr |= MCI_PWR_UP;

			break;

		}
@@ -453,7 +453,7 @@ static void mmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) 
	}



	if (ios->bus_mode == MMC_BUSMODE_OPENDRAIN) {

		if (host->hw_designer != 0x80)

		if (host->hw_designer != AMBA_VENDOR_ST)

			pwr |= MCI_ROD;

		else {

			/*

include/linux/amba/bus.h

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,11 @@ struct amba_driver { 
	struct amba_id		*id_table;

};



enum amba_vendor {

	AMBA_VENDOR_ARM = 0x41,

	AMBA_VENDOR_ST = 0x80,

};



#define amba_get_drvdata(d)	dev_get_drvdata(&d->dev)

#define amba_set_drvdata(d,p)	dev_set_drvdata(&d->dev, p)