diff options
author | Olof Johansson <olof@lixom.net> | 2014-01-02 14:45:27 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-01-02 14:45:27 -0500 |
commit | a7dedb4fead89f88255862a9bc46f4c7ec094c2e (patch) | |
tree | d07b09522364b895dc91ccd2d057668d2fa692c5 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
parent | 9dc9b8e51f95fce0cc3d50ef80402203d2dcd68a (diff) | |
parent | 6075a8b2b6c32ddcb99b85189ae41ab2903e560f (diff) |
Merge tag 'davinci-for-v3.14/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/drivers
From Sekhar Nori:
DaVinci GPIO driver updates
---------------------------
This pull request contains updates to DaVinci GPIO driver and the
resultant platform code changes. The updates include DT-conversion and
changes to make the driver cross-platform ready.
* tag 'davinci-for-v3.14/gpio' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
gpio: davinci: don't create irq_domain in case of unbanked irqs
gpio: davinci: use chained_irq_enter/chained_irq_exit API
gpio: davinci: add OF support
gpio: davinci: remove unused variable intc_irq_num
gpio: davinci: convert to use irqdomain support.
gpio: introduce GPIO_DAVINCI kconfig option
gpio: davinci: get rid of DAVINCI_N_GPIO
gpio: davinci: use {readl|writel}_relaxed() instead of __raw_*
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
-rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 4da33c407de1..2652b9e1ccc7 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt | |||
@@ -32,6 +32,7 @@ est ESTeem Wireless Modems | |||
32 | fsl Freescale Semiconductor | 32 | fsl Freescale Semiconductor |
33 | GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 33 | GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. |
34 | gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. | 34 | gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. |
35 | gmt Global Mixed-mode Technology, Inc. | ||
35 | hisilicon Hisilicon Limited. | 36 | hisilicon Hisilicon Limited. |
36 | hp Hewlett Packard | 37 | hp Hewlett Packard |
37 | ibm International Business Machines (IBM) | 38 | ibm International Business Machines (IBM) |
@@ -39,6 +40,7 @@ idt Integrated Device Technologies, Inc. | |||
39 | img Imagination Technologies Ltd. | 40 | img Imagination Technologies Ltd. |
40 | intercontrol Inter Control Group | 41 | intercontrol Inter Control Group |
41 | isl Intersil | 42 | isl Intersil |
43 | lg LG Corporation | ||
42 | linux Linux-specific binding | 44 | linux Linux-specific binding |
43 | lsi LSI Corp. (LSI Logic) | 45 | lsi LSI Corp. (LSI Logic) |
44 | marvell Marvell Technology Group Ltd. | 46 | marvell Marvell Technology Group Ltd. |