diff options
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-ibm-occ.txt | 13 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/aspeed-smc.txt | 73 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/serial/8250.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 | ||||
| -rw-r--r-- | Documentation/hwmon/adm1275 | 29 |
5 files changed, 111 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-ibm-occ.txt b/Documentation/devicetree/bindings/i2c/i2c-ibm-occ.txt new file mode 100644 index 000000000000..9aab2df8c5ed --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/i2c-ibm-occ.txt @@ -0,0 +1,13 @@ +HWMON i2c driver for IBM POWER CPU OCC (On Chip Controller) + +Required properties: + - compatible: must be "ibm,power8-occ-i2c" + - reg: physical address + +Example: +i2c3: i2c-bus@100 { + occ@50 { + compatible = "ibm,occ-i2c"; + reg = <0x50>; + }; +}; diff --git a/Documentation/devicetree/bindings/mtd/aspeed-smc.txt b/Documentation/devicetree/bindings/mtd/aspeed-smc.txt new file mode 100644 index 000000000000..e17aea843651 --- /dev/null +++ b/Documentation/devicetree/bindings/mtd/aspeed-smc.txt @@ -0,0 +1,73 @@ +* Aspeed Static Memory controller in SPI mode +* Aspeed SPI Flash Controller + +Required properties: + - compatible : Should be "aspeed,fmc" for Static Memory Controller (AST2400, AST2300?), or + "aspeed,smc" for the SPI flash controller + - reg : the first contains the register location and length, + the second through nth contains the memory mapping address and length + for the access window for each chips select + - interrupts : Should contain the interrupt for the dma device if fmc + - clocks : The APB clock input to the controller + - #address-cells : must be 1 corresponding to chip select child binding + - #size-cells : must be 0 corresponding to chip select child binding + + +Child node required properties: + - reg : must contain chip select number in first cell of address, must + be 1 tuple long + - compatible : may contain "vendor,part", must include "jedec,spi-nor" + (see spi-nor.txt binding). + +Child node optional properties: + - label - (optional) name to assign to mtd, default os assigned + - spi-max-frequency - (optional) max frequency of spi bus (XXX max if missing) + - spi-cpol - (optional) Empty property indicating device requires + inverse clock polarity (CPOL) mode (boolean) + - spi-cpha - (optional) Empty property indicating device requires + shifted clock phase (CPHA) mode (boolean) + - spi-tx-bus-width - (optional) The bus width(number of data wires) that + used for MOSI. Defaults to 1 if not present. + - spi-rx-bus-width - (optional) The bus width(number of data wires) that + used for MOSI. Defaults to 1 if not present. + +Child node optional properties: + - see mtd/partiton.txt for partitioning bindings and mtd naming + + +Example: + +fmc: fmc@1e620000 { + compatible = "aspeed,fmc"; + reg = < 0x1e620000 0x94 + 0x20000000 0x02000000 + 0x22000000 0x02000000 >; + #address-cells = <1>; + #size-cells = <0>; + flash@0 { + reg = < 0 >; + compatible = "jedec,spi-nor" ; + label = "bmc"; + /* spi-max-frequency = <>; */ + /* m25p,fast-read; */ + #address-cells = <1>; + #size-cells = <1>; + boot@0 { + label = "boot-loader"; + reg = < 0 0x8000 > + } + image@8000 { + label = "kernel-image"; + reg = < 0x8000 0x1f8000 > + } + }; + flash@1 { + reg = < 1 >; + compatible = "jedec,spi-nor" ; + label = "alt"; + /* spi-max-frequency = <>; */ + status = "fail"; + /* m25p,fast-read; */ + }; +}; + diff --git a/Documentation/devicetree/bindings/serial/8250.txt b/Documentation/devicetree/bindings/serial/8250.txt index 91d5ab0e60fc..1b887f252601 100644 --- a/Documentation/devicetree/bindings/serial/8250.txt +++ b/Documentation/devicetree/bindings/serial/8250.txt @@ -20,6 +20,7 @@ Required properties: - "altr,16550-FIFO128" - "fsl,16550-FIFO64" - "fsl,ns16550" + - "aspeed,vuart" - "serial" if the port type is unknown. - reg : offset and length of the register set for the device. - interrupts : should contain uart interrupt. diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 55df1d444e9f..78d969b3d1d2 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -28,6 +28,7 @@ arm ARM Ltd. armadeus ARMadeus Systems SARL artesyn Artesyn Embedded Technologies Inc. asahi-kasei Asahi Kasei Corp. +aspeed ASPEED TECHNOLOGY Inc. atmel Atmel Corporation auo AU Optronics Corporation avago Avago Technologies diff --git a/Documentation/hwmon/adm1275 b/Documentation/hwmon/adm1275 index d697229e3c18..791bc0bd91e6 100644 --- a/Documentation/hwmon/adm1275 +++ b/Documentation/hwmon/adm1275 @@ -14,6 +14,10 @@ Supported chips: Prefix: 'adm1276' Addresses scanned: - Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1276.pdf + * Analog Devices ADM1278 + Prefix: 'adm1278' + Addresses scanned: - + Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1278.pdf * Analog Devices ADM1293/ADM1294 Prefix: 'adm1293', 'adm1294' Addresses scanned: - @@ -25,13 +29,15 @@ Author: Guenter Roeck <linux@roeck-us.net> Description ----------- -This driver supports hardware montoring for Analog Devices ADM1075, ADM1275, -ADM1276, ADM1293, and ADM1294 Hot-Swap Controller and Digital Power Monitors. +This driver supports hardware monitoring for Analog Devices ADM1075, ADM1275, +ADM1276, ADM1278, ADM1293, and ADM1294 Hot-Swap Controller and Digital +Power Monitors. -ADM1075, ADM1275, ADM1276, ADM1293, and ADM1294 are hot-swap controllers that -allow a circuit board to be removed from or inserted into a live backplane. -They also feature current and voltage readback via an integrated 12 -bit analog-to-digital converter (ADC), accessed using a PMBus interface. +ADM1075, ADM1275, ADM1276, ADM1278, ADM1293, and ADM1294 are hot-swap +controllers that allow a circuit board to be removed from or inserted into +a live backplane. They also feature current and voltage readback via an +integrated 12 bit analog-to-digital converter (ADC), accessed using a +PMBus interface. The driver is a client driver to the core PMBus driver. Please see Documentation/hwmon/pmbus for details on PMBus client drivers. @@ -96,3 +102,14 @@ power1_reset_history Write any value to reset history. Power attributes are supported on ADM1075, ADM1276, ADM1293, and ADM1294. + +temp1_input Chip temperature. + Temperature attributes are only available on ADM1278. +temp1_max Maximum chip temperature. +temp1_max_alarm Temperature alarm. +temp1_crit Critical chip temperature. +temp1_crit_alarm Critical temperature high alarm. +temp1_highest Highest observed temperature. +temp1_reset_history Write any value to reset history. + + Temperature attributes are supported on ADM1278. |
