Add Xilinx AMS Driver
Subsystems (4)
cover Add Xilinx AMS Driver
Add Xilinx AMS driver which is used for Xilinx's ZynqMP AMS controller. This AMS driver is used to report various interface voltages and temperatures across the system.
This driver handles AMS module including PS-Sysmon & PL-Sysmon. The binding documentation is added for understanding of AMS, PS, PL Sysmon Channels.
Manish Narani (3):
dt-bindings: iio: adc: Add Xilinx AMS binding documentation
iio: adc: Add Xilinx AMS driver
arm64: zynqmp: DT: Add Xilinx AMS node
.../devicetree/bindings/iio/adc/xilinx-ams.txt | 159 +++ arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 26 + drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/xilinx-ams.c | 1081 ++++++++++++++++++++ drivers/iio/adc/xilinx-ams.h | 281 +++++ 6 files changed, 1558 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt create mode 100644 drivers/iio/adc/xilinx-ams.c create mode 100644 drivers/iio/adc/xilinx-ams.h
Signature · 1 line
2.1.1
PATCH 1/3 dt-bindings: iio: adc: Add Xilinx AMS binding documentation
Xilinx AMS have several ADC channels that can be used for measurement of different voltages and temperatures. Document the same in the bindings.
--- .../devicetree/bindings/iio/adc/xilinx-ams.txt | 159 +++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +159 -0
@@ -0,0 +1,159 @@ +Xilinx AMS controller + +The AMS includes an ADC as well as on-chip sensors that can be used to +sample external voltages and monitor on-die operating conditions, such as +temperature and supply voltage levels. The AMS has two SYSMON blocks. +PL-SYSMON block is capable of monitoring off chip voltage and temperature. +PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring from +external master. Out of this interface currently only DRP is supported. +Other block PS-SYSMON is memory mapped to PS. Both of block has built-in +alarm generation logic that is used to interrupt the processor based on +condition set. + +All designs should have AMS registers, but PS and PL are optional. The +AMS controller can work with only PS, only PL and both PS and PL +configurations. Please specify registers according to your design. Devicetree +should always have AMS module property. Providing PS & PL module is optional. + +Required properties: + - compatible: Should be "xlnx,zynqmp-ams" + - reg: Should specify AMS register space + - interrupts: Interrupt number for the AMS control interface + - interrupt-names: Interrupt name, must be "ams-irq" + - clocks: Should contain a clock specifier for the device + - ranges: keep the property empty to map child address space + (for PS and/or PL) nodes 1:1 onto the parent address + space + +AMS device tree subnode: + - compatible: Should be "xlnx,zynqmp-ams-ps" or "xlnx,zynqmp-ams-pl" + - reg: Register space for PS or PL + +Optional properties: + +Following optional property only valid for PL. + - xlnx,ext-channels: List of external channels that are connected to the + AMS PL module. + + The child nodes of this node represent the external channels which are + connected to the AMS Module. If the property is not present + no external channels will be assumed to be connected. + + Each child node represents one channel and has the following + properties: + Required properties: + * reg: Pair of pins the channel is connected to. + 0: VP/VN + 1: VUSER0 + 2: VUSER1 + 3: VUSER3 + 4: VUSER4 + 5: VAUXP[0]/VAUXN[0] + 6: VAUXP[1]/VAUXN[1] + ... + 20: VAUXP[15]/VAUXN[15] + Note each channel number should only be used at most + once. + Optional properties: + * xlnx,bipolar: If set the channel is used in bipolar + mode. + + +Example: + xilinx_ams: ams at ffa50000 { + compatible = "xlnx,zynqmp-ams"; + interrupt-parent = <&gic>; + interrupts = <0 56 4>; + interrupt-names = "ams-irq"; + clocks = <&clkc 70>; + reg = <0x0 0xffa50000 0x0 0x800>; + reg-names = "ams-base"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + ams_ps: ams_ps at ffa50800 { + compatible = "xlnx,zynqmp-ams-ps"; + reg = <0x0 0xffa50800 0x0 0x400>; + }; + + ams_pl: ams_pl at ffa50c00 { + compatible = "xlnx,zynqmp-ams-pl"; + reg = <0x0 0xffa50c00 0x0 0x400>; + xlnx,ext-channels { + #address-cells = <1>; + #size-cells = <0>; + channel at 0 { + reg = <0>; + xlnx,bipolar; + }; + channel at 1 { + reg = <1>; + }; + channel at 8 { + reg = <8>; + xlnx,bipolar; + }; + }; + }; + }; + +AMS Channels Details: + +Sysmon Block |Channel| Details |Measurement + Number Type +--------------------------------------------------------------------------------------------------------- +AMS CTRL |0 |System PLLs voltage measurement, VCC_PSPLL. |Voltage + |1 |Battery voltage measurement, VCC_PSBATT. |Voltage + |2 |PL Internal voltage measurement, VCCINT. |Voltage + |3 |Block RAM voltage measurement, VCCBRAM. |Voltage + |4 |PL Aux voltage measurement, VCCAUX. |Voltage + |5 |Voltage measurement for six DDR I/O PLLs, VCC_PSDDR_PLL. |Voltage + |6 |VCC_PSINTFP_DDR voltage measurement. |Voltage +--------------------------------------------------------------------------------------------------------- +PS Sysmon |7 |LPD temperature measurement. |Temperature + |8 |FPD Temperature Measurment (REMOTE). |Temperature + |9 |VCC PS LPD voltage measurement (supply1). |Voltage + |10 |VCC PS FPD voltage measurement (supply2). |Voltage + |11 |PS Aux voltage reference (supply3). |Voltage + |12 |DDR I/O VCC voltage measurement. |Voltage + |13 |PS IO Bank 503 voltage measurement (supply5). |Voltage + |14 |PS IO Bank 500 voltage measurement (supply6). |Voltage + |15 |VCCO_PSIO1 voltage measurement. |Voltage + |16 |VCCO_PSIO2 voltage measurement. |Voltage + |17 |VCC_PS_GTR voltage measurement (VPS_MGTRAVCC). |Voltage + |18 |VTT_PS_GTR voltage measurement (VPS_MGTRAVTT). |Voltage + |19 |VCC_PSADC voltage measurement. |Voltage +--------------------------------------------------------------------------------------------------------- +PL Sysmon |20 |PL Temperature measurement. |Temperature + |21 |PL Internal Voltage Voltage measurement, VCCINT. |Voltage + |22 |PL Auxiliary Voltage measurement, VCCAUX. |Voltage + |23 |ADC Reference P+ Voltage measurement. |Voltage + |24 |ADC Reference N- Voltage measurement. |Voltage + |25 |PL Block RAM Voltage measurement, VCCBRAM. |Voltage + |26 |LPD Internal Voltage measurement, VCC_PSINTLP (supply4). |Voltage + |27 |FPD Internal Voltage measurement, VCC_PSINTFP (supply5). |Voltage + |28 |PS Auxiliary Voltage measurement (supply6). |Voltage + |29 |PL VCCADC Voltage measurement (vccams). |Voltage + |30 |Differencial analog input signal Voltage measurment. |Voltage + |31 |VUser0 Voltage measurement (supply7). |Voltage + |32 |VUser1 Voltage measurement (supply8). |Voltage + |33 |VUser2 Voltage measurement (supply9). |Voltage + |34 |VUser3 Voltage measurement (supply10). |Voltage + |35 |Auxiliary ch 0 Voltage measurement (VAux0). |Voltage + |36 |Auxiliary ch 1 Voltage measurement (VAux1). |Voltage + |37 |Auxiliary ch 2 Voltage measurement (VAux2). |Voltage + |38 |Auxiliary ch 3 Voltage measurement (VAux3). |Voltage + |39 |Auxiliary ch 4 Voltage measurement (VAux4). |Voltage + |40 |Auxiliary ch 5 Voltage measurement (VAux5). |Voltage + |41 |Auxiliary ch 6 Voltage measurement (VAux6). |Voltage + |42 |Auxiliary ch 7 Voltage measurement (VAux7). |Voltage + |43 |Auxiliary ch 8 Voltage measurement (VAux8). |Voltage + |44 |Auxiliary ch 9 Voltage measurement (VAux9). |Voltage + |45 |Auxiliary ch 10 Voltage measurement (VAux10). |Voltage + |46 |Auxiliary ch 11 Voltage measurement (VAux11). |Voltage + |47 |Auxiliary ch 12 Voltage measurement (VAux12). |Voltage + |48 |Auxiliary ch 13 Voltage measurement (VAux13). |Voltage + |49 |Auxiliary ch 14 Voltage measurement (VAux14). |Voltage + |50 |Auxiliary ch 15 Voltage measurement (VAux15). |Voltage +---------------------------------------------------------------------------------------------------------
Signature · 1 line
2.1.1
Jonathan Cameron
maintainerRe: [PATCH 1/3] dt-bindings: iio: adc: Add Xilinx AMS binding documentation
Quoted 16 lines · On Thu, 30 Aug 2018 15:52:17 +0530 Manish Narani <[email protected]>…
Xilinx AMS have several ADC channels that can be used for measurement of different voltages and temperatures. Document the same in the bindings.
Signed-off-by Manish Narani <[email protected]>--- .../devicetree/bindings/iio/adc/xilinx-ams.txt | 159 +++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/xilinx-ams.txtDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0@@ -0,0 +1,159 @@ +Xilinx AMS controller
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 11
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ +The AMS includes an ADC as well as on-chip sensors that can be used to +sample external voltages and monitor on-die operating conditions, such as +temperature and supply voltage levels. The AMS has two SYSMON blocks. +PL-SYSMON block is capable of monitoring off chip voltage and temperature. +PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring from +external master. Out of this interface currently only DRP is supported. +Other block PS-SYSMON is memory mapped to PS. Both of block has built-in +alarm generation logic that is used to interrupt the processor based on +condition set.
I guess anyone reading this because they have the hardware would know what PS and PL are, but it would still be nice to define those acronyms!
Google suggest, Programmable Logic (FPGA bit I guess) and Process Space (Arm core bit?) As I read this, from a driver point of view it doesn't really matter - these are just blocks of channels that are there?
This binding is complex enough I definitely want some DT binding review.
Quoted 25 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +25
-0+ +All designs should have AMS registers, but PS and PL are optional. The +AMS controller can work with only PS, only PL and both PS and PL +configurations. Please specify registers according to your design. Devicetree +should always have AMS module property. Providing PS & PL module is optional. + +Required properties: + - compatible: Should be "xlnx,zynqmp-ams" + - reg: Should specify AMS register space + - interrupts: Interrupt number for the AMS control interface + - interrupt-names: Interrupt name, must be "ams-irq" + - clocks: Should contain a clock specifier for the device + - ranges: keep the property empty to map child address space + (for PS and/or PL) nodes 1:1 onto the parent address + space + +AMS device tree subnode: + - compatible: Should be "xlnx,zynqmp-ams-ps" or "xlnx,zynqmp-ams-pl" + - reg: Register space for PS or PL + +Optional properties: + +Following optional property only valid for PL. + - xlnx,ext-channels: List of external channels that are connected to the + AMS PL module.
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 46
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ + The child nodes of this node represent the external channels which are + connected to the AMS Module. If the property is not present + no external channels will be assumed to be connected. + + Each child node represents one channel and has the following + properties: + Required properties: + * reg: Pair of pins the channel is connected to. + 0: VP/VN
Hmm. So we have this table here of the ones that may or may not be connected with different numbering from the overall table. Given these indexes are arbitrary can we unify them?
I.e. use the index from below but state here which values can be used?
Quoted 103 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +103
-0+ 1: VUSER0 + 2: VUSER1 + 3: VUSER3 + 4: VUSER4 + 5: VAUXP[0]/VAUXN[0] + 6: VAUXP[1]/VAUXN[1] + ... + 20: VAUXP[15]/VAUXN[15] + Note each channel number should only be used at most + once. + Optional properties: + * xlnx,bipolar: If set the channel is used in bipolar + mode. + + +Example: + xilinx_ams: ams at ffa50000 { + compatible = "xlnx,zynqmp-ams"; + interrupt-parent = <&gic>; + interrupts = <0 56 4>; + interrupt-names = "ams-irq"; + clocks = <&clkc 70>; + reg = <0x0 0xffa50000 0x0 0x800>; + reg-names = "ams-base"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + ams_ps: ams_ps at ffa50800 { + compatible = "xlnx,zynqmp-ams-ps"; + reg = <0x0 0xffa50800 0x0 0x400>; + }; + + ams_pl: ams_pl at ffa50c00 { + compatible = "xlnx,zynqmp-ams-pl"; + reg = <0x0 0xffa50c00 0x0 0x400>; + xlnx,ext-channels { + #address-cells = <1>; + #size-cells = <0>; + channel at 0 { + reg = <0>; + xlnx,bipolar; + }; + channel at 1 { + reg = <1>; + }; + channel at 8 { + reg = <8>; + xlnx,bipolar; + }; + }; + }; + }; + +AMS Channels Details: + +Sysmon Block |Channel| Details |Measurement + Number Type +--------------------------------------------------------------------------------------------------------- +AMS CTRL |0 |System PLLs voltage measurement, VCC_PSPLL. |Voltage + |1 |Battery voltage measurement, VCC_PSBATT. |Voltage + |2 |PL Internal voltage measurement, VCCINT. |Voltage + |3 |Block RAM voltage measurement, VCCBRAM. |Voltage + |4 |PL Aux voltage measurement, VCCAUX. |Voltage + |5 |Voltage measurement for six DDR I/O PLLs, VCC_PSDDR_PLL. |Voltage + |6 |VCC_PSINTFP_DDR voltage measurement. |Voltage +--------------------------------------------------------------------------------------------------------- +PS Sysmon |7 |LPD temperature measurement. |Temperature + |8 |FPD Temperature Measurment (REMOTE). |Temperature + |9 |VCC PS LPD voltage measurement (supply1). |Voltage + |10 |VCC PS FPD voltage measurement (supply2). |Voltage + |11 |PS Aux voltage reference (supply3). |Voltage + |12 |DDR I/O VCC voltage measurement. |Voltage + |13 |PS IO Bank 503 voltage measurement (supply5). |Voltage + |14 |PS IO Bank 500 voltage measurement (supply6). |Voltage + |15 |VCCO_PSIO1 voltage measurement. |Voltage + |16 |VCCO_PSIO2 voltage measurement. |Voltage + |17 |VCC_PS_GTR voltage measurement (VPS_MGTRAVCC). |Voltage + |18 |VTT_PS_GTR voltage measurement (VPS_MGTRAVTT). |Voltage + |19 |VCC_PSADC voltage measurement. |Voltage +--------------------------------------------------------------------------------------------------------- +PL Sysmon |20 |PL Temperature measurement. |Temperature + |21 |PL Internal Voltage Voltage measurement, VCCINT. |Voltage + |22 |PL Auxiliary Voltage measurement, VCCAUX. |Voltage + |23 |ADC Reference P+ Voltage measurement. |Voltage + |24 |ADC Reference N- Voltage measurement. |Voltage + |25 |PL Block RAM Voltage measurement, VCCBRAM. |Voltage + |26 |LPD Internal Voltage measurement, VCC_PSINTLP (supply4). |Voltage + |27 |FPD Internal Voltage measurement, VCC_PSINTFP (supply5). |Voltage + |28 |PS Auxiliary Voltage measurement (supply6). |Voltage + |29 |PL VCCADC Voltage measurement (vccams). |Voltage + |30 |Differencial analog input signal Voltage measurment. |Voltage + |31 |VUser0 Voltage measurement (supply7). |Voltage + |32 |VUser1 Voltage measurement (supply8). |Voltage + |33 |VUser2 Voltage measurement (supply9). |Voltage + |34 |VUser3 Voltage measurement (supply10). |Voltage + |35 |Auxiliary ch 0 Voltage measurement (VAux0). |Voltage + |36 |Auxiliary ch 1 Voltage measurement (VAux1). |Voltage + |37 |Auxiliary ch 2 Voltage measurement (VAux2). |Voltage + |38 |Auxiliary ch 3 Voltage measurement (VAux3). |Voltage + |39 |Auxiliary ch 4 Voltage measurement (VAux4). |Voltage + |40 |Auxiliary ch 5 Voltage measurement (VAux5). |Voltage + |41 |Auxiliary ch 6 Voltage measurement (VAux6). |Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 159
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ |42 |Auxiliary ch 7 Voltage measurement (VAux7). |Voltage + |43 |Auxiliary ch 8 Voltage measurement (VAux8). |Voltage + |44 |Auxiliary ch 9 Voltage measurement (VAux9). |Voltage + |45 |Auxiliary ch 10 Voltage measurement (VAux10). |Voltage + |46 |Auxiliary ch 11 Voltage measurement (VAux11). |Voltage + |47 |Auxiliary ch 12 Voltage measurement (VAux12). |Voltage + |48 |Auxiliary ch 13 Voltage measurement (VAux13). |Voltage + |49 |Auxiliary ch 14 Voltage measurement (VAux14). |Voltage + |50 |Auxiliary ch 15 Voltage measurement (VAux15). |Voltage +---------------------------------------------------------------------------------------------------------
Thanks,
Jonathan
RE: [PATCH 1/3] dt-bindings: iio: adc: Add Xilinx AMS binding documentation
Hi Jonathan,
Thanks for the review!
Quoted 46 lines
-----Original Message-----
From: Jonathan Cameron [mailto:jic23 at kernel.org]
Sent: Sunday, September 2, 2018 11:45 PM
To: Manish Narani <[email protected]>
Cc:knaack.hat gmx.de; lars at metafoo.de; pmeerw at pmeerw.net; robh+dt at kernel.org; mark.rutland at arm.com; Michal Simek <[email protected]>; leoyang.li at nxp.com; sudeep.holla at arm.com; amit.kucheria at linaro.org; broonie at kernel.org; arnaud.pouliquen at st.com; geert at linux-m68k.org; eugen.hristev at microchip.com; rdunlap at infradead.org; lukas at wunner.de; freeman.liu at spreadtrum.com; vilhelm.gray at gmail.com; tglx at linutronix.de; baolin.wang at linaro.org; gregkh at linuxfoundation.org; Srinivas Goud <[email protected]>; Anirudha Sarangi <[email protected]>; linux-iio at vger.kernel.org; devicetree at vger.kernel.org; linux-arm- kernel at lists.infradead.org; linux-kernel at vger.kernel.org
Subject: Re: [PATCH 1/3] dt-bindings: iio: adc: Add Xilinx AMS binding documentationQuoted 6 lines · On Thu, 30 Aug 2018 15:52:17 +0530 Manish Narani <[email protected]>…
Xilinx AMS have several ADC channels that can be used for measurement of different voltages and temperatures. Document the same in the bindings.
Signed-off-by Manish Narani <[email protected]>--- .../devicetree/bindings/iio/adc/xilinx-ams.txt | 159+++++++++++++++++++++
Quoted 11 lines
1 file changed, 159 insertions(+) create mode 100644
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txtDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +0
-0Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 5
Quoted 5 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +5
-0@@ -0,0 +1,159 @@ +Xilinx AMS controller + +The AMS includes an ADC as well as on-chip sensors that can be used +to sample external voltages and monitor on-die operating conditions, +such as temperature and supply voltage levels. The AMS has two SYSMONblocks.
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 6
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+PL-SYSMON block is capable of monitoring off chip voltage andtemperature.
Quoted 8 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 11
Quoted 5 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +5
-0+PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring +from external master. Out of this interface currently only DRP is supported. +Other block PS-SYSMON is memory mapped to PS. Both of block has +built-in alarm generation logic that is used to interrupt the +processor based on condition set.I guess anyone reading this because they have the hardware would know what PS and PL are, but it would still be nice to define those acronyms!
Okay, I will rectify this in v2.
Quoted 4 lines
Google suggest, Programmable Logic (FPGA bit I guess) and Process Space (Arm core bit?) As I read this, from a driver point of view it doesn't really matter - these are just blocks of channels that are there?
Yes, these are just blocks of channels, which are enabled/disabled via devicetree child nodes "xlnx,zynqmp-ams-ps" and "xlnx,zynqmp-ams-pl".
Quoted 2 lines
This binding is complex enough I definitely want some DT binding review.
Sure!
Quoted 44 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 16
Quoted 8 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +5
-0+ +All designs should have AMS registers, but PS and PL are optional. +The AMS controller can work with only PS, only PL and both PS and PL +configurations. Please specify registers according to your design. +Devicetree should always have AMS module property. Providing PS & PLmodule is optional.
Quoted 12 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +12
-0+ +Required properties: + - compatible: Should be "xlnx,zynqmp-ams" + - reg: Should specify AMS register space + - interrupts: Interrupt number for the AMS control interface + - interrupt-names: Interrupt name, must be "ams-irq" + - clocks: Should contain a clock specifier for the device + - ranges: keep the property empty to map child address space + (for PS and/or PL) nodes 1:1 onto the parent address + space + +AMS device tree subnode:Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ - compatible: Should be "xlnx,zynqmp-ams-ps" or "xlnx,zynqmp-ams-pl" + - reg: Register space for PS or PL + +Optional properties: + +Following optional property only valid for PL. + - xlnx,ext-channels: List of external channels that are connected to the + AMS PL module. + + The child nodes of this node represent the external channels whichare
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 46
Quoted 8 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +8
-0+ connected to the AMS Module. If the property is not present + no external channels will be assumed to be connected. + + Each child node represents one channel and has the following + properties: + Required properties: + * reg: Pair of pins the channel is connected to. + 0: VP/VNHmm. So we have this table here of the ones that may or may not be connected with different numbering from the overall table. Given these indexes are arbitrary can we unify them?
Quoted 1 line
I.e. use the index from below but state here which values can be used?
Okay. I guess you are suggesting to use the channel index from the channel details table given in the end of this file and state here which number (for 'reg' value) should be used for given channel. Is this correct?
Quoted 168 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +9
-0+ 1: VUSER0 + 2: VUSER1 + 3: VUSER3 + 4: VUSER4 + 5: VAUXP[0]/VAUXN[0] + 6: VAUXP[1]/VAUXN[1] + ... + 20: VAUXP[15]/VAUXN[15] + Note each channel number should only be used atmost
Quoted 38 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +38
-0+ once. + Optional properties: + * xlnx,bipolar: If set the channel is used in bipolar + mode. + + +Example: + xilinx_ams: ams at ffa50000 { + compatible = "xlnx,zynqmp-ams"; + interrupt-parent = <&gic>; + interrupts = <0 56 4>; + interrupt-names = "ams-irq"; + clocks = <&clkc 70>; + reg = <0x0 0xffa50000 0x0 0x800>; + reg-names = "ams-base"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + ams_ps: ams_ps at ffa50800 { + compatible = "xlnx,zynqmp-ams-ps"; + reg = <0x0 0xffa50800 0x0 0x400>; + }; + + ams_pl: ams_pl at ffa50c00 { + compatible = "xlnx,zynqmp-ams-pl"; + reg = <0x0 0xffa50c00 0x0 0x400>; + xlnx,ext-channels { + #address-cells = <1>; + #size-cells = <0>; + channel at 0 { + reg = <0>; + xlnx,bipolar; + }; + channel at 1 { + reg = <1>; + }; + channel at 8 {Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ reg = <8>; + xlnx,bipolar; + }; + }; + }; + }; + +AMS Channels Details: + +Sysmon Block |Channel| Details|Measurement
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 104
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ NumberType
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 105
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+---------------------------------------------------------------------------------------------------------
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 106
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+AMS CTRL |0 |System PLLs voltage measurement, VCC_PSPLL.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 107
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |1 |Battery voltage measurement, VCC_PSBATT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 108
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |2 |PL Internal voltage measurement, VCCINT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 109
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |3 |Block RAM voltage measurement, VCCBRAM.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 110
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |4 |PL Aux voltage measurement, VCCAUX.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 111
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |5 |Voltage measurement for six DDR I/O PLLs,
VCC_PSDDR_PLL. |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 112
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |6 |VCC_PSINTFP_DDR voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 113
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+---------------------------------------------------------------------------------------------------------
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 114
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+PS Sysmon |7 |LPD temperature measurement.|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 115
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |8 |FPD Temperature Measurment (REMOTE).|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 116
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |9 |VCC PS LPD voltage measurement (supply1).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 117
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |10 |VCC PS FPD voltage measurement (supply2).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 118
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |11 |PS Aux voltage reference (supply3).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 119
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |12 |DDR I/O VCC voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 120
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |13 |PS IO Bank 503 voltage measurement (supply5).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 121
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |14 |PS IO Bank 500 voltage measurement (supply6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 122
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |15 |VCCO_PSIO1 voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 123
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |16 |VCCO_PSIO2 voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 124
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |17 |VCC_PS_GTR voltage measurement(
VPS_MGTRAVCC). |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 125
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |18 |VTT_PS_GTR voltage measurement(
VPS_MGTRAVTT). |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 126
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |19 |VCC_PSADC voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 127
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+---------------------------------------------------------------------------------------------------------
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 128
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+PL Sysmon |20 |PL Temperature measurement.|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 129
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |21 |PL Internal Voltage Voltage measurement, VCCINT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 130
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |22 |PL Auxiliary Voltage measurement, VCCAUX.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 131
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |23 |ADC Reference P+ Voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 132
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |24 |ADC Reference N- Voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 133
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |25 |PL Block RAM Voltage measurement, VCCBRAM.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 134
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |26 |LPD Internal Voltage measurement, VCC_PSINTLP(supply4). |Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 135
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |27 |FPD Internal Voltage measurement, VCC_PSINTFP(supply5). |Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 136
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |28 |PS Auxiliary Voltage measurement (supply6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 137
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |29 |PL VCCADC Voltage measurement (vccams).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 138
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |30 |Differencial analog input signal Voltage measurment.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 139
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |31 |VUser0 Voltage measurement (supply7).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 140
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |32 |VUser1 Voltage measurement (supply8).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 141
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |33 |VUser2 Voltage measurement (supply9).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 142
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |34 |VUser3 Voltage measurement (supply10).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 143
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |35 |Auxiliary ch 0 Voltage measurement (VAux0).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 144
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |36 |Auxiliary ch 1 Voltage measurement (VAux1).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 145
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |37 |Auxiliary ch 2 Voltage measurement (VAux2).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 146
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |38 |Auxiliary ch 3 Voltage measurement (VAux3).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 147
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |39 |Auxiliary ch 4 Voltage measurement (VAux4).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 148
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |40 |Auxiliary ch 5 Voltage measurement (VAux5).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 149
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |41 |Auxiliary ch 6 Voltage measurement (VAux6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 150
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |42 |Auxiliary ch 7 Voltage measurement (VAux7).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 151
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |43 |Auxiliary ch 8 Voltage measurement (VAux8).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 152
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |44 |Auxiliary ch 9 Voltage measurement (VAux9).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 153
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |45 |Auxiliary ch 10 Voltage measurement (VAux10).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 154
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |46 |Auxiliary ch 11 Voltage measurement (VAux11).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 155
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |47 |Auxiliary ch 12 Voltage measurement (VAux12).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 156
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |48 |Auxiliary ch 13 Voltage measurement (VAux13).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 157
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |49 |Auxiliary ch 14 Voltage measurement (VAux14).|Voltage
Quoted 8 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 158
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |50 |Auxiliary ch 15 Voltage measurement (VAux15).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 2 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +2
-0+--------------------------------------------------------------------- +------------------------------------Thanks,
Jonathan
Thanks,
Manish Narani
Jonathan Cameron
maintainerRe: [PATCH 1/3] dt-bindings: iio: adc: Add Xilinx AMS binding documentation
Quoted 62 lines · On Thu, 6 Sep 2018 13:27:34 +0000 Manish Narani <[email protected]> wrote:
Hi Jonathan,
Thanks for the review!
Quoted 46 lines
-----Original Message-----
From: Jonathan Cameron [mailto:jic23 at kernel.org]
Sent: Sunday, September 2, 2018 11:45 PM
To: Manish Narani <[email protected]>
Cc:knaack.hat gmx.de; lars at metafoo.de; pmeerw at pmeerw.net; robh+dt at kernel.org; mark.rutland at arm.com; Michal Simek <[email protected]>; leoyang.li at nxp.com; sudeep.holla at arm.com; amit.kucheria at linaro.org; broonie at kernel.org; arnaud.pouliquen at st.com; geert at linux-m68k.org; eugen.hristev at microchip.com; rdunlap at infradead.org; lukas at wunner.de; freeman.liu at spreadtrum.com; vilhelm.gray at gmail.com; tglx at linutronix.de; baolin.wang at linaro.org; gregkh at linuxfoundation.org; Srinivas Goud <[email protected]>; Anirudha Sarangi <[email protected]>; linux-iio at vger.kernel.org; devicetree at vger.kernel.org; linux-arm- kernel at lists.infradead.org; linux-kernel at vger.kernel.org
Subject: Re: [PATCH 1/3] dt-bindings: iio: adc: Add Xilinx AMS binding documentationQuoted 6 lines · On Thu, 30 Aug 2018 15:52:17 +0530 Manish Narani <[email protected]>…
Xilinx AMS have several ADC channels that can be used for measurement of different voltages and temperatures. Document the same in the bindings.
Signed-off-by Manish Narani <[email protected]>--- .../devicetree/bindings/iio/adc/xilinx-ams.txt | 159+++++++++++++++++++++
Quoted 11 lines
1 file changed, 159 insertions(+) create mode 100644
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txtDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +0
-0Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 5
Quoted 5 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +5
-0@@ -0,0 +1,159 @@ +Xilinx AMS controller + +The AMS includes an ADC as well as on-chip sensors that can be used +to sample external voltages and monitor on-die operating conditions, +such as temperature and supply voltage levels. The AMS has two SYSMONblocks.
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 6
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+PL-SYSMON block is capable of monitoring off chip voltage andtemperature.
Quoted 8 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 11
Quoted 5 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +5
-0+PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring +from external master. Out of this interface currently only DRP is supported. +Other block PS-SYSMON is memory mapped to PS. Both of block has +built-in alarm generation logic that is used to interrupt the +processor based on condition set.I guess anyone reading this because they have the hardware would know what PS and PL are, but it would still be nice to define those acronyms!
Okay, I will rectify this in v2.
Quoted 1 line
Quoted 8 lines
Quoted 3 lines
Google suggest, Programmable Logic (FPGA bit I guess) and Process Space (Arm core bit?) As I read this, from a driver point of view it doesn't really matter - these are just blocks of channels that are there?
Yes, these are just blocks of channels, which are enabled/disabled via devicetree child nodes "xlnx,zynqmp-ams-ps" and "xlnx,zynqmp-ams-pl".
Great, put please expand in here on the naming. This may not matter for people using this particular driver, but having clear human readable descriptions is useful when we are looking for similarities between this an future drivers etc.
Quoted 61 lines
Quoted 4 lines
This binding is complex enough I definitely want some DT binding review.
Sure!
Quoted 54 lines
Quoted 9 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +2
-0+ +All designs should have AMS registers, but PS and PL areoptional. +The AMS controller can work with only PS, only PL and both PS and PL +configurations. Please specify registers according to your design. +Devicetree should always have AMS module property. Providing PS & PL
module is optional.
Quoted 27 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +5
-0+ +Required properties: + - compatible: Should be "xlnx,zynqmp-ams" + - reg: Should specify AMS register space + - interrupts: Interrupt number for the AMS controlinterface
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +3
-0+ - interrupt-names: Interrupt name, must be "ams-irq" + - clocks: Should contain a clock specifier for the device + - ranges: keep the property empty to map child addressspace
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ (for PS and/or PL) nodes 1:1 onto the parentaddress
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +4
-0+ space + +AMS device tree subnode: + - compatible: Should be "xlnx,zynqmp-ams-ps" or"xlnx,zynqmp-ams-pl"
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +6
-0+ - reg: Register space for PS or PL + +Optional properties: + +Following optional property only valid for PL. + - xlnx,ext-channels: List of external channels that areconnected to the
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +3
-0+ AMS PL module. + + The child nodes of this node represent the externalQuoted 1 line
channels which
are
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 46
Quoted 11 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ connected to the AMS Module. If the property is notpresent
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +3
-0+ no external channels will be assumed to be connected. + + Each child node represents one channel and has thefollowing
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +3
-0+ properties: + Required properties: + * reg: Pair of pins the channel isconnected to.
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ 0: VP/VNHmm. So we have this table here of the ones that may or may not be connected with different numbering from the overall table. Given these indexes are arbitrary can we unify them?
Quoted 8 lines
Quoted 2 lines
I.e. use the index from below but state here which values can be used?
Okay. I guess you are suggesting to use the channel index from the channel details table given in the end of this file and state here which number (for 'reg' value) should be used for given channel. Is this correct?
Exactly right.
Quoted 180 lines
Quoted 169 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 11 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +9
-0+ 1: VUSER0 + 2: VUSER1 + 3: VUSER3 + 4: VUSER4 + 5: VAUXP[0]/VAUXN[0] + 6: VAUXP[1]/VAUXN[1] + ... + 20: VAUXP[15]/VAUXN[15] + Note each channel number should only be used atmost
Quoted 38 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +38
-0+ once. + Optional properties: + * xlnx,bipolar: If set the channel is used in bipolar + mode. + + +Example: + xilinx_ams: ams at ffa50000 { + compatible = "xlnx,zynqmp-ams"; + interrupt-parent = <&gic>; + interrupts = <0 56 4>; + interrupt-names = "ams-irq"; + clocks = <&clkc 70>; + reg = <0x0 0xffa50000 0x0 0x800>; + reg-names = "ams-base"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + ams_ps: ams_ps at ffa50800 { + compatible = "xlnx,zynqmp-ams-ps"; + reg = <0x0 0xffa50800 0x0 0x400>; + }; + + ams_pl: ams_pl at ffa50c00 { + compatible = "xlnx,zynqmp-ams-pl"; + reg = <0x0 0xffa50c00 0x0 0x400>; + xlnx,ext-channels { + #address-cells = <1>; + #size-cells = <0>; + channel at 0 { + reg = <0>; + xlnx,bipolar; + }; + channel at 1 { + reg = <1>; + }; + channel at 8 {Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ reg = <8>; + xlnx,bipolar; + }; + }; + }; + }; + +AMS Channels Details: + +Sysmon Block |Channel| Details|Measurement
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ NumberType
Quoted 1 line
+---------------------------------------------------------------------------------------------------
------
Quoted 1 line
+AMS CTRL |0 |System PLLs voltage measurement,
VCC_PSPLL.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |1 |Battery voltage measurement, VCC_PSBATT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |2 |PL Internal voltage measurement, VCCINT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |3 |Block RAM voltage measurement, VCCBRAM.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |4 |PL Aux voltage measurement, VCCAUX.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |5 |Voltage measurement for six DDR I/O PLLs,
VCC_PSDDR_PLL. |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |6 |VCC_PSINTFP_DDR voltage measurement.|Voltage
Quoted 1 line
+---------------------------------------------------------------------------------------------------
------
Quoted 1 line
+PS Sysmon |7 |LPD temperature measurement.
|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |8 |FPD Temperature Measurment (REMOTE).|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |9 |VCC PS LPD voltage measurement (supply1).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |10 |VCC PS FPD voltage measurement (supply2).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |11 |PS Aux voltage reference (supply3).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |12 |DDR I/O VCC voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |13 |PS IO Bank 503 voltage measurement (supply5).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |14 |PS IO Bank 500 voltage measurement (supply6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |15 |VCCO_PSIO1 voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |16 |VCCO_PSIO2 voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |17 |VCC_PS_GTR voltage measurement(
VPS_MGTRAVCC). |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |18 |VTT_PS_GTR voltage measurement(
VPS_MGTRAVTT). |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |19 |VCC_PSADC voltage measurement.|Voltage
Quoted 1 line
+---------------------------------------------------------------------------------------------------
------
Quoted 1 line
+PL Sysmon |20 |PL Temperature measurement.
|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |21 |PL Internal Voltage Voltage measurement, VCCINT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |22 |PL Auxiliary Voltage measurement, VCCAUX.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |23 |ADC Reference P+ Voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |24 |ADC Reference N- Voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |25 |PL Block RAM Voltage measurement, VCCBRAM.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |26 |LPD Internal Voltage measurement, VCC_PSINTLP(supply4). |Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |27 |FPD Internal Voltage measurement, VCC_PSINTFP(supply5). |Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |28 |PS Auxiliary Voltage measurement (supply6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |29 |PL VCCADC Voltage measurement (vccams).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |30 |Differencial analog input signal Voltage measurment.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |31 |VUser0 Voltage measurement (supply7).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |32 |VUser1 Voltage measurement (supply8).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |33 |VUser2 Voltage measurement (supply9).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |34 |VUser3 Voltage measurement (supply10).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |35 |Auxiliary ch 0 Voltage measurement (VAux0).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |36 |Auxiliary ch 1 Voltage measurement (VAux1).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |37 |Auxiliary ch 2 Voltage measurement (VAux2).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |38 |Auxiliary ch 3 Voltage measurement (VAux3).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |39 |Auxiliary ch 4 Voltage measurement (VAux4).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |40 |Auxiliary ch 5 Voltage measurement (VAux5).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |41 |Auxiliary ch 6 Voltage measurement (VAux6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |42 |Auxiliary ch 7 Voltage measurement (VAux7).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |43 |Auxiliary ch 8 Voltage measurement (VAux8).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |44 |Auxiliary ch 9 Voltage measurement (VAux9).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |45 |Auxiliary ch 10 Voltage measurement (VAux10).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |46 |Auxiliary ch 11 Voltage measurement (VAux11).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |47 |Auxiliary ch 12 Voltage measurement (VAux12).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |48 |Auxiliary ch 13 Voltage measurement (VAux13).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |49 |Auxiliary ch 14 Voltage measurement (VAux14).|Voltage
Quoted 8 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |50 |Auxiliary ch 15 Voltage measurement (VAux15).|Voltage
Quoted 2 lines
+--------------------------------------------------------------------- +------------------------------------Thanks,
Jonathan
Thanks,
Manish Narani
Rob Herring
maintainerPATCH 1/3 dt-bindings: iio: adc: Add Xilinx AMS binding documentation
In reply to Manish NaraniQuoted 35 lines · Manish Narani
Xilinx AMS have several ADC channels that can be used for measurement of different voltages and temperatures. Document the same in the bindings.
Signed-off-by Manish Narani <[email protected]>--- .../devicetree/bindings/iio/adc/xilinx-ams.txt | 159 +++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/adc/xilinx-ams.txtDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +20
-0@@ -0,0 +1,159 @@ +Xilinx AMS controller + +The AMS includes an ADC as well as on-chip sensors that can be used to +sample external voltages and monitor on-die operating conditions, such as +temperature and supply voltage levels. The AMS has two SYSMON blocks. +PL-SYSMON block is capable of monitoring off chip voltage and temperature. +PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring from +external master. Out of this interface currently only DRP is supported. +Other block PS-SYSMON is memory mapped to PS. Both of block has built-in +alarm generation logic that is used to interrupt the processor based on +condition set. + +All designs should have AMS registers, but PS and PL are optional. The +AMS controller can work with only PS, only PL and both PS and PL +configurations. Please specify registers according to your design. Devicetree +should always have AMS module property. Providing PS & PL module is optional. + +Required properties: + - compatible: Should be "xlnx,zynqmp-ams" + - reg: Should specify AMS register space
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 30
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ - interrupts: Interrupt number for the AMS control interface + - interrupt-names: Interrupt name, must be "ams-irq" + - clocks: Should contain a clock specifier for the device + - ranges: keep the property empty to map child address space + (for PS and/or PL) nodes 1:1 onto the parent address + space + +AMS device tree subnode: + - compatible: Should be "xlnx,zynqmp-ams-ps" or "xlnx,zynqmp-ams-pl" + - reg: Register space for PS or PL
Please split each child node into its own section.
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 34
Quoted 4 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +4
-0+ +Optional properties: + +Following optional property only valid for PL.
property or...
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 38
Quoted 4 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +4
-0+ - xlnx,ext-channels: List of external channels that are connected to the + AMS PL module. + + The child nodes of this node represent the external channels which are
node?
Quoted 25 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +25
-0+ connected to the AMS Module. If the property is not present + no external channels will be assumed to be connected. + + Each child node represents one channel and has the following + properties: + Required properties: + * reg: Pair of pins the channel is connected to. + 0: VP/VN + 1: VUSER0 + 2: VUSER1 + 3: VUSER3 + 4: VUSER4 + 5: VAUXP[0]/VAUXN[0] + 6: VAUXP[1]/VAUXN[1] + ... + 20: VAUXP[15]/VAUXN[15] + Note each channel number should only be used at most + once. + Optional properties: + * xlnx,bipolar: If set the channel is used in bipolar + mode. + + +Example: + xilinx_ams: ams at ffa50000 {
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 73
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ compatible = "xlnx,zynqmp-ams"; + interrupt-parent = <&gic>; + interrupts = <0 56 4>; + interrupt-names = "ams-irq"; + clocks = <&clkc 70>; + reg = <0x0 0xffa50000 0x0 0x800>; + reg-names = "ams-base"; + #address-cells = <2>; + #size-cells = <2>; + ranges;
There's no need for 64-bits of addresses and sizes here. Use ranges.
Quoted 89 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +86
-0+ + ams_ps: ams_ps at ffa50800 { + compatible = "xlnx,zynqmp-ams-ps"; + reg = <0x0 0xffa50800 0x0 0x400>; + }; + + ams_pl: ams_pl at ffa50c00 { + compatible = "xlnx,zynqmp-ams-pl"; + reg = <0x0 0xffa50c00 0x0 0x400>; + xlnx,ext-channels { + #address-cells = <1>; + #size-cells = <0>; + channel at 0 { + reg = <0>; + xlnx,bipolar; + }; + channel at 1 { + reg = <1>; + }; + channel at 8 { + reg = <8>; + xlnx,bipolar; + }; + }; + }; + }; + +AMS Channels Details: + +Sysmon Block |Channel| Details |Measurement + Number Type +--------------------------------------------------------------------------------------------------------- +AMS CTRL |0 |System PLLs voltage measurement, VCC_PSPLL. |Voltage + |1 |Battery voltage measurement, VCC_PSBATT. |Voltage + |2 |PL Internal voltage measurement, VCCINT. |Voltage + |3 |Block RAM voltage measurement, VCCBRAM. |Voltage + |4 |PL Aux voltage measurement, VCCAUX. |Voltage + |5 |Voltage measurement for six DDR I/O PLLs, VCC_PSDDR_PLL. |Voltage + |6 |VCC_PSINTFP_DDR voltage measurement. |Voltage +--------------------------------------------------------------------------------------------------------- +PS Sysmon |7 |LPD temperature measurement. |Temperature + |8 |FPD Temperature Measurment (REMOTE). |Temperature + |9 |VCC PS LPD voltage measurement (supply1). |Voltage + |10 |VCC PS FPD voltage measurement (supply2). |Voltage + |11 |PS Aux voltage reference (supply3). |Voltage + |12 |DDR I/O VCC voltage measurement. |Voltage + |13 |PS IO Bank 503 voltage measurement (supply5). |Voltage + |14 |PS IO Bank 500 voltage measurement (supply6). |Voltage + |15 |VCCO_PSIO1 voltage measurement. |Voltage + |16 |VCCO_PSIO2 voltage measurement. |Voltage + |17 |VCC_PS_GTR voltage measurement (VPS_MGTRAVCC). |Voltage + |18 |VTT_PS_GTR voltage measurement (VPS_MGTRAVTT). |Voltage + |19 |VCC_PSADC voltage measurement. |Voltage +--------------------------------------------------------------------------------------------------------- +PL Sysmon |20 |PL Temperature measurement. |Temperature + |21 |PL Internal Voltage Voltage measurement, VCCINT. |Voltage + |22 |PL Auxiliary Voltage measurement, VCCAUX. |Voltage + |23 |ADC Reference P+ Voltage measurement. |Voltage + |24 |ADC Reference N- Voltage measurement. |Voltage + |25 |PL Block RAM Voltage measurement, VCCBRAM. |Voltage + |26 |LPD Internal Voltage measurement, VCC_PSINTLP (supply4). |Voltage + |27 |FPD Internal Voltage measurement, VCC_PSINTFP (supply5). |Voltage + |28 |PS Auxiliary Voltage measurement (supply6). |Voltage + |29 |PL VCCADC Voltage measurement (vccams). |Voltage + |30 |Differencial analog input signal Voltage measurment. |Voltage + |31 |VUser0 Voltage measurement (supply7). |Voltage + |32 |VUser1 Voltage measurement (supply8). |Voltage + |33 |VUser2 Voltage measurement (supply9). |Voltage + |34 |VUser3 Voltage measurement (supply10). |Voltage + |35 |Auxiliary ch 0 Voltage measurement (VAux0). |Voltage + |36 |Auxiliary ch 1 Voltage measurement (VAux1). |Voltage + |37 |Auxiliary ch 2 Voltage measurement (VAux2). |Voltage + |38 |Auxiliary ch 3 Voltage measurement (VAux3). |Voltage + |39 |Auxiliary ch 4 Voltage measurement (VAux4). |Voltage + |40 |Auxiliary ch 5 Voltage measurement (VAux5). |Voltage + |41 |Auxiliary ch 6 Voltage measurement (VAux6). |Voltage + |42 |Auxiliary ch 7 Voltage measurement (VAux7). |Voltage + |43 |Auxiliary ch 8 Voltage measurement (VAux8). |Voltage + |44 |Auxiliary ch 9 Voltage measurement (VAux9). |Voltage + |45 |Auxiliary ch 10 Voltage measurement (VAux10). |Voltage + |46 |Auxiliary ch 11 Voltage measurement (VAux11). |Voltage + |47 |Auxiliary ch 12 Voltage measurement (VAux12). |Voltage + |48 |Auxiliary ch 13 Voltage measurement (VAux13). |Voltage + |49 |Auxiliary ch 14 Voltage measurement (VAux14). |Voltage + |50 |Auxiliary ch 15 Voltage measurement (VAux15). |Voltage +---------------------------------------------------------------------------------------------------------Signature · 1 line
2.1.1
RE: [PATCH 1/3] dt-bindings: iio: adc: Add Xilinx AMS binding documentation
Hi Rob,
Thanks for the review. Please see my comments inline.
Quoted 16 lines
From: Rob Herring [mailto:robh at kernel.org]
Sent: Tuesday, September 4, 2018 6:48 AM
To: Manish Narani <[email protected]>Quoted 6 lines · Manish Narani
Xilinx AMS have several ADC channels that can be used for measurement of different voltages and temperatures. Document the same in the bindings.
Signed-off-by Manish Narani <[email protected]>--- .../devicetree/bindings/iio/adc/xilinx-ams.txt | 159+++++++++++++++++++++
Quoted 4 lines
1 file changed, 159 insertions(+) create mode 100644
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 11 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 30
Quoted 9 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +3
-0+AMS device tree subnode: + - compatible: Should be "xlnx,zynqmp-ams-ps" or "xlnx,zynqmp-ams-pl" + - reg: Register space for PS or PLPlease split each child node into its own section.
Okay. I will update this in v2.
Quoted 7 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 34
Quoted 5 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +4
-0+ +Optional properties: + +Following optional property only valid for PL.property or...
It should be node. I will update this in v2.
Quoted 39 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 6 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +5
-0+ - xlnx,ext-channels: List of external channels that are connected to the + AMS PL module. + + The child nodes of this node represent the external channels which +arenode?
Quoted 7 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +7
-0+ connected to the AMS Module. If the property is not present + no external channels will be assumed to be connected. + + Each child node represents one channel and has the following + properties: + Required properties: + * reg: Pair of pins the channel is connected to.Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ 0: VP/VN + 1: VUSER0 + 2: VUSER1 + 3: VUSER3 + 4: VUSER4 + 5: VAUXP[0]/VAUXN[0] + 6: VAUXP[1]/VAUXN[1] + ... + 20: VAUXP[15]/VAUXN[15] + Note each channel number should only be used atmost
Quoted 12 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +12
-0+ once. + Optional properties: + * xlnx,bipolar: If set the channel is used in bipolar + mode. + + +Example: + xilinx_ams: ams at ffa50000 { + compatible = "xlnx,zynqmp-ams"; + interrupt-parent = <&gic>; + interrupts = <0 56 4>; + interrupt-names = "ams-irq";
Quoted 8 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt line 73
Quoted 6 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +6
-0+ clocks = <&clkc 70>; + reg = <0x0 0xffa50000 0x0 0x800>; + reg-names = "ams-base"; + #address-cells = <2>; + #size-cells = <2>; + ranges;There's no need for 64-bits of addresses and sizes here. Use ranges.
Okay.
Quoted 133 lines
Quoted 20 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +20
-0+ + ams_ps: ams_ps at ffa50800 { + compatible = "xlnx,zynqmp-ams-ps"; + reg = <0x0 0xffa50800 0x0 0x400>; + }; + + ams_pl: ams_pl at ffa50c00 { + compatible = "xlnx,zynqmp-ams-pl"; + reg = <0x0 0xffa50c00 0x0 0x400>; + xlnx,ext-channels { + #address-cells = <1>; + #size-cells = <0>; + channel at 0 { + reg = <0>; + xlnx,bipolar; + }; + channel at 1 { + reg = <1>; + }; + channel at 8 {Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 10 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +10
-0+ reg = <8>; + xlnx,bipolar; + }; + }; + }; + }; + +AMS Channels Details: + +Sysmon Block |Channel| Details|Measurement
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ NumberType
Quoted 1 line
+---------------------------------------------------------------------------------------------------
------
Quoted 1 line
+AMS CTRL |0 |System PLLs voltage measurement,
VCC_PSPLL.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |1 |Battery voltage measurement, VCC_PSBATT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |2 |PL Internal voltage measurement, VCCINT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |3 |Block RAM voltage measurement, VCCBRAM.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |4 |PL Aux voltage measurement, VCCAUX.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |5 |Voltage measurement for six DDR I/O PLLs,
VCC_PSDDR_PLL. |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |6 |VCC_PSINTFP_DDR voltage measurement.|Voltage
Quoted 1 line
+---------------------------------------------------------------------------------------------------
------
Quoted 1 line
+PS Sysmon |7 |LPD temperature measurement.
|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |8 |FPD Temperature Measurment (REMOTE).|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |9 |VCC PS LPD voltage measurement (supply1).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |10 |VCC PS FPD voltage measurement (supply2).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |11 |PS Aux voltage reference (supply3).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |12 |DDR I/O VCC voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |13 |PS IO Bank 503 voltage measurement (supply5).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |14 |PS IO Bank 500 voltage measurement (supply6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |15 |VCCO_PSIO1 voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |16 |VCCO_PSIO2 voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |17 |VCC_PS_GTR voltage measurement(
VPS_MGTRAVCC). |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |18 |VTT_PS_GTR voltage measurement(
VPS_MGTRAVTT). |VoltageDocumentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |19 |VCC_PSADC voltage measurement.|Voltage
Quoted 1 line
+---------------------------------------------------------------------------------------------------
------
Quoted 1 line
+PL Sysmon |20 |PL Temperature measurement.
|Temperature
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |21 |PL Internal Voltage Voltage measurement, VCCINT.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |22 |PL Auxiliary Voltage measurement, VCCAUX.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |23 |ADC Reference P+ Voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |24 |ADC Reference N- Voltage measurement.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |25 |PL Block RAM Voltage measurement, VCCBRAM.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |26 |LPD Internal Voltage measurement, VCC_PSINTLP(supply4). |Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |27 |FPD Internal Voltage measurement, VCC_PSINTFP(supply5). |Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |28 |PS Auxiliary Voltage measurement (supply6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |29 |PL VCCADC Voltage measurement (vccams).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |30 |Differencial analog input signal Voltage measurment.|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |31 |VUser0 Voltage measurement (supply7).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |32 |VUser1 Voltage measurement (supply8).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |33 |VUser2 Voltage measurement (supply9).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |34 |VUser3 Voltage measurement (supply10).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |35 |Auxiliary ch 0 Voltage measurement (VAux0).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |36 |Auxiliary ch 1 Voltage measurement (VAux1).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |37 |Auxiliary ch 2 Voltage measurement (VAux2).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |38 |Auxiliary ch 3 Voltage measurement (VAux3).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |39 |Auxiliary ch 4 Voltage measurement (VAux4).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |40 |Auxiliary ch 5 Voltage measurement (VAux5).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |41 |Auxiliary ch 6 Voltage measurement (VAux6).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |42 |Auxiliary ch 7 Voltage measurement (VAux7).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |43 |Auxiliary ch 8 Voltage measurement (VAux8).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |44 |Auxiliary ch 9 Voltage measurement (VAux9).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |45 |Auxiliary ch 10 Voltage measurement (VAux10).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |46 |Auxiliary ch 11 Voltage measurement (VAux11).|Voltage
Quoted 13 lines
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |47 |Auxiliary ch 12 Voltage measurement (VAux12).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |48 |Auxiliary ch 13 Voltage measurement (VAux13).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |49 |Auxiliary ch 14 Voltage measurement (VAux14).|Voltage
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt
Quoted 1 line
Documentation/devicetree/bindings/iio/adc/xilinx-ams.txt new file +1
-0+ |50 |Auxiliary ch 15 Voltage measurement (VAux15).|Voltage
Quoted 5 lines
+--------------------------------------------------------------------- +--------------------------------------
2.1.1
Thanks,
Manish Narani
PATCH 2/3 iio: adc: Add Xilinx AMS driver
In reply to Manish NaraniThe AMS includes an ADC as well as on-chip sensors that can be used to sample external voltages and monitor on-die operating conditions, such as temperature and supply voltage levels. The AMS has two SYSMON blocks. PL-SYSMON block is capable of monitoring off chip voltage and temperature.
PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring from external master. Out of these interface currently only DRP is supported.
Other block PS-SYSMON is memory mapped to PS.
The AMS can use internal channels to monitor voltage and temperature as well as one primary and up to 16 auxiliary channels for measuring external voltages.
The voltage and temperature monitoring channels also have event capability which allows to generate an interrupt when their value falls below or raises above a set threshold.
--- drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/xilinx-ams.c | 1081 ++++++++++++++++++++++++++++++++++++++++++ drivers/iio/adc/xilinx-ams.h | 281 +++++++++++ 4 files changed, 1373 insertions(+) create mode 100644 drivers/iio/adc/xilinx-ams.c create mode 100644 drivers/iio/adc/xilinx-ams.h
drivers/iio/adc/Kconfig +10 -0
@@ -941,4 +941,14 @@ config XILINX_XADC The driver can also be build as a module. If so, the module will be called xilinx-xadc. +config XILINX_AMS + tristate "Xilinx AMS driver" + depends on ARCH_ZYNQMP || COMPILE_TEST + depends on HAS_IOMEM + help + Say yes here to have support for the Xilinx AMS. + + The driver can also be build as a module. If so, the module will be called + xilinx-ams. + endmenu
drivers/iio/adc/Makefile +1 -0
@@ -85,4 +85,5 @@ obj-$(CONFIG_VF610_ADC) += vf610_adc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o xilinx-xadc-y := xilinx-xadc-core.o xilinx-xadc-events.o obj-$(CONFIG_XILINX_XADC) += xilinx-xadc.o +obj-$(CONFIG_XILINX_AMS) += xilinx-ams.o obj-$(CONFIG_SD_ADC_MODULATOR) += sd_adc_modulator.o
drivers/iio/adc/xilinx-ams.c new file +1081 -0
1,081 lines not on this page · raw message
drivers/iio/adc/xilinx-ams.h new file +281 -0
281 lines not on this page · raw message
Signature · 1 line
2.1.1
Re: [PATCH 2/3] iio: adc: Add Xilinx AMS driver
Quoted 6 lines · Manish Narani
drivers/iio/adc/Kconfig +0
-0@@ -941,4 +941,14 @@ config XILINX_XADC The driver can also be build as a module. If so, the module will be called
drivers/iio/adc/Kconfig config XILINX_XADC · line 951
Quoted 10 lines
drivers/iio/adc/Kconfig +8
-0xilinx-xadc. +config XILINX_AMS + tristate "Xilinx AMS driver" + depends on ARCH_ZYNQMP || COMPILE_TEST + depends on HAS_IOMEM + help + Say yes here to have support for the Xilinx AMS. + + The driver can also be build as a module. If so, the module will be called
built
Quoted 3 lines
drivers/iio/adc/Kconfig +2
-0+ xilinx-ams. + endmenu
Signature · 1 line
~Randy
Jonathan Cameron
maintainerRe: [PATCH 2/3] iio: adc: Add Xilinx AMS driver
In reply to Manish NaraniQuoted 16 lines · On Thu, 30 Aug 2018 15:52:18 +0530 Manish Narani <[email protected]>…
The AMS includes an ADC as well as on-chip sensors that can be used to sample external voltages and monitor on-die operating conditions, such as temperature and supply voltage levels. The AMS has two SYSMON blocks. PL-SYSMON block is capable of monitoring off chip voltage and temperature.
PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring from external master. Out of these interface currently only DRP is supported.
Other block PS-SYSMON is memory mapped to PS.
The AMS can use internal channels to monitor voltage and temperature as well as one primary and up to 16 auxiliary channels for measuring external voltages.
The voltage and temperature monitoring channels also have event capability which allows to generate an interrupt when their value falls below or raises above a set threshold.
Quoted 1 line
Signed-off-by Manish Narani <[email protected]>
Given the use of extended_name in here, there is a whole lot of undocumented userspace ABI. Please add to
Documentation/ABI/testing/sysfs-bus-iio-xilinx-ams or similar.
I am a little concerned at introducing quite so many of these. Perhaps we need to revisit how we represent this sort of information...
Otherwise, a few minor things inline but looking fairly good overall.
Thanks,
Jonathan
Quoted 53 lines
--- drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/xilinx-ams.c | 1081 ++++++++++++++++++++++++++++++++++++++++++ drivers/iio/adc/xilinx-ams.h | 281 +++++++++++ 4 files changed, 1373 insertions(+) create mode 100644 drivers/iio/adc/xilinx-ams.c create mode 100644 drivers/iio/adc/xilinx-ams.hdrivers/iio/adc/Kconfig +10
-0@@ -941,4 +941,14 @@ config XILINX_XADC The driver can also be build as a module. If so, the module will be called xilinx-xadc. +config XILINX_AMS + tristate "Xilinx AMS driver" + depends on ARCH_ZYNQMP || COMPILE_TEST + depends on HAS_IOMEM + help + Say yes here to have support for the Xilinx AMS. + + The driver can also be build as a module. If so, the module will be called + xilinx-ams. + endmenudrivers/iio/adc/Makefile +1
-0@@ -85,4 +85,5 @@ obj-$(CONFIG_VF610_ADC) += vf610_adc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o xilinx-xadc-y := xilinx-xadc-core.o xilinx-xadc-events.o obj-$(CONFIG_XILINX_XADC) += xilinx-xadc.o +obj-$(CONFIG_XILINX_AMS) += xilinx-ams.o obj-$(CONFIG_SD_ADC_MODULATOR) += sd_adc_modulator.odrivers/iio/adc/xilinx-ams.c new file +9
-0@@ -0,0 +1,1081 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Xilinx AMS driver +* +* Copyright (C) 2017-2018 Xilinx, Inc. +* +* Manish Narani <[email protected]> +* Rajnikant Bhojani <[email protected]> +*/
drivers/iio/adc/xilinx-ams.c line 19
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/clk.h> +#include <linux/of_address.h> +#include <linux/iopoll.h> +#include <linux/delay.h>
There is a rough convention of alphabetical order if there isn't a reason to do otherwise.
Here you might keep the iio headers for their own block at the end, but the rest should be in order.
Quoted 13 lines
drivers/iio/adc/xilinx-ams.c new file +13
-0+#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/events.h> +#include <linux/io.h> + +#include "xilinx-ams.h" + +static const unsigned int AMS_UNMASK_TIMEOUT_MS =500 ; + +static inline void ams_ps_update_reg (struct ams *ams,unsigned int offset, +u32 mask,u32 data) +{ +u32 val;
drivers/iio/adc/xilinx-ams.c line 42
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ + val =readl (ams->ps_base + offset); +writel ((val & ~mask) | (data & mask), ams->ps_base + offset); +} + +static inline void ams_pl_write_reg (struct ams *ams,unsigned int offset, +u32 data) +{ +writel (data, ams->pl_base + offset); +}
I'm always anti wrappers that don't add much. In this driver you also only use them 'sometimes'.
I'd prefer just having the writel inline all the time. The update functions have a little more purpose and given they are called quite often, perhaps are worth keeping.
Another option is to use regmap for the whole thing getting you update functions and caching etc. Might not be worth it here. Up to you.
Quoted 217 lines
drivers/iio/adc/xilinx-ams.c new file +217
-0+ +static inline void ams_pl_update_reg (struct ams *ams,unsigned int offset, +u32 mask,u32 data) +{ +u32 val; + + val =readl (ams->pl_base + offset); +writel ((val & ~mask) | (data & mask), ams->pl_base + offset); +} + +static void ams_update_intrmask (struct ams *ams,u64 mask,u64 val) +{ + ams->intr_mask &= ~mask; + ams->intr_mask |= (val & mask); + +writel (~(ams->intr_mask | ams->masked_alarm), ams->base +AMS_IER_0 ); +writel (~(ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT ), + ams->base +AMS_IER_1 ); +writel (ams->intr_mask | ams->masked_alarm, ams->base +AMS_IDR_0 ); +writel (ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT , + ams->base +AMS_IDR_1 ); +} + +static void ams_disable_all_alarms (struct ams *ams) +{ +/* disable PS module alarm */ +if (ams->ps_base) { +ams_ps_update_reg (ams,AMS_REG_CONFIG1 ,AMS_REGCFG1_ALARM_MASK , +AMS_REGCFG1_ALARM_MASK ); +ams_ps_update_reg (ams,AMS_REG_CONFIG3 ,AMS_REGCFG3_ALARM_MASK , +AMS_REGCFG3_ALARM_MASK ); + } + +/* disable PL module alarm */ +if (ams->pl_base) { +ams_pl_update_reg (ams,AMS_REG_CONFIG1 , +AMS_REGCFG1_ALARM_MASK , +AMS_REGCFG1_ALARM_MASK ); +ams_pl_update_reg (ams,AMS_REG_CONFIG3 , +AMS_REGCFG3_ALARM_MASK , +AMS_REGCFG3_ALARM_MASK ); + } +} + +static void iio_ams_update_alarm (struct ams *ams,unsigned long alarm_mask) +{ +u32 cfg; +unsigned long flags; +unsigned long pl_alarm_mask; + +if (ams->ps_base) { +/* Configuring PS alarm enable */ + cfg = ~((alarm_mask &AMS_ISR0_ALARM_2_TO_0_MASK ) << +AMS_CONF1_ALARM_2_TO_0_SHIFT ); + cfg &= ~((alarm_mask &AMS_ISR0_ALARM_6_TO_3_MASK ) << +AMS_CONF1_ALARM_6_TO_3_SHIFT ); +ams_ps_update_reg (ams,AMS_REG_CONFIG1 ,AMS_REGCFG1_ALARM_MASK , + cfg); + + cfg = ~((alarm_mask >>AMS_CONF3_ALARM_12_TO_7_SHIFT ) & +AMS_ISR0_ALARM_12_TO_7_MASK ); +ams_ps_update_reg (ams,AMS_REG_CONFIG3 ,AMS_REGCFG3_ALARM_MASK , + cfg); + } + +if (ams->pl_base) { + pl_alarm_mask = (alarm_mask >>AMS_PL_ALARM_START ); +/* Configuring PL alarm enable */ + cfg = ~((pl_alarm_mask &AMS_ISR0_ALARM_2_TO_0_MASK ) << +AMS_CONF1_ALARM_2_TO_0_SHIFT ); + cfg &= ~((pl_alarm_mask &AMS_ISR0_ALARM_6_TO_3_MASK ) << +AMS_CONF1_ALARM_6_TO_3_SHIFT ); +ams_pl_update_reg (ams,AMS_REG_CONFIG1 , +AMS_REGCFG1_ALARM_MASK , cfg); + + cfg = ~((pl_alarm_mask >>AMS_CONF3_ALARM_12_TO_7_SHIFT ) & +AMS_ISR0_ALARM_12_TO_7_MASK ); +ams_pl_update_reg (ams,AMS_REG_CONFIG3 , +AMS_REGCFG3_ALARM_MASK , cfg); + } + +spin_lock_irqsave (&ams->lock, flags); +ams_update_intrmask (ams,AMS_ISR0_ALARM_MASK , ~alarm_mask); +spin_unlock_irqrestore (&ams->lock, flags); +} + +static void ams_enable_channel_sequence (struct ams *ams) +{ +int i; +unsigned long long scan_mask; +struct iio_dev *indio_dev =iio_priv_to_dev (ams); + +/* +* Enable channel sequence. First 22 bit of scan_mask represent +* PS channels, and next remaining bit represents PL channels. +*/ + +/* Run calibration of PS & PL as part of the sequence */ + scan_mask =0x1 |BIT (PS_SEQ_MAX ); +for (i =0 ; i < indio_dev->num_channels; i++) + scan_mask |=BIT (indio_dev->channels[i].scan_index); + +if (ams->ps_base) { +/* put sysmon in a soft reset to change the sequence */ +ams_ps_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , +AMS_CONF1_SEQ_DEFAULT ); + +/* configure basic channels */ +writel (scan_mask &AMS_REG_SEQ0_MASK , + ams->ps_base +AMS_REG_SEQ_CH0 ); +writel (AMS_REG_SEQ2_MASK & + (scan_mask >>AMS_REG_SEQ2_MASK_SHIFT ), + ams->ps_base +AMS_REG_SEQ_CH2 ); + +/* set continuous sequence mode */ +ams_ps_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , +AMS_CONF1_SEQ_CONTINUOUS ); + } + +if (ams->pl_base) { +/* put sysmon in a soft reset to change the sequence */ +ams_pl_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , +AMS_CONF1_SEQ_DEFAULT ); + +/* configure basic channels */ + scan_mask = scan_mask >>PS_SEQ_MAX ; +writel (scan_mask &AMS_REG_SEQ0_MASK , + ams->pl_base +AMS_REG_SEQ_CH0 ); +writel (AMS_REG_SEQ2_MASK & + (scan_mask >>AMS_REG_SEQ2_MASK_SHIFT ), + ams->pl_base +AMS_REG_SEQ_CH2 ); +writel (AMS_REG_SEQ1_MASK & + (scan_mask >>AMS_REG_SEQ1_MASK_SHIFT ), + ams->pl_base +AMS_REG_SEQ_CH1 ); + +/* set continuous sequence mode */ +ams_pl_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , +AMS_CONF1_SEQ_CONTINUOUS ); + } +} + +static int iio_ams_init_device (struct ams *ams) +{ +u32 reg; +int ret; + +/* reset AMS */ +if (ams->ps_base) { +writel (AMS_PS_RESET_VALUE , ams->ps_base +AMS_VP_VN ); + + ret =readl_poll_timeout (ams->base +AMS_PS_CSTS , reg, + (reg &AMS_PS_CSTS_PS_READY ) == +AMS_PS_CSTS_PS_READY ,0 , +AMS_INIT_TIMEOUT ); +if (ret) +return ret; + +/* put sysmon in a default state */ +ams_ps_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , +AMS_CONF1_SEQ_DEFAULT ); + } + +if (ams->pl_base) { +writel (AMS_PL_RESET_VALUE , ams->pl_base +AMS_VP_VN ); + + ret =readl_poll_timeout (ams->base +AMS_PL_CSTS , reg, + (reg &AMS_PL_CSTS_ACCESS_MASK ) == +AMS_PL_CSTS_ACCESS_MASK ,0 , +AMS_INIT_TIMEOUT ); +if (ret) +return ret; + +/* put sysmon in a default state */ +ams_pl_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , +AMS_CONF1_SEQ_DEFAULT ); + } + +ams_disable_all_alarms (ams); + +/* Disable interrupt */ +ams_update_intrmask (ams, ~0 , ~0 ); + +/* Clear any pending interrupt */ +writel (AMS_ISR0_ALARM_MASK , ams->base +AMS_ISR_0 ); +writel (AMS_ISR1_ALARM_MASK , ams->base +AMS_ISR_1 ); + +return 0 ; +} + +static int ams_enable_single_channel (struct ams *ams,unsigned int offset) +{ +u8 channel_num =0 ; + +switch (offset) { +case AMS_VCC_PSPLL0 : + channel_num =AMS_VCC_PSPLL0_CH ; +break ; +case AMS_VCC_PSPLL3 : + channel_num =AMS_VCC_PSPLL3_CH ; +break ; +case AMS_VCCINT : + channel_num =AMS_VCCINT_CH ; +break ; +case AMS_VCCBRAM : + channel_num =AMS_VCCBRAM_CH ; +break ; +case AMS_VCCAUX : + channel_num =AMS_VCCAUX_CH ; +break ; +case AMS_PSDDRPLL : + channel_num =AMS_PSDDRPLL_CH ; +break ; +case AMS_PSINTFPDDR : + channel_num =AMS_PSINTFPDDR_CH ; +break ; +default : +return -EINVAL ;
drivers/iio/adc/xilinx-ams.c line 269
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ } + +/* set single channel, sequencer off mode */ +ams_ps_update_reg (ams,AMS_REG_CONFIG1 ,AMS_CONF1_SEQ_MASK , +AMS_CONF1_SEQ_SINGLE_CHANNEL ); + +/* write the channel number */ +ams_ps_update_reg (ams,AMS_REG_CONFIG0 ,AMS_CONF0_CHANNEL_NUM_MASK , + channel_num); +mdelay (1 );
This delay should be documented.. Preferably with a reference to the datasheet to justify the particular value.
Quoted 22 lines
drivers/iio/adc/xilinx-ams.c new file +22
-0+ +return 0 ; +} + +static int ams_read_vcc_reg (struct ams *ams,unsigned int offset,u32 *data) +{ +int ret; + + ret =ams_enable_single_channel (ams, offset); +if (ret) +return ret; + + *data =readl (ams->base + offset); +ams_enable_channel_sequence (ams); + +return 0 ; +} + +static int ams_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{
drivers/iio/adc/xilinx-ams.c line 301
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+struct ams *ams =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +mutex_lock (&ams->mutex); +if (chan->scan_index >= (PS_SEQ_MAX *3 )) { + ret =ams_read_vcc_reg (ams, chan->address, val); +if (ret) + goto read_raw_err;
Missing mutex_unlock?
Quoted 54 lines
drivers/iio/adc/xilinx-ams.c new file +54
-0+ }else if (chan->scan_index >=PS_SEQ_MAX ) + *val =readl (ams->pl_base + chan->address); +else + *val =readl (ams->ps_base + chan->address); +mutex_unlock (&ams->mutex); + +return IIO_VAL_INT ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_VOLTAGE : +switch (chan->address) { +case AMS_SUPPLY1 : +case AMS_SUPPLY2 : +case AMS_SUPPLY3 : +case AMS_SUPPLY4 : + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +case AMS_SUPPLY5 : +case AMS_SUPPLY6 : +if (chan->scan_index <PS_SEQ_MAX ) + *val =AMS_SUPPLY_SCALE_6VOLT ; +else + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +case AMS_SUPPLY7 : +case AMS_SUPPLY8 : + *val =AMS_SUPPLY_SCALE_6VOLT ; +break ; +case AMS_SUPPLY9 : +case AMS_SUPPLY10 : +if (chan->scan_index <PS_SEQ_MAX ) + *val =AMS_SUPPLY_SCALE_3VOLT ; +else + *val =AMS_SUPPLY_SCALE_6VOLT ; +break ; +case AMS_VCC_PSPLL0 : +case AMS_VCC_PSPLL3 : +case AMS_VCCINT : +case AMS_VCCBRAM : +case AMS_VCCAUX : +case AMS_PSDDRPLL : +case AMS_PSINTFPDDR : + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +default : + *val =AMS_SUPPLY_SCALE_1VOLT ; +break ; + } + *val2 =AMS_SUPPLY_SCALE_DIV_BIT ; +return IIO_VAL_FRACTIONAL_LOG2 ; +case IIO_TEMP : + *val =AMS_TEMP_SCALE ; + *val2 =AMS_TEMP_SCALE_DIV_BIT ; +return IIO_VAL_FRACTIONAL_LOG2 ;
drivers/iio/adc/xilinx-ams.c line 365
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+default : +return -EINVAL ; + } +case IIO_CHAN_INFO_OFFSET : +/* Only the temperature channel has an offset */ + *val =AMS_TEMP_OFFSET ; +return IIO_VAL_INT ; + } + +read_raw_err:
Given we only return an error code here, are we not better just doing that inline?
Quoted 240 lines
drivers/iio/adc/xilinx-ams.c new file +240
-0+return -EINVAL ; +} + +static int ams_get_alarm_offset (int scan_index,enum iio_event_direction dir) +{ +int offset =0 ; + +if (scan_index >=PS_SEQ_MAX ) + scan_index -=PS_SEQ_MAX ; + +if (dir ==IIO_EV_DIR_FALLING ) { +if (scan_index <AMS_SEQ_SUPPLY7 ) + offset =AMS_ALARM_THRESHOLD_OFF_10 ; +else + offset =AMS_ALARM_THRESHOLD_OFF_20 ; + } + +switch (scan_index) { +case AMS_SEQ_TEMP : +return AMS_ALARM_TEMP + offset; +case AMS_SEQ_SUPPLY1 : +return AMS_ALARM_SUPPLY1 + offset; +case AMS_SEQ_SUPPLY2 : +return AMS_ALARM_SUPPLY2 + offset; +case AMS_SEQ_SUPPLY3 : +return AMS_ALARM_SUPPLY3 + offset; +case AMS_SEQ_SUPPLY4 : +return AMS_ALARM_SUPPLY4 + offset; +case AMS_SEQ_SUPPLY5 : +return AMS_ALARM_SUPPLY5 + offset; +case AMS_SEQ_SUPPLY6 : +return AMS_ALARM_SUPPLY6 + offset; +case AMS_SEQ_SUPPLY7 : +return AMS_ALARM_SUPPLY7 + offset; +case AMS_SEQ_SUPPLY8 : +return AMS_ALARM_SUPPLY8 + offset; +case AMS_SEQ_SUPPLY9 : +return AMS_ALARM_SUPPLY9 + offset; +case AMS_SEQ_SUPPLY10 : +return AMS_ALARM_SUPPLY10 + offset; +case AMS_SEQ_VCCAMS : +return AMS_ALARM_VCCAMS + offset; +case AMS_SEQ_TEMP_REMOTE : +return AMS_ALARM_TEMP_REMOTE + offset; + } + +return 0 ; +} + +static const struct iio_chan_spec *ams_event_to_channel ( +struct iio_dev *indio_dev,u32 event) +{ +int scan_index =0 , i; + +if (event >=AMS_PL_ALARM_START ) { + event -=AMS_PL_ALARM_START ; + scan_index =PS_SEQ_MAX ; + } + +switch (event) { +case AMS_ALARM_BIT_TEMP : + scan_index +=AMS_SEQ_TEMP ; +break ; +case AMS_ALARM_BIT_SUPPLY1 : + scan_index +=AMS_SEQ_SUPPLY1 ; +break ; +case AMS_ALARM_BIT_SUPPLY2 : + scan_index +=AMS_SEQ_SUPPLY2 ; +break ; +case AMS_ALARM_BIT_SUPPLY3 : + scan_index +=AMS_SEQ_SUPPLY3 ; +break ; +case AMS_ALARM_BIT_SUPPLY4 : + scan_index +=AMS_SEQ_SUPPLY4 ; +break ; +case AMS_ALARM_BIT_SUPPLY5 : + scan_index +=AMS_SEQ_SUPPLY5 ; +break ; +case AMS_ALARM_BIT_SUPPLY6 : + scan_index +=AMS_SEQ_SUPPLY6 ; +break ; +case AMS_ALARM_BIT_SUPPLY7 : + scan_index +=AMS_SEQ_SUPPLY7 ; +break ; +case AMS_ALARM_BIT_SUPPLY8 : + scan_index +=AMS_SEQ_SUPPLY8 ; +break ; +case AMS_ALARM_BIT_SUPPLY9 : + scan_index +=AMS_SEQ_SUPPLY9 ; +break ; +case AMS_ALARM_BIT_SUPPLY10 : + scan_index +=AMS_SEQ_SUPPLY10 ; +break ; +case AMS_ALARM_BIT_VCCAMS : + scan_index +=AMS_SEQ_VCCAMS ; +break ; +case AMS_ALARM_BIT_TEMP_REMOTE : + scan_index +=AMS_SEQ_TEMP_REMOTE ; +break ; + } + +for (i =0 ; i < indio_dev->num_channels; i++) +if (indio_dev->channels[i].scan_index == scan_index) +break ; + +return &indio_dev->channels[i]; +} + +static int ams_get_alarm_mask (int scan_index) +{ +int bit =0 ; + +if (scan_index >=PS_SEQ_MAX ) { + bit =AMS_PL_ALARM_START ; + scan_index -=PS_SEQ_MAX ; + } + +switch (scan_index) { +case AMS_SEQ_TEMP : +return BIT (AMS_ALARM_BIT_TEMP + bit); +case AMS_SEQ_SUPPLY1 : +return BIT (AMS_ALARM_BIT_SUPPLY1 + bit); +case AMS_SEQ_SUPPLY2 : +return BIT (AMS_ALARM_BIT_SUPPLY2 + bit); +case AMS_SEQ_SUPPLY3 : +return BIT (AMS_ALARM_BIT_SUPPLY3 + bit); +case AMS_SEQ_SUPPLY4 : +return BIT (AMS_ALARM_BIT_SUPPLY4 + bit); +case AMS_SEQ_SUPPLY5 : +return BIT (AMS_ALARM_BIT_SUPPLY5 + bit); +case AMS_SEQ_SUPPLY6 : +return BIT (AMS_ALARM_BIT_SUPPLY6 + bit); +case AMS_SEQ_SUPPLY7 : +return BIT (AMS_ALARM_BIT_SUPPLY7 + bit); +case AMS_SEQ_SUPPLY8 : +return BIT (AMS_ALARM_BIT_SUPPLY8 + bit); +case AMS_SEQ_SUPPLY9 : +return BIT (AMS_ALARM_BIT_SUPPLY9 + bit); +case AMS_SEQ_SUPPLY10 : +return BIT (AMS_ALARM_BIT_SUPPLY10 + bit); +case AMS_SEQ_VCCAMS : +return BIT (AMS_ALARM_BIT_VCCAMS + bit); +case AMS_SEQ_TEMP_REMOTE : +return BIT (AMS_ALARM_BIT_TEMP_REMOTE + bit); + } + +return 0 ; +} + +static int ams_read_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir) +{ +struct ams *ams =iio_priv (indio_dev); + +return (ams->alarm_mask &ams_get_alarm_mask (chan->scan_index)) ?1 :0 ; +} + +static int ams_write_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +int state) +{ +struct ams *ams =iio_priv (indio_dev); +unsigned int alarm; + + alarm =ams_get_alarm_mask (chan->scan_index); + +mutex_lock (&ams->mutex); + +if (state) + ams->alarm_mask |= alarm; +else + ams->alarm_mask &= ~alarm; + +iio_ams_update_alarm (ams, ams->alarm_mask); + +mutex_unlock (&ams->mutex); + +return 0 ; +} + +static int ams_read_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info,int *val,int *val2) +{ +struct ams *ams =iio_priv (indio_dev); +unsigned int offset =ams_get_alarm_offset (chan->scan_index, dir); + +mutex_lock (&ams->mutex); + +if (chan->scan_index >=PS_SEQ_MAX ) + *val =readl (ams->pl_base + offset); +else + *val =readl (ams->ps_base + offset); + +mutex_unlock (&ams->mutex); + +return IIO_VAL_INT ; +} + +static int ams_write_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info,int val,int val2) +{ +struct ams *ams =iio_priv (indio_dev); +unsigned int offset; + +mutex_lock (&ams->mutex); + +/* Set temperature channel threshold to direct threshold */ +if (chan->type ==IIO_TEMP ) { + offset =ams_get_alarm_offset (chan->scan_index, +IIO_EV_DIR_FALLING ); + +if (chan->scan_index >=PS_SEQ_MAX ) +ams_pl_update_reg (ams, offset, +AMS_ALARM_THR_DIRECT_MASK , +AMS_ALARM_THR_DIRECT_MASK ); +else +ams_ps_update_reg (ams, offset, +AMS_ALARM_THR_DIRECT_MASK , +AMS_ALARM_THR_DIRECT_MASK ); + } + + offset =ams_get_alarm_offset (chan->scan_index, dir); +if (chan->scan_index >=PS_SEQ_MAX ) +writel (val, ams->pl_base + offset); +else +writel (val, ams->ps_base + offset); + +mutex_unlock (&ams->mutex); + +return 0 ;
drivers/iio/adc/xilinx-ams.c line 615
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+} + +static void ams_handle_event (struct iio_dev *indio_dev,u32 event) +{ +const struct iio_chan_spec *chan; + + chan =ams_event_to_channel (indio_dev, event); + +if (chan->type ==IIO_TEMP ) { +/* The temperature channel only supports over-temperature
In IIO we use the standard kernel syntax for comments of /*
* The temperature...
*/
This form is only used in a few subsystems such as net.
It's minor but nice to be consistent...
Quoted 69 lines
drivers/iio/adc/xilinx-ams.c new file +69
-0+* events +*/ +iio_push_event (indio_dev, +IIO_UNMOD_EVENT_CODE (chan->type, chan->channel, +IIO_EV_TYPE_THRESH , +IIO_EV_DIR_RISING ), +iio_get_time_ns (indio_dev)); + }else { +/* For other channels we don't know whether it is a upper or +* lower threshold event. Userspace will have to check the +* channel value if it wants to know. +*/ +iio_push_event (indio_dev, +IIO_UNMOD_EVENT_CODE (chan->type, chan->channel, +IIO_EV_TYPE_THRESH , +IIO_EV_DIR_EITHER ), +iio_get_time_ns (indio_dev)); + } +} + +static void ams_handle_events (struct iio_dev *indio_dev,unsigned long events) +{ +unsigned int bit; + +for_each_set_bit (bit, &events,AMS_NO_OF_ALARMS ) +ams_handle_event (indio_dev, bit); +} + +/** +* ams_unmask_worker - ams alarm interrupt unmask worker +* @work : work to be done +* +* The ZynqMP threshold interrupts are level sensitive. Since we can't make the +* threshold condition go way from within the interrupt handler, this means as +* soon as a threshold condition is present we would enter the interrupt handler +* again and again. To work around this we mask all active threshold interrupts +* in the interrupt handler and start a timer. In this timer we poll the +* interrupt status and only if the interrupt is inactive we unmask it again. +*/ +static void ams_unmask_worker (struct work_struct *work) +{ + struct ams *ams = container_of(work, struct ams, ams_unmask_work.work); +unsigned int status, unmask; + +spin_lock_irq (&ams->lock); + + status =readl (ams->base +AMS_ISR_0 ); + +/* Clear those bits which are not active anymore */ + unmask = (ams->masked_alarm ^ status) & ams->masked_alarm; + +/* clear status of disabled alarm */ + unmask |= ams->intr_mask; + + ams->masked_alarm &= status; + +/* Also clear those which are masked out anyway */ + ams->masked_alarm &= ~ams->intr_mask; + +/* Clear the interrupts before we unmask them */ +writel (unmask, ams->base +AMS_ISR_0 ); + +ams_update_intrmask (ams,0 ,0 ); + +spin_unlock_irq (&ams->lock); + +/* if still pending some alarm re-trigger the timer */ +if (ams->masked_alarm) + schedule_delayed_work(&ams->ams_unmask_work,
drivers/iio/adc/xilinx-ams.c line 694
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ msecs_to_jiffies(AMS_UNMASK_TIMEOUT_MS)); +} + +static irqreturn_t ams_iio_irq (int irq,void *data) +{ +unsigned int isr0, isr1; +struct iio_dev *indio_dev = data; +struct ams *ams =iio_priv (indio_dev); + +spin_lock (&ams->lock);
Do these need to be handled in interrupt context? Would we be better off doing it in an interrupt thread where we can sleep (and hence not use a spin lock for example)?
Perhaps not, but this doesn't immediately feel time critical...
drivers/iio/adc/xilinx-ams.c line 705
Quoted 11 lines
drivers/iio/adc/xilinx-ams.c new file +11
-0+ + isr0 =readl (ams->base +AMS_ISR_0 ); + isr1 =readl (ams->base +AMS_ISR_1 ); + +/* only process alarms that are not masked */ + isr0 &= ~((ams->intr_mask &AMS_ISR0_ALARM_MASK ) | ams->masked_alarm); + isr1 &= ~(ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT ); + +/* clear interrupt */ +writel (isr0, ams->base +AMS_ISR_0 ); +writel (isr1, ams->base +AMS_ISR_1 );
If we have interrupts here that aren't ours we should a) not be clearing them
b) be returning IRQ_NONE so it can be handled as an incorrect interrupt and reported as such.
Quoted 65 lines
drivers/iio/adc/xilinx-ams.c new file +65
-0+ +if (isr0) { +/* Once the alarm interrupt occurred, mask until get cleared */ + ams->masked_alarm |= isr0; +ams_update_intrmask (ams,0 ,0 ); + +ams_handle_events (indio_dev, isr0); + +schedule_delayed_work (&ams->ams_unmask_work, +msecs_to_jiffies (AMS_UNMASK_TIMEOUT_MS )); + } + +spin_unlock (&ams->lock); + +return IRQ_HANDLED ; +} + +static const struct iio_event_spec ams_temp_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_separate =BIT (IIO_EV_INFO_ENABLE ) | +BIT (IIO_EV_INFO_VALUE ), + }, +}; + +static const struct iio_event_spec ams_voltage_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_separate =BIT (IIO_EV_INFO_VALUE ), + }, { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_FALLING , + .mask_separate =BIT (IIO_EV_INFO_VALUE ), + }, { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_EITHER , + .mask_separate =BIT (IIO_EV_INFO_ENABLE ), + }, +}; + +static const struct iio_chan_spec ams_ps_channels[] = { +AMS_PS_CHAN_TEMP (AMS_SEQ_TEMP ,AMS_TEMP ,"ps_temp" ), +AMS_PS_CHAN_TEMP (AMS_SEQ_TEMP_REMOTE ,AMS_TEMP_REMOTE ,"remote_temp" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY1 ,AMS_SUPPLY1 ,"vccpsintlp" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY2 ,AMS_SUPPLY2 ,"vccpsintfp" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY3 ,AMS_SUPPLY3 ,"vccpsaux" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY4 ,AMS_SUPPLY4 ,"vccpsddr" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY5 ,AMS_SUPPLY5 ,"vccpsio3" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY6 ,AMS_SUPPLY6 ,"vccpsio0" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY7 ,AMS_SUPPLY7 ,"vccpsio1" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY8 ,AMS_SUPPLY8 ,"vccpsio2" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY9 ,AMS_SUPPLY9 ,"psmgtravcc" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_SUPPLY10 ,AMS_SUPPLY10 ,"psmgtravtt" ), +AMS_PS_CHAN_VOLTAGE (AMS_SEQ_VCCAMS ,AMS_VCCAMS ,"vccams" ), +}; + +static const struct iio_chan_spec ams_pl_channels[] = { +AMS_PL_CHAN_TEMP (AMS_SEQ_TEMP ,AMS_TEMP ,"pl_temp" ), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY1 ,AMS_SUPPLY1 ,"vccint" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY2 ,AMS_SUPPLY2 ,"vccaux" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_VREFP ,AMS_VREFP ,"vccvrefp" , false), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_VREFN ,AMS_VREFN ,"vccvrefn" , false), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY3 ,AMS_SUPPLY3 ,"vccbram" , true),
drivers/iio/adc/xilinx-ams.c line 780
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY4 ,AMS_SUPPLY4 ,"vccplintlp" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY5 ,AMS_SUPPLY5 ,"vccplintfp" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY6 ,AMS_SUPPLY6 ,"vccplaux" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_VCCAMS ,AMS_VCCAMS ,"vccams" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_VP_VN ,AMS_VP_VN ,"vccvpvn" , false), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY7 ,AMS_SUPPLY7 ,"vuser0" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY8 ,AMS_SUPPLY8 ,"vuser1" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY9 ,AMS_SUPPLY9 ,"vuser2" , true), +AMS_PL_CHAN_VOLTAGE (AMS_SEQ_SUPPLY10 ,AMS_SUPPLY10 ,"vuser3" , true), + AMS_PL_AUX_CHAN_VOLTAGE(0, "vccaux0"),
Extended_name is a two edged sword. It lets you make nice specifically named channels, but it also breaks almost all userspace code as it doesn't know how to handle the extra bit on the end of the name.
As such we tend to only specify it for very special use non standard channels (such as the power supplies)
For the aux channels, it has no particular meaning. So I would prefer that you dropped it and just left them with the indexes.
Quoted 62 lines
drivers/iio/adc/xilinx-ams.c new file +62
-0+AMS_PL_AUX_CHAN_VOLTAGE (1 ,"vccaux1" ), +AMS_PL_AUX_CHAN_VOLTAGE (2 ,"vccaux2" ), +AMS_PL_AUX_CHAN_VOLTAGE (3 ,"vccaux3" ), +AMS_PL_AUX_CHAN_VOLTAGE (4 ,"vccaux4" ), +AMS_PL_AUX_CHAN_VOLTAGE (5 ,"vccaux5" ), +AMS_PL_AUX_CHAN_VOLTAGE (6 ,"vccaux6" ), +AMS_PL_AUX_CHAN_VOLTAGE (7 ,"vccaux7" ), +AMS_PL_AUX_CHAN_VOLTAGE (8 ,"vccaux8" ), +AMS_PL_AUX_CHAN_VOLTAGE (9 ,"vccaux9" ), +AMS_PL_AUX_CHAN_VOLTAGE (10 ,"vccaux10" ), +AMS_PL_AUX_CHAN_VOLTAGE (11 ,"vccaux11" ), +AMS_PL_AUX_CHAN_VOLTAGE (12 ,"vccaux12" ), +AMS_PL_AUX_CHAN_VOLTAGE (13 ,"vccaux13" ), +AMS_PL_AUX_CHAN_VOLTAGE (14 ,"vccaux14" ), + AMS_PL_AUX_CHAN_VOLTAGE(15, "vccaux15"), +}; + +static const struct iio_chan_spec ams_ctrl_channels[] = { +AMS_CTRL_CHAN_VOLTAGE (AMS_SEQ_VCC_PSPLL ,AMS_VCC_PSPLL0 ,"vcc_pspll0" ), +AMS_CTRL_CHAN_VOLTAGE (AMS_SEQ_VCC_PSBATT ,AMS_VCC_PSPLL3 ,"vcc_psbatt" ), +AMS_CTRL_CHAN_VOLTAGE (AMS_SEQ_VCCINT ,AMS_VCCINT ,"vccint" ), +AMS_CTRL_CHAN_VOLTAGE (AMS_SEQ_VCCBRAM ,AMS_VCCBRAM ,"vccbram" ), +AMS_CTRL_CHAN_VOLTAGE (AMS_SEQ_VCCAUX ,AMS_VCCAUX ,"vccaux" ), +AMS_CTRL_CHAN_VOLTAGE (AMS_SEQ_PSDDRPLL ,AMS_PSDDRPLL ,"psddrpll" ), +AMS_CTRL_CHAN_VOLTAGE (AMS_SEQ_INTDDR ,AMS_PSINTFPDDR ,"psintfpddr" ), +}; + +static int ams_init_module (struct iio_dev *indio_dev,struct device_node *np, +struct iio_chan_spec *channels) +{ +struct ams *ams =iio_priv (indio_dev); +struct device_node *chan_node, *child; +int ret, num_channels =0 ; +unsigned int reg; + +if (of_device_is_compatible (np,"xlnx,zynqmp-ams-ps" )) { + ams->ps_base =of_iomap (np,0 ); +if (!ams->ps_base) +return -ENXIO ; + +/* add PS channels to iio device channels */ +memcpy (channels + num_channels, ams_ps_channels, +sizeof (ams_ps_channels)); + num_channels +=ARRAY_SIZE (ams_ps_channels); + }else if (of_device_is_compatible (np,"xlnx,zynqmp-ams-pl" )) { + ams->pl_base =of_iomap (np,0 ); +if (!ams->pl_base) +return -ENXIO ; + +/* Copy only first 10 fix channels */ +memcpy (channels + num_channels, ams_pl_channels, +AMS_PL_MAX_FIXED_CHANNEL *sizeof (*channels)); + num_channels +=AMS_PL_MAX_FIXED_CHANNEL ; + + chan_node =of_get_child_by_name (np,"xlnx,ext-channels" ); +if (chan_node) { +for_each_child_of_node (chan_node, child) { + ret =of_property_read_u32 (child,"reg" , ®); +if (ret || reg >AMS_PL_MAX_EXT_CHANNEL ) +continue ; + + memcpy(&channels[num_channels],
drivers/iio/adc/xilinx-ams.c line 852
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ &ams_pl_channels[reg + +AMS_PL_MAX_FIXED_CHANNEL ], + sizeof(*channels)); + +if (of_property_read_bool (child, +"xlnx,bipolar" )) + channels[num_channels].scan_type.sign = +'s' ; + + num_channels +=1 ;
num_channels++;
Quoted 11 lines
drivers/iio/adc/xilinx-ams.c new file +11
-0+ } + } +of_node_put (chan_node); + }else if (of_device_is_compatible (np,"xlnx,zynqmp-ams" )) { +/* add AMS channels to iio device channels */ +memcpy (channels + num_channels, ams_ctrl_channels, +sizeof (ams_ctrl_channels)); + num_channels +=ARRAY_SIZE (ams_ctrl_channels); + }else { +return -EINVAL ; + }
drivers/iio/adc/xilinx-ams.c line 873
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ +return num_channels; +} + +static int ams_parse_dt (struct iio_dev *indio_dev,struct platform_device *pdev) +{ +struct ams *ams =iio_priv (indio_dev); +struct iio_chan_spec *ams_channels, *dev_channels; +struct device_node *child_node =NULL , *np = pdev->dev.of_node; +int ret, chan_vol =0 , chan_temp =0 , i, rising_off, falling_off;
chan_vol and chan_temp are counts? Perhaps their names can make that clearer.
Quoted 60 lines
drivers/iio/adc/xilinx-ams.c new file +60
-0+unsigned int num_channels =0 ; + +/* Initialize buffer for channel specification */ + ams_channels =kzalloc (sizeof (ams_ps_channels) + +sizeof (ams_pl_channels) + +sizeof (ams_ctrl_channels),GFP_KERNEL ); +if (!ams_channels) +return -ENOMEM ; + +if (of_device_is_available (np)) { + ret =ams_init_module (indio_dev, np, ams_channels); +if (ret <0 ) { +kfree (ams_channels); +return ret; + } + + num_channels += ret; + } + +for_each_child_of_node (np, child_node) { +if (of_device_is_available (child_node)) { + ret =ams_init_module (indio_dev, child_node, + ams_channels + num_channels); +if (ret <0 ) { +kfree (ams_channels); +return ret; + } + + num_channels += ret; + } + } + +for (i =0 ; i < num_channels; i++) { +if (ams_channels[i].type ==IIO_VOLTAGE ) + ams_channels[i].channel = chan_vol++; +else + ams_channels[i].channel = chan_temp++; + +if (ams_channels[i].scan_index < (PS_SEQ_MAX *3 )) { +/* set threshold to max and min for each channel */ + falling_off =ams_get_alarm_offset ( + ams_channels[i].scan_index, +IIO_EV_DIR_FALLING ); + rising_off =ams_get_alarm_offset ( + ams_channels[i].scan_index, +IIO_EV_DIR_RISING ); +if (ams_channels[i].scan_index >=PS_SEQ_MAX ) { +writel (AMS_ALARM_THR_MIN , + ams->pl_base + falling_off); +writel (AMS_ALARM_THR_MAX , + ams->pl_base + rising_off); + }else { +writel (AMS_ALARM_THR_MIN , + ams->ps_base + falling_off); +writel (AMS_ALARM_THR_MAX , + ams->ps_base + rising_off); + } + } + } +
drivers/iio/adc/xilinx-ams.c line 943
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ dev_channels =devm_kzalloc (&pdev->dev,sizeof (*dev_channels) * + num_channels,GFP_KERNEL ); +if (!dev_channels) { +kfree (ams_channels); +return -ENOMEM ; + } + +memcpy (dev_channels, ams_channels, +sizeof (*ams_channels) * num_channels); +kfree (ams_channels);
If you were to reorder this so the ams_channels cleanup was last you could use the nice clean pattern of
error:
kfree(ams_channels); return ret;
To make it clear that the ams_channels gets freed in all paths.
Quoted 31 lines
drivers/iio/adc/xilinx-ams.c new file +31
-0+ indio_dev->channels = dev_channels; + indio_dev->num_channels = num_channels; + +return 0 ; +} + +static const struct iio_info iio_pl_info = { + .read_raw = &ams_read_raw, + .read_event_config = &ams_read_event_config, + .write_event_config = &ams_write_event_config, + .read_event_value = &ams_read_event_value, + .write_event_value = &ams_write_event_value, +}; + +static const struct of_device_id ams_of_match_table[] = { + { .compatible ="xlnx,zynqmp-ams" }, + { } +}; +MODULE_DEVICE_TABLE (of, ams_of_match_table); + +static int ams_probe (struct platform_device *pdev) +{ +struct iio_dev *indio_dev; +struct ams *ams; +struct resource *res; +int ret; + +if (!pdev->dev.of_node) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&pdev->dev,sizeof (*ams));
drivers/iio/adc/xilinx-ams.c line 984
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+if (!indio_dev) +return -ENOMEM ; + + ams =iio_priv (indio_dev); +mutex_init (&ams->mutex); +spin_lock_init (&ams->lock); + + indio_dev->dev.parent = &pdev->dev; + indio_dev->dev.of_node = pdev->dev.of_node; + indio_dev->name ="ams" ;
As names go, that one is a too little generic. Particularly with a common manufacturer of ADCs called Austrian Micro Systems ;) No possibility of confusion!
It's fine to use ams within the driver, but for external interfaces, perhaps prefix with xilinx-?
Quoted 21 lines
drivers/iio/adc/xilinx-ams.c new file +21
-0+ + indio_dev->info = &iio_pl_info; + indio_dev->modes =INDIO_DIRECT_MODE ; + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"ams-base" ); + ams->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (ams->base)) +return PTR_ERR (ams->base); + +INIT_DELAYED_WORK (&ams->ams_unmask_work, ams_unmask_worker); + + ams->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (ams->clk)) +return PTR_ERR (ams->clk); +clk_prepare_enable (ams->clk); + + ret =iio_ams_init_device (ams); +if (ret) { +dev_err (&pdev->dev,"failed to initialize AMS\n" ); + goto clk_disable; + }
drivers/iio/adc/xilinx-ams.c line 1015
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ + ret =ams_parse_dt (indio_dev, pdev); +if (ret) { +dev_err (&pdev->dev,"failure in parsing DT\n" ); + goto clk_disable; + } + +ams_enable_channel_sequence (ams); + + ams->irq =platform_get_irq_byname (pdev,"ams-irq" );
Why store this in the ams structure? It's not used anywhere other than in the next line.
drivers/iio/adc/xilinx-ams.c line 1017
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ ret =devm_request_irq (&pdev->dev, ams->irq, &ams_iio_irq,0 ,"ams-irq" , + indio_dev);
This mixing of devm and non devm functions makes it tricky to be sure there aren't an races.
One easy solution is to use devm_add_action to put the clk_disable_unprepare into the cleanup list.
drivers/iio/adc/xilinx-ams.c line 1025
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+if (ret <0 ) { +dev_err (&pdev->dev,"failed to register interrupt\n" ); + goto clk_disable; + } + +platform_set_drvdata (pdev, indio_dev); + +return iio_device_register (indio_dev);
What if device register returns an error? You leave the clock enabled.
That way everything is using the managed cleanup and the ordering will be correct.
The alternative is to not use devm forms for everything after the clk_prepare_enable.
Quoted 25 lines
drivers/iio/adc/xilinx-ams.c new file +25
-0+ +clk_disable: +clk_disable_unprepare (ams->clk); + +return ret; +} + +static int ams_remove (struct platform_device *pdev) +{ +struct iio_dev *indio_dev =platform_get_drvdata (pdev); +struct ams *ams =iio_priv (indio_dev); + +cancel_delayed_work (&ams->ams_unmask_work); + +/* Unregister the device */ +iio_device_unregister (indio_dev); +clk_disable_unprepare (ams->clk); + +return 0 ; +} + +static int __maybe_unused ams_suspend (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct ams *ams =iio_priv (indio_dev);
drivers/iio/adc/xilinx-ams.c line 1060
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ +clk_disable_unprepare (ams->clk); + +return 0 ; +} + +static int __maybe_unused ams_resume (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct ams *ams =iio_priv (indio_dev);
You could streamline this without loss of clarity as.
struct ams *ams = iio_priv(dev_get_drvdata(dev));
(very minor point!)
Quoted 4 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+ +clk_prepare_enable (ams->clk); + +return 0 ;
drivers/iio/adc/xilinx-ams.c line 1074
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+} + +static SIMPLE_DEV_PM_OPS(ams_pm_ops, ams_suspend, ams_resume); + +static struct platform_driver ams_driver = { + .probe = ams_probe, + .remove = ams_remove, + .driver = { + .name ="ams" , + .pm = &ams_pm_ops,
Spacing here seems a little odd. Just have a single space after pm
drivers/iio/adc/xilinx-ams.h
Quoted 12 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+ .of_match_table = ams_of_match_table, + }, +}; +module_platform_driver (ams_driver); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Xilinx, Inc." );drivers/iio/adc/xilinx-ams.h new file +0
-0
I can't immediately see why a lot of this wants to be in a header.
Please move it inline with the C file.
Quoted 261 lines
drivers/iio/adc/xilinx-ams.h new file +260
-0@@ -0,0 +1,281 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Xilinx AMS driver +* +* Copyright (C) 2017-2018 Xilinx, Inc. +* +* Manish Narani <[email protected]> +* Rajnikant Bhojani <[email protected]> +*/ + +#ifndef __XILINX_AMS_H__ +#define __XILINX_AMS_H__ + +#define AMS_MISC_CTRL 0x000 +#define AMS_ISR_0 0x010 +#define AMS_ISR_1 0x014 +#define AMS_IMR_0 0x018 +#define AMS_IMR_1 0x01c +#define AMS_IER_0 0x020 +#define AMS_IER_1 0x024 +#define AMS_IDR_0 0x028 +#define AMS_IDR_1 0x02c +#define AMS_PS_CSTS 0x040 +#define AMS_PL_CSTS 0x044 +#define AMS_MON_CSTS 0x050 + +#define AMS_VCC_PSPLL0 0x060 +#define AMS_VCC_PSPLL3 0x06C +#define AMS_VCCINT 0x078 +#define AMS_VCCBRAM 0x07C +#define AMS_VCCAUX 0x080 +#define AMS_PSDDRPLL 0x084 +#define AMS_PSINTFPDDR 0x09C + +#define AMS_VCC_PSPLL0_CH 48 +#define AMS_VCC_PSPLL3_CH 51 +#define AMS_VCCINT_CH 54 +#define AMS_VCCBRAM_CH 55 +#define AMS_VCCAUX_CH 56 +#define AMS_PSDDRPLL_CH 57 +#define AMS_PSINTFPDDR_CH 63 + +#define AMS_REG_CONFIG0 0x100 +#define AMS_REG_CONFIG1 0x104 +#define AMS_REG_CONFIG2 0x108 +#define AMS_REG_CONFIG3 0x10C +#define AMS_REG_CONFIG4 0x110 +#define AMS_REG_SEQ_CH0 0x120 +#define AMS_REG_SEQ_CH1 0x124 +#define AMS_REG_SEQ_CH2 0x118 + +#define AMS_TEMP 0x000 +#define AMS_SUPPLY1 0x004 +#define AMS_SUPPLY2 0x008 +#define AMS_VP_VN 0x00c +#define AMS_VREFP 0x010 +#define AMS_VREFN 0x014 +#define AMS_SUPPLY3 0x018 +#define AMS_SUPPLY4 0x034 +#define AMS_SUPPLY5 0x038 +#define AMS_SUPPLY6 0x03c +#define AMS_SUPPLY7 0x200 +#define AMS_SUPPLY8 0x204 +#define AMS_SUPPLY9 0x208 +#define AMS_SUPPLY10 0x20c +#define AMS_VCCAMS 0x210 +#define AMS_TEMP_REMOTE 0x214 + +#define AMS_REG_VAUX (x) (0x40 + (4*(x))) +#define AMS_REG_VUSER (x) (0x200 + (4*(x))) + +#define AMS_PS_RESET_VALUE 0xFFFFU +#define AMS_PL_RESET_VALUE 0xFFFFU + +#define AMS_CONF0_CHANNEL_NUM_MASK (0x3f << 0) + +#define AMS_CONF1_SEQ_MASK (0xf << 12) +#define AMS_CONF1_SEQ_DEFAULT (0 << 12) +#define AMS_CONF1_SEQ_SINGLE_PASS (1 << 12) +#define AMS_CONF1_SEQ_CONTINUOUS (2 << 12) +#define AMS_CONF1_SEQ_SINGLE_CHANNEL (3 << 12) + +#define AMS_REG_SEQ0_MASK 0xFFFF +#define AMS_REG_SEQ2_MASK 0x3F +#define AMS_REG_SEQ1_MASK 0xFFFF +#define AMS_REG_SEQ2_MASK_SHIFT 16 +#define AMS_REG_SEQ1_MASK_SHIFT 22 + +#define AMS_REGCFG1_ALARM_MASK 0xF0F +#define AMS_REGCFG3_ALARM_MASK 0x3F + +#define AMS_ALARM_TEMP 0x140 +#define AMS_ALARM_SUPPLY1 0x144 +#define AMS_ALARM_SUPPLY2 0x148 +#define AMS_ALARM_OT 0x14c + +#define AMS_ALARM_SUPPLY3 0x160 +#define AMS_ALARM_SUPPLY4 0x164 +#define AMS_ALARM_SUPPLY5 0x168 +#define AMS_ALARM_SUPPLY6 0x16c +#define AMS_ALARM_SUPPLY7 0x180 +#define AMS_ALARM_SUPPLY8 0x184 +#define AMS_ALARM_SUPPLY9 0x188 +#define AMS_ALARM_SUPPLY10 0x18c +#define AMS_ALARM_VCCAMS 0x190 +#define AMS_ALARM_TEMP_REMOTE 0x194 +#define AMS_ALARM_THRESHOLD_OFF_10 0x10 +#define AMS_ALARM_THRESHOLD_OFF_20 0x20 + +#define AMS_ALARM_THR_DIRECT_MASK 0x01 +#define AMS_ALARM_THR_MIN 0x0000 +#define AMS_ALARM_THR_MAX 0xffff + +#define AMS_NO_OF_ALARMS 32 +#define AMS_PL_ALARM_START 16 +#define AMS_ISR0_ALARM_MASK 0xFFFFFFFFU +#define AMS_ISR1_ALARM_MASK 0xE000001FU +#define AMS_ISR1_INTR_MASK_SHIFT 32 +#define AMS_ISR0_ALARM_2_TO_0_MASK 0x07 +#define AMS_ISR0_ALARM_6_TO_3_MASK 0x78 +#define AMS_ISR0_ALARM_12_TO_7_MASK 0x3F +#define AMS_CONF1_ALARM_2_TO_0_SHIFT 1 +#define AMS_CONF1_ALARM_6_TO_3_SHIFT 5 +#define AMS_CONF3_ALARM_12_TO_7_SHIFT 8 + +#define AMS_PS_CSTS_PS_READY 0x08010000U +#define AMS_PL_CSTS_ACCESS_MASK 0x00000001U + +#define AMS_PL_MAX_FIXED_CHANNEL 10 +#define AMS_PL_MAX_EXT_CHANNEL 20 + +#define AMS_INIT_TIMEOUT 10000 + +/* +* Following scale and offset value is derived from +* UG580 (v1.7) December 20, 2016 +*/ +#define AMS_SUPPLY_SCALE_1VOLT 1000 +#define AMS_SUPPLY_SCALE_3VOLT 3000 +#define AMS_SUPPLY_SCALE_6VOLT 6000 +#define AMS_SUPPLY_SCALE_DIV_BIT 16 + +#define AMS_TEMP_SCALE 509314 +#define AMS_TEMP_SCALE_DIV_BIT 16 +#define AMS_TEMP_OFFSET -((280230L << 16) / 509314) + +enum ams_alarm_bit { +AMS_ALARM_BIT_TEMP , +AMS_ALARM_BIT_SUPPLY1 , +AMS_ALARM_BIT_SUPPLY2 , +AMS_ALARM_BIT_SUPPLY3 , +AMS_ALARM_BIT_SUPPLY4 , +AMS_ALARM_BIT_SUPPLY5 , +AMS_ALARM_BIT_SUPPLY6 , +AMS_ALARM_BIT_RESERVED , +AMS_ALARM_BIT_SUPPLY7 , +AMS_ALARM_BIT_SUPPLY8 , +AMS_ALARM_BIT_SUPPLY9 , +AMS_ALARM_BIT_SUPPLY10 , +AMS_ALARM_BIT_VCCAMS , +AMS_ALARM_BIT_TEMP_REMOTE +}; + +enum ams_seq { +AMS_SEQ_VCC_PSPLL , +AMS_SEQ_VCC_PSBATT , +AMS_SEQ_VCCINT , +AMS_SEQ_VCCBRAM , +AMS_SEQ_VCCAUX , +AMS_SEQ_PSDDRPLL , +AMS_SEQ_INTDDR +}; + +enum ams_ps_pl_seq { +AMS_SEQ_CALIB , +AMS_SEQ_RSVD_1 , +AMS_SEQ_RSVD_2 , +AMS_SEQ_TEST , +AMS_SEQ_RSVD_4 , +AMS_SEQ_SUPPLY4 , +AMS_SEQ_SUPPLY5 , +AMS_SEQ_SUPPLY6 , +AMS_SEQ_TEMP , +AMS_SEQ_SUPPLY2 , +AMS_SEQ_SUPPLY1 , +AMS_SEQ_VP_VN , +AMS_SEQ_VREFP , +AMS_SEQ_VREFN , +AMS_SEQ_SUPPLY3 , +AMS_SEQ_CURRENT_MON , +AMS_SEQ_SUPPLY7 , +AMS_SEQ_SUPPLY8 , +AMS_SEQ_SUPPLY9 , +AMS_SEQ_SUPPLY10 , +AMS_SEQ_VCCAMS , +AMS_SEQ_TEMP_REMOTE , +AMS_SEQ_MAX +}; + +#define AMS_SEQ (x) (AMS_SEQ_MAX + (x)) +#define AMS_VAUX_SEQ (x) (AMS_SEQ_MAX + (x)) + +#define PS_SEQ_MAX AMS_SEQ_MAX +#define PS_SEQ (x) (x) +#define PL_SEQ (x) (PS_SEQ_MAX + x) + +#define AMS_CHAN_TEMP (_scan_index, _addr, _ext) { \ + .type = IIO_TEMP, \ + .indexed = 1, \ + .address = (_addr), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .event_spec = ams_temp_events, \ + .num_event_specs = ARRAY_SIZE(ams_temp_events), \ + .scan_index = (_scan_index), \ + .scan_type = { \ + .sign = 'u', \ + .realbits = 12, \ + .storagebits = 16, \ + .shift = 4, \ + .endianness = IIO_CPU, \ + }, \ + .extend_name = _ext, \ +} + +#define AMS_CHAN_VOLTAGE (_scan_index, _addr, _ext, _alarm) { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .address = (_addr), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .event_spec = (_alarm) ? ams_voltage_events : NULL, \ + .num_event_specs = (_alarm) ? ARRAY_SIZE(ams_voltage_events) : 0, \ + .scan_index = (_scan_index), \ + .scan_type = { \ + .realbits = 10, \ + .storagebits = 16, \ + .shift = 6, \ + .endianness = IIO_CPU, \ + }, \ + .extend_name = _ext, \ +} + +#define AMS_PS_CHAN_TEMP (_scan_index, _addr, _ext) \ + AMS_CHAN_TEMP(PS_SEQ(_scan_index), _addr, _ext) +#define AMS_PS_CHAN_VOLTAGE (_scan_index, _addr, _ext) \ + AMS_CHAN_VOLTAGE(PS_SEQ(_scan_index), _addr, _ext, true) + +#define AMS_PL_CHAN_TEMP (_scan_index, _addr, _ext) \ + AMS_CHAN_TEMP(PL_SEQ(_scan_index), _addr, _ext) +#define AMS_PL_CHAN_VOLTAGE (_scan_index, _addr, _ext, _alarm) \ + AMS_CHAN_VOLTAGE(PL_SEQ(_scan_index), _addr, _ext, _alarm) +#define AMS_PL_AUX_CHAN_VOLTAGE (_auxno, _ext) \ + AMS_CHAN_VOLTAGE(PL_SEQ(AMS_VAUX_SEQ(_auxno)), \ + AMS_REG_VAUX(_auxno), _ext, false) +#define AMS_CTRL_CHAN_VOLTAGE (_scan_index, _addr, _ext) \ + AMS_CHAN_VOLTAGE(PL_SEQ(AMS_VAUX_SEQ(AMS_SEQ(_scan_index))), \
drivers/iio/adc/xilinx-ams.h line 270
Quoted 10 lines
drivers/iio/adc/xilinx-ams.h new file +10
-0+ _addr, _ext, false) + +struct ams { +void __iomem *base; +void __iomem *ps_base; +void __iomem *pl_base; +struct clk *clk; +struct device *dev; + +struct mutex mutex;
Pleases give clear comments on what these locks are protecting. It's certainly curious to see a mutex and a spinlock with such generic names right next to each other.
drivers/iio/adc/xilinx-ams.h line 276
Quoted 6 lines
drivers/iio/adc/xilinx-ams.h new file +6
-0+spinlock_t lock; + +unsigned int alarm_mask; +unsigned int masked_alarm; +u64 intr_mask; +int irq;
As noted above, this is only used next to where it is first set. No advantage in having it here.
Quoted 5 lines
drivers/iio/adc/xilinx-ams.h new file +5
-0+ + struct delayed_work ams_unmask_work; +}; + +#endif /* __XILINX_AMS_H__ */
RE: [PATCH 2/3] iio: adc: Add Xilinx AMS driver
Hi Jonathan,
Thanks a lot for the review. Please see my response inline.
Quoted 35 lines
-----Original Message-----
From: Jonathan Cameron [mailto:jic23 at kernel.org]
Sent: Monday, September 3, 2018 1:27 AM
To: Manish Narani <[email protected]>
Cc:knaack.hat gmx.de; lars at metafoo.de; pmeerw at pmeerw.net; robh+dt at kernel.org; mark.rutland at arm.com; Michal Simek <[email protected]>; leoyang.li at nxp.com; sudeep.holla at arm.com; amit.kucheria at linaro.org; broonie at kernel.org; arnaud.pouliquen at st.com; geert at linux-m68k.org; eugen.hristev at microchip.com; rdunlap at infradead.org; lukas at wunner.de; freeman.liu at spreadtrum.com; vilhelm.gray at gmail.com; tglx at linutronix.de; baolin.wang at linaro.org; gregkh at linuxfoundation.org; Srinivas Goud <[email protected]>; Anirudha Sarangi <[email protected]>; linux-iio at vger.kernel.org; devicetree at vger.kernel.org; linux-arm- kernel at lists.infradead.org; linux-kernel at vger.kernel.org
Subject: Re: [PATCH 2/3] iio: adc: Add Xilinx AMS driverQuoted 16 lines · On Thu, 30 Aug 2018 15:52:18 +0530 Manish Narani <[email protected]>…
The AMS includes an ADC as well as on-chip sensors that can be used to sample external voltages and monitor on-die operating conditions, such as temperature and supply voltage levels. The AMS has two SYSMON blocks. PL-SYSMON block is capable of monitoring off chip voltage and temperature.
PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring from external master. Out of these interface currently only DRP is supported.
Other block PS-SYSMON is memory mapped to PS.
The AMS can use internal channels to monitor voltage and temperature as well as one primary and up to 16 auxiliary channels for measuring external voltages.
The voltage and temperature monitoring channels also have event capability which allows to generate an interrupt when their value falls below or raises above a set threshold.
Quoted 6 lines
Quoted 1 line
Signed-off-by Manish Narani <[email protected]>Given the use of
extended_namein here, there is a whole lot of undocumented userspace ABI. Please add to
Documentation/ABI/testing/sysfs-bus-iio-xilinx-amsor similar.
Okay sure.
Quoted 77 lines
I am a little concerned at introducing quite so many of these. Perhaps we need to revisit how we represent this sort of information...
Otherwise, a few minor things inline but looking fairly good overall.
Thanks,
Jonathan
Quoted 15 lines
--- drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/xilinx-ams.c | 1081 ++++++++++++++++++++++++++++++++++++++++++ drivers/iio/adc/xilinx-ams.h | 281 +++++++++++ 4 files changed, 1373 insertions(+) create mode 100644 drivers/iio/adc/xilinx-ams.c create mode 100644
drivers/iio/adc/xilinx-ams.hdrivers/iio/adc/Kconfig index renamed from drivers/iio/adc/Kconfig +0
-04a75492..405ea00 100644
drivers/iio/adc/Kconfig config XILINX_XADC · line 941
Quoted 1 line
drivers/iio/adc/Kconfig +0
-0@@ -941,4 +941,14 @@ config XILINX_XADC The driver can also be build as a module. If so, the module will becalled
drivers/iio/adc/Kconfig config XILINX_XADC
Quoted 10 lines
drivers/iio/adc/Kconfig +8
-0xilinx-xadc. +config XILINX_AMS + tristate "Xilinx AMS driver" + depends on ARCH_ZYNQMP || COMPILE_TEST + depends on HAS_IOMEM + help + Say yes here to have support for the Xilinx AMS. + + The driver can also be build as a module. If so, the module will becalled
Quoted 26 lines
drivers/iio/adc/Kconfig +2
-0+ xilinx-ams. + endmenudrivers/iio/adc/Makefile index renamed from drivers/iio/adc/Makefile +0
-003db7b5..fbfcc45 100644
drivers/iio/adc/Makefile +0
-0@@ -85,4 +85,5 @@ obj-$(CONFIG_VF610_ADC) += vf610_adc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o xilinx-xadc-y :=xilinx-xadc-core.o xilinx-xadc-events.o
obj-$(CONFIG_XILINX_XADC) += xilinx-xadc.o
+obj-$(CONFIG_XILINX_AMS) += xilinx-ams.o
obj-$(CONFIG_SD_ADC_MODULATOR) += sd_adc_modulator.o diff --gita/drivers/iio/adc/xilinx-ams.cb/drivers/iio/adc/xilinx-ams.cnew file mode 100644 index 0000000..10bcc52drivers/iio/adc/xilinx-ams.c new file +8
-0@@ -0,0 +1,1081 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Xilinx AMS driver +* +* Copyright (C) 2017-2018 Xilinx, Inc. +* +* Manish Narani <[email protected]> +* Rajnikant Bhojani <[email protected]> */ drivers/iio/adc/xilinx-ams.c line 18
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/clk.h> +#include <linux/of_address.h> +#include <linux/iopoll.h> +#include <linux/delay.h> There is a rough convention of alphabetical order if there isn't a reason to do otherwise.
Quoted 2 lines
Here you might keep the iio headers for their own block at the end, but the rest should be in order.
Okay I will try to follow the same and update in v2.
Quoted 16 lines
Quoted 16 lines
drivers/iio/adc/xilinx-ams.c new file +15
-0+#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/events.h> +#include <linux/io.h> + +#include "xilinx-ams.h" + +static const unsigned int AMS_UNMASK_TIMEOUT_MS =500 ; + +static inline void ams_ps_update_reg (struct ams *ams,unsigned int offset, +u32 mask,u32 data) +{ +u32 val; + + val =readl (ams->ps_base + offset);
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+writel ((val & ~mask) | (data & mask), ams->ps_base + offset); } + +static inline void ams_pl_write_reg (struct ams *ams,unsigned int offset, +u32 data) +{ +writel (data, ams->pl_base + offset); }I'm always anti wrappers that don't add much. In this driver you also only use them 'sometimes'.
Okay, I will use writel inline in v2
Quoted 7 lines
I'd prefer just having the writel inline all the time. The update functions have a little more purpose and given they are called quite often, perhaps are worth keeping.
Another option is to use regmap for the whole thing getting you update functions and caching etc. Might not be worth it here. Up to you.
Sure. I will try to explore this.
Quoted 240 lines
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+ +static inline void ams_pl_update_reg (struct ams *ams,unsigned int offset, +u32 mask,u32 data) +{drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+u32 val; + + val =readl (ams->pl_base + offset); +writel ((val & ~mask) | (data & mask), ams->pl_base + offset); } + +static void ams_update_intrmask (struct ams *ams,u64 mask,u64 val) { + ams->intr_mask &= ~mask; + ams->intr_mask |= (val & mask); + + writel(~(ams->intr_mask | ams->masked_alarm), ams->base +
AMS_IER_0);drivers/iio/adc/xilinx-ams.c
Quoted 3 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+writel (~(ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT ), + ams->base +AMS_IER_1 ); + writel(ams->intr_mask | ams->masked_alarm, ams->base +
AMS_IDR_0);drivers/iio/adc/xilinx-ams.c
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+writel (ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT , + ams->base +AMS_IDR_1 ); +} + +static void ams_disable_all_alarms (struct ams *ams) { +/* disable PS module alarm */ +if (ams->ps_base) { + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_REGCFG1_ALARM_MASK,drivers/iio/adc/xilinx-ams.c line 66
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ AMS_REGCFG1_ALARM_MASK); + ams_ps_update_reg(ams, AMS_REG_CONFIG3,
AMS_REGCFG3_ALARM_MASK,Quoted 15 lines
drivers/iio/adc/xilinx-ams.c new file +15
-0+ AMS_REGCFG3_ALARM_MASK); + } + +/* disable PL module alarm */ +if (ams->pl_base) { +ams_pl_update_reg (ams,AMS_REG_CONFIG1 , +AMS_REGCFG1_ALARM_MASK , +AMS_REGCFG1_ALARM_MASK ); +ams_pl_update_reg (ams,AMS_REG_CONFIG3 , +AMS_REGCFG3_ALARM_MASK , +AMS_REGCFG3_ALARM_MASK ); + } +} + +static void iio_ams_update_alarm(struct ams *ams, unsigned longdrivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+alarm_mask) { +u32 cfg; +unsigned long flags; +unsigned long pl_alarm_mask; + +if (ams->ps_base) { +/* Configuring PS alarm enable */ + cfg = ~((alarm_mask &AMS_ISR0_ALARM_2_TO_0_MASK ) << +AMS_CONF1_ALARM_2_TO_0_SHIFT ); + cfg &= ~((alarm_mask & AMS_ISR0_ALARM_6_TO_3_MASK)<<
drivers/iio/adc/xilinx-ams.c line 93
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ AMS_CONF1_ALARM_6_TO_3_SHIFT); + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_REGCFG1_ALARM_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 3 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+ cfg); + + cfg = ~((alarm_mask >>
AMS_CONF3_ALARM_12_TO_7_SHIFT) &drivers/iio/adc/xilinx-ams.c line 98
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ AMS_ISR0_ALARM_12_TO_7_MASK); + ams_ps_update_reg(ams, AMS_REG_CONFIG3,
AMS_REGCFG3_ALARM_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 7 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+ cfg); + } + +if (ams->pl_base) { + pl_alarm_mask = (alarm_mask >>AMS_PL_ALARM_START ); +/* Configuring PL alarm enable */ + cfg = ~((pl_alarm_mask & AMS_ISR0_ALARM_2_TO_0_MASK)<<
drivers/iio/adc/xilinx-ams.c line 107
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ AMS_CONF1_ALARM_2_TO_0_SHIFT); + cfg &= ~((pl_alarm_mask &
AMS_ISR0_ALARM_6_TO_3_MASK) <<drivers/iio/adc/xilinx-ams.c
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ AMS_CONF1_ALARM_6_TO_3_SHIFT); +ams_pl_update_reg (ams,AMS_REG_CONFIG1 , +AMS_REGCFG1_ALARM_MASK , cfg); + + cfg = ~((pl_alarm_mask >>
AMS_CONF3_ALARM_12_TO_7_SHIFT) &Quoted 17 lines
drivers/iio/adc/xilinx-ams.c new file +17
-0+ AMS_ISR0_ALARM_12_TO_7_MASK); +ams_pl_update_reg (ams,AMS_REG_CONFIG3 , +AMS_REGCFG3_ALARM_MASK , cfg); + } + +spin_lock_irqsave (&ams->lock, flags); +ams_update_intrmask (ams,AMS_ISR0_ALARM_MASK , ~alarm_mask); +spin_unlock_irqrestore (&ams->lock, flags); } + +static void ams_enable_channel_sequence (struct ams *ams) { +int i; +unsigned long long scan_mask; +struct iio_dev *indio_dev =iio_priv_to_dev (ams); + +/* +* Enable channel sequence. First 22 bit of scan_mask represent +* PS channels, and next remaining bit represents PL channels. drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+*/ + +/* Run calibration of PS & PL as part of the sequence */ + scan_mask =0x1 |BIT (PS_SEQ_MAX ); +for (i =0 ; i < indio_dev->num_channels; i++) + scan_mask |=BIT (indio_dev->channels[i].scan_index); + +if (ams->ps_base) { +/* put sysmon in a soft reset to change the sequence */ + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 11 lines
drivers/iio/adc/xilinx-ams.c new file +11
-0+ AMS_CONF1_SEQ_DEFAULT); + +/* configure basic channels */ +writel (scan_mask &AMS_REG_SEQ0_MASK , + ams->ps_base +AMS_REG_SEQ_CH0 ); +writel (AMS_REG_SEQ2_MASK & + (scan_mask >>AMS_REG_SEQ2_MASK_SHIFT ), + ams->ps_base +AMS_REG_SEQ_CH2 ); + +/* set continuous sequence mode */ + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+ AMS_CONF1_SEQ_CONTINUOUS); + } + +if (ams->pl_base) { +/* put sysmon in a soft reset to change the sequence */ + ams_pl_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ AMS_CONF1_SEQ_DEFAULT); + +/* configure basic channels */ + scan_mask = scan_mask >>PS_SEQ_MAX ; + writel(scan_mask & AMS_REG_SEQ0_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ ams->pl_base + AMS_REG_SEQ_CH0); +writel (AMS_REG_SEQ2_MASK & + (scan_mask >>AMS_REG_SEQ2_MASK_SHIFT ), + ams->pl_base +AMS_REG_SEQ_CH2 ); +writel (AMS_REG_SEQ1_MASK & + (scan_mask >>AMS_REG_SEQ1_MASK_SHIFT ), + ams->pl_base +AMS_REG_SEQ_CH1 ); + +/* set continuous sequence mode */ + ams_pl_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,Quoted 11 lines
drivers/iio/adc/xilinx-ams.c new file +11
-0+ AMS_CONF1_SEQ_CONTINUOUS); + } +} + +static int iio_ams_init_device (struct ams *ams) { +u32 reg; +int ret; + +/* reset AMS */ +if (ams->ps_base) { +writel (AMS_PS_RESET_VALUE , ams->ps_base +AMS_VP_VN );drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ + ret =readl_poll_timeout (ams->base +AMS_PS_CSTS , reg, + (reg &AMS_PS_CSTS_PS_READY ) == +AMS_PS_CSTS_PS_READY ,0 , +AMS_INIT_TIMEOUT ); +if (ret) +return ret; + +/* put sysmon in a default state */ + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+ AMS_CONF1_SEQ_DEFAULT); + } + +if (ams->pl_base) { +writel (AMS_PL_RESET_VALUE , ams->pl_base +AMS_VP_VN ); + + ret =readl_poll_timeout (ams->base +AMS_PL_CSTS , reg, + (reg & AMS_PL_CSTS_ACCESS_MASK)==
drivers/iio/adc/xilinx-ams.c
Quoted 7 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+AMS_PL_CSTS_ACCESS_MASK ,0 , + AMS_INIT_TIMEOUT); +if (ret) +return ret; + +/* put sysmon in a default state */ + ams_pl_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,Quoted 37 lines
drivers/iio/adc/xilinx-ams.c new file +37
-0+ AMS_CONF1_SEQ_DEFAULT); + } + +ams_disable_all_alarms (ams); + +/* Disable interrupt */ +ams_update_intrmask (ams, ~0 , ~0 ); + +/* Clear any pending interrupt */ +writel (AMS_ISR0_ALARM_MASK , ams->base +AMS_ISR_0 ); +writel (AMS_ISR1_ALARM_MASK , ams->base +AMS_ISR_1 ); + +return 0 ; +} + +static int ams_enable_single_channel (struct ams *ams,unsigned int +offset) { +u8 channel_num =0 ; + +switch (offset) { +case AMS_VCC_PSPLL0 : + channel_num =AMS_VCC_PSPLL0_CH ; +break ; +case AMS_VCC_PSPLL3 : + channel_num =AMS_VCC_PSPLL3_CH ; +break ; +case AMS_VCCINT : + channel_num =AMS_VCCINT_CH ; +break ; +case AMS_VCCBRAM : + channel_num =AMS_VCCBRAM_CH ; +break ; +case AMS_VCCAUX : + channel_num =AMS_VCCAUX_CH ; +break ; +case AMS_PSDDRPLL : + channel_num =AMS_PSDDRPLL_CH ;drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+break ; +case AMS_PSINTFPDDR : + channel_num =AMS_PSINTFPDDR_CH ; +break ; +default : +return -EINVAL ; + } + +/* set single channel, sequencer off mode */ + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 4 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+ AMS_CONF1_SEQ_SINGLE_CHANNEL); + +/* write the channel number */ + ams_ps_update_reg(ams, AMS_REG_CONFIG0,
AMS_CONF0_CHANNEL_NUM_MASK,
Quoted 4 lines
drivers/iio/adc/xilinx-ams.c line 269
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ channel_num); +mdelay (1 );This delay should be documented.. Preferably with a reference to the datasheet to justify the particular value.
There is an option to poll for EOC (End of Conversion) to be set in a register. I will replace this delay will that polling.
Quoted 27 lines
Quoted 27 lines
drivers/iio/adc/xilinx-ams.c new file +26
-0+ +return 0 ; +} + +static int ams_read_vcc_reg (struct ams *ams,unsigned int offset,u32 +*data) { +int ret; + + ret =ams_enable_single_channel (ams, offset); +if (ret) +return ret; + + *data =readl (ams->base + offset); +ams_enable_channel_sequence (ams); + +return 0 ; +} + +static int ams_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{ +struct ams *ams =iio_priv (indio_dev); +int ret; + +switch (mask) {
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 301
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+case IIO_CHAN_INFO_RAW : +mutex_lock (&ams->mutex); +if (chan->scan_index >= (PS_SEQ_MAX *3 )) { + ret =ams_read_vcc_reg (ams, chan->address, val); +if (ret) + goto read_raw_err;Missing
mutex_unlock?
Missed it. This will be corrected in v2.
Quoted 60 lines
Quoted 60 lines
drivers/iio/adc/xilinx-ams.c new file +59
-0+ }else if (chan->scan_index >=PS_SEQ_MAX ) + *val =readl (ams->pl_base + chan->address); +else + *val =readl (ams->ps_base + chan->address); +mutex_unlock (&ams->mutex); + +return IIO_VAL_INT ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_VOLTAGE : +switch (chan->address) { +case AMS_SUPPLY1 : +case AMS_SUPPLY2 : +case AMS_SUPPLY3 : +case AMS_SUPPLY4 : + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +case AMS_SUPPLY5 : +case AMS_SUPPLY6 : +if (chan->scan_index <PS_SEQ_MAX ) + *val =AMS_SUPPLY_SCALE_6VOLT ; +else + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +case AMS_SUPPLY7 : +case AMS_SUPPLY8 : + *val =AMS_SUPPLY_SCALE_6VOLT ; +break ; +case AMS_SUPPLY9 : +case AMS_SUPPLY10 : +if (chan->scan_index <PS_SEQ_MAX ) + *val =AMS_SUPPLY_SCALE_3VOLT ; +else + *val =AMS_SUPPLY_SCALE_6VOLT ; +break ; +case AMS_VCC_PSPLL0 : +case AMS_VCC_PSPLL3 : +case AMS_VCCINT : +case AMS_VCCBRAM : +case AMS_VCCAUX : +case AMS_PSDDRPLL : +case AMS_PSINTFPDDR : + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +default : + *val =AMS_SUPPLY_SCALE_1VOLT ; +break ; + } + *val2 =AMS_SUPPLY_SCALE_DIV_BIT ; +return IIO_VAL_FRACTIONAL_LOG2 ; +case IIO_TEMP : + *val =AMS_TEMP_SCALE ; + *val2 =AMS_TEMP_SCALE_DIV_BIT ; +return IIO_VAL_FRACTIONAL_LOG2 ; +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_OFFSET : +/* Only the temperature channel has an offset */
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 365
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ *val =AMS_TEMP_OFFSET ; +return IIO_VAL_INT ; + } + +read_raw_err:Given we only return an error code here, are we not better just doing that inline?
Yes. You are right. Will update this in v2.
Quoted 252 lines
Quoted 146 lines
drivers/iio/adc/xilinx-ams.c new file +145
-0+return -EINVAL ; +} + +static int ams_get_alarm_offset (int scan_index,enum +iio_event_direction dir) { +int offset =0 ; + +if (scan_index >=PS_SEQ_MAX ) + scan_index -=PS_SEQ_MAX ; + +if (dir ==IIO_EV_DIR_FALLING ) { +if (scan_index <AMS_SEQ_SUPPLY7 ) + offset =AMS_ALARM_THRESHOLD_OFF_10 ; +else + offset =AMS_ALARM_THRESHOLD_OFF_20 ; + } + +switch (scan_index) { +case AMS_SEQ_TEMP : +return AMS_ALARM_TEMP + offset; +case AMS_SEQ_SUPPLY1 : +return AMS_ALARM_SUPPLY1 + offset; +case AMS_SEQ_SUPPLY2 : +return AMS_ALARM_SUPPLY2 + offset; +case AMS_SEQ_SUPPLY3 : +return AMS_ALARM_SUPPLY3 + offset; +case AMS_SEQ_SUPPLY4 : +return AMS_ALARM_SUPPLY4 + offset; +case AMS_SEQ_SUPPLY5 : +return AMS_ALARM_SUPPLY5 + offset; +case AMS_SEQ_SUPPLY6 : +return AMS_ALARM_SUPPLY6 + offset; +case AMS_SEQ_SUPPLY7 : +return AMS_ALARM_SUPPLY7 + offset; +case AMS_SEQ_SUPPLY8 : +return AMS_ALARM_SUPPLY8 + offset; +case AMS_SEQ_SUPPLY9 : +return AMS_ALARM_SUPPLY9 + offset; +case AMS_SEQ_SUPPLY10 : +return AMS_ALARM_SUPPLY10 + offset; +case AMS_SEQ_VCCAMS : +return AMS_ALARM_VCCAMS + offset; +case AMS_SEQ_TEMP_REMOTE : +return AMS_ALARM_TEMP_REMOTE + offset; + } + +return 0 ; +} + +static const struct iio_chan_spec *ams_event_to_channel ( +struct iio_dev *indio_dev,u32 event) { +int scan_index =0 , i; + +if (event >=AMS_PL_ALARM_START ) { + event -=AMS_PL_ALARM_START ; + scan_index =PS_SEQ_MAX ; + } + +switch (event) { +case AMS_ALARM_BIT_TEMP : + scan_index +=AMS_SEQ_TEMP ; +break ; +case AMS_ALARM_BIT_SUPPLY1 : + scan_index +=AMS_SEQ_SUPPLY1 ; +break ; +case AMS_ALARM_BIT_SUPPLY2 : + scan_index +=AMS_SEQ_SUPPLY2 ; +break ; +case AMS_ALARM_BIT_SUPPLY3 : + scan_index +=AMS_SEQ_SUPPLY3 ; +break ; +case AMS_ALARM_BIT_SUPPLY4 : + scan_index +=AMS_SEQ_SUPPLY4 ; +break ; +case AMS_ALARM_BIT_SUPPLY5 : + scan_index +=AMS_SEQ_SUPPLY5 ; +break ; +case AMS_ALARM_BIT_SUPPLY6 : + scan_index +=AMS_SEQ_SUPPLY6 ; +break ; +case AMS_ALARM_BIT_SUPPLY7 : + scan_index +=AMS_SEQ_SUPPLY7 ; +break ; +case AMS_ALARM_BIT_SUPPLY8 : + scan_index +=AMS_SEQ_SUPPLY8 ; +break ; +case AMS_ALARM_BIT_SUPPLY9 : + scan_index +=AMS_SEQ_SUPPLY9 ; +break ; +case AMS_ALARM_BIT_SUPPLY10 : + scan_index +=AMS_SEQ_SUPPLY10 ; +break ; +case AMS_ALARM_BIT_VCCAMS : + scan_index +=AMS_SEQ_VCCAMS ; +break ; +case AMS_ALARM_BIT_TEMP_REMOTE : + scan_index +=AMS_SEQ_TEMP_REMOTE ; +break ; + } + +for (i =0 ; i < indio_dev->num_channels; i++) +if (indio_dev->channels[i].scan_index == scan_index) +break ; + +return &indio_dev->channels[i]; +} + +static int ams_get_alarm_mask (int scan_index) { +int bit =0 ; + +if (scan_index >=PS_SEQ_MAX ) { + bit =AMS_PL_ALARM_START ; + scan_index -=PS_SEQ_MAX ; + } + +switch (scan_index) { +case AMS_SEQ_TEMP : +return BIT (AMS_ALARM_BIT_TEMP + bit); +case AMS_SEQ_SUPPLY1 : +return BIT (AMS_ALARM_BIT_SUPPLY1 + bit); +case AMS_SEQ_SUPPLY2 : +return BIT (AMS_ALARM_BIT_SUPPLY2 + bit); +case AMS_SEQ_SUPPLY3 : +return BIT (AMS_ALARM_BIT_SUPPLY3 + bit); +case AMS_SEQ_SUPPLY4 : +return BIT (AMS_ALARM_BIT_SUPPLY4 + bit); +case AMS_SEQ_SUPPLY5 : +return BIT (AMS_ALARM_BIT_SUPPLY5 + bit); +case AMS_SEQ_SUPPLY6 : +return BIT (AMS_ALARM_BIT_SUPPLY6 + bit); +case AMS_SEQ_SUPPLY7 : +return BIT (AMS_ALARM_BIT_SUPPLY7 + bit); +case AMS_SEQ_SUPPLY8 : +return BIT (AMS_ALARM_BIT_SUPPLY8 + bit); +case AMS_SEQ_SUPPLY9 : +return BIT (AMS_ALARM_BIT_SUPPLY9 + bit); +case AMS_SEQ_SUPPLY10 : +return BIT (AMS_ALARM_BIT_SUPPLY10 + bit); +case AMS_SEQ_VCCAMS : +return BIT (AMS_ALARM_BIT_VCCAMS + bit); +case AMS_SEQ_TEMP_REMOTE : +return BIT (AMS_ALARM_BIT_TEMP_REMOTE + bit); + } + +return 0 ;drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+} + +static int ams_read_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir) +{ +struct ams *ams =iio_priv (indio_dev); + +return (ams->alarm_mask &ams_get_alarm_mask (chan->scan_index))? 1
Quoted 80 lines
drivers/iio/adc/xilinx-ams.c new file +80
-0+: 0; } + +static int ams_write_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +int state) +{ +struct ams *ams =iio_priv (indio_dev); +unsigned int alarm; + + alarm =ams_get_alarm_mask (chan->scan_index); + +mutex_lock (&ams->mutex); + +if (state) + ams->alarm_mask |= alarm; +else + ams->alarm_mask &= ~alarm; + +iio_ams_update_alarm (ams, ams->alarm_mask); + +mutex_unlock (&ams->mutex); + +return 0 ; +} + +static int ams_read_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info,int *val,int *val2) { +struct ams *ams =iio_priv (indio_dev); +unsigned int offset =ams_get_alarm_offset (chan->scan_index, dir); + +mutex_lock (&ams->mutex); + +if (chan->scan_index >=PS_SEQ_MAX ) + *val =readl (ams->pl_base + offset); +else + *val =readl (ams->ps_base + offset); + +mutex_unlock (&ams->mutex); + +return IIO_VAL_INT ; +} + +static int ams_write_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info,int val,int val2) { +struct ams *ams =iio_priv (indio_dev); +unsigned int offset; + +mutex_lock (&ams->mutex); + +/* Set temperature channel threshold to direct threshold */ +if (chan->type ==IIO_TEMP ) { + offset =ams_get_alarm_offset (chan->scan_index, +IIO_EV_DIR_FALLING ); + +if (chan->scan_index >=PS_SEQ_MAX ) +ams_pl_update_reg (ams, offset, +AMS_ALARM_THR_DIRECT_MASK , +AMS_ALARM_THR_DIRECT_MASK ); +else +ams_ps_update_reg (ams, offset, +AMS_ALARM_THR_DIRECT_MASK , +AMS_ALARM_THR_DIRECT_MASK ); + } + + offset =ams_get_alarm_offset (chan->scan_index, dir); +if (chan->scan_index >=PS_SEQ_MAX ) +writel (val, ams->pl_base + offset); +else +writel (val, ams->ps_base + offset); + +mutex_unlock (&ams->mutex); +drivers/iio/adc/xilinx-ams.c line 615
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+return 0 ; +} + +static void ams_handle_event (struct iio_dev *indio_dev,u32 event) { +const struct iio_chan_spec *chan; + + chan =ams_event_to_channel (indio_dev, event); + +if (chan->type ==IIO_TEMP ) { +/* The temperature channel only supports over-temperature In IIO we use the standard kernel syntax for comments of /*
* The temperature...
*/
Quoted 3 lines
This form is only used in a few subsystems such as net.
It's minor but nice to be consistent...
Okay. Will update this in v2.
Quoted 92 lines
Quoted 39 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+* events +*/ + iio_push_event(indio_dev, + IIO_UNMOD_EVENT_CODE(chan->type, chan-channel,
drivers/iio/adc/xilinx-ams.c new file +10
-0+ IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + iio_get_time_ns(indio_dev)); + }else { +/* For other channels we don't know whether it is a upper or +* lower threshold event. Userspace will have to check the +* channel value if it wants to know. +*/ + iio_push_event(indio_dev, + IIO_UNMOD_EVENT_CODE(chan->type, chan-channel,
drivers/iio/adc/xilinx-ams.c new file +22
-0+ IIO_EV_TYPE_THRESH, + IIO_EV_DIR_EITHER), + iio_get_time_ns(indio_dev)); + } +} + +static void ams_handle_events (struct iio_dev *indio_dev,unsigned +long events) { +unsigned int bit; + +for_each_set_bit (bit, &events,AMS_NO_OF_ALARMS ) +ams_handle_event (indio_dev, bit); +} + +/** +* ams_unmask_worker - ams alarm interrupt unmask worker +* @work : work to be done +* +* The ZynqMP threshold interrupts are level sensitive. Since we +can't make the +* threshold condition go way from within the interrupt handler, this +means as drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+* soon as a threshold condition is present we would enter the +interrupt handler +* again and again. To work around this we mask all active threshold +interrupts +* in the interrupt handler and start a timer. In this timer we poll +the +* interrupt status and only if the interrupt is inactive we unmask it again. +*/ +static void ams_unmask_worker (struct work_struct *work) { + struct ams *ams = container_of(work, struct ams,ams_unmask_work.work);
Quoted 18 lines
drivers/iio/adc/xilinx-ams.c new file +18
-0+unsigned int status, unmask; + +spin_lock_irq (&ams->lock); + + status =readl (ams->base +AMS_ISR_0 ); + +/* Clear those bits which are not active anymore */ + unmask = (ams->masked_alarm ^ status) & ams->masked_alarm; + +/* clear status of disabled alarm */ + unmask |= ams->intr_mask; + + ams->masked_alarm &= status; + +/* Also clear those which are masked out anyway */ + ams->masked_alarm &= ~ams->intr_mask; + +/* Clear the interrupts before we unmask them */ drivers/iio/adc/xilinx-ams.c line 687
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+writel (unmask, ams->base +AMS_ISR_0 ); + +ams_update_intrmask (ams,0 ,0 ); + +spin_unlock_irq (&ams->lock); + +/* if still pending some alarm re-trigger the timer */ +if (ams->masked_alarm) + schedule_delayed_work(&ams->ams_unmask_work, +
msecs_to_jiffies(AMS_UNMASK_TIMEOUT_MS));drivers/iio/adc/xilinx-ams.c line 694
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+} + +static irqreturn_t ams_iio_irq (int irq,void *data) { +unsigned int isr0, isr1; +struct iio_dev *indio_dev = data; +struct ams *ams =iio_priv (indio_dev); + +spin_lock (&ams->lock);Do these need to be handled in interrupt context? Would we be better off doing it in an interrupt thread where we can sleep (and hence not use a spin lock for example)?
Quoted 1 line
Perhaps not, but this doesn't immediately feel time critical...
This is not time critical. I will remove spin lock here.
Quoted 17 lines
drivers/iio/adc/xilinx-ams.c line 705
Quoted 13 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+ + isr0 =readl (ams->base +AMS_ISR_0 ); + isr1 =readl (ams->base +AMS_ISR_1 ); + +/* only process alarms that are not masked */ + isr0 &= ~((ams->intr_mask & AMS_ISR0_ALARM_MASK) | ams-
masked_alarm);drivers/iio/adc/xilinx-ams.c new file +5
-0+ isr1 &= ~(ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT ); + +/* clear interrupt */ +writel (isr0, ams->base +AMS_ISR_0 ); +writel (isr1, ams->base +AMS_ISR_1 );If we have interrupts here that aren't ours we should a) not be clearing them
b) be returningIRQ_NONEso it can be handled as an incorrect interrupt and reported as such.
Right. Will update this in v2.
Quoted 108 lines
drivers/iio/adc/xilinx-ams.c
Quoted 4 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+ +if (isr0) { +/* Once the alarm interrupt occurred, mask until get cleared */
drivers/iio/adc/xilinx-ams.c line 717
Quoted 7 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+ ams->masked_alarm |= isr0; +ams_update_intrmask (ams,0 ,0 ); + +ams_handle_events (indio_dev, isr0); + + schedule_delayed_work(&ams->ams_unmask_work, +
msecs_to_jiffies(AMS_UNMASK_TIMEOUT_MS));Quoted 25 lines
drivers/iio/adc/xilinx-ams.c new file +25
-0+ } + +spin_unlock (&ams->lock); + +return IRQ_HANDLED ; +} + +static const struct iio_event_spec ams_temp_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_separate =BIT (IIO_EV_INFO_ENABLE ) | +BIT (IIO_EV_INFO_VALUE ), + }, +}; + +static const struct iio_event_spec ams_voltage_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_separate =BIT (IIO_EV_INFO_VALUE ), + }, { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_FALLING , + .mask_separate =BIT (IIO_EV_INFO_VALUE ),drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ }, { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_EITHER, + .mask_separate = BIT(IIO_EV_INFO_ENABLE), + }, +}; + +static const struct iio_chan_spec ams_ps_channels[] = { +AMS_PS_CHAN_TEMP (AMS_SEQ_TEMP ,AMS_TEMP ,"ps_temp" ), + AMS_PS_CHAN_TEMP(AMS_SEQ_TEMP_REMOTE,
AMS_TEMP_REMOTE, "remote_temp"),drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY1, AMS_SUPPLY1,"vccpsintlp"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY2, AMS_SUPPLY2,"vccpsintfp"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY3, AMS_SUPPLY3,"vccpsaux"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY4, AMS_SUPPLY4,"vccpsddr"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY5, AMS_SUPPLY5,"vccpsio3"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY6, AMS_SUPPLY6,"vccpsio0"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY7, AMS_SUPPLY7,"vccpsio1"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY8, AMS_SUPPLY8,"vccpsio2"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY9, AMS_SUPPLY9,"psmgtravcc"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY10, AMS_SUPPLY10,"psmgtravtt"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_VCCAMS, AMS_VCCAMS,"vccams"), };
drivers/iio/adc/xilinx-ams.c
Quoted 4 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+ +static const struct iio_chan_spec ams_pl_channels[] = { +AMS_PL_CHAN_TEMP (AMS_SEQ_TEMP ,AMS_TEMP ,"pl_temp" ), + AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY1, AMS_SUPPLY1, "vccint",true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY2, AMS_SUPPLY2,"vccaux", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_VREFP, AMS_VREFP, "vccvrefp",false),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_VREFN, AMS_VREFN, "vccvrefn",false),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY3, AMS_SUPPLY3,"vccbram", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY4, AMS_SUPPLY4,"vccplintlp", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY5, AMS_SUPPLY5,"vccplintfp", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY6, AMS_SUPPLY6,"vccplaux", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_VCCAMS, AMS_VCCAMS,"vccams", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_VP_VN, AMS_VP_VN, "vccvpvn",false),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY7, AMS_SUPPLY7,"vuser0", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY8, AMS_SUPPLY8,"vuser1", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY9, AMS_SUPPLY9,"vuser2", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY10, AMS_SUPPLY10,"vuser3", true),
drivers/iio/adc/xilinx-ams.c line 780
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_AUX_CHAN_VOLTAGE(0, "vccaux0"),
Extended_nameis a two edged sword. It lets you make nice specifically named channels, but it also breaks almost all userspace code as it doesn't know how to handle the extra bit on the end of the name.
Quoted 5 lines
As such we tend to only specify it for very special use non standard channels (such as the power supplies)
For the aux channels, it has no particular meaning. So I would prefer that you dropped it and just left them with the indexes.
Okay. I will keep the extended names for AMS_SUPPLY* and remove them for the aux channels.
Quoted 78 lines
Quoted 9 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+AMS_PL_AUX_CHAN_VOLTAGE (1 ,"vccaux1" ), +AMS_PL_AUX_CHAN_VOLTAGE (2 ,"vccaux2" ), +AMS_PL_AUX_CHAN_VOLTAGE (3 ,"vccaux3" ), +AMS_PL_AUX_CHAN_VOLTAGE (4 ,"vccaux4" ), +AMS_PL_AUX_CHAN_VOLTAGE (5 ,"vccaux5" ), +AMS_PL_AUX_CHAN_VOLTAGE (6 ,"vccaux6" ), +AMS_PL_AUX_CHAN_VOLTAGE (7 ,"vccaux7" ), + AMS_PL_AUX_CHAN_VOLTAGE(8, "vccaux8"),drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ AMS_PL_AUX_CHAN_VOLTAGE(9, "vccaux9"), + AMS_PL_AUX_CHAN_VOLTAGE(10, "vccaux10"), + AMS_PL_AUX_CHAN_VOLTAGE(11, "vccaux11"), + AMS_PL_AUX_CHAN_VOLTAGE(12, "vccaux12"), + AMS_PL_AUX_CHAN_VOLTAGE(13, "vccaux13"), + AMS_PL_AUX_CHAN_VOLTAGE(14, "vccaux14"), + AMS_PL_AUX_CHAN_VOLTAGE(15, "vccaux15"), }; + +static const struct iio_chan_spec ams_ctrl_channels[] = { + AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCC_PSPLL, AMS_VCC_PSPLL0,"
vcc_pspll0"),drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCC_PSBATT,
AMS_VCC_PSPLL3, "vcc_psbatt"),drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCCINT, AMS_VCCINT,"vccint"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCCBRAM, AMS_VCCBRAM,"vccbram"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCCAUX, AMS_VCCAUX,"vccaux"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_PSDDRPLL, AMS_PSDDRPLL,"psddrpll"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_INTDDR, AMS_PSINTFPDDR,"psintfpddr"),
drivers/iio/adc/xilinx-ams.c
Quoted 3 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+}; + +static int ams_init_module(struct iio_dev *indio_dev, struct device_node*np,
Quoted 19 lines
drivers/iio/adc/xilinx-ams.c new file +19
-0+ struct iio_chan_spec *channels) { +struct ams *ams =iio_priv (indio_dev); +struct device_node *chan_node, *child; +int ret, num_channels =0 ; +unsigned int reg; + +if (of_device_is_compatible (np,"xlnx,zynqmp-ams-ps" )) { + ams->ps_base =of_iomap (np,0 ); +if (!ams->ps_base) +return -ENXIO ; + +/* add PS channels to iio device channels */ +memcpy (channels + num_channels, ams_ps_channels, +sizeof (ams_ps_channels)); + num_channels +=ARRAY_SIZE (ams_ps_channels); + }else if (of_device_is_compatible (np,"xlnx,zynqmp-ams-pl" )) { + ams->pl_base =of_iomap (np,0 ); +if (!ams->pl_base) +return -ENXIO ;drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ +/* Copy only first 10 fix channels */ +memcpy (channels + num_channels, ams_pl_channels, +AMS_PL_MAX_FIXED_CHANNEL *sizeof (*channels)); + num_channels +=AMS_PL_MAX_FIXED_CHANNEL ; + + chan_node =of_get_child_by_name (np,"xlnx,ext-channels" ); +if (chan_node) { +for_each_child_of_node (chan_node, child) { + ret = of_property_read_u32(child, "reg",®);
drivers/iio/adc/xilinx-ams.c line 851
Quoted 11 lines
drivers/iio/adc/xilinx-ams.c new file +11
-0+if (ret || reg >AMS_PL_MAX_EXT_CHANNEL ) +continue ; + +memcpy (&channels[num_channels], + &ams_pl_channels[reg + +AMS_PL_MAX_FIXED_CHANNEL ], +sizeof (*channels)); + +if (of_property_read_bool (child, +"xlnx,bipolar" )) +channels[num_channels].scan_type.sign =
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c line 852
Quoted 3 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+'s' ; + + num_channels +=1 ;num_channels++;
Okay.
Quoted 17 lines
Quoted 17 lines
drivers/iio/adc/xilinx-ams.c new file +16
-0+ } + } +of_node_put (chan_node); + }else if (of_device_is_compatible (np,"xlnx,zynqmp-ams" )) { +/* add AMS channels to iio device channels */ +memcpy (channels + num_channels, ams_ctrl_channels, +sizeof (ams_ctrl_channels)); + num_channels +=ARRAY_SIZE (ams_ctrl_channels); + }else { +return -EINVAL ; + } + +return num_channels; +} + +static int ams_parse_dt(struct iio_dev *indio_dev, struct
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 873
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+platform_device *pdev) { +struct ams *ams =iio_priv (indio_dev); +struct iio_chan_spec *ams_channels, *dev_channels; +struct device_node *child_node =NULL , *np = pdev->dev.of_node; +int ret, chan_vol =0 , chan_temp =0 , i, rising_off, falling_off;
chan_volandchan_tempare counts? Perhaps their names can make that clearer.
Okay. I will change their name to 'vol_ch_cnt' and 'temp_ch_cnt' in v2.
Quoted 74 lines
Quoted 61 lines
drivers/iio/adc/xilinx-ams.c new file +60
-0+unsigned int num_channels =0 ; + +/* Initialize buffer for channel specification */ + ams_channels =kzalloc (sizeof (ams_ps_channels) + +sizeof (ams_pl_channels) + +sizeof (ams_ctrl_channels),GFP_KERNEL ); +if (!ams_channels) +return -ENOMEM ; + +if (of_device_is_available (np)) { + ret =ams_init_module (indio_dev, np, ams_channels); +if (ret <0 ) { +kfree (ams_channels); +return ret; + } + + num_channels += ret; + } + +for_each_child_of_node (np, child_node) { +if (of_device_is_available (child_node)) { + ret =ams_init_module (indio_dev, child_node, + ams_channels + num_channels); +if (ret <0 ) { +kfree (ams_channels); +return ret; + } + + num_channels += ret; + } + } + +for (i =0 ; i < num_channels; i++) { +if (ams_channels[i].type ==IIO_VOLTAGE ) + ams_channels[i].channel = chan_vol++; +else + ams_channels[i].channel = chan_temp++; + +if (ams_channels[i].scan_index < (PS_SEQ_MAX *3 )) { +/* set threshold to max and min for each channel */ + falling_off =ams_get_alarm_offset ( + ams_channels[i].scan_index, +IIO_EV_DIR_FALLING ); + rising_off =ams_get_alarm_offset ( + ams_channels[i].scan_index, +IIO_EV_DIR_RISING ); +if (ams_channels[i].scan_index >=PS_SEQ_MAX ) { +writel (AMS_ALARM_THR_MIN , + ams->pl_base + falling_off); +writel (AMS_ALARM_THR_MAX , + ams->pl_base + rising_off); + }else { +writel (AMS_ALARM_THR_MIN , + ams->ps_base + falling_off); +writel (AMS_ALARM_THR_MAX , + ams->ps_base + rising_off); + } + } + } +drivers/iio/adc/xilinx-ams.c line 943
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ dev_channels =devm_kzalloc (&pdev->dev,sizeof (*dev_channels) * + num_channels,GFP_KERNEL ); +if (!dev_channels) { +kfree (ams_channels); +return -ENOMEM ; + } + +memcpy (dev_channels, ams_channels, +sizeof (*ams_channels) * num_channels); +kfree (ams_channels);If you were to reorder this so the
ams_channelscleanup was last you could use the nice clean pattern of
Quoted 6 lines
error:
kfree(ams_channels); return ret;To make it clear that the
ams_channelsgets freed in all paths.
Fair enough. I will update this in v2.
Quoted 44 lines
Quoted 30 lines
drivers/iio/adc/xilinx-ams.c new file +29
-0+ indio_dev->channels = dev_channels; + indio_dev->num_channels = num_channels; + +return 0 ; +} + +static const struct iio_info iio_pl_info = { + .read_raw = &ams_read_raw, + .read_event_config = &ams_read_event_config, + .write_event_config = &ams_write_event_config, + .read_event_value = &ams_read_event_value, + .write_event_value = &ams_write_event_value, }; + +static const struct of_device_id ams_of_match_table[] = { + { .compatible ="xlnx,zynqmp-ams" }, + { } +}; +MODULE_DEVICE_TABLE (of, ams_of_match_table); + +static int ams_probe (struct platform_device *pdev) { +struct iio_dev *indio_dev; +struct ams *ams; +struct resource *res; +int ret; + +if (!pdev->dev.of_node) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&pdev->dev,sizeof (*ams));drivers/iio/adc/xilinx-ams.c line 984
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+if (!indio_dev) +return -ENOMEM ; + + ams =iio_priv (indio_dev); +mutex_init (&ams->mutex); +spin_lock_init (&ams->lock); + + indio_dev->dev.parent = &pdev->dev; + indio_dev->dev.of_node = pdev->dev.of_node; + indio_dev->name ="ams" ;As names go, that one is a too little generic. Particularly with a common manufacturer of ADCs called Austrian Micro Systems ;) No possibility of confusion!
Quoted 2 lines
It's fine to use ams within the driver, but for external interfaces, perhaps prefix with xilinx-?
Okay. I will use xilinx-ams.
Quoted 29 lines
drivers/iio/adc/xilinx-ams.c
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ + indio_dev->info = &iio_pl_info; + indio_dev->modes =INDIO_DIRECT_MODE ; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM,"ams-base");
drivers/iio/adc/xilinx-ams.c
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ ams->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (ams->base)) +return PTR_ERR (ams->base); + + INIT_DELAYED_WORK(&ams->ams_unmask_work,
ams_unmask_worker);Quoted 16 lines
drivers/iio/adc/xilinx-ams.c new file +16
-0+ + ams->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (ams->clk)) +return PTR_ERR (ams->clk); +clk_prepare_enable (ams->clk); + + ret =iio_ams_init_device (ams); +if (ret) { +dev_err (&pdev->dev,"failed to initialize AMS\n" ); + goto clk_disable; + } + + ret =ams_parse_dt (indio_dev, pdev); +if (ret) { +dev_err (&pdev->dev,"failure in parsing DT\n" ); + goto clk_disable;
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 1015
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ } + +ams_enable_channel_sequence (ams); + + ams->irq =platform_get_irq_byname (pdev,"ams-irq" );Why store this in the ams structure? It's not used anywhere other than in the next line.
Okay. Will update this in v2.
Quoted 9 lines
drivers/iio/adc/xilinx-ams.c
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +1
-0+ ret = devm_request_irq(&pdev->dev, ams->irq, &ams_iio_irq, 0, "ams-irq",
drivers/iio/adc/xilinx-ams.c line 1017
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ indio_dev);This mixing of devm and non devm functions makes it tricky to be sure there aren't an races.
One easy solution is to use
devm_add_actionto put theclk_disable_unprepareinto the cleanup list.
Okay.
Quoted 12 lines
drivers/iio/adc/xilinx-ams.c line 1025
Quoted 9 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+if (ret <0 ) { +dev_err (&pdev->dev,"failed to register interrupt\n" ); + goto clk_disable; + } + +platform_set_drvdata (pdev, indio_dev); + +return iio_device_register (indio_dev);What if device register returns an error? You leave the clock enabled.
Quoted 5 lines
That way everything is using the managed cleanup and the ordering will be correct.
The alternative is to not use devm forms for everything after the
clk_prepare_enable.
Yes. This is better.
Quoted 35 lines
Quoted 23 lines
drivers/iio/adc/xilinx-ams.c new file +22
-0+ +clk_disable: +clk_disable_unprepare (ams->clk); + +return ret; +} + +static int ams_remove (struct platform_device *pdev) { +struct iio_dev *indio_dev =platform_get_drvdata (pdev); +struct ams *ams =iio_priv (indio_dev); + +cancel_delayed_work (&ams->ams_unmask_work); + +/* Unregister the device */ +iio_device_unregister (indio_dev); +clk_disable_unprepare (ams->clk); + +return 0 ; +} + +static int __maybe_unused ams_suspend (struct device *dev) { +struct iio_dev *indio_dev =dev_get_drvdata (dev);drivers/iio/adc/xilinx-ams.c line 1060
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+struct ams *ams =iio_priv (indio_dev); + +clk_disable_unprepare (ams->clk); + +return 0 ; +} + +static int __maybe_unused ams_resume (struct device *dev) { +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct ams *ams =iio_priv (indio_dev);You could streamline this without loss of clarity as.
Quoted 3 lines
struct ams *ams = iio_priv(dev_get_drvdata(dev));
(very minor point!)
Okay.
Quoted 8 lines
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+ +clk_prepare_enable (ams->clk); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(ams_pm_ops, ams_suspend, ams_resume); +
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 1074
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+static struct platform_driver ams_driver = { + .probe = ams_probe, + .remove = ams_remove, + .driver = { + .name ="ams" , + .pm = &ams_pm_ops,Spacing here seems a little odd. Just have a single space after pm
Okay.
Quoted 16 lines
drivers/iio/adc/xilinx-ams.h
Quoted 13 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+ .of_match_table = ams_of_match_table, + }, +}; +module_platform_driver (ams_driver); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Xilinx, Inc." );(quoted diff) +0
-0
b/drivers/iio/adc/xilinx-ams.hnew file mode 100644 index 0000000..b9fa262drivers/iio/adc/xilinx-ams.h new file +0
-0I can't immediately see why a lot of this wants to be in a header.
Quoted 1 line
Please move it inline with the C file.
Okay. I will update that in v2.
Quoted 265 lines
Quoted 247 lines
drivers/iio/adc/xilinx-ams.h new file +244
-0@@ -0,0 +1,281 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Xilinx AMS driver +* +* Copyright (C) 2017-2018 Xilinx, Inc. +* +* Manish Narani <[email protected]> +* Rajnikant Bhojani <[email protected]> */ + +#ifndef __XILINX_AMS_H__ +#define __XILINX_AMS_H__ + +#define AMS_MISC_CTRL 0x000 +#define AMS_ISR_0 0x010 +#define AMS_ISR_1 0x014 +#define AMS_IMR_0 0x018 +#define AMS_IMR_1 0x01c +#define AMS_IER_0 0x020 +#define AMS_IER_1 0x024 +#define AMS_IDR_0 0x028 +#define AMS_IDR_1 0x02c +#define AMS_PS_CSTS 0x040 +#define AMS_PL_CSTS 0x044 +#define AMS_MON_CSTS 0x050 + +#define AMS_VCC_PSPLL0 0x060 +#define AMS_VCC_PSPLL3 0x06C +#define AMS_VCCINT 0x078 +#define AMS_VCCBRAM 0x07C +#define AMS_VCCAUX 0x080 +#define AMS_PSDDRPLL 0x084 +#define AMS_PSINTFPDDR 0x09C + +#define AMS_VCC_PSPLL0_CH 48 +#define AMS_VCC_PSPLL3_CH 51 +#define AMS_VCCINT_CH 54 +#define AMS_VCCBRAM_CH 55 +#define AMS_VCCAUX_CH 56 +#define AMS_PSDDRPLL_CH 57 +#define AMS_PSINTFPDDR_CH 63 + +#define AMS_REG_CONFIG0 0x100 +#define AMS_REG_CONFIG1 0x104 +#define AMS_REG_CONFIG2 0x108 +#define AMS_REG_CONFIG3 0x10C +#define AMS_REG_CONFIG4 0x110 +#define AMS_REG_SEQ_CH0 0x120 +#define AMS_REG_SEQ_CH1 0x124 +#define AMS_REG_SEQ_CH2 0x118 + +#define AMS_TEMP 0x000 +#define AMS_SUPPLY1 0x004 +#define AMS_SUPPLY2 0x008 +#define AMS_VP_VN 0x00c +#define AMS_VREFP 0x010 +#define AMS_VREFN 0x014 +#define AMS_SUPPLY3 0x018 +#define AMS_SUPPLY4 0x034 +#define AMS_SUPPLY5 0x038 +#define AMS_SUPPLY6 0x03c +#define AMS_SUPPLY7 0x200 +#define AMS_SUPPLY8 0x204 +#define AMS_SUPPLY9 0x208 +#define AMS_SUPPLY10 0x20c +#define AMS_VCCAMS 0x210 +#define AMS_TEMP_REMOTE 0x214 + +#define AMS_REG_VAUX (x) (0x40 + (4*(x))) +#define AMS_REG_VUSER (x) (0x200 + (4*(x))) + +#define AMS_PS_RESET_VALUE 0xFFFFU +#define AMS_PL_RESET_VALUE 0xFFFFU + +#define AMS_CONF0_CHANNEL_NUM_MASK (0x3f << 0) + +#define AMS_CONF1_SEQ_MASK (0xf << 12) +#define AMS_CONF1_SEQ_DEFAULT (0 << 12) +#define AMS_CONF1_SEQ_SINGLE_PASS (1 << 12) +#define AMS_CONF1_SEQ_CONTINUOUS (2 << 12) +#define AMS_CONF1_SEQ_SINGLE_CHANNEL (3 << 12) + +#define AMS_REG_SEQ0_MASK 0xFFFF +#define AMS_REG_SEQ2_MASK 0x3F +#define AMS_REG_SEQ1_MASK 0xFFFF +#define AMS_REG_SEQ2_MASK_SHIFT 16 +#define AMS_REG_SEQ1_MASK_SHIFT 22 + +#define AMS_REGCFG1_ALARM_MASK 0xF0F +#define AMS_REGCFG3_ALARM_MASK 0x3F + +#define AMS_ALARM_TEMP 0x140 +#define AMS_ALARM_SUPPLY1 0x144 +#define AMS_ALARM_SUPPLY2 0x148 +#define AMS_ALARM_OT 0x14c + +#define AMS_ALARM_SUPPLY3 0x160 +#define AMS_ALARM_SUPPLY4 0x164 +#define AMS_ALARM_SUPPLY5 0x168 +#define AMS_ALARM_SUPPLY6 0x16c +#define AMS_ALARM_SUPPLY7 0x180 +#define AMS_ALARM_SUPPLY8 0x184 +#define AMS_ALARM_SUPPLY9 0x188 +#define AMS_ALARM_SUPPLY10 0x18c +#define AMS_ALARM_VCCAMS 0x190 +#define AMS_ALARM_TEMP_REMOTE 0x194 +#define AMS_ALARM_THRESHOLD_OFF_10 0x10 #define +AMS_ALARM_THRESHOLD_OFF_20 0x20 + +#define AMS_ALARM_THR_DIRECT_MASK 0x01 +#define AMS_ALARM_THR_MIN 0x0000 +#define AMS_ALARM_THR_MAX 0xffff + +#define AMS_NO_OF_ALARMS 32 +#define AMS_PL_ALARM_START 16 +#define AMS_ISR0_ALARM_MASK 0xFFFFFFFFU +#define AMS_ISR1_ALARM_MASK 0xE000001FU +#define AMS_ISR1_INTR_MASK_SHIFT 32 +#define AMS_ISR0_ALARM_2_TO_0_MASK 0x07 +#define AMS_ISR0_ALARM_6_TO_3_MASK 0x78 +#define AMS_ISR0_ALARM_12_TO_7_MASK 0x3F +#define AMS_CONF1_ALARM_2_TO_0_SHIFT 1 +#define AMS_CONF1_ALARM_6_TO_3_SHIFT 5 +#define AMS_CONF3_ALARM_12_TO_7_SHIFT 8 + +#define AMS_PS_CSTS_PS_READY 0x08010000U +#define AMS_PL_CSTS_ACCESS_MASK 0x00000001U + +#define AMS_PL_MAX_FIXED_CHANNEL 10 +#define AMS_PL_MAX_EXT_CHANNEL 20 + +#define AMS_INIT_TIMEOUT 10000 + +/* +* Following scale and offset value is derived from +* UG580 (v1.7) December 20, 2016 +*/ +#define AMS_SUPPLY_SCALE_1VOLT 1000 +#define AMS_SUPPLY_SCALE_3VOLT 3000 +#define AMS_SUPPLY_SCALE_6VOLT 6000 +#define AMS_SUPPLY_SCALE_DIV_BIT 16 + +#define AMS_TEMP_SCALE 509314 +#define AMS_TEMP_SCALE_DIV_BIT 16 +#define AMS_TEMP_OFFSET -((280230L << 16) / 509314) + +enum ams_alarm_bit { +AMS_ALARM_BIT_TEMP , +AMS_ALARM_BIT_SUPPLY1 , +AMS_ALARM_BIT_SUPPLY2 , +AMS_ALARM_BIT_SUPPLY3 , +AMS_ALARM_BIT_SUPPLY4 , +AMS_ALARM_BIT_SUPPLY5 , +AMS_ALARM_BIT_SUPPLY6 , +AMS_ALARM_BIT_RESERVED , +AMS_ALARM_BIT_SUPPLY7 , +AMS_ALARM_BIT_SUPPLY8 , +AMS_ALARM_BIT_SUPPLY9 , +AMS_ALARM_BIT_SUPPLY10 , +AMS_ALARM_BIT_VCCAMS , +AMS_ALARM_BIT_TEMP_REMOTE +}; + +enum ams_seq { +AMS_SEQ_VCC_PSPLL , +AMS_SEQ_VCC_PSBATT , +AMS_SEQ_VCCINT , +AMS_SEQ_VCCBRAM , +AMS_SEQ_VCCAUX , +AMS_SEQ_PSDDRPLL , +AMS_SEQ_INTDDR +}; + +enum ams_ps_pl_seq { +AMS_SEQ_CALIB , +AMS_SEQ_RSVD_1 , +AMS_SEQ_RSVD_2 , +AMS_SEQ_TEST , +AMS_SEQ_RSVD_4 , +AMS_SEQ_SUPPLY4 , +AMS_SEQ_SUPPLY5 , +AMS_SEQ_SUPPLY6 , +AMS_SEQ_TEMP , +AMS_SEQ_SUPPLY2 , +AMS_SEQ_SUPPLY1 , +AMS_SEQ_VP_VN , +AMS_SEQ_VREFP , +AMS_SEQ_VREFN , +AMS_SEQ_SUPPLY3 , +AMS_SEQ_CURRENT_MON , +AMS_SEQ_SUPPLY7 , +AMS_SEQ_SUPPLY8 , +AMS_SEQ_SUPPLY9 , +AMS_SEQ_SUPPLY10 , +AMS_SEQ_VCCAMS , +AMS_SEQ_TEMP_REMOTE , +AMS_SEQ_MAX +}; + +#define AMS_SEQ (x) (AMS_SEQ_MAX + (x)) +#define AMS_VAUX_SEQ (x) (AMS_SEQ_MAX + (x)) + +#define PS_SEQ_MAX AMS_SEQ_MAX +#define PS_SEQ (x) (x) +#define PL_SEQ (x) (PS_SEQ_MAX + x) + +#define AMS_CHAN_TEMP (_scan_index, _addr, _ext) { \ + .type = IIO_TEMP, \ + .indexed = 1, \ + .address = (_addr), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .event_spec = ams_temp_events, \ + .num_event_specs = ARRAY_SIZE(ams_temp_events), \ + .scan_index = (_scan_index), \ + .scan_type = { \ + .sign = 'u', \ + .realbits = 12, \ + .storagebits = 16, \ + .shift = 4, \ + .endianness = IIO_CPU, \ + }, \ + .extend_name = _ext, \ +} + +#define AMS_CHAN_VOLTAGE (_scan_index, _addr, _ext, _alarm) { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .address = (_addr), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .event_spec = (_alarm) ? ams_voltage_events : NULL, \ + .num_event_specs = (_alarm) ? ARRAY_SIZE(ams_voltage_events) : 0, \ + .scan_index = (_scan_index), \ + .scan_type = { \ + .realbits = 10, \ + .storagebits = 16, \ + .shift = 6, \ + .endianness = IIO_CPU, \ + }, \ + .extend_name = _ext, \ +}drivers/iio/adc/xilinx-ams.h line 254
Quoted 10 lines
drivers/iio/adc/xilinx-ams.h new file +10
-0+ +#define AMS_PS_CHAN_TEMP (_scan_index, _addr, _ext) \ + AMS_CHAN_TEMP(PS_SEQ(_scan_index), _addr, _ext) #define +AMS_PS_CHAN_VOLTAGE(_scan_index, _addr, _ext) \ + AMS_CHAN_VOLTAGE(PS_SEQ(_scan_index), _addr, _ext, true) + +#define AMS_PL_CHAN_TEMP (_scan_index, _addr, _ext) \ + AMS_CHAN_TEMP(PL_SEQ(_scan_index), _addr, _ext) #define +AMS_PL_CHAN_VOLTAGE(_scan_index, _addr, _ext, _alarm) \ +AMS_CHAN_VOLTAGE (PL_SEQ (_scan_index), _addr, _ext, _alarm)#define
drivers/iio/adc/xilinx-ams.h line 259
Quoted 5 lines
drivers/iio/adc/xilinx-ams.h new file +5
-0+AMS_PL_AUX_CHAN_VOLTAGE(_auxno, _ext) \ +AMS_CHAN_VOLTAGE (PL_SEQ (AMS_VAUX_SEQ (_auxno)), \ + AMS_REG_VAUX(_auxno), _ext, false) #define +AMS_CTRL_CHAN_VOLTAGE (_scan_index, _addr, _ext) \ +AMS_CHAN_VOLTAGE(PL_SEQ(AMS_VAUX_SEQ(AMS_SEQ(_scan_inde
x))), \
Quoted 13 lines
drivers/iio/adc/xilinx-ams.h line 270
Quoted 10 lines
drivers/iio/adc/xilinx-ams.h new file +10
-0+ _addr, _ext, false) + +struct ams { +void __iomem *base; +void __iomem *ps_base; +void __iomem *pl_base; +struct clk *clk; +struct device *dev; + +struct mutex mutex;Pleases give clear comments on what these locks are protecting. It's certainly curious to see a mutex and a spinlock with such generic names right next to each other.
Okay. I will update with the comments in v2.
Quoted 9 lines
drivers/iio/adc/xilinx-ams.h line 276
Quoted 7 lines
drivers/iio/adc/xilinx-ams.h new file +6
-0+spinlock_t lock; + +unsigned int alarm_mask; +unsigned int masked_alarm; +u64 intr_mask; +int irq;As noted above, this is only used next to where it is first set. No advantage in having it here.
I will remove this in v2.
Quoted 5 lines
drivers/iio/adc/xilinx-ams.h line 281
Quoted 5 lines
drivers/iio/adc/xilinx-ams.h new file +4
-0+ + struct delayed_work ams_unmask_work; }; + +#endif /* __XILINX_AMS_H__ */
Thanks,
Manish Narani
Jonathan Cameron
maintainerRe: [PATCH 2/3] iio: adc: Add Xilinx AMS driver
Quoted 3 lines · On Thu, 6 Sep 2018 15:19:29 +0000 Manish Narani <[email protected]> wrote:
Hi Jonathan,
Thanks a lot for the review. Please see my response inline.
Hi Manish,
Just one thing to think about. (and I'm not that great about this
myself :) Please look to crop out irrelevant text. It saves time when people are checking to see if there are discussion points ongoing.
If you are replying to a review and agree with the suggestion then feel free to cut that chunk out too. If you agree entirely don't bother replying at all. I'll assume it will all be fixed in the next version. I know this may seem impolite, but it's better to save everyone time!
I'm lazy and like to minimize the time it takes me to look through responses to reviews ;)
Thanks,
Jonathan
Quoted 1,710 lines
Quoted 36 lines
-----Original Message-----
From: Jonathan Cameron [mailto:jic23 at kernel.org]
Sent: Monday, September 3, 2018 1:27 AM
To: Manish Narani <[email protected]>
Cc:knaack.hat gmx.de; lars at metafoo.de; pmeerw at pmeerw.net; robh+dt at kernel.org; mark.rutland at arm.com; Michal Simek <[email protected]>; leoyang.li at nxp.com; sudeep.holla at arm.com; amit.kucheria at linaro.org; broonie at kernel.org; arnaud.pouliquen at st.com; geert at linux-m68k.org; eugen.hristev at microchip.com; rdunlap at infradead.org; lukas at wunner.de; freeman.liu at spreadtrum.com; vilhelm.gray at gmail.com; tglx at linutronix.de; baolin.wang at linaro.org; gregkh at linuxfoundation.org; Srinivas Goud <[email protected]>; Anirudha Sarangi <[email protected]>; linux-iio at vger.kernel.org; devicetree at vger.kernel.org; linux-arm- kernel at lists.infradead.org; linux-kernel at vger.kernel.org
Subject: Re: [PATCH 2/3] iio: adc: Add Xilinx AMS driverQuoted 16 lines · On Thu, 30 Aug 2018 15:52:18 +0530 Manish Narani <[email protected]>…
The AMS includes an ADC as well as on-chip sensors that can be used to sample external voltages and monitor on-die operating conditions, such as temperature and supply voltage levels. The AMS has two SYSMON blocks. PL-SYSMON block is capable of monitoring off chip voltage and temperature.
PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring from external master. Out of these interface currently only DRP is supported.
Other block PS-SYSMON is memory mapped to PS.
The AMS can use internal channels to monitor voltage and temperature as well as one primary and up to 16 auxiliary channels for measuring external voltages.
The voltage and temperature monitoring channels also have event capability which allows to generate an interrupt when their value falls below or raises above a set threshold.Quoted 6 lines
Quoted 1 line
Signed-off-by Manish Narani <[email protected]>Given the use of
extended_namein here, there is a whole lot of undocumented userspace ABI. Please add to
Documentation/ABI/testing/sysfs-bus-iio-xilinx-amsor similar.Okay sure.
Quoted 77 lines
I am a little concerned at introducing quite so many of these. Perhaps we need to revisit how we represent this sort of information...
Otherwise, a few minor things inline but looking fairly good overall.
Thanks,
Jonathan
Quoted 15 lines
--- drivers/iio/adc/Kconfig | 10 + drivers/iio/adc/Makefile | 1 + drivers/iio/adc/xilinx-ams.c | 1081 ++++++++++++++++++++++++++++++++++++++++++ drivers/iio/adc/xilinx-ams.h | 281 +++++++++++ 4 files changed, 1373 insertions(+) create mode 100644 drivers/iio/adc/xilinx-ams.c create mode 100644
drivers/iio/adc/xilinx-ams.hdrivers/iio/adc/Kconfig index renamed from drivers/iio/adc/Kconfig +0
-04a75492..405ea00 100644
drivers/iio/adc/Kconfig config XILINX_XADC · line 941
Quoted 1 line
drivers/iio/adc/Kconfig +0
-0@@ -941,4 +941,14 @@ config XILINX_XADC The driver can also be build as a module. If so, the module will becalled
drivers/iio/adc/Kconfig config XILINX_XADC
Quoted 10 lines
drivers/iio/adc/Kconfig +8
-0xilinx-xadc. +config XILINX_AMS + tristate "Xilinx AMS driver" + depends on ARCH_ZYNQMP || COMPILE_TEST + depends on HAS_IOMEM + help + Say yes here to have support for the Xilinx AMS. + + The driver can also be build as a module. If so, the module will becalled
Quoted 26 lines
drivers/iio/adc/Kconfig +2
-0+ xilinx-ams. + endmenudrivers/iio/adc/Makefile index renamed from drivers/iio/adc/Makefile +0
-003db7b5..fbfcc45 100644
drivers/iio/adc/Makefile +0
-0@@ -85,4 +85,5 @@ obj-$(CONFIG_VF610_ADC) += vf610_adc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o xilinx-xadc-y :=xilinx-xadc-core.o xilinx-xadc-events.o
obj-$(CONFIG_XILINX_XADC) += xilinx-xadc.o
+obj-$(CONFIG_XILINX_AMS) += xilinx-ams.o
obj-$(CONFIG_SD_ADC_MODULATOR) += sd_adc_modulator.o diff --gita/drivers/iio/adc/xilinx-ams.cb/drivers/iio/adc/xilinx-ams.cnew file mode 100644 index 0000000..10bcc52drivers/iio/adc/xilinx-ams.c new file +8
-0@@ -0,0 +1,1081 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Xilinx AMS driver +* +* Copyright (C) 2017-2018 Xilinx, Inc. +* +* Manish Narani <[email protected]> +* Rajnikant Bhojani <[email protected]> */ drivers/iio/adc/xilinx-ams.c line 18
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ +#include <linux/kernel.h> +#include <linux/slab.h> +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/clk.h> +#include <linux/of_address.h> +#include <linux/iopoll.h> +#include <linux/delay.h> There is a rough convention of alphabetical order if there isn't a reason to do otherwise.
Quoted 2 lines
Here you might keep the iio headers for their own block at the end, but the rest should be in order.
Okay I will try to follow the same and update in v2.
Quoted 16 lines
Quoted 16 lines
drivers/iio/adc/xilinx-ams.c new file +15
-0+#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/events.h> +#include <linux/io.h> + +#include "xilinx-ams.h" + +static const unsigned int AMS_UNMASK_TIMEOUT_MS =500 ; + +static inline void ams_ps_update_reg (struct ams *ams,unsigned int offset, +u32 mask,u32 data) +{ +u32 val; + + val =readl (ams->ps_base + offset);Quoted 8 lines
drivers/iio/adc/xilinx-ams.c
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+writel ((val & ~mask) | (data & mask), ams->ps_base + offset); } + +static inline void ams_pl_write_reg (struct ams *ams,unsigned int offset, +u32 data) +{ +writel (data, ams->pl_base + offset); }I'm always anti wrappers that don't add much. In this driver you also only use them 'sometimes'.
Okay, I will use writel inline in v2
Quoted 7 lines
I'd prefer just having the writel inline all the time. The update functions have a little more purpose and given they are called quite often, perhaps are worth keeping.
Another option is to use regmap for the whole thing getting you update functions and caching etc. Might not be worth it here. Up to you.
Sure. I will try to explore this.
Quoted 240 lines
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+ +static inline void ams_pl_update_reg (struct ams *ams,unsigned int offset, +u32 mask,u32 data) +{drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+u32 val; + + val =readl (ams->pl_base + offset); +writel ((val & ~mask) | (data & mask), ams->pl_base + offset); } + +static void ams_update_intrmask (struct ams *ams,u64 mask,u64 val) { + ams->intr_mask &= ~mask; + ams->intr_mask |= (val & mask); + + writel(~(ams->intr_mask | ams->masked_alarm), ams->base +
AMS_IER_0);drivers/iio/adc/xilinx-ams.c
Quoted 3 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+writel (~(ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT ), + ams->base +AMS_IER_1 ); + writel(ams->intr_mask | ams->masked_alarm, ams->base +
AMS_IDR_0);drivers/iio/adc/xilinx-ams.c
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+writel (ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT , + ams->base +AMS_IDR_1 ); +} + +static void ams_disable_all_alarms (struct ams *ams) { +/* disable PS module alarm */ +if (ams->ps_base) { + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_REGCFG1_ALARM_MASK,drivers/iio/adc/xilinx-ams.c line 66
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ AMS_REGCFG1_ALARM_MASK); + ams_ps_update_reg(ams, AMS_REG_CONFIG3,
AMS_REGCFG3_ALARM_MASK,Quoted 15 lines
drivers/iio/adc/xilinx-ams.c new file +15
-0+ AMS_REGCFG3_ALARM_MASK); + } + +/* disable PL module alarm */ +if (ams->pl_base) { +ams_pl_update_reg (ams,AMS_REG_CONFIG1 , +AMS_REGCFG1_ALARM_MASK , +AMS_REGCFG1_ALARM_MASK ); +ams_pl_update_reg (ams,AMS_REG_CONFIG3 , +AMS_REGCFG3_ALARM_MASK , +AMS_REGCFG3_ALARM_MASK ); + } +} + +static void iio_ams_update_alarm(struct ams *ams, unsigned longdrivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+alarm_mask) { +u32 cfg; +unsigned long flags; +unsigned long pl_alarm_mask; + +if (ams->ps_base) { +/* Configuring PS alarm enable */ + cfg = ~((alarm_mask &AMS_ISR0_ALARM_2_TO_0_MASK ) << +AMS_CONF1_ALARM_2_TO_0_SHIFT ); + cfg &= ~((alarm_mask & AMS_ISR0_ALARM_6_TO_3_MASK)<<
drivers/iio/adc/xilinx-ams.c line 93
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ AMS_CONF1_ALARM_6_TO_3_SHIFT); + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_REGCFG1_ALARM_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 3 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+ cfg); + + cfg = ~((alarm_mask >>
AMS_CONF3_ALARM_12_TO_7_SHIFT) &drivers/iio/adc/xilinx-ams.c line 98
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ AMS_ISR0_ALARM_12_TO_7_MASK); + ams_ps_update_reg(ams, AMS_REG_CONFIG3,
AMS_REGCFG3_ALARM_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 7 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+ cfg); + } + +if (ams->pl_base) { + pl_alarm_mask = (alarm_mask >>AMS_PL_ALARM_START ); +/* Configuring PL alarm enable */ + cfg = ~((pl_alarm_mask & AMS_ISR0_ALARM_2_TO_0_MASK)<<
drivers/iio/adc/xilinx-ams.c line 107
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ AMS_CONF1_ALARM_2_TO_0_SHIFT); + cfg &= ~((pl_alarm_mask &
AMS_ISR0_ALARM_6_TO_3_MASK) <<drivers/iio/adc/xilinx-ams.c
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ AMS_CONF1_ALARM_6_TO_3_SHIFT); +ams_pl_update_reg (ams,AMS_REG_CONFIG1 , +AMS_REGCFG1_ALARM_MASK , cfg); + + cfg = ~((pl_alarm_mask >>
AMS_CONF3_ALARM_12_TO_7_SHIFT) &Quoted 17 lines
drivers/iio/adc/xilinx-ams.c new file +17
-0+ AMS_ISR0_ALARM_12_TO_7_MASK); +ams_pl_update_reg (ams,AMS_REG_CONFIG3 , +AMS_REGCFG3_ALARM_MASK , cfg); + } + +spin_lock_irqsave (&ams->lock, flags); +ams_update_intrmask (ams,AMS_ISR0_ALARM_MASK , ~alarm_mask); +spin_unlock_irqrestore (&ams->lock, flags); } + +static void ams_enable_channel_sequence (struct ams *ams) { +int i; +unsigned long long scan_mask; +struct iio_dev *indio_dev =iio_priv_to_dev (ams); + +/* +* Enable channel sequence. First 22 bit of scan_mask represent +* PS channels, and next remaining bit represents PL channels. drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+*/ + +/* Run calibration of PS & PL as part of the sequence */ + scan_mask =0x1 |BIT (PS_SEQ_MAX ); +for (i =0 ; i < indio_dev->num_channels; i++) + scan_mask |=BIT (indio_dev->channels[i].scan_index); + +if (ams->ps_base) { +/* put sysmon in a soft reset to change the sequence */ + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 11 lines
drivers/iio/adc/xilinx-ams.c new file +11
-0+ AMS_CONF1_SEQ_DEFAULT); + +/* configure basic channels */ +writel (scan_mask &AMS_REG_SEQ0_MASK , + ams->ps_base +AMS_REG_SEQ_CH0 ); +writel (AMS_REG_SEQ2_MASK & + (scan_mask >>AMS_REG_SEQ2_MASK_SHIFT ), + ams->ps_base +AMS_REG_SEQ_CH2 ); + +/* set continuous sequence mode */ + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+ AMS_CONF1_SEQ_CONTINUOUS); + } + +if (ams->pl_base) { +/* put sysmon in a soft reset to change the sequence */ + ams_pl_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ AMS_CONF1_SEQ_DEFAULT); + +/* configure basic channels */ + scan_mask = scan_mask >>PS_SEQ_MAX ; + writel(scan_mask & AMS_REG_SEQ0_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ ams->pl_base + AMS_REG_SEQ_CH0); +writel (AMS_REG_SEQ2_MASK & + (scan_mask >>AMS_REG_SEQ2_MASK_SHIFT ), + ams->pl_base +AMS_REG_SEQ_CH2 ); +writel (AMS_REG_SEQ1_MASK & + (scan_mask >>AMS_REG_SEQ1_MASK_SHIFT ), + ams->pl_base +AMS_REG_SEQ_CH1 ); + +/* set continuous sequence mode */ + ams_pl_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,Quoted 11 lines
drivers/iio/adc/xilinx-ams.c new file +11
-0+ AMS_CONF1_SEQ_CONTINUOUS); + } +} + +static int iio_ams_init_device (struct ams *ams) { +u32 reg; +int ret; + +/* reset AMS */ +if (ams->ps_base) { +writel (AMS_PS_RESET_VALUE , ams->ps_base +AMS_VP_VN );drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ + ret =readl_poll_timeout (ams->base +AMS_PS_CSTS , reg, + (reg &AMS_PS_CSTS_PS_READY ) == +AMS_PS_CSTS_PS_READY ,0 , +AMS_INIT_TIMEOUT ); +if (ret) +return ret; + +/* put sysmon in a default state */ + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+ AMS_CONF1_SEQ_DEFAULT); + } + +if (ams->pl_base) { +writel (AMS_PL_RESET_VALUE , ams->pl_base +AMS_VP_VN ); + + ret =readl_poll_timeout (ams->base +AMS_PL_CSTS , reg, + (reg & AMS_PL_CSTS_ACCESS_MASK)==
drivers/iio/adc/xilinx-ams.c
Quoted 7 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+AMS_PL_CSTS_ACCESS_MASK ,0 , + AMS_INIT_TIMEOUT); +if (ret) +return ret; + +/* put sysmon in a default state */ + ams_pl_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,Quoted 37 lines
drivers/iio/adc/xilinx-ams.c new file +37
-0+ AMS_CONF1_SEQ_DEFAULT); + } + +ams_disable_all_alarms (ams); + +/* Disable interrupt */ +ams_update_intrmask (ams, ~0 , ~0 ); + +/* Clear any pending interrupt */ +writel (AMS_ISR0_ALARM_MASK , ams->base +AMS_ISR_0 ); +writel (AMS_ISR1_ALARM_MASK , ams->base +AMS_ISR_1 ); + +return 0 ; +} + +static int ams_enable_single_channel (struct ams *ams,unsigned int +offset) { +u8 channel_num =0 ; + +switch (offset) { +case AMS_VCC_PSPLL0 : + channel_num =AMS_VCC_PSPLL0_CH ; +break ; +case AMS_VCC_PSPLL3 : + channel_num =AMS_VCC_PSPLL3_CH ; +break ; +case AMS_VCCINT : + channel_num =AMS_VCCINT_CH ; +break ; +case AMS_VCCBRAM : + channel_num =AMS_VCCBRAM_CH ; +break ; +case AMS_VCCAUX : + channel_num =AMS_VCCAUX_CH ; +break ; +case AMS_PSDDRPLL : + channel_num =AMS_PSDDRPLL_CH ;drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+break ; +case AMS_PSINTFPDDR : + channel_num =AMS_PSINTFPDDR_CH ; +break ; +default : +return -EINVAL ; + } + +/* set single channel, sequencer off mode */ + ams_ps_update_reg(ams, AMS_REG_CONFIG1,
AMS_CONF1_SEQ_MASK,drivers/iio/adc/xilinx-ams.c
Quoted 4 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+ AMS_CONF1_SEQ_SINGLE_CHANNEL); + +/* write the channel number */ + ams_ps_update_reg(ams, AMS_REG_CONFIG0,
AMS_CONF0_CHANNEL_NUM_MASK,Quoted 4 lines
drivers/iio/adc/xilinx-ams.c line 269
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +2
-0+ channel_num); +mdelay (1 );This delay should be documented.. Preferably with a reference to the datasheet to justify the particular value.
There is an option to poll for EOC (End of Conversion) to be set in a register. I will replace this delay will that polling.
Quoted 27 lines
Quoted 27 lines
drivers/iio/adc/xilinx-ams.c new file +26
-0+ +return 0 ; +} + +static int ams_read_vcc_reg (struct ams *ams,unsigned int offset,u32 +*data) { +int ret; + + ret =ams_enable_single_channel (ams, offset); +if (ret) +return ret; + + *data =readl (ams->base + offset); +ams_enable_channel_sequence (ams); + +return 0 ; +} + +static int ams_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{ +struct ams *ams =iio_priv (indio_dev); +int ret; + +switch (mask) {Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 301
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+case IIO_CHAN_INFO_RAW : +mutex_lock (&ams->mutex); +if (chan->scan_index >= (PS_SEQ_MAX *3 )) { + ret =ams_read_vcc_reg (ams, chan->address, val); +if (ret) + goto read_raw_err;Missing
mutex_unlock?Missed it. This will be corrected in v2.
Quoted 60 lines
Quoted 60 lines
drivers/iio/adc/xilinx-ams.c new file +59
-0+ }else if (chan->scan_index >=PS_SEQ_MAX ) + *val =readl (ams->pl_base + chan->address); +else + *val =readl (ams->ps_base + chan->address); +mutex_unlock (&ams->mutex); + +return IIO_VAL_INT ; +case IIO_CHAN_INFO_SCALE : +switch (chan->type) { +case IIO_VOLTAGE : +switch (chan->address) { +case AMS_SUPPLY1 : +case AMS_SUPPLY2 : +case AMS_SUPPLY3 : +case AMS_SUPPLY4 : + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +case AMS_SUPPLY5 : +case AMS_SUPPLY6 : +if (chan->scan_index <PS_SEQ_MAX ) + *val =AMS_SUPPLY_SCALE_6VOLT ; +else + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +case AMS_SUPPLY7 : +case AMS_SUPPLY8 : + *val =AMS_SUPPLY_SCALE_6VOLT ; +break ; +case AMS_SUPPLY9 : +case AMS_SUPPLY10 : +if (chan->scan_index <PS_SEQ_MAX ) + *val =AMS_SUPPLY_SCALE_3VOLT ; +else + *val =AMS_SUPPLY_SCALE_6VOLT ; +break ; +case AMS_VCC_PSPLL0 : +case AMS_VCC_PSPLL3 : +case AMS_VCCINT : +case AMS_VCCBRAM : +case AMS_VCCAUX : +case AMS_PSDDRPLL : +case AMS_PSINTFPDDR : + *val =AMS_SUPPLY_SCALE_3VOLT ; +break ; +default : + *val =AMS_SUPPLY_SCALE_1VOLT ; +break ; + } + *val2 =AMS_SUPPLY_SCALE_DIV_BIT ; +return IIO_VAL_FRACTIONAL_LOG2 ; +case IIO_TEMP : + *val =AMS_TEMP_SCALE ; + *val2 =AMS_TEMP_SCALE_DIV_BIT ; +return IIO_VAL_FRACTIONAL_LOG2 ; +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_OFFSET : +/* Only the temperature channel has an offset */ Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 365
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ *val =AMS_TEMP_OFFSET ; +return IIO_VAL_INT ; + } + +read_raw_err:Given we only return an error code here, are we not better just doing that inline?
Yes. You are right. Will update this in v2.
Quoted 252 lines
Quoted 146 lines
drivers/iio/adc/xilinx-ams.c new file +145
-0+return -EINVAL ; +} + +static int ams_get_alarm_offset (int scan_index,enum +iio_event_direction dir) { +int offset =0 ; + +if (scan_index >=PS_SEQ_MAX ) + scan_index -=PS_SEQ_MAX ; + +if (dir ==IIO_EV_DIR_FALLING ) { +if (scan_index <AMS_SEQ_SUPPLY7 ) + offset =AMS_ALARM_THRESHOLD_OFF_10 ; +else + offset =AMS_ALARM_THRESHOLD_OFF_20 ; + } + +switch (scan_index) { +case AMS_SEQ_TEMP : +return AMS_ALARM_TEMP + offset; +case AMS_SEQ_SUPPLY1 : +return AMS_ALARM_SUPPLY1 + offset; +case AMS_SEQ_SUPPLY2 : +return AMS_ALARM_SUPPLY2 + offset; +case AMS_SEQ_SUPPLY3 : +return AMS_ALARM_SUPPLY3 + offset; +case AMS_SEQ_SUPPLY4 : +return AMS_ALARM_SUPPLY4 + offset; +case AMS_SEQ_SUPPLY5 : +return AMS_ALARM_SUPPLY5 + offset; +case AMS_SEQ_SUPPLY6 : +return AMS_ALARM_SUPPLY6 + offset; +case AMS_SEQ_SUPPLY7 : +return AMS_ALARM_SUPPLY7 + offset; +case AMS_SEQ_SUPPLY8 : +return AMS_ALARM_SUPPLY8 + offset; +case AMS_SEQ_SUPPLY9 : +return AMS_ALARM_SUPPLY9 + offset; +case AMS_SEQ_SUPPLY10 : +return AMS_ALARM_SUPPLY10 + offset; +case AMS_SEQ_VCCAMS : +return AMS_ALARM_VCCAMS + offset; +case AMS_SEQ_TEMP_REMOTE : +return AMS_ALARM_TEMP_REMOTE + offset; + } + +return 0 ; +} + +static const struct iio_chan_spec *ams_event_to_channel ( +struct iio_dev *indio_dev,u32 event) { +int scan_index =0 , i; + +if (event >=AMS_PL_ALARM_START ) { + event -=AMS_PL_ALARM_START ; + scan_index =PS_SEQ_MAX ; + } + +switch (event) { +case AMS_ALARM_BIT_TEMP : + scan_index +=AMS_SEQ_TEMP ; +break ; +case AMS_ALARM_BIT_SUPPLY1 : + scan_index +=AMS_SEQ_SUPPLY1 ; +break ; +case AMS_ALARM_BIT_SUPPLY2 : + scan_index +=AMS_SEQ_SUPPLY2 ; +break ; +case AMS_ALARM_BIT_SUPPLY3 : + scan_index +=AMS_SEQ_SUPPLY3 ; +break ; +case AMS_ALARM_BIT_SUPPLY4 : + scan_index +=AMS_SEQ_SUPPLY4 ; +break ; +case AMS_ALARM_BIT_SUPPLY5 : + scan_index +=AMS_SEQ_SUPPLY5 ; +break ; +case AMS_ALARM_BIT_SUPPLY6 : + scan_index +=AMS_SEQ_SUPPLY6 ; +break ; +case AMS_ALARM_BIT_SUPPLY7 : + scan_index +=AMS_SEQ_SUPPLY7 ; +break ; +case AMS_ALARM_BIT_SUPPLY8 : + scan_index +=AMS_SEQ_SUPPLY8 ; +break ; +case AMS_ALARM_BIT_SUPPLY9 : + scan_index +=AMS_SEQ_SUPPLY9 ; +break ; +case AMS_ALARM_BIT_SUPPLY10 : + scan_index +=AMS_SEQ_SUPPLY10 ; +break ; +case AMS_ALARM_BIT_VCCAMS : + scan_index +=AMS_SEQ_VCCAMS ; +break ; +case AMS_ALARM_BIT_TEMP_REMOTE : + scan_index +=AMS_SEQ_TEMP_REMOTE ; +break ; + } + +for (i =0 ; i < indio_dev->num_channels; i++) +if (indio_dev->channels[i].scan_index == scan_index) +break ; + +return &indio_dev->channels[i]; +} + +static int ams_get_alarm_mask (int scan_index) { +int bit =0 ; + +if (scan_index >=PS_SEQ_MAX ) { + bit =AMS_PL_ALARM_START ; + scan_index -=PS_SEQ_MAX ; + } + +switch (scan_index) { +case AMS_SEQ_TEMP : +return BIT (AMS_ALARM_BIT_TEMP + bit); +case AMS_SEQ_SUPPLY1 : +return BIT (AMS_ALARM_BIT_SUPPLY1 + bit); +case AMS_SEQ_SUPPLY2 : +return BIT (AMS_ALARM_BIT_SUPPLY2 + bit); +case AMS_SEQ_SUPPLY3 : +return BIT (AMS_ALARM_BIT_SUPPLY3 + bit); +case AMS_SEQ_SUPPLY4 : +return BIT (AMS_ALARM_BIT_SUPPLY4 + bit); +case AMS_SEQ_SUPPLY5 : +return BIT (AMS_ALARM_BIT_SUPPLY5 + bit); +case AMS_SEQ_SUPPLY6 : +return BIT (AMS_ALARM_BIT_SUPPLY6 + bit); +case AMS_SEQ_SUPPLY7 : +return BIT (AMS_ALARM_BIT_SUPPLY7 + bit); +case AMS_SEQ_SUPPLY8 : +return BIT (AMS_ALARM_BIT_SUPPLY8 + bit); +case AMS_SEQ_SUPPLY9 : +return BIT (AMS_ALARM_BIT_SUPPLY9 + bit); +case AMS_SEQ_SUPPLY10 : +return BIT (AMS_ALARM_BIT_SUPPLY10 + bit); +case AMS_SEQ_VCCAMS : +return BIT (AMS_ALARM_BIT_VCCAMS + bit); +case AMS_SEQ_TEMP_REMOTE : +return BIT (AMS_ALARM_BIT_TEMP_REMOTE + bit); + } + +return 0 ;drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+} + +static int ams_read_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir) +{ +struct ams *ams =iio_priv (indio_dev); + +return (ams->alarm_mask &ams_get_alarm_mask (chan->scan_index))? 1
Quoted 80 lines
drivers/iio/adc/xilinx-ams.c new file +80
-0+: 0; } + +static int ams_write_event_config (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +int state) +{ +struct ams *ams =iio_priv (indio_dev); +unsigned int alarm; + + alarm =ams_get_alarm_mask (chan->scan_index); + +mutex_lock (&ams->mutex); + +if (state) + ams->alarm_mask |= alarm; +else + ams->alarm_mask &= ~alarm; + +iio_ams_update_alarm (ams, ams->alarm_mask); + +mutex_unlock (&ams->mutex); + +return 0 ; +} + +static int ams_read_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info,int *val,int *val2) { +struct ams *ams =iio_priv (indio_dev); +unsigned int offset =ams_get_alarm_offset (chan->scan_index, dir); + +mutex_lock (&ams->mutex); + +if (chan->scan_index >=PS_SEQ_MAX ) + *val =readl (ams->pl_base + offset); +else + *val =readl (ams->ps_base + offset); + +mutex_unlock (&ams->mutex); + +return IIO_VAL_INT ; +} + +static int ams_write_event_value (struct iio_dev *indio_dev, +const struct iio_chan_spec *chan, +enum iio_event_type type, +enum iio_event_direction dir, +enum iio_event_info info,int val,int val2) { +struct ams *ams =iio_priv (indio_dev); +unsigned int offset; + +mutex_lock (&ams->mutex); + +/* Set temperature channel threshold to direct threshold */ +if (chan->type ==IIO_TEMP ) { + offset =ams_get_alarm_offset (chan->scan_index, +IIO_EV_DIR_FALLING ); + +if (chan->scan_index >=PS_SEQ_MAX ) +ams_pl_update_reg (ams, offset, +AMS_ALARM_THR_DIRECT_MASK , +AMS_ALARM_THR_DIRECT_MASK ); +else +ams_ps_update_reg (ams, offset, +AMS_ALARM_THR_DIRECT_MASK , +AMS_ALARM_THR_DIRECT_MASK ); + } + + offset =ams_get_alarm_offset (chan->scan_index, dir); +if (chan->scan_index >=PS_SEQ_MAX ) +writel (val, ams->pl_base + offset); +else +writel (val, ams->ps_base + offset); + +mutex_unlock (&ams->mutex); +drivers/iio/adc/xilinx-ams.c line 615
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+return 0 ; +} + +static void ams_handle_event (struct iio_dev *indio_dev,u32 event) { +const struct iio_chan_spec *chan; + + chan =ams_event_to_channel (indio_dev, event); + +if (chan->type ==IIO_TEMP ) { +/* The temperature channel only supports over-temperature In IIO we use the standard kernel syntax for comments of /*
* The temperature...
*/Quoted 3 lines
This form is only used in a few subsystems such as net.
It's minor but nice to be consistent...
Okay. Will update this in v2.
Quoted 92 lines
Quoted 39 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+* events +*/ + iio_push_event(indio_dev, + IIO_UNMOD_EVENT_CODE(chan->type, chan-channel,
drivers/iio/adc/xilinx-ams.c new file +10
-0+ IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + iio_get_time_ns(indio_dev)); + }else { +/* For other channels we don't know whether it is a upper or +* lower threshold event. Userspace will have to check the +* channel value if it wants to know. +*/ + iio_push_event(indio_dev, + IIO_UNMOD_EVENT_CODE(chan->type, chan-channel,
drivers/iio/adc/xilinx-ams.c new file +22
-0+ IIO_EV_TYPE_THRESH, + IIO_EV_DIR_EITHER), + iio_get_time_ns(indio_dev)); + } +} + +static void ams_handle_events (struct iio_dev *indio_dev,unsigned +long events) { +unsigned int bit; + +for_each_set_bit (bit, &events,AMS_NO_OF_ALARMS ) +ams_handle_event (indio_dev, bit); +} + +/** +* ams_unmask_worker - ams alarm interrupt unmask worker +* @work : work to be done +* +* The ZynqMP threshold interrupts are level sensitive. Since we +can't make the +* threshold condition go way from within the interrupt handler, this +means as drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+* soon as a threshold condition is present we would enter the +interrupt handler +* again and again. To work around this we mask all active threshold +interrupts +* in the interrupt handler and start a timer. In this timer we poll +the +* interrupt status and only if the interrupt is inactive we unmask it again. +*/ +static void ams_unmask_worker (struct work_struct *work) { + struct ams *ams = container_of(work, struct ams,ams_unmask_work.work);
Quoted 18 lines
drivers/iio/adc/xilinx-ams.c new file +18
-0+unsigned int status, unmask; + +spin_lock_irq (&ams->lock); + + status =readl (ams->base +AMS_ISR_0 ); + +/* Clear those bits which are not active anymore */ + unmask = (ams->masked_alarm ^ status) & ams->masked_alarm; + +/* clear status of disabled alarm */ + unmask |= ams->intr_mask; + + ams->masked_alarm &= status; + +/* Also clear those which are masked out anyway */ + ams->masked_alarm &= ~ams->intr_mask; + +/* Clear the interrupts before we unmask them */ drivers/iio/adc/xilinx-ams.c line 687
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+writel (unmask, ams->base +AMS_ISR_0 ); + +ams_update_intrmask (ams,0 ,0 ); + +spin_unlock_irq (&ams->lock); + +/* if still pending some alarm re-trigger the timer */ +if (ams->masked_alarm) + schedule_delayed_work(&ams->ams_unmask_work, +
msecs_to_jiffies(AMS_UNMASK_TIMEOUT_MS));drivers/iio/adc/xilinx-ams.c line 694
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+} + +static irqreturn_t ams_iio_irq (int irq,void *data) { +unsigned int isr0, isr1; +struct iio_dev *indio_dev = data; +struct ams *ams =iio_priv (indio_dev); + +spin_lock (&ams->lock);Do these need to be handled in interrupt context? Would we be better off doing it in an interrupt thread where we can sleep (and hence not use a spin lock for example)?
Quoted 1 line
Perhaps not, but this doesn't immediately feel time critical...
This is not time critical. I will remove spin lock here.
Quoted 17 lines
drivers/iio/adc/xilinx-ams.c line 705
Quoted 13 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+ + isr0 =readl (ams->base +AMS_ISR_0 ); + isr1 =readl (ams->base +AMS_ISR_1 ); + +/* only process alarms that are not masked */ + isr0 &= ~((ams->intr_mask & AMS_ISR0_ALARM_MASK) | ams-
masked_alarm);drivers/iio/adc/xilinx-ams.c new file +5
-0+ isr1 &= ~(ams->intr_mask >>AMS_ISR1_INTR_MASK_SHIFT ); + +/* clear interrupt */ +writel (isr0, ams->base +AMS_ISR_0 ); +writel (isr1, ams->base +AMS_ISR_1 );If we have interrupts here that aren't ours we should a) not be clearing them
b) be returningIRQ_NONEso it can be handled as an incorrect interrupt and reported as such.Right. Will update this in v2.
Quoted 108 lines
drivers/iio/adc/xilinx-ams.c
Quoted 4 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+ +if (isr0) { +/* Once the alarm interrupt occurred, mask until get cleared */
drivers/iio/adc/xilinx-ams.c line 717
Quoted 7 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+ ams->masked_alarm |= isr0; +ams_update_intrmask (ams,0 ,0 ); + +ams_handle_events (indio_dev, isr0); + + schedule_delayed_work(&ams->ams_unmask_work, +
msecs_to_jiffies(AMS_UNMASK_TIMEOUT_MS));Quoted 25 lines
drivers/iio/adc/xilinx-ams.c new file +25
-0+ } + +spin_unlock (&ams->lock); + +return IRQ_HANDLED ; +} + +static const struct iio_event_spec ams_temp_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_separate =BIT (IIO_EV_INFO_ENABLE ) | +BIT (IIO_EV_INFO_VALUE ), + }, +}; + +static const struct iio_event_spec ams_voltage_events[] = { + { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_RISING , + .mask_separate =BIT (IIO_EV_INFO_VALUE ), + }, { + .type =IIO_EV_TYPE_THRESH , + .dir =IIO_EV_DIR_FALLING , + .mask_separate =BIT (IIO_EV_INFO_VALUE ),drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ }, { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_EITHER, + .mask_separate = BIT(IIO_EV_INFO_ENABLE), + }, +}; + +static const struct iio_chan_spec ams_ps_channels[] = { +AMS_PS_CHAN_TEMP (AMS_SEQ_TEMP ,AMS_TEMP ,"ps_temp" ), + AMS_PS_CHAN_TEMP(AMS_SEQ_TEMP_REMOTE,
AMS_TEMP_REMOTE, "remote_temp"),drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY1, AMS_SUPPLY1,"vccpsintlp"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY2, AMS_SUPPLY2,"vccpsintfp"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY3, AMS_SUPPLY3,"vccpsaux"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY4, AMS_SUPPLY4,"vccpsddr"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY5, AMS_SUPPLY5,"vccpsio3"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY6, AMS_SUPPLY6,"vccpsio0"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY7, AMS_SUPPLY7,"vccpsio1"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY8, AMS_SUPPLY8,"vccpsio2"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY9, AMS_SUPPLY9,"psmgtravcc"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_SUPPLY10, AMS_SUPPLY10,"psmgtravtt"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PS_CHAN_VOLTAGE(AMS_SEQ_VCCAMS, AMS_VCCAMS,"vccams"), };
drivers/iio/adc/xilinx-ams.c
Quoted 4 lines
drivers/iio/adc/xilinx-ams.c new file +4
-0+ +static const struct iio_chan_spec ams_pl_channels[] = { +AMS_PL_CHAN_TEMP (AMS_SEQ_TEMP ,AMS_TEMP ,"pl_temp" ), + AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY1, AMS_SUPPLY1, "vccint",true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY2, AMS_SUPPLY2,"vccaux", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_VREFP, AMS_VREFP, "vccvrefp",false),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_VREFN, AMS_VREFN, "vccvrefn",false),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY3, AMS_SUPPLY3,"vccbram", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY4, AMS_SUPPLY4,"vccplintlp", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY5, AMS_SUPPLY5,"vccplintfp", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY6, AMS_SUPPLY6,"vccplaux", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_VCCAMS, AMS_VCCAMS,"vccams", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_VP_VN, AMS_VP_VN, "vccvpvn",false),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY7, AMS_SUPPLY7,"vuser0", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY8, AMS_SUPPLY8,"vuser1", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY9, AMS_SUPPLY9,"vuser2", true),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_CHAN_VOLTAGE(AMS_SEQ_SUPPLY10, AMS_SUPPLY10,"vuser3", true),
drivers/iio/adc/xilinx-ams.c line 780
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_PL_AUX_CHAN_VOLTAGE(0, "vccaux0"),
Extended_nameis a two edged sword. It lets you make nice specifically named channels, but it also breaks almost all userspace code as it doesn't know how to handle the extra bit on the end of the name.Quoted 5 lines
As such we tend to only specify it for very special use non standard channels (such as the power supplies)
For the aux channels, it has no particular meaning. So I would prefer that you dropped it and just left them with the indexes.
Okay. I will keep the extended names for AMS_SUPPLY* and remove them for the aux channels.
Quoted 78 lines
Quoted 9 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+AMS_PL_AUX_CHAN_VOLTAGE (1 ,"vccaux1" ), +AMS_PL_AUX_CHAN_VOLTAGE (2 ,"vccaux2" ), +AMS_PL_AUX_CHAN_VOLTAGE (3 ,"vccaux3" ), +AMS_PL_AUX_CHAN_VOLTAGE (4 ,"vccaux4" ), +AMS_PL_AUX_CHAN_VOLTAGE (5 ,"vccaux5" ), +AMS_PL_AUX_CHAN_VOLTAGE (6 ,"vccaux6" ), +AMS_PL_AUX_CHAN_VOLTAGE (7 ,"vccaux7" ), + AMS_PL_AUX_CHAN_VOLTAGE(8, "vccaux8"),drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ AMS_PL_AUX_CHAN_VOLTAGE(9, "vccaux9"), + AMS_PL_AUX_CHAN_VOLTAGE(10, "vccaux10"), + AMS_PL_AUX_CHAN_VOLTAGE(11, "vccaux11"), + AMS_PL_AUX_CHAN_VOLTAGE(12, "vccaux12"), + AMS_PL_AUX_CHAN_VOLTAGE(13, "vccaux13"), + AMS_PL_AUX_CHAN_VOLTAGE(14, "vccaux14"), + AMS_PL_AUX_CHAN_VOLTAGE(15, "vccaux15"), }; + +static const struct iio_chan_spec ams_ctrl_channels[] = { + AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCC_PSPLL, AMS_VCC_PSPLL0,"
vcc_pspll0"),drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCC_PSBATT,
AMS_VCC_PSPLL3, "vcc_psbatt"),drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCCINT, AMS_VCCINT,"vccint"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCCBRAM, AMS_VCCBRAM,"vccbram"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_VCCAUX, AMS_VCCAUX,"vccaux"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_PSDDRPLL, AMS_PSDDRPLL,"psddrpll"),
drivers/iio/adc/xilinx-ams.c
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ AMS_CTRL_CHAN_VOLTAGE(AMS_SEQ_INTDDR, AMS_PSINTFPDDR,"psintfpddr"),
drivers/iio/adc/xilinx-ams.c
Quoted 3 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+}; + +static int ams_init_module(struct iio_dev *indio_dev, struct device_node*np,
Quoted 19 lines
drivers/iio/adc/xilinx-ams.c new file +19
-0+ struct iio_chan_spec *channels) { +struct ams *ams =iio_priv (indio_dev); +struct device_node *chan_node, *child; +int ret, num_channels =0 ; +unsigned int reg; + +if (of_device_is_compatible (np,"xlnx,zynqmp-ams-ps" )) { + ams->ps_base =of_iomap (np,0 ); +if (!ams->ps_base) +return -ENXIO ; + +/* add PS channels to iio device channels */ +memcpy (channels + num_channels, ams_ps_channels, +sizeof (ams_ps_channels)); + num_channels +=ARRAY_SIZE (ams_ps_channels); + }else if (of_device_is_compatible (np,"xlnx,zynqmp-ams-pl" )) { + ams->pl_base =of_iomap (np,0 ); +if (!ams->pl_base) +return -ENXIO ;drivers/iio/adc/xilinx-ams.c
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ +/* Copy only first 10 fix channels */ +memcpy (channels + num_channels, ams_pl_channels, +AMS_PL_MAX_FIXED_CHANNEL *sizeof (*channels)); + num_channels +=AMS_PL_MAX_FIXED_CHANNEL ; + + chan_node =of_get_child_by_name (np,"xlnx,ext-channels" ); +if (chan_node) { +for_each_child_of_node (chan_node, child) { + ret = of_property_read_u32(child, "reg",®);
drivers/iio/adc/xilinx-ams.c line 851
Quoted 11 lines
drivers/iio/adc/xilinx-ams.c new file +11
-0+if (ret || reg >AMS_PL_MAX_EXT_CHANNEL ) +continue ; + +memcpy (&channels[num_channels], + &ams_pl_channels[reg + +AMS_PL_MAX_FIXED_CHANNEL ], +sizeof (*channels)); + +if (of_property_read_bool (child, +"xlnx,bipolar" )) +channels[num_channels].scan_type.sign =
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c line 852
Quoted 3 lines
drivers/iio/adc/xilinx-ams.c new file +3
-0+'s' ; + + num_channels +=1 ;num_channels++;
Okay.
Quoted 17 lines
Quoted 17 lines
drivers/iio/adc/xilinx-ams.c new file +16
-0+ } + } +of_node_put (chan_node); + }else if (of_device_is_compatible (np,"xlnx,zynqmp-ams" )) { +/* add AMS channels to iio device channels */ +memcpy (channels + num_channels, ams_ctrl_channels, +sizeof (ams_ctrl_channels)); + num_channels +=ARRAY_SIZE (ams_ctrl_channels); + }else { +return -EINVAL ; + } + +return num_channels; +} + +static int ams_parse_dt(struct iio_dev *indio_dev, structQuoted 8 lines
drivers/iio/adc/xilinx-ams.c line 873
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+platform_device *pdev) { +struct ams *ams =iio_priv (indio_dev); +struct iio_chan_spec *ams_channels, *dev_channels; +struct device_node *child_node =NULL , *np = pdev->dev.of_node; +int ret, chan_vol =0 , chan_temp =0 , i, rising_off, falling_off;
chan_volandchan_tempare counts? Perhaps their names can make that clearer.Okay. I will change their name to '
vol_ch_cnt' and 'temp_ch_cnt' in v2.Quoted 74 lines
Quoted 61 lines
drivers/iio/adc/xilinx-ams.c new file +60
-0+unsigned int num_channels =0 ; + +/* Initialize buffer for channel specification */ + ams_channels =kzalloc (sizeof (ams_ps_channels) + +sizeof (ams_pl_channels) + +sizeof (ams_ctrl_channels),GFP_KERNEL ); +if (!ams_channels) +return -ENOMEM ; + +if (of_device_is_available (np)) { + ret =ams_init_module (indio_dev, np, ams_channels); +if (ret <0 ) { +kfree (ams_channels); +return ret; + } + + num_channels += ret; + } + +for_each_child_of_node (np, child_node) { +if (of_device_is_available (child_node)) { + ret =ams_init_module (indio_dev, child_node, + ams_channels + num_channels); +if (ret <0 ) { +kfree (ams_channels); +return ret; + } + + num_channels += ret; + } + } + +for (i =0 ; i < num_channels; i++) { +if (ams_channels[i].type ==IIO_VOLTAGE ) + ams_channels[i].channel = chan_vol++; +else + ams_channels[i].channel = chan_temp++; + +if (ams_channels[i].scan_index < (PS_SEQ_MAX *3 )) { +/* set threshold to max and min for each channel */ + falling_off =ams_get_alarm_offset ( + ams_channels[i].scan_index, +IIO_EV_DIR_FALLING ); + rising_off =ams_get_alarm_offset ( + ams_channels[i].scan_index, +IIO_EV_DIR_RISING ); +if (ams_channels[i].scan_index >=PS_SEQ_MAX ) { +writel (AMS_ALARM_THR_MIN , + ams->pl_base + falling_off); +writel (AMS_ALARM_THR_MAX , + ams->pl_base + rising_off); + }else { +writel (AMS_ALARM_THR_MIN , + ams->ps_base + falling_off); +writel (AMS_ALARM_THR_MAX , + ams->ps_base + rising_off); + } + } + } +drivers/iio/adc/xilinx-ams.c line 943
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+ dev_channels =devm_kzalloc (&pdev->dev,sizeof (*dev_channels) * + num_channels,GFP_KERNEL ); +if (!dev_channels) { +kfree (ams_channels); +return -ENOMEM ; + } + +memcpy (dev_channels, ams_channels, +sizeof (*ams_channels) * num_channels); +kfree (ams_channels);If you were to reorder this so the
ams_channelscleanup was last you could use the nice clean pattern ofQuoted 6 lines
error:
kfree(ams_channels); return ret;To make it clear that the
ams_channelsgets freed in all paths.Fair enough. I will update this in v2.
Quoted 44 lines
Quoted 30 lines
drivers/iio/adc/xilinx-ams.c new file +29
-0+ indio_dev->channels = dev_channels; + indio_dev->num_channels = num_channels; + +return 0 ; +} + +static const struct iio_info iio_pl_info = { + .read_raw = &ams_read_raw, + .read_event_config = &ams_read_event_config, + .write_event_config = &ams_write_event_config, + .read_event_value = &ams_read_event_value, + .write_event_value = &ams_write_event_value, }; + +static const struct of_device_id ams_of_match_table[] = { + { .compatible ="xlnx,zynqmp-ams" }, + { } +}; +MODULE_DEVICE_TABLE (of, ams_of_match_table); + +static int ams_probe (struct platform_device *pdev) { +struct iio_dev *indio_dev; +struct ams *ams; +struct resource *res; +int ret; + +if (!pdev->dev.of_node) +return -ENODEV ; + + indio_dev =devm_iio_device_alloc (&pdev->dev,sizeof (*ams));drivers/iio/adc/xilinx-ams.c line 984
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+if (!indio_dev) +return -ENOMEM ; + + ams =iio_priv (indio_dev); +mutex_init (&ams->mutex); +spin_lock_init (&ams->lock); + + indio_dev->dev.parent = &pdev->dev; + indio_dev->dev.of_node = pdev->dev.of_node; + indio_dev->name ="ams" ;As names go, that one is a too little generic. Particularly with a common manufacturer of ADCs called Austrian Micro Systems ;) No possibility of confusion!
Quoted 2 lines
It's fine to use ams within the driver, but for external interfaces, perhaps prefix with xilinx-?
Okay. I will use xilinx-ams.
Quoted 29 lines
drivers/iio/adc/xilinx-ams.c
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ + indio_dev->info = &iio_pl_info; + indio_dev->modes =INDIO_DIRECT_MODE ; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM,"ams-base");
drivers/iio/adc/xilinx-ams.c
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ ams->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (ams->base)) +return PTR_ERR (ams->base); + + INIT_DELAYED_WORK(&ams->ams_unmask_work,
ams_unmask_worker);Quoted 16 lines
drivers/iio/adc/xilinx-ams.c new file +16
-0+ + ams->clk =devm_clk_get (&pdev->dev,NULL ); +if (IS_ERR (ams->clk)) +return PTR_ERR (ams->clk); +clk_prepare_enable (ams->clk); + + ret =iio_ams_init_device (ams); +if (ret) { +dev_err (&pdev->dev,"failed to initialize AMS\n" ); + goto clk_disable; + } + + ret =ams_parse_dt (indio_dev, pdev); +if (ret) { +dev_err (&pdev->dev,"failure in parsing DT\n" ); + goto clk_disable;Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 1015
Quoted 5 lines
drivers/iio/adc/xilinx-ams.c new file +5
-0+ } + +ams_enable_channel_sequence (ams); + + ams->irq =platform_get_irq_byname (pdev,"ams-irq" );Why store this in the ams structure? It's not used anywhere other than in the next line.
Okay. Will update this in v2.
Quoted 9 lines
drivers/iio/adc/xilinx-ams.c
Quoted 2 lines
drivers/iio/adc/xilinx-ams.c new file +1
-0+ ret = devm_request_irq(&pdev->dev, ams->irq, &ams_iio_irq, 0, "ams-irq",
drivers/iio/adc/xilinx-ams.c line 1017
Quoted 1 line
drivers/iio/adc/xilinx-ams.c new file +1
-0+ indio_dev);This mixing of devm and non devm functions makes it tricky to be sure there aren't an races.
One easy solution is to use
devm_add_actionto put theclk_disable_unprepareinto the cleanup list.Okay.
Quoted 12 lines
drivers/iio/adc/xilinx-ams.c line 1025
Quoted 9 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+if (ret <0 ) { +dev_err (&pdev->dev,"failed to register interrupt\n" ); + goto clk_disable; + } + +platform_set_drvdata (pdev, indio_dev); + +return iio_device_register (indio_dev);What if device register returns an error? You leave the clock enabled.
Quoted 5 lines
That way everything is using the managed cleanup and the ordering will be correct.
The alternative is to not use devm forms for everything after the
clk_prepare_enable.Yes. This is better.
Quoted 35 lines
Quoted 23 lines
drivers/iio/adc/xilinx-ams.c new file +22
-0+ +clk_disable: +clk_disable_unprepare (ams->clk); + +return ret; +} + +static int ams_remove (struct platform_device *pdev) { +struct iio_dev *indio_dev =platform_get_drvdata (pdev); +struct ams *ams =iio_priv (indio_dev); + +cancel_delayed_work (&ams->ams_unmask_work); + +/* Unregister the device */ +iio_device_unregister (indio_dev); +clk_disable_unprepare (ams->clk); + +return 0 ; +} + +static int __maybe_unused ams_suspend (struct device *dev) { +struct iio_dev *indio_dev =dev_get_drvdata (dev);drivers/iio/adc/xilinx-ams.c line 1060
Quoted 10 lines
drivers/iio/adc/xilinx-ams.c new file +10
-0+struct ams *ams =iio_priv (indio_dev); + +clk_disable_unprepare (ams->clk); + +return 0 ; +} + +static int __maybe_unused ams_resume (struct device *dev) { +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct ams *ams =iio_priv (indio_dev);You could streamline this without loss of clarity as.
Quoted 3 lines
struct ams *ams = iio_priv(dev_get_drvdata(dev));
(very minor point!)
Okay.
Quoted 8 lines
Quoted 8 lines
drivers/iio/adc/xilinx-ams.c new file +8
-0+ +clk_prepare_enable (ams->clk); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(ams_pm_ops, ams_suspend, ams_resume); +Quoted 8 lines
drivers/iio/adc/xilinx-ams.c line 1074
Quoted 6 lines
drivers/iio/adc/xilinx-ams.c new file +6
-0+static struct platform_driver ams_driver = { + .probe = ams_probe, + .remove = ams_remove, + .driver = { + .name ="ams" , + .pm = &ams_pm_ops,Spacing here seems a little odd. Just have a single space after pm
Okay.
Quoted 16 lines
drivers/iio/adc/xilinx-ams.h
Quoted 13 lines
drivers/iio/adc/xilinx-ams.c new file +7
-0+ .of_match_table = ams_of_match_table, + }, +}; +module_platform_driver (ams_driver); + +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Xilinx, Inc." );(quoted diff) +0
-0
b/drivers/iio/adc/xilinx-ams.hnew file mode 100644 index 0000000..b9fa262drivers/iio/adc/xilinx-ams.h new file +0
-0I can't immediately see why a lot of this wants to be in a header.
Quoted 1 line
Please move it inline with the C file.
Okay. I will update that in v2.
Quoted 265 lines
Quoted 247 lines
drivers/iio/adc/xilinx-ams.h new file +244
-0@@ -0,0 +1,281 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Xilinx AMS driver +* +* Copyright (C) 2017-2018 Xilinx, Inc. +* +* Manish Narani <[email protected]> +* Rajnikant Bhojani <[email protected]> */ + +#ifndef __XILINX_AMS_H__ +#define __XILINX_AMS_H__ + +#define AMS_MISC_CTRL 0x000 +#define AMS_ISR_0 0x010 +#define AMS_ISR_1 0x014 +#define AMS_IMR_0 0x018 +#define AMS_IMR_1 0x01c +#define AMS_IER_0 0x020 +#define AMS_IER_1 0x024 +#define AMS_IDR_0 0x028 +#define AMS_IDR_1 0x02c +#define AMS_PS_CSTS 0x040 +#define AMS_PL_CSTS 0x044 +#define AMS_MON_CSTS 0x050 + +#define AMS_VCC_PSPLL0 0x060 +#define AMS_VCC_PSPLL3 0x06C +#define AMS_VCCINT 0x078 +#define AMS_VCCBRAM 0x07C +#define AMS_VCCAUX 0x080 +#define AMS_PSDDRPLL 0x084 +#define AMS_PSINTFPDDR 0x09C + +#define AMS_VCC_PSPLL0_CH 48 +#define AMS_VCC_PSPLL3_CH 51 +#define AMS_VCCINT_CH 54 +#define AMS_VCCBRAM_CH 55 +#define AMS_VCCAUX_CH 56 +#define AMS_PSDDRPLL_CH 57 +#define AMS_PSINTFPDDR_CH 63 + +#define AMS_REG_CONFIG0 0x100 +#define AMS_REG_CONFIG1 0x104 +#define AMS_REG_CONFIG2 0x108 +#define AMS_REG_CONFIG3 0x10C +#define AMS_REG_CONFIG4 0x110 +#define AMS_REG_SEQ_CH0 0x120 +#define AMS_REG_SEQ_CH1 0x124 +#define AMS_REG_SEQ_CH2 0x118 + +#define AMS_TEMP 0x000 +#define AMS_SUPPLY1 0x004 +#define AMS_SUPPLY2 0x008 +#define AMS_VP_VN 0x00c +#define AMS_VREFP 0x010 +#define AMS_VREFN 0x014 +#define AMS_SUPPLY3 0x018 +#define AMS_SUPPLY4 0x034 +#define AMS_SUPPLY5 0x038 +#define AMS_SUPPLY6 0x03c +#define AMS_SUPPLY7 0x200 +#define AMS_SUPPLY8 0x204 +#define AMS_SUPPLY9 0x208 +#define AMS_SUPPLY10 0x20c +#define AMS_VCCAMS 0x210 +#define AMS_TEMP_REMOTE 0x214 + +#define AMS_REG_VAUX (x) (0x40 + (4*(x))) +#define AMS_REG_VUSER (x) (0x200 + (4*(x))) + +#define AMS_PS_RESET_VALUE 0xFFFFU +#define AMS_PL_RESET_VALUE 0xFFFFU + +#define AMS_CONF0_CHANNEL_NUM_MASK (0x3f << 0) + +#define AMS_CONF1_SEQ_MASK (0xf << 12) +#define AMS_CONF1_SEQ_DEFAULT (0 << 12) +#define AMS_CONF1_SEQ_SINGLE_PASS (1 << 12) +#define AMS_CONF1_SEQ_CONTINUOUS (2 << 12) +#define AMS_CONF1_SEQ_SINGLE_CHANNEL (3 << 12) + +#define AMS_REG_SEQ0_MASK 0xFFFF +#define AMS_REG_SEQ2_MASK 0x3F +#define AMS_REG_SEQ1_MASK 0xFFFF +#define AMS_REG_SEQ2_MASK_SHIFT 16 +#define AMS_REG_SEQ1_MASK_SHIFT 22 + +#define AMS_REGCFG1_ALARM_MASK 0xF0F +#define AMS_REGCFG3_ALARM_MASK 0x3F + +#define AMS_ALARM_TEMP 0x140 +#define AMS_ALARM_SUPPLY1 0x144 +#define AMS_ALARM_SUPPLY2 0x148 +#define AMS_ALARM_OT 0x14c + +#define AMS_ALARM_SUPPLY3 0x160 +#define AMS_ALARM_SUPPLY4 0x164 +#define AMS_ALARM_SUPPLY5 0x168 +#define AMS_ALARM_SUPPLY6 0x16c +#define AMS_ALARM_SUPPLY7 0x180 +#define AMS_ALARM_SUPPLY8 0x184 +#define AMS_ALARM_SUPPLY9 0x188 +#define AMS_ALARM_SUPPLY10 0x18c +#define AMS_ALARM_VCCAMS 0x190 +#define AMS_ALARM_TEMP_REMOTE 0x194 +#define AMS_ALARM_THRESHOLD_OFF_10 0x10 #define +AMS_ALARM_THRESHOLD_OFF_20 0x20 + +#define AMS_ALARM_THR_DIRECT_MASK 0x01 +#define AMS_ALARM_THR_MIN 0x0000 +#define AMS_ALARM_THR_MAX 0xffff + +#define AMS_NO_OF_ALARMS 32 +#define AMS_PL_ALARM_START 16 +#define AMS_ISR0_ALARM_MASK 0xFFFFFFFFU +#define AMS_ISR1_ALARM_MASK 0xE000001FU +#define AMS_ISR1_INTR_MASK_SHIFT 32 +#define AMS_ISR0_ALARM_2_TO_0_MASK 0x07 +#define AMS_ISR0_ALARM_6_TO_3_MASK 0x78 +#define AMS_ISR0_ALARM_12_TO_7_MASK 0x3F +#define AMS_CONF1_ALARM_2_TO_0_SHIFT 1 +#define AMS_CONF1_ALARM_6_TO_3_SHIFT 5 +#define AMS_CONF3_ALARM_12_TO_7_SHIFT 8 + +#define AMS_PS_CSTS_PS_READY 0x08010000U +#define AMS_PL_CSTS_ACCESS_MASK 0x00000001U + +#define AMS_PL_MAX_FIXED_CHANNEL 10 +#define AMS_PL_MAX_EXT_CHANNEL 20 + +#define AMS_INIT_TIMEOUT 10000 + +/* +* Following scale and offset value is derived from +* UG580 (v1.7) December 20, 2016 +*/ +#define AMS_SUPPLY_SCALE_1VOLT 1000 +#define AMS_SUPPLY_SCALE_3VOLT 3000 +#define AMS_SUPPLY_SCALE_6VOLT 6000 +#define AMS_SUPPLY_SCALE_DIV_BIT 16 + +#define AMS_TEMP_SCALE 509314 +#define AMS_TEMP_SCALE_DIV_BIT 16 +#define AMS_TEMP_OFFSET -((280230L << 16) / 509314) + +enum ams_alarm_bit { +AMS_ALARM_BIT_TEMP , +AMS_ALARM_BIT_SUPPLY1 , +AMS_ALARM_BIT_SUPPLY2 , +AMS_ALARM_BIT_SUPPLY3 , +AMS_ALARM_BIT_SUPPLY4 , +AMS_ALARM_BIT_SUPPLY5 , +AMS_ALARM_BIT_SUPPLY6 , +AMS_ALARM_BIT_RESERVED , +AMS_ALARM_BIT_SUPPLY7 , +AMS_ALARM_BIT_SUPPLY8 , +AMS_ALARM_BIT_SUPPLY9 , +AMS_ALARM_BIT_SUPPLY10 , +AMS_ALARM_BIT_VCCAMS , +AMS_ALARM_BIT_TEMP_REMOTE +}; + +enum ams_seq { +AMS_SEQ_VCC_PSPLL , +AMS_SEQ_VCC_PSBATT , +AMS_SEQ_VCCINT , +AMS_SEQ_VCCBRAM , +AMS_SEQ_VCCAUX , +AMS_SEQ_PSDDRPLL , +AMS_SEQ_INTDDR +}; + +enum ams_ps_pl_seq { +AMS_SEQ_CALIB , +AMS_SEQ_RSVD_1 , +AMS_SEQ_RSVD_2 , +AMS_SEQ_TEST , +AMS_SEQ_RSVD_4 , +AMS_SEQ_SUPPLY4 , +AMS_SEQ_SUPPLY5 , +AMS_SEQ_SUPPLY6 , +AMS_SEQ_TEMP , +AMS_SEQ_SUPPLY2 , +AMS_SEQ_SUPPLY1 , +AMS_SEQ_VP_VN , +AMS_SEQ_VREFP , +AMS_SEQ_VREFN , +AMS_SEQ_SUPPLY3 , +AMS_SEQ_CURRENT_MON , +AMS_SEQ_SUPPLY7 , +AMS_SEQ_SUPPLY8 , +AMS_SEQ_SUPPLY9 , +AMS_SEQ_SUPPLY10 , +AMS_SEQ_VCCAMS , +AMS_SEQ_TEMP_REMOTE , +AMS_SEQ_MAX +}; + +#define AMS_SEQ (x) (AMS_SEQ_MAX + (x)) +#define AMS_VAUX_SEQ (x) (AMS_SEQ_MAX + (x)) + +#define PS_SEQ_MAX AMS_SEQ_MAX +#define PS_SEQ (x) (x) +#define PL_SEQ (x) (PS_SEQ_MAX + x) + +#define AMS_CHAN_TEMP (_scan_index, _addr, _ext) { \ + .type = IIO_TEMP, \ + .indexed = 1, \ + .address = (_addr), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .event_spec = ams_temp_events, \ + .num_event_specs = ARRAY_SIZE(ams_temp_events), \ + .scan_index = (_scan_index), \ + .scan_type = { \ + .sign = 'u', \ + .realbits = 12, \ + .storagebits = 16, \ + .shift = 4, \ + .endianness = IIO_CPU, \ + }, \ + .extend_name = _ext, \ +} + +#define AMS_CHAN_VOLTAGE (_scan_index, _addr, _ext, _alarm) { \ + .type = IIO_VOLTAGE, \ + .indexed = 1, \ + .address = (_addr), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .event_spec = (_alarm) ? ams_voltage_events : NULL, \ + .num_event_specs = (_alarm) ? ARRAY_SIZE(ams_voltage_events) : 0, \ + .scan_index = (_scan_index), \ + .scan_type = { \ + .realbits = 10, \ + .storagebits = 16, \ + .shift = 6, \ + .endianness = IIO_CPU, \ + }, \ + .extend_name = _ext, \ +}drivers/iio/adc/xilinx-ams.h line 254
Quoted 10 lines
drivers/iio/adc/xilinx-ams.h new file +10
-0+ +#define AMS_PS_CHAN_TEMP (_scan_index, _addr, _ext) \ + AMS_CHAN_TEMP(PS_SEQ(_scan_index), _addr, _ext) #define +AMS_PS_CHAN_VOLTAGE(_scan_index, _addr, _ext) \ + AMS_CHAN_VOLTAGE(PS_SEQ(_scan_index), _addr, _ext, true) + +#define AMS_PL_CHAN_TEMP (_scan_index, _addr, _ext) \ + AMS_CHAN_TEMP(PL_SEQ(_scan_index), _addr, _ext) #define +AMS_PL_CHAN_VOLTAGE(_scan_index, _addr, _ext, _alarm) \ +AMS_CHAN_VOLTAGE (PL_SEQ (_scan_index), _addr, _ext, _alarm)#define
drivers/iio/adc/xilinx-ams.h line 259
Quoted 5 lines
drivers/iio/adc/xilinx-ams.h new file +5
-0+AMS_PL_AUX_CHAN_VOLTAGE(_auxno, _ext) \ +AMS_CHAN_VOLTAGE (PL_SEQ (AMS_VAUX_SEQ (_auxno)), \ + AMS_REG_VAUX(_auxno), _ext, false) #define +AMS_CTRL_CHAN_VOLTAGE (_scan_index, _addr, _ext) \ +AMS_CHAN_VOLTAGE(PL_SEQ(AMS_VAUX_SEQ(AMS_SEQ(_scan_inde
x))), \Quoted 13 lines
drivers/iio/adc/xilinx-ams.h line 270
Quoted 10 lines
drivers/iio/adc/xilinx-ams.h new file +10
-0+ _addr, _ext, false) + +struct ams { +void __iomem *base; +void __iomem *ps_base; +void __iomem *pl_base; +struct clk *clk; +struct device *dev; + +struct mutex mutex;Pleases give clear comments on what these locks are protecting. It's certainly curious to see a mutex and a spinlock with such generic names right next to each other.
Okay. I will update with the comments in v2.
Quoted 9 lines
drivers/iio/adc/xilinx-ams.h line 276
Quoted 7 lines
drivers/iio/adc/xilinx-ams.h new file +6
-0+spinlock_t lock; + +unsigned int alarm_mask; +unsigned int masked_alarm; +u64 intr_mask; +int irq;As noted above, this is only used next to where it is first set. No advantage in having it here.
I will remove this in v2.
Quoted 5 lines
drivers/iio/adc/xilinx-ams.h line 281
Quoted 5 lines
drivers/iio/adc/xilinx-ams.h new file +4
-0+ + struct delayed_work ams_unmask_work; }; + +#endif /* __XILINX_AMS_H__ */ Thanks,
Manish Narani
PATCH 3/3 arm64: zynqmp: DT: Add Xilinx AMS node
In reply to Manish NaraniThe Xilinx AMS includes an ADC as well as on-chip sensors that can be used to sample external and monitor on-die operating conditions, such as temperature and supply voltage levels.
--- arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
arch/arm64/boot/dts/xilinx/zynqmp.dtsi +26 -0
@@ -617,5 +617,31 @@ reg = <0x0 0xfd4d0000 0x0 0x1000>; timeout-sec = <10>; }; + + xilinx_ams: ams at ffa50000 { + compatible = "xlnx,zynqmp-ams"; + status = "disabled"; + interrupt-parent = <&gic>; + interrupts = <0 56 4>; + interrupt-names = "ams-irq"; + reg = <0x0 0xffa50000 0x0 0x800>; + reg-names = "ams-base"; + #address-cells = <2>; + #size-cells = <2>; + #io-channel-cells = <1>; + ranges; + + ams_ps: ams_ps at ffa50800 { + compatible = "xlnx,zynqmp-ams-ps"; + status = "disabled"; + reg = <0x0 0xffa50800 0x0 0x400>; + }; + + ams_pl: ams_pl at ffa50c00 { + compatible = "xlnx,zynqmp-ams-pl"; + status = "disabled"; + reg = <0x0 0xffa50c00 0x0 0x400>; + }; + }; }; };
Signature · 1 line
2.1.1