Merge branch 'socfpga/dt' into next/dt

SoCFPGA DT changes from Dinh Nguyen.

* socfpga/dt:
  dts: Rename DW APB timer compatible strings
  dts: Deprecate ALTR as a vendor prefix
  of: add vendor prefix for Altera Corp.

Signed-off-by: Olof Johansson <[email protected]>
This commit is contained in:
Olof Johansson 2013-08-29 12:59:11 -07:00
commit 56e9e0f3a3
11 changed files with 28 additions and 31 deletions

View file

@ -302,6 +302,7 @@ static int altera_spi_remove(struct platform_device *dev)
#ifdef CONFIG_OF
static const struct of_device_id altera_spi_match[] = {
{ .compatible = "ALTR,spi-1.0", },
{ .compatible = "altr,spi-1.0", },
{},
};
MODULE_DEVICE_TABLE(of, altera_spi_match);