Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 280124
b: refs/heads/master
c: 2b24628
h: refs/heads/master
v: v3
  • Loading branch information
Tomoya MORINAGA authored and Grant Likely committed Oct 29, 2011
1 parent 577140d commit 944dcac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 92b3a5c1bc3c7da1ae4675d014124f4a97ddb632
refs/heads/master: 2b246283277862c4866a005852af5c70fd581824
12 changes: 6 additions & 6 deletions trunk/drivers/spi/spi-topcliff-pch.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* SPI bus driver for the Topcliff PCH used by Intel SoCs
*
* Copyright (C) 2010 OKI SEMICONDUCTOR Co., LTD.
* Copyright (C) 2011 LAPIS Semiconductor Co., Ltd.
*
* 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
Expand Down Expand Up @@ -95,7 +95,7 @@
#define PCH_CLOCK_HZ 50000000
#define PCH_MAX_SPBR 1023

/* Definition for ML7213/ML7831 by OKI SEMICONDUCTOR */
/* Definition for ML7213/ML7223/ML7831 by LAPIS Semiconductor */
#define PCI_VENDOR_ID_ROHM 0x10DB
#define PCI_DEVICE_ID_ML7213_SPI 0x802c
#define PCI_DEVICE_ID_ML7223_SPI 0x800F
Expand All @@ -104,9 +104,9 @@
/*
* Set the number of SPI instance max
* Intel EG20T PCH : 1ch
* OKI SEMICONDUCTOR ML7213 IOH : 2ch
* OKI SEMICONDUCTOR ML7223 IOH : 1ch
* OKI SEMICONDUCTOR ML7831 IOH : 1ch
* LAPIS Semiconductor ML7213 IOH : 2ch
* LAPIS Semiconductor ML7223 IOH : 1ch
* LAPIS Semiconductor ML7831 IOH : 1ch
*/
#define PCH_SPI_MAX_DEV 2

Expand Down Expand Up @@ -1756,4 +1756,4 @@ MODULE_PARM_DESC(use_dma,
"to use DMA for data transfers pass 1 else 0; default 1");

MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Intel EG20T PCH/OKI SEMICONDUCTOR ML7xxx IOH SPI Driver");
MODULE_DESCRIPTION("Intel EG20T PCH/LAPIS Semiconductor ML7xxx IOH SPI Driver");

0 comments on commit 944dcac

Please sign in to comment.