-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'linus' into x86/microcode, to pick up merge window changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
- Loading branch information
Showing
1,910 changed files
with
70,595 additions
and
29,250 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,41 @@ | ||
| What: /sys/bus/iio/devices/iio:deviceX/tia_resistanceY | ||
| /sys/bus/iio/devices/iio:deviceX/tia_capacitanceY | ||
| Date: December 2015 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <afd@ti.com> | ||
| Description: | ||
| Get and set the resistance and the capacitance settings for the | ||
| Transimpedance Amplifier. Y is 1 for Rf1 and Cf1, Y is 2 for | ||
| Rf2 and Cf2 values. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/tia_separate_en | ||
| Date: December 2015 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <afd@ti.com> | ||
| Description: | ||
| Enable or disable separate settings for the TransImpedance | ||
| Amplifier above, when disabled both values are set by the | ||
| first channel. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_raw | ||
| /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_ambient_raw | ||
| Date: December 2015 | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_raw | ||
| Date: May 2016 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <afd@ti.com> | ||
| Description: | ||
| Get measured values from the ADC for these stages. Y is the | ||
| specific LED number. The values are expressed in 24-bit twos | ||
| complement. | ||
| specific stage number corresponding to datasheet stage names | ||
| as follows: | ||
| 1 -> LED2 | ||
| 2 -> ALED2/LED3 | ||
| 3 -> LED1 | ||
| 4 -> ALED1/LED4 | ||
| Note that channels 5 and 6 represent LED2-ALED2 and LED1-ALED1 | ||
| respectively which simply helper channels containing the | ||
| calculated difference in the value of stage 1 - 2 and 3 - 4. | ||
| The values are expressed in 24-bit twos complement. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw | ||
| Date: December 2015 | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_offset | ||
| Date: May 2016 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <afd@ti.com> | ||
| Description: | ||
| Get differential values from the ADC for these stages. Y is the | ||
| specific LED number. The values are expressed in 24-bit twos | ||
| complement for the specified LEDs. | ||
| Get and set the offset cancellation DAC setting for these | ||
| stages. The values are expressed in 5-bit sign-magnitude. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_offset | ||
| /sys/bus/iio/devices/iio:deviceX/out_current_ledY_ambient_offset | ||
| Date: December 2015 | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_resistance | ||
| What: /sys/bus/iio/devices/iio:deviceX/in_intensityY_capacitance | ||
| Date: May 2016 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <afd@ti.com> | ||
| Description: | ||
| Get and set the offset cancellation DAC setting for these | ||
| stages. The values are expressed in 5-bit sign-magnitude. | ||
| Get and set the resistance and the capacitance settings for the | ||
| Transimpedance Amplifier during the associated stage. | ||
|
|
||
| What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_raw | ||
| Date: December 2015 | ||
| What: /sys/bus/iio/devices/iio:deviceX/out_currentY_raw | ||
| Date: May 2016 | ||
| KernelVersion: | ||
| Contact: Andrew F. Davis <afd@ti.com> | ||
| Description: | ||
| Get and set the LED current for the specified LED. Y is the | ||
| specific LED number. | ||
| Get and set the LED current for the specified LED active during | ||
| this stage. Y is the specific stage number. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
Documentation/devicetree/bindings/hwmon/apm-xgene-hwmon.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| APM X-Gene hwmon driver | ||
|
|
||
| APM X-Gene SOC sensors are accessed over the "SLIMpro" mailbox. | ||
|
|
||
| Required properties : | ||
| - compatible : should be "apm,xgene-slimpro-hwmon" | ||
| - mboxes : use the label reference for the mailbox as the first parameter. | ||
| The second parameter is the channel number. | ||
|
|
||
| Example : | ||
| hwmonslimpro { | ||
| compatible = "apm,xgene-slimpro-hwmon"; | ||
| mboxes = <&mailbox 7>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| Properties for Jedec JC-42.4 compatible temperature sensors | ||
|
|
||
| Required properties: | ||
| - compatible: May include a device-specific string consisting of the | ||
| manufacturer and the name of the chip. A list of supported | ||
| chip names follows. | ||
| Must include "jedec,jc-42.4-temp" for any Jedec JC-42.4 | ||
| compatible temperature sensor. | ||
|
|
||
| Supported chip names: | ||
| adi,adt7408 | ||
| atmel,at30ts00 | ||
| atmel,at30tse004 | ||
| onnn,cat6095 | ||
| onnn,cat34ts02 | ||
| maxim,max6604 | ||
| microchip,mcp9804 | ||
| microchip,mcp9805 | ||
| microchip,mcp9808 | ||
| microchip,mcp98243 | ||
| microchip,mcp98244 | ||
| microchip,mcp9843 | ||
| nxp,se97 | ||
| nxp,se98 | ||
| st,stts2002 | ||
| st,stts2004 | ||
| st,stts3000 | ||
| st,stts424 | ||
| st,stts424e | ||
| idt,tse2002 | ||
| idt,tse2004 | ||
| idt,ts3000 | ||
| idt,ts3001 | ||
|
|
||
| - reg: I2C address | ||
|
|
||
| Example: | ||
|
|
||
| temp-sensor@1a { | ||
| compatible = "jedec,jc-42.4-temp"; | ||
| reg = <0x1a>; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
Documentation/devicetree/bindings/iio/adc/brcm,iproc-static-adc.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| * Broadcom's IPROC Static ADC controller | ||
|
|
||
| Broadcom iProc ADC controller has 8 channels 10bit ADC. | ||
| Allows user to convert analog input voltage values to digital. | ||
|
|
||
| Required properties: | ||
|
|
||
| - compatible: Must be "brcm,iproc-static-adc" | ||
|
|
||
| - adc-syscon: Handler of syscon node defining physical base address of the | ||
| controller and length of memory mapped region. | ||
|
|
||
| - #io-channel-cells = <1>; As ADC has multiple outputs | ||
| refer to Documentation/devicetree/bindings/iio/iio-bindings.txt for details. | ||
|
|
||
| - io-channel-ranges: | ||
| refer to Documentation/devicetree/bindings/iio/iio-bindings.txt for details. | ||
|
|
||
| - clocks: Clock used for this block. | ||
|
|
||
| - clock-names: Clock name should be given as tsc_clk. | ||
|
|
||
| - interrupts: interrupt line number. | ||
|
|
||
| For example: | ||
|
|
||
| ts_adc_syscon: ts_adc_syscon@180a6000 { | ||
| compatible = "brcm,iproc-ts-adc-syscon","syscon"; | ||
| reg = <0x180a6000 0xc30>; | ||
| }; | ||
|
|
||
| adc: adc@180a6000 { | ||
| compatible = "brcm,iproc-static-adc"; | ||
| adc-syscon = <&ts_adc_syscon>; | ||
| #io-channel-cells = <1>; | ||
| io-channel-ranges; | ||
| clocks = <&asiu_clks BCM_CYGNUS_ASIU_ADC_CLK>; | ||
| clock-names = "tsc_clk"; | ||
| interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_HIGH>; | ||
| status = "disabled"; | ||
| }; |
Oops, something went wrong.