da9061: DA9061 driver submission
Subsystems (8)
v3 cover da9061: DA9061 driver submission
From: Steve Twiss <[email protected]>
This patch set adds support for the Dialog DA9061 Power Management IC. Support is made by altering the existing DA9062 device driver, where appropriate.
In this patch set the following is provided:
[PATCH V3 1/9] Binding for onkey
[PATCH V3 2/9] Binding for watchdog
[PATCH V3 3/9] Binding for thermal supervisor
[PATCH V3 4/9] Binding for MFD and regulators
[PATCH V3 5/9] MFD core support
[PATCH V3 6/9] BUCKs and LDOs
[PATCH V3 7/9] Watchdog
[PATCH V3 8/9] PMIC temperature monitoring
[PATCH V3 9/9] MAINTAINERS update
Some patches from this previous set have been applied:
[PATCH V2 07/10] Onkey -- https://lkml.org/lkml/2016/10/26/1169
This patch applies against linux-next and v4.8
Thank you,
Steve Twiss, Dialog Semiconductor Ltd.
Steve Twiss (9):
Documentation: devicetree: input: additions for da9061 onkey driver
Documentation: devicetree: watchdog: da9062/61 watchdog timer binding
Documentation: devicetree: thermal: da9062/61 TJUNC temperature
binding
Documentation: devicetree: mfd: da9062/61 MFD binding
mfd: da9061: MFD core support
regulator: da9061: BUCK and LDO regulator driver
watchdog: da9062/61: watchdog driver
thermal: da9062/61: Thermal junction temperature monitoring driver
MAINTAINERS: da9062/61 updates to the Dialog Semiconductor search
terms
.../devicetree/bindings/input/da9062-onkey.txt | 45 ++- Documentation/devicetree/bindings/mfd/da9062.txt | 52 ++- .../devicetree/bindings/thermal/da9062-thermal.txt | 37 ++ .../devicetree/bindings/watchdog/da9062-wdt.txt | 23 ++ MAINTAINERS | 4 + drivers/mfd/Kconfig | 5 +- drivers/mfd/da9062-core.c | 427 ++++++++++++++++++++- drivers/regulator/Kconfig | 4 +- drivers/regulator/da9062-regulator.c | 301 ++++++++++++++- drivers/thermal/Kconfig | 10 + drivers/thermal/Makefile | 1 + drivers/thermal/da9062-thermal.c | 291 ++++++++++++++ drivers/watchdog/Kconfig | 4 +- drivers/watchdog/da9062_wdt.c | 12 +- include/linux/mfd/da9062/core.h | 27 +- include/linux/mfd/da9062/registers.h | 2 + 16 files changed, 1181 insertions(+), 64 deletions(-) create mode 100644 Documentation/devicetree/bindings/thermal/da9062-thermal.txt create mode 100644 Documentation/devicetree/bindings/watchdog/da9062-wdt.txt create mode 100644 drivers/thermal/da9062-thermal.c
Signature · 1 line
end-of-patch for PATCH V3
PATCH v3 1/9 Documentation: devicetree: input: additions for da9061 onkey driver
From: Steve Twiss <[email protected]>
Add binding information for DA9061 onkey.
This patch updates the compatible string "dlg,da9061-onkey" to support DA9061, removes the reference to KEY_SLEEP (which the driver no longer supports) and fixes a typo in the example for DA9063.
Supporting KEY_SLEEP was not the general convention and the typical solution should have been for KEY_POWER to support both cases of suspend and S/W power off. This change was sent to the DA9063 ONKEY device driver in a separate patch, but the documentation was not updated at that time.
- f889bea Report KEY_POWER instead of KEY_SLEEP during power key-press
This patch also adds two new examples, one for DA9062 and one for DA9061. The DA9061 examples uses a fall-back compatible string for the DA9062 onkey driver.
---
This patch applies against linux-next and v4.8
v2 -> v3
- Patch renamed from [PATCH V2 01/10] to [PATCH V3 1/9]
- Each compatible line should be a valid combination of compatible strings, alter DA9061 line to include the fall back compatible string
- Update the commit message to include KEY_SLEEP removal explanation and a link back to the original device driver commit. This will allow full traceability back to the original patch change
- Link in information about associated patches from this set without describing them as being explicitly dependent on this binding
v1 -> v2
- Patch renamed from [PATCH V1 06/10] to [PATCH V2 01/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Typo s/ther/the/ in commit message
- Explanation about why KEY_SLEEP was removed (see below)
- Addition of DA9062 example
- Addition of a DA9061 example to follow the driver fall-back compatible convention being applied for this device driver
Hi,
There is also new binding examples for DA9062 and DA9061. Importantly, the Linux device driver changes for DA9061 were rejected because the DA9062 device driver can be reused. For this reason, the DA9061 example uses a fall-back compatible string.
Other information:
The device driver from this patch set (associated with this binding) was applied by Dmitry Torokhov on 26-Oct-2016. See:
- [PATCH V2 07/10] Input: da9061: onkey driver.
- https://lkml.org/lkml/2016/10/26/1169
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
.../devicetree/bindings/input/da9062-onkey.txt | 45 ++++++++++++++-------- 1 file changed, 30 insertions(+), 15 deletions(-)
Documentation/devicetree/bindings/input/da9062-onkey.txt +30 -15
@@ -1,32 +1,47 @@ -* Dialog DA9062/63 OnKey Module +* Dialog DA9061/62/63 OnKey Module -This module is part of the DA9062/DA9063. For more details about entire -chips see Documentation/devicetree/bindings/mfd/da9062.txt and -Documentation/devicetree/bindings/mfd/da9063.txt +This module is part of the DA9061/DA9062/DA9063. For more details about entire +DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt +For DA9063 see Documentation/devicetree/bindings/mfd/da9063.txt -This module provides KEY_POWER, KEY_SLEEP and events. +This module provides the KEY_POWER event. Required properties: -- compatible: should be one of: - dlg,da9062-onkey - dlg,da9063-onkey +- compatible: should be one of the following valid compatible string lines: + "dlg,da9061-onkey", "dlg,da9062-onkey" + "dlg,da9062-onkey" + "dlg,da9063-onkey" Optional properties: - - dlg,disable-key-power : Disable power-down using a long key-press. If this +- dlg,disable-key-power : Disable power-down using a long key-press. If this entry exists the OnKey driver will remove support for the KEY_POWER key - press. If this entry does not exist then by default the key-press - triggered power down is enabled and the OnKey will support both KEY_POWER - and KEY_SLEEP. + press when triggered using a long press of the OnKey. -Example: - - pmic0: da9062@58 { +Example: DA9063 + pmic0: da9063@58 { onkey { compatible = "dlg,da9063-onkey"; dlg,disable-key-power; }; + }; + +Example: DA9062 + + pmic0: da9062@58 { + onkey { + compatible = "dlg,da9062-onkey"; + dlg,disable-key-power; + }; + }; + +Example: DA9061 using a fall-back compatible for the DA9062 onkey driver + pmic0: da9061@58 { + onkey { + compatible = "dlg,da9061-onkey", "dlg,da9062-onkey"; + dlg,disable-key-power; + }; };
Signature · 1 line
end-of-patch for PATCH V3
Re: [PATCH V3 1/9] Documentation: devicetree: input: additions for da9061 onkey driver
Quoted 15 lines · Steve Twiss
From: Steve Twiss <[email protected]>
Add binding information for DA9061 onkey.
This patch updates the compatible string "dlg,da9061-onkey" to support DA9061, removes the reference to
KEY_SLEEP(which the driver no longer supports) and fixes a typo in the example for DA9063.Supporting
KEY_SLEEPwas not the general convention and the typical solution should have been forKEY_POWERto support both cases of suspend and S/W power off. This change was sent to the DA9063 ONKEY device driver in a separate patch, but the documentation was not updated at that time.
- f889bea ReportKEY_POWERinstead ofKEY_SLEEPduring power key-press
Quoted 5 lines
This patch also adds two new examples, one for DA9062 and one for DA9061. The DA9061 examples uses a fall-back compatible string for the DA9062 onkey driver.
Signed-off-by Steve Twiss <[email protected]>
Applied, thank you.
Quoted 114 lines
---
This patch applies against linux-next and v4.8v2 -> v3
- Patch renamed from [PATCH V2 01/10] to [PATCH V3 1/9]
- Each compatible line should be a valid combination of compatible strings, alter DA9061 line to include the fall back compatible string
- Update the commit message to includeKEY_SLEEPremoval explanation and a link back to the original device driver commit. This will allow full traceability back to the original patch change
- Link in information about associated patches from this set without describing them as being explicitly dependent on this bindingv1 -> v2
- Patch renamed from [PATCH V1 06/10] to [PATCH V2 01/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Typo s/ther/the/ in commit message
- Explanation about whyKEY_SLEEPwas removed (see below)
- Addition of DA9062 example
- Addition of a DA9061 example to follow the driver fall-back compatible convention being applied for this device driverHi,
There is also new binding examples for DA9062 and DA9061. Importantly, the Linux device driver changes for DA9061 were rejected because the DA9062 device driver can be reused. For this reason, the DA9061 example uses a fall-back compatible string.
Other information:
The device driver from this patch set (associated with this binding) was applied by Dmitry Torokhov on 26-Oct-2016. See:
- [PATCH V2 07/10] Input: da9061: onkey driver.
- https://lkml.org/lkml/2016/10/26/1169Regards,
Steve Twiss, Dialog Semiconductor Ltd..../devicetree/bindings/input/da9062-onkey.txt | 45 ++++++++++++++-------- 1 file changed, 30 insertions(+), 15 deletions(-)Documentation/devicetree/bindings/input/da9062-onkey.txt +30
-15@@ -1,32 +1,47 @@ -* Dialog DA9062/63 OnKey Module +* Dialog DA9061/62/63 OnKey Module -This module is part of the DA9062/DA9063. For more details about entire -chips see Documentation/devicetree/bindings/mfd/da9062.txt and -Documentation/devicetree/bindings/mfd/da9063.txt +This module is part of the DA9061/DA9062/DA9063. For more details about entire +DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt +For DA9063 see Documentation/devicetree/bindings/mfd/da9063.txt -This module provides KEY_POWER, KEY_SLEEP and events. +This module provides the KEY_POWER event. Required properties: -- compatible: should be one of: - dlg,da9062-onkey - dlg,da9063-onkey +- compatible: should be one of the following valid compatible string lines: + "dlg,da9061-onkey", "dlg,da9062-onkey" + "dlg,da9062-onkey" + "dlg,da9063-onkey" Optional properties: - - dlg,disable-key-power : Disable power-down using a long key-press. If this +- dlg,disable-key-power : Disable power-down using a long key-press. If this entry exists the OnKey driver will remove support for the KEY_POWER key - press. If this entry does not exist then by default the key-press - triggered power down is enabled and the OnKey will support both KEY_POWER - and KEY_SLEEP. + press when triggered using a long press of the OnKey. -Example: - - pmic0: da9062@58 { +Example: DA9063 + pmic0: da9063@58 { onkey { compatible = "dlg,da9063-onkey"; dlg,disable-key-power; }; + }; + +Example: DA9062 + + pmic0: da9062@58 { + onkey { + compatible = "dlg,da9062-onkey"; + dlg,disable-key-power; + }; + }; + +Example: DA9061 using a fall-back compatible for the DA9062 onkey driver + pmic0: da9061@58 { + onkey { + compatible = "dlg,da9061-onkey", "dlg,da9062-onkey"; + dlg,disable-key-power; + }; };Signature · 1 line
end-of-patch for PATCH V3
Signature · 5 lines
Dmitry -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V3 1/9] Documentation: devicetree: input: additions for da9061 onkey driver
In reply to Steve TwissQuoted 57 lines · Steve Twiss
From: Steve Twiss <[email protected]>
Add binding information for DA9061 onkey.
This patch updates the compatible string "dlg,da9061-onkey" to support DA9061, removes the reference to
KEY_SLEEP(which the driver no longer supports) and fixes a typo in the example for DA9063.Supporting
KEY_SLEEPwas not the general convention and the typical solution should have been forKEY_POWERto support both cases of suspend and S/W power off. This change was sent to the DA9063 ONKEY device driver in a separate patch, but the documentation was not updated at that time.
- f889bea ReportKEY_POWERinstead ofKEY_SLEEPduring power key-pressThis patch also adds two new examples, one for DA9062 and one for DA9061. The DA9061 examples uses a fall-back compatible string for the DA9062 onkey driver.
Signed-off-by Steve Twiss <[email protected]>---
This patch applies against linux-next and v4.8v2 -> v3
- Patch renamed from [PATCH V2 01/10] to [PATCH V3 1/9]
- Each compatible line should be a valid combination of compatible strings, alter DA9061 line to include the fall back compatible string
- Update the commit message to includeKEY_SLEEPremoval explanation and a link back to the original device driver commit. This will allow full traceability back to the original patch change
- Link in information about associated patches from this set without describing them as being explicitly dependent on this bindingv1 -> v2
- Patch renamed from [PATCH V1 06/10] to [PATCH V2 01/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Typo s/ther/the/ in commit message
- Explanation about whyKEY_SLEEPwas removed (see below)
- Addition of DA9062 example
- Addition of a DA9061 example to follow the driver fall-back compatible convention being applied for this device driverHi,
There is also new binding examples for DA9062 and DA9061. Importantly, the Linux device driver changes for DA9061 were rejected because the DA9062 device driver can be reused. For this reason, the DA9061 example uses a fall-back compatible string.
Other information:
The device driver from this patch set (associated with this binding) was applied by Dmitry Torokhov on 26-Oct-2016. See:
- [PATCH V2 07/10] Input: da9061: onkey driver.
- https://lkml.org/lkml/2016/10/26/1169
Quoted 6 lines
Regards,
Steve Twiss, Dialog Semiconductor Ltd..../devicetree/bindings/input/da9062-onkey.txt | 45 ++++++++++++++-------- 1 file changed, 30 insertions(+), 15 deletions(-)
PATCH v3 2/9 Documentation: devicetree: watchdog: da9062/61 watchdog timer binding
In reply to Steve TwissFrom: Steve Twiss <[email protected]>
Add binding information for DA9062 and DA9061 watchdog.
Example bindings for both DA9062 and DA9061 devices are added. For the DA9061 device, a fallback compatible line is added as a valid combination of compatible strings.
The original binding for DA9062 (only) used to reside inside the Documentation/devicetree/bindings/mfd/da9062.txt MFD document. The da9062-watchdog section was deleted in that file and replaced with a link to the new DA9061/62 binding information stored in this patch.
---
This patch applies against linux-next and v4.8
v2 -> v3
- Patch renamed from [PATCH V1 02/10] to [PATCH V3 2/9]
- Each compatible line should be a valid combination of compatible strings, alter DA9061 line to include the fall back compatible string
- Update the commit message to describe this change
- Add information about associated patches from this set without describing them as being explicitly dependent on this binding
v1 -> v2
- Patch renamed from [PATCH V1 07/10] to [PATCH V2 02/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Updated the patch description to be explicit about where parts of this binding had originally been stored
- A second example for DA9061 is provided to highlight the use of a fall-back compatible option for the DA9062 watchdog driver
Hi,
A previous [PATCH V1 07/10] was acked-by: Rob Herring, however changes in the Linux device driver have meant an additional binding information and an example is necessary to describe the use of DA9061.
The Linux device driver changes for DA9061 were rejected after conversations with the watchdog maintainers, specifically about compatibility between DA9061 and DA9062 watchdog hardware components. In the case of the watchdog the DA9062 device driver is compatible with the DA9061 and for this reason there is minimal change required to the DA9062 watchdog device driver and so the example for the DA9061 watchdog shows the use of a fall-back compatible string.
Other information:
The device driver from this patch set (associated with this binding) is
[PATCH V3 7/9] watchdog: da9061: watchdog driver
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
.../devicetree/bindings/watchdog/da9062-wdt.txt | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Documentation/devicetree/bindings/watchdog/da9062-wdt.txt
Documentation/devicetree/bindings/watchdog/da9062-wdt.txt new file +23 -0
@@ -0,0 +1,23 @@ +* Dialog Semiconductor DA9062/61 Watchdog Timer + +Required properties: + +- compatible: should be one of the following valid compatible string lines: + "dlg,da9061-watchdog", "dlg,da9062-watchdog" + "dlg,da9062-watchdog" + +Example: DA9062 + + pmic0: da9062@58 { + watchdog { + compatible = "dlg,da9062-watchdog"; + }; + }; + +Example: DA9061 using a fall-back compatible for the DA9062 watchdog driver + + pmic0: da9061@58 { + watchdog { + compatible = "dlg,da9061-watchdog", "dlg,da9062-watchdog"; + }; + };
Signature · 6 lines
end-of-patch for PATCH V3 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V3 2/9] Documentation: devicetree: watchdog: da9062/61 watchdog timer binding
Quoted 8 lines · Steve Twiss
From: Steve Twiss <[email protected]>
Add binding information for DA9062 and DA9061 watchdog.
Example bindings for both DA9062 and DA9061 devices are added. For the DA9061 device, a fallback compatible line is added as a valid combination of compatible strings.
Quoted 7 lines
The original binding for DA9062 (only) used to reside inside the
Documentation/devicetree/bindings/mfd/da9062.txtMFD document. The da9062-watchdog section was deleted in that file and replaced with a link to the new DA9061/62 binding information stored in this patch.Signed-off-by Steve Twiss <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 3/9 Documentation: devicetree: thermal: da9062/61 TJUNC temperature binding
In reply to Steve TwissFrom: Steve Twiss <[email protected]>
Device tree binding information for DA9062 and DA9061 thermal junction temperature monitor.
Binding descriptions for the DA9061 and DA9062 thermal TJUNC supervisor device driver, using a single THERMAL_TRIP_HOT trip-wire and allowing for a configurable polling period for over-temperature polling.
This patch also adds two examples, one for DA9062 and one for DA9061. The DA9061 example uses a fall-back compatible string for the DA9062.
---
This patch applies against linux-next and v4.8
v2 -> v3
- Patch renamed from [PATCH V2 03/10] to [PATCH V3 3/9]
- Changes suggested from other component reviews by Rob Herring:
- Each compatible line should be a valid combination of compatible
strings: alter DA9061 line to include the fall back compatible string and update the commit message accordingly
- Add e-mail information about associated patches from this set without describing them as being explicitly dependent on this binding
v1 -> v2
- Patch renamed from [PATCH V1 08/10] to [PATCH V2 03/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- A second example for DA9061 is provided to highlight the use of a fall-back compatible option for the DA9062
Hi,
The older [PATCH V1 08/10] was acked-by: Rob Herring, however this has not been added because changes have been made to add a new binding example. This describes the use of DA9061.
This addition was made after alterations to the device driver meant that a fall-back compatible string could reuse the DA9062 device driver.
The device driver from this patch set (associated with this binding) is:
[PATCH V3 8/9] thermal: da9061: TJUNC temperature driver
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
.../devicetree/bindings/thermal/da9062-thermal.txt | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/da9062-thermal.txt
Documentation/devicetree/bindings/thermal/da9062-thermal.txt new file +37 -0
@@ -0,0 +1,37 @@ +* Dialog DA9062/61 TJUNC Thermal Module + +This module is part of the DA9061/DA9062. For more details about entire +DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt + +Junction temperature thermal module uses an interrupt signal to identify +high THERMAL_TRIP_HOT temperatures for the PMIC device. + +Required properties: + +- compatible: should be one of the following valid compatible string lines: + "dlg,da9061-thermal", "dlg,da9062-thermal" + "dlg,da9062-thermal" + +Optional properties: + +- dlg,tjunc-temp-polling-period-ms : Specify the polling period, measured + in milliseconds, between thermal zone device update checks. + +Example: DA9062 + + pmic0: da9062@58 { + thermal { + compatible = "dlg,da9062-thermal"; + dlg,tjunc-temp-polling-period-ms = <3000>; + }; + }; + +Example: DA9061 using a fall-back compatible for the DA9062 onkey driver + + pmic0: da9061@58 { + thermal { + compatible = "dlg,da9061-thermal", "dlg,da9062-thermal"; + dlg,tjunc-temp-polling-period-ms = <3000>; + }; + }; +
Signature · 1 line
end-of-patch for PATCH V3
Re: [PATCH V3 3/9] Documentation: devicetree: thermal: da9062/61 TJUNC temperature binding
Quoted 5 lines · Steve Twiss
From: Steve Twiss <[email protected]>
Device tree binding information for DA9062 and DA9061 thermal junction temperature monitor.
Quoted 8 lines
Binding descriptions for the DA9061 and DA9062 thermal TJUNC supervisor device driver, using a single
THERMAL_TRIP_HOTtrip-wire and allowing for a configurable polling period for over-temperature polling.This patch also adds two examples, one for DA9062 and one for DA9061. The DA9061 example uses a fall-back compatible string for the DA9062.
Signed-off-by Steve Twiss <[email protected]>
PATCH v3 4/9 Documentation: devicetree: mfd: da9062/61 MFD binding
In reply to Steve TwissFrom: Steve Twiss <[email protected]>
Extend existing DA9062 binding information to include the DA9061 PMIC for MFD core and regulators.
Add a da9062-onkey link to the existing onkey binding file.
Add a da9062-thermal link to the new temperature monitoring binding file.
Delete the da9062-watchdog section and replace it with a link to the new DA9061/62 binding information file.
---
This patch applies against linux-next and v4.8
v2 -> v3
- Patch renamed from [PATCH V2 04/10] to [PATCH V3 4/9]
- Ensure binding description concentrates on the device not the device driver
- Separate the DA9061 and DA9062 sub-device tables to distinguish the difference between the two devices
- Update the commit message to describe this change
- Add e-mail information about associated patches from this set without describing them as being explicitly dependent on this binding
v1 -> v2
- Patch renamed from [PATCH V1 09/10] to [PATCH V2 04/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
Hi,
Other information:
The device driver from this patch set (associated with this binding) is
- [PATCH V3 1/9] mfd: da9061: MFD core support
and also the following binding file changes:
- [PATCH V3 1/9] Binding for onkey
- [PATCH V3 2/9] Binding for watchdog
- [PATCH V3 3/9] Binding for thermal
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
Documentation/devicetree/bindings/mfd/da9062.txt | 52 ++++++++++++++++++------ 1 file changed, 40 insertions(+), 12 deletions(-)
Documentation/devicetree/bindings/mfd/da9062.txt +40 -12
@@ -1,22 +1,39 @@ * Dialog DA9062 Power Management Integrated Circuit (PMIC) -DA9062 consists of a large and varied group of sub-devices: +Product information for the DA9062 and DA9061 devices can be found here: +- http://www.dialog-semiconductor.com/products/da9062 +- http://www.dialog-semiconductor.com/products/da9061 + +The DA9062 PMIC consists of: Device Supply Names Description ------ ------------ ----------- da9062-regulator : : LDOs & BUCKs da9062-rtc : : Real-Time Clock +da9062-onkey : : On Key +da9062-watchdog : : Watchdog Timer +da9062-thermal : : Thermal + +The DA9061 PMIC consists of: + +Device Supply Names Description +------ ------------ ----------- +da9062-regulator : : LDOs & BUCKs +da9062-onkey : : On Key da9062-watchdog : : Watchdog Timer +da9062-thermal : : Thermal ====== Required properties: -- compatible : Should be "dlg,da9062". +- compatible : Should be + "dlg,da9062" for DA9062 + "dlg,da9061" for DA9061 - reg : Specifies the I2C slave address (this defaults to 0x58 but it can be modified to match the chip's OTP settings). - interrupt-parent : Specifies the reference to the interrupt controller for - the DA9062. + the DA9062 or DA9061. - interrupts : IRQ line information. - interrupt-controller
@@ -25,8 +42,8 @@ further information on IRQ bindings. Sub-nodes: -- regulators : This node defines the settings for the LDOs and BUCKs. The - DA9062 regulators are bound using their names listed below: +- regulators : This node defines the settings for the LDOs and BUCKs. + The DA9062 regulators are bound using their names listed below: buck1 : BUCK_1 buck2 : BUCK_2
@@ -37,6 +54,16 @@ Sub-nodes: ldo3 : LDO_3 ldo4 : LDO_4 + The DA9061 regulators are bound using their names listed below: + + buck1 : BUCK_1 + buck2 : BUCK_2 + buck3 : BUCK_3 + ldo1 : LDO_1 + ldo2 : LDO_2 + ldo3 : LDO_3 + ldo4 : LDO_4 + The component follows the standard regulator framework and the bindings details of individual regulator device can be found in: Documentation/devicetree/bindings/regulator/regulator.txt
@@ -46,9 +73,14 @@ Sub-nodes: with the DA9062. There are currently no entries in this binding, however compatible = "dlg,da9062-rtc" should be added if a node is created. -- watchdog: This node defines the settings for the watchdog driver associated - with the DA9062 PMIC. The compatible = "dlg,da9062-watchdog" should be added - if a node is created. + +- onkey : See ../input/da9062-onkey.txt + + +- watchdog: See ../watchdog/da9062-watchdog.txt + + +- thermal : See ../thermal/da9062-thermal.txt Example:
@@ -64,10 +96,6 @@ Example: compatible = "dlg,da9062-rtc"; }; - watchdog { - compatible = "dlg,da9062-watchdog"; - }; - regulators { DA9062_BUCK1: buck1 { regulator-name = "BUCK1";
Signature · 6 lines
end-of-patch for PATCH V3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V3 4/9] Documentation: devicetree: mfd: da9062/61 MFD binding
Quoted 133 lines · Steve Twiss
From: Steve Twiss <[email protected]>
Extend existing DA9062 binding information to include the DA9061 PMIC for MFD core and regulators.
Add a da9062-onkey link to the existing onkey binding file.
Add a da9062-thermal link to the new temperature monitoring binding file.
Delete the da9062-watchdog section and replace it with a link to the new DA9061/62 binding information file.
Signed-off-by Steve Twiss <[email protected]>---
This patch applies against linux-next and v4.8v2 -> v3
- Patch renamed from [PATCH V2 04/10] to [PATCH V3 4/9]
- Ensure binding description concentrates on the device not the device driver
- Separate the DA9061 and DA9062 sub-device tables to distinguish the difference between the two devices
- Update the commit message to describe this change
- Add e-mail information about associated patches from this set without describing them as being explicitly dependent on this bindingv1 -> v2
- Patch renamed from [PATCH V1 09/10] to [PATCH V2 04/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency orderHi,
Other information:
The device driver from this patch set (associated with this binding) is- [PATCH V3 1/9] mfd: da9061: MFD core support
and also the following binding file changes:
- [PATCH V3 1/9] Binding for onkey
- [PATCH V3 2/9] Binding for watchdog
- [PATCH V3 3/9] Binding for thermalRegards,
Steve Twiss, Dialog Semiconductor Ltd.Documentation/devicetree/bindings/mfd/da9062.txt | 52 ++++++++++++++++++------ 1 file changed, 40 insertions(+), 12 deletions(-)Documentation/devicetree/bindings/mfd/da9062.txt +32
-6@@ -1,22 +1,39 @@ * Dialog DA9062 Power Management Integrated Circuit (PMIC) -DA9062 consists of a large and varied group of sub-devices: +Product information for the DA9062 and DA9061 devices can be found here: +- http://www.dialog-semiconductor.com/products/da9062 +- http://www.dialog-semiconductor.com/products/da9061 + +The DA9062 PMIC consists of: Device Supply Names Description ------ ------------ ----------- da9062-regulator : : LDOs & BUCKs da9062-rtc : : Real-Time Clock +da9062-onkey : : On Key +da9062-watchdog : : Watchdog Timer +da9062-thermal : : Thermal + +The DA9061 PMIC consists of: + +Device Supply Names Description +------ ------------ ----------- +da9062-regulator : : LDOs & BUCKs +da9062-onkey : : On Key da9062-watchdog : : Watchdog Timer +da9062-thermal : : Thermal ====== Required properties: -- compatible : Should be "dlg,da9062". +- compatible : Should be + "dlg,da9062" for DA9062 + "dlg,da9061" for DA9061 - reg : Specifies the I2C slave address (this defaults to 0x58 but it can be modified to match the chip's OTP settings). - interrupt-parent : Specifies the reference to the interrupt controller for - the DA9062. + the DA9062 or DA9061. - interrupts : IRQ line information. - interrupt-controller@@ -25,8 +42,8 @@ further information on IRQ bindings. Sub-nodes: -- regulators : This node defines the settings for the LDOs and BUCKs. The - DA9062 regulators are bound using their names listed below: +- regulators : This node defines the settings for the LDOs and BUCKs. + The DA9062 regulators are bound using their names listed below: buck1 : BUCK_1 buck2 : BUCK_2@@ -37,6 +54,16 @@ Sub-nodes: ldo3 : LDO_3 ldo4 : LDO_4 + The DA9061 regulators are bound using their names listed below: + + buck1 : BUCK_1 + buck2 : BUCK_2 + buck3 : BUCK_3 + ldo1 : LDO_1 + ldo2 : LDO_2 + ldo3 : LDO_3 + ldo4 : LDO_4 + The component follows the standard regulator framework and the bindings details of individual regulator device can be found in: Documentation/devicetree/bindings/regulator/regulator.txt@@ -46,9 +73,14 @@ Sub-nodes: with the DA9062. There are currently no entries in this binding, however compatible = "dlg,da9062-rtc" should be added if a node is created. -- watchdog: This node defines the settings for the watchdog driver associated
Documentation/devicetree/bindings/mfd/da9062.txt Sub-nodes: · line 83
Quoted 10 lines
Documentation/devicetree/bindings/mfd/da9062.txt +8
-2- with the DA9062 PMIC. The compatible = "dlg,da9062-watchdog" should be added - if a node is created. + +- onkey : See ../input/da9062-onkey.txt + + +- watchdog: See ../watchdog/da9062-watchdog.txt + + +- thermal : See ../thermal/da9062-thermal.txt
Remove all those extra lines in between.
Documentation/devicetree/bindings/mfd/da9062.txt Example: · line 70
Quoted 9 lines
Documentation/devicetree/bindings/mfd/da9062.txt +0
-4Example:@@ -64,10 +96,6 @@ Example: compatible = "dlg,da9062-rtc"; }; - watchdog { - compatible = "dlg,da9062-watchdog"; - }; -
Why don't you include a sub-node per child device and use of_platform_populate() to register the devices?
Quoted 3 lines
Documentation/devicetree/bindings/mfd/da9062.txt +0
-0regulators { DA9062_BUCK1: buck1 { regulator-name = "BUCK1";
Signature · 8 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH V3 4/9] Documentation: devicetree: mfd: da9062/61 MFD binding
T24gMDIgTm92ZW1iZXIgMjAxNiAxNDozMiwgTGVlIEpvbmVzIHdyb3RlOg0KDQo+IE9uIE1vbiwg MzEgT2N0IDIwMTYsIFN0ZXZlIFR3aXNzIHdyb3RlOg0KPiA+IEZyb206IFN0ZXZlIFR3aXNzIDxz dHdpc3Mub3BlbnNvdXJjZUBkaWFzZW1pLmNvbT4NCj4gPg0KPiA+IFsuLi5dDQo+ID4NCj4gPiAr LSBvbmtleSA6IFNlZSAuLi9pbnB1dC9kYTkwNjItb25rZXkudHh0DQo+ID4gKw0KPiA+ICsNCj4g PiArLSB3YXRjaGRvZzogU2VlIC4uL3dhdGNoZG9nL2RhOTA2Mi13YXRjaGRvZy50eHQNCj4gPiAr DQo+ID4gKw0KPiA+ICstIHRoZXJtYWwgOiBTZWUgLi4vdGhlcm1hbC9kYTkwNjItdGhlcm1hbC50 eHQNCj4gDQo+IFJlbW92ZSBhbGwgdGhvc2UgZXh0cmEgbGluZXMgaW4gYmV0d2Vlbi4NCg0KT2su DQoNCj4gPiAgRXhhbXBsZToNCj4gPiBAQCAtNjQsMTAgKzk2LDYgQEAgRXhhbXBsZToNCj4gPiAg CQkJY29tcGF0aWJsZSA9ICJkbGcsZGE5MDYyLXJ0YyI7DQo+ID4gIAkJfTsNCj4gPg0KPiA+IC0J CXdhdGNoZG9nIHsNCj4gPiAtCQkJY29tcGF0aWJsZSA9ICJkbGcsZGE5MDYyLXdhdGNoZG9nIjsN Cj4gPiAtCQl9Ow0KPiA+IC0NCj4gDQo+IFdoeSBkb24ndCB5b3UgaW5jbHVkZSBhIHN1Yi1ub2Rl IHBlciBjaGlsZCBkZXZpY2UgYW5kIHVzZQ0KPiBvZl9wbGF0Zm9ybV9wb3B1bGF0ZSgpIHRvIHJl Z2lzdGVyIHRoZSBkZXZpY2VzPw0KDQpJbiB0aGlzIGNhc2UgSSdtIGp1c3QgbW92aW5nIHRoZSBi aW5kaW5nIGRlc2NyaXB0aW9ucyBpbnRvIGENCmRpZmZlcmVudCBmaWxlLiBJJ20gbm90IHN1cmUg SSB1bmRlcnN0YW5kIHdoYXQgeW91IG1lYW4gaGVyZS4NCldoYXQgZG8geW91IGhhdmUgaW4gbWlu ZD8NCg0KUmVnYXJkcywNClN0ZXZlDQo=
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V3 4/9] Documentation: devicetree: mfd: da9062/61 MFD binding
In reply to Steve TwissQuoted 5 lines · Steve Twiss
From: Steve Twiss <[email protected]>
Extend existing DA9062 binding information to include the DA9061 PMIC for MFD core and regulators.
Quoted 8 lines
Add a da9062-onkey link to the existing onkey binding file.
Add a da9062-thermal link to the new temperature monitoring binding file.
Delete the da9062-watchdog section and replace it with a link to the new DA9061/62 binding information file.
Signed-off-by Steve Twiss <[email protected]>
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v3 5/9 mfd: da9061: MFD core support
In reply to Steve TwissFrom: Steve Twiss <[email protected]>
MFD support for DA9061 is provided as part of the DA9062 device driver.
The registers header file adds two new chip variant IDs defined in DA9061 and DA9062 hardware. The core header file adds new software enumerations for listing the valid DA9061 IRQs and a da9062_compatible_types enumeration for distinguishing between DA9061/62 devices in software.
The core source code adds a new .compatible of_device_id entry. This is extended from DA9062 to support both "dlg,da9061" and "dlg,da9062". The .data entry now holds a reference to the enumerated device type.
A new regmap_irq_chip model is added for DA9061 and this supports the new list of regmap_irq entries. A new mfd_cell da9061_devs[] array lists the new sub system components for DA9061. Support is added for a new DA9061 regmap_config which lists the correct readable, writable and volatile ranges for this chip.
The probe function uses the device tree compatible string to switch on the da9062_compatible_types and configure the correct mfd cells, irq chip and regmap config.
Kconfig is updated to reflect support for DA9061 and DA9062 PMICs.
---
This patch applies against linux-next and v4.8
v2 -> v3
- NO CODE CHANGE
- Patch renamed from [PATCH V2 05/10] to [PATCH V3 5/9]
v1 -> v2
- Patch renamed from [PATCH V1 01/10] to [PATCH V2 05/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Fixed typo in the commit message "readble" to "readable"
- Removed the explicit cross-check to decide if there is a conflict between the device tree compatible string and the hardware definition. This patch assumes the device tree is correctly written and therefore removes the need for a hardware/DT sanity check.
- Removed extra semicolon in drivers/mfd/da9062-core.c:877
- Re-write compatible entries into numerical order
Lee,
This patch adds support for the DA9061 PMIC. This is done as part of the existing DA9062 device driver by extending the of_device_id match table. This in turn allows new MFD cells, irq chip and regmap definitions to support DA9061.
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
drivers/mfd/Kconfig | 5 +- drivers/mfd/da9062-core.c | 427 +++++++++++++++++++++++++++++++++-- include/linux/mfd/da9062/core.h | 27 ++- include/linux/mfd/da9062/registers.h | 2 + 4 files changed, 441 insertions(+), 20 deletions(-)
drivers/mfd/Kconfig +3 -2
@@ -236,13 +236,14 @@ config MFD_DA9055 called "da9055" config MFD_DA9062 - tristate "Dialog Semiconductor DA9062 PMIC Support" + tristate "Dialog Semiconductor DA9062/61 PMIC Support" select MFD_CORE select REGMAP_I2C select REGMAP_IRQ depends on I2C help - Say yes here for support for the Dialog Semiconductor DA9062 PMIC. + Say yes here for support for the Dialog Semiconductor DA9061 and + DA9062 PMICs. This includes the I2C driver and core APIs. Additional drivers must be enabled in order to use the functionality of the device.
drivers/mfd/da9062-core.c +410 -17
524 lines not on this page · raw message
include/linux/mfd/da9062/core.h +26 -1
@@ -18,7 +18,31 @@#include <linux/interrupt.h> #include <linux/mfd/da9062/registers.h> -/* Interrupts */ +enum da9062_compatible_types { +COMPAT_TYPE_DA9061 =1 , +COMPAT_TYPE_DA9062 , +}; + +enum da9061_irqs { +/* IRQ A */ +DA9061_IRQ_ONKEY , +DA9061_IRQ_WDG_WARN , +DA9061_IRQ_SEQ_RDY , +/* IRQ B*/ +DA9061_IRQ_TEMP , +DA9061_IRQ_LDO_LIM , +DA9061_IRQ_DVC_RDY , +DA9061_IRQ_VDD_WARN , +/* IRQ C */ +DA9061_IRQ_GPI0 , +DA9061_IRQ_GPI1 , +DA9061_IRQ_GPI2 , +DA9061_IRQ_GPI3 , +DA9061_IRQ_GPI4 , + +DA9061_NUM_IRQ , +}; +enum da9062_irqs {/* IRQ A */ DA9062_IRQ_ONKEY ,
@@ -45,6 +69,7 @@ struct da9062 {struct device *dev;struct regmap *regmap;struct regmap_irq_chip_data *regmap_irq; + enum da9062_compatible_types chip_type; };#endif /* __MFD_DA9062_CORE_H__ */
include/linux/mfd/da9062/registers.h +2 -0
@@ -18,6 +18,8 @@#define DA9062_PMIC_DEVICE_ID 0x62#define DA9062_PMIC_VARIANT_MRC_AA 0x01 +#define DA9062_PMIC_VARIANT_VRC_DA9061 0x01 +#define DA9062_PMIC_VARIANT_VRC_DA9062 0x02#define DA9062_I2C_PAGE_SEL_SHIFT 1
Signature · 1 line
end-of-patch for PATCH V3
Re: [PATCH V3 5/9] mfd: da9061: MFD core support
Quoted 62 lines · Steve Twiss
From: Steve Twiss <[email protected]>
MFD support for DA9061 is provided as part of the DA9062 device driver.
The registers header file adds two new chip variant IDs defined in DA9061 and DA9062 hardware. The core header file adds new software enumerations for listing the valid DA9061 IRQs and a
da9062_compatible_typesenumeration for distinguishing between DA9061/62 devices in software.The core source code adds a new .compatible
of_device_identry. This is extended from DA9062 to support both "dlg,da9061" and "dlg,da9062". The .data entry now holds a reference to the enumerated device type.A new
regmap_irq_chipmodel is added for DA9061 and this supports the new list ofregmap_irqentries. A newmfd_cellda9061_devs[] array lists the new sub system components for DA9061. Support is added for a new DA9061regmap_configwhich lists the correct readable, writable and volatile ranges for this chip.The probe function uses the device tree compatible string to switch on the
da9062_compatible_typesand configure the correct mfd cells, irq chip and regmap config.
Kconfigis updated to reflect support for DA9061 and DA9062 PMICs.Signed-off-by Steve Twiss <[email protected]>---
This patch applies against linux-next and v4.8v2 -> v3
- NO CODE CHANGE
- Patch renamed from [PATCH V2 05/10] to [PATCH V3 5/9]v1 -> v2
- Patch renamed from [PATCH V1 01/10] to [PATCH V2 05/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Fixed typo in the commit message "readble" to "readable"
- Removed the explicit cross-check to decide if there is a conflict between the device tree compatible string and the hardware definition. This patch assumes the device tree is correctly written and therefore removes the need for a hardware/DT sanity check.
- Removed extra semicolon indrivers/mfd/da9062-core.c:877
- Re-write compatible entries into numerical orderLee,
This patch adds support for the DA9061 PMIC. This is done as part of the existing DA9062 device driver by extending the
of_device_idmatch table. This in turn allows new MFD cells, irq chip and regmap definitions to support DA9061.Regards,
Steve Twiss, Dialog Semiconductor Ltd.drivers/mfd/Kconfig | 5 +- drivers/mfd/da9062-core.c | 427 +++++++++++++++++++++++++++++++++-- include/linux/mfd/da9062/core.h | 27 ++- include/linux/mfd/da9062/registers.h | 2 + 4 files changed, 441 insertions(+), 20 deletions(-)
[...]
Quoted 12 lines
drivers/mfd/da9062-core.c +7
-1@@ -475,7 +855,25 @@ static int da9062_i2c_probe(struct i2c_client *i2c,return -EINVAL ; } - chip->regmap =devm_regmap_init_i2c (i2c, &da9062_regmap_config); +switch (chip->chip_type) { +case (COMPAT_TYPE_DA9061 ): + cell = da9061_devs; + cell_num =ARRAY_SIZE (da9061_devs); + irq_chip = &da9061_irq_chip; + config = &da9061_regmap_config; +break ;
drivers/mfd/da9062-core.c static int da9062_i2c_probe(struct i2c_client *i2c, · line 874
Quoted 10 lines
drivers/mfd/da9062-core.c +10
-0+case (COMPAT_TYPE_DA9062 ): + cell = da9062_devs; + cell_num =ARRAY_SIZE (da9062_devs); + irq_chip = &da9062_irq_chip; + config = &da9062_regmap_config; +break ; +default : +dev_err (chip->dev,"Unrecognised chip type\n" ); +return -ENODEV ; + }
I very much dislike when MFD and OF functionality is mixed.
In your case you can use da9062_get_device_type() to dynamically interrogate the device and register using the correct MFD cells that way.
drivers/mfd/da9062-core.c static int da9062_i2c_probe(struct i2c_client *i2c, · line 894
Quoted 10 lines
drivers/mfd/da9062-core.c +2
-1+ chip->regmap =devm_regmap_init_i2c (i2c, config);if (IS_ERR (chip->regmap)) { ret =PTR_ERR (chip->regmap); dev_err(chip->dev, "Failed to allocate register map: %d\n",@@ -493,7 +891,7 @@ static int da9062_i2c_probe(struct i2c_client *i2c, ret = regmap_add_irq_chip(chip->regmap, i2c->irq, IRQF_TRIGGER_LOW | IRQF_ONESHOT | IRQF_SHARED, - -1, &da9062_irq_chip, + -1, irq_chip,
What is -1?
Quoted 11 lines
drivers/mfd/da9062-core.c +2
-2&chip->regmap_irq);if (ret) { dev_err(chip->dev, "Failed to request IRQ %d: %d\n",@@ -503,8 +901,8 @@ static int da9062_i2c_probe(struct i2c_client *i2c, irq_base =regmap_irq_chip_get_base (chip->regmap_irq); - ret = mfd_add_devices(chip->dev, PLATFORM_DEVID_NONE, da9062_devs, - ARRAY_SIZE(da9062_devs), NULL, irq_base, + ret = mfd_add_devices(chip->dev, PLATFORM_DEVID_NONE, cell, + cell_num, NULL, irq_base,
[...]
Signature · 8 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH V3 5/9] mfd: da9061: MFD core support
Quoted 28 lines · Lee Jones
Quoted 14 lines · Steve Twiss
From: Steve Twiss <[email protected]>
drivers/mfd/da9062-core.c +7
-1@@ -475,7 +855,25 @@ static int da9062_i2c_probe(struct i2c_client *i2c,return -EINVAL ; } - chip->regmap =devm_regmap_init_i2c (i2c, &da9062_regmap_config); +switch (chip->chip_type) { +case (COMPAT_TYPE_DA9061 ): + cell = da9061_devs; + cell_num =ARRAY_SIZE (da9061_devs); + irq_chip = &da9061_irq_chip; + config = &da9061_regmap_config; +break ;drivers/mfd/da9062-core.c static int da9062_i2c_probe(struct i2c_client *i2c, · line 874
Quoted 10 lines
drivers/mfd/da9062-core.c +10
-0+case (COMPAT_TYPE_DA9062 ): + cell = da9062_devs; + cell_num =ARRAY_SIZE (da9062_devs); + irq_chip = &da9062_irq_chip; + config = &da9062_regmap_config; +break ; +default : +dev_err (chip->dev,"Unrecognised chip type\n" ); +return -ENODEV ; + }I very much dislike when MFD and OF functionality is mixed.
Quoted 3 lines
In your case you can use
da9062_get_device_type()to dynamically interrogate the device and register using the correct MFD cells that way.
Hi Lee,
It's the device tree that decides what the chip type is. It's not chip interrogation in this case. The ordering dictates this I think: to access the hardware ID register, a regmap definition is needed first. But because the correct I2C register map requires a knowledge of what chip is being used, it becomes a circular dependency.
To solve this dependency, I define the chip type (DA9061 or DA9062) in the device tree and assign the correct regmap first before accessing any registers.
Quoted 6 lines
Quoted 6 lines
drivers/mfd/da9062-core.c +1
-0+ chip->regmap =devm_regmap_init_i2c (i2c, config);if (IS_ERR (chip->regmap)) { ret =PTR_ERR (chip->regmap); dev_err(chip->dev, "Failed to allocate register map: %d\n",@@ -493,7 +891,7 @@ static int da9062_i2c_probe(struct i2c_client *i2c,
Quoted 6 lines
drivers/mfd/da9062-core.c static int da9062_i2c_probe(struct i2c_client *i2c, · line 894
Quoted 4 lines
drivers/mfd/da9062-core.c +1
-1ret = regmap_add_irq_chip(chip->regmap, i2c->irq, IRQF_TRIGGER_LOW | IRQF_ONESHOT |IRQF_SHARED, - -1, &da9062_irq_chip, + -1, irq_chip,What is -1?
.. it's a request for an irq_base.
http://lxr.free-electrons.com/source/kernel/irq/irqdesc.c#L477
Is there a reason I shouldn't be doing that?
There doesn't seem to be a #define anywhere, and using -1 seems to be the standard in the kernel at the moment.
Regards,
Steve
PATCH v3 6/9 regulator: da9061: BUCK and LDO regulator driver
In reply to Steve TwissFrom: Steve Twiss <[email protected]>
Regulator support for the DA9061 is added into the DA9062 regulator driver.
The regulators for DA9061 differ from those of DA9062.
A new DA9061 enumeration list for the LDOs and Bucks supported by this device is added. Regulator information added: the old regulator information for DA9062 is renamed from local_regulator_info[] to local_da9062_regulator_info[] and a new array is added to support local_da9061_regulator_info[].
The probe() function switches on the da9062_compatible_types enumeration and configures the correct da9062_regulator_info array and number of regulator entries.
Kconfig is updated to reflect support for DA9061 and DA9062 regulators.
---
This patch applies against linux-next and v4.8
v2 -> v3
- NO CODE CHANGE
- Patch renamed from [PATCH V2 06/10] to [PATCH V3 6/9]
- Added Ack from Mark Brown
v1 -> v2
- Patch renamed from [PATCH V1 02/10] to [PATCH V2 06/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Updated header to use DA9061 and DA9062
Mark,
These changes depend on a header file provided as part of an earlier patch [PATCH V3 5/9] from this set. The regulator probe() switches on the chip_type which uses enum da9062_compatible_types in core.h from this patch.
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
drivers/regulator/Kconfig | 4 +- drivers/regulator/da9062-regulator.c | 301 +++++++++++++++++++++++++++++++++-- 2 files changed, 292 insertions(+), 13 deletions(-)
drivers/regulator/Kconfig +2 -2
@@ -188,11 +188,11 @@ config REGULATOR_DA9055 will be called da9055-regulator. config REGULATOR_DA9062 - tristate "Dialog Semiconductor DA9062 regulators" + tristate "Dialog Semiconductor DA9061/62 regulators" depends on MFD_DA9062 help Say y here to support the BUCKs and LDOs regulators found on - DA9062 PMICs. + DA9061 and DA9062 PMICs. This driver can also be built as a module. If so, the module will be called da9062-regulator.
drivers/regulator/da9062-regulator.c +290 -11
354 lines not on this page · raw message
Signature · 1 line
end-of-patch for PATCH V3
PATCH v3 7/9 watchdog: da9062/61: watchdog driver
In reply to Steve TwissFrom: Steve Twiss <[email protected]>
The of_device_id match array is added to support "dlg,da9062-watchdog" as a valid .compatible string. A MODULE_DEVICE_TABLE() macro is added.
This patch assumes the use of a DA9062 fallback compatible string for the DTS to pick up the DA9062 device driver for use with the DA9061 watchdog hardware
Copyright header is updated to add DA9061 in its description and the module description macro is extended to include DA9061.
Kconfig is updated to reflect support for DA9061/62.
---
This patch applies against linux-next and v4.8
v2 -> v3
- Patch renamed from [PATCH V2 08/10] to [PATCH V3 7/9]
- Removal of match->data and of_match_node search. There is only one compatible string now. and delete the .data = &da9062_watchdog_info association in the struct of_device_id compatible table.
- Addition of MODULE_DEVICE_TABLE macro to allow modinfo additions:
da9062_wdt.ko platform:da9062_watchdog
of:N*T*Cdlg,da9062_watchdogC*
of:N*T*Cdlg,da9062_watchdogv1 -> v2
- Patch renamed from [PATCH V1 04/10] to [PATCH V2 08/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Removal of the DA9061 compatible entries for this device driver.
- Additional explanation in the patch description for the use of a fall-back compatible DTS string
Guenter,
Alterations have been made in accordance with the previous e-mail thread on the use of compatible strings: https://lkml.org/lkml/2016/10/7/641
This patch now assumes the use of a fallback compatible string in the DTS. Of the form: compatible = "dlg,da9061-watchdog", "dlg,da9062-watchdog";
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
drivers/watchdog/Kconfig | 4 ++-- drivers/watchdog/da9062_wdt.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-)
drivers/watchdog/Kconfig +2 -2
@@ -104,11 +104,11 @@ config DA9063_WATCHDOG This driver can be built as a module. The module name is da9063_wdt. config DA9062_WATCHDOG - tristate "Dialog DA9062 Watchdog" + tristate "Dialog DA9062/61 Watchdog" depends on MFD_DA9062 select WATCHDOG_CORE help - Support for the watchdog in the DA9062 PMIC. + Support for the watchdog in the DA9062 and DA9061 PMICs. This driver can be built as a module. The module name is da9062_wdt.
drivers/watchdog/da9062_wdt.c +10 -2
@@ -1,5 +1,5 @@/* -* da9062_wdt.c - WDT device driver for DA9062 +* Watchdog device driver for DA9062 and DA9061 PMICs * Copyright (C) 2015 Dialog Semiconductor Ltd. * * This program is free software; you can redistribute it and/or
@@ -188,6 +188,13 @@ static const struct watchdog_ops da9062_watchdog_ops = { .set_timeout = da9062_wdt_set_timeout, }; +static const struct of_device_id da9062_compatible_id_table[] = { + { .compatible ="dlg,da9062-watchdog" , }, + { }, +}; + +MODULE_DEVICE_TABLE (of, da9062_compatible_id_table); +static int da9062_wdt_probe (struct platform_device *pdev) {int ret;
@@ -244,11 +251,12 @@ static struct platform_driver da9062_wdt_driver = { .remove = da9062_wdt_remove, .driver = { .name = "da9062-watchdog", + .of_match_table = da9062_compatible_id_table, }, };module_platform_driver (da9062_wdt_driver);MODULE_AUTHOR ("S Twiss <[email protected]>" ); -MODULE_DESCRIPTION ("WDT device driver for Dialog DA9062" ); +MODULE_DESCRIPTION ("WDT device driver for Dialog DA9062 and DA9061" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:da9062-watchdog" );
Signature · 6 lines
end-of-patch for PATCH V3 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH V3 7/9] watchdog: da9062/61: watchdog driver
Quoted 9 lines · Steve Twiss
From: Steve Twiss <[email protected]>
The
of_device_idmatch array is added to support "dlg,da9062-watchdog" as a valid .compatible string. AMODULE_DEVICE_TABLE()macro is added.This patch assumes the use of a DA9062 fallback compatible string for the DTS to pick up the DA9062 device driver for use with the DA9061 watchdog hardware
Quoted 6 lines
Copyright header is updated to add DA9061 in its description and the module description macro is extended to include DA9061.
Kconfigis updated to reflect support for DA9061/62.Signed-off-by Steve Twiss <[email protected]>
Quoted 95 lines
---
This patch applies against linux-next and v4.8v2 -> v3
- Patch renamed from [PATCH V2 08/10] to [PATCH V3 7/9]
- Removal ofmatch->dataandof_match_nodesearch. There is only one compatible string now. and delete the .data =&da9062_watchdog_infoassociation in the structof_device_idcompatible table.
- Addition ofMODULE_DEVICE_TABLEmacro to allow modinfo additions:da9062_wdt.ko platform:da9062_watchdog of:N*T*Cdlg,da9062_watchdogC* of:N*T*Cdlg,da9062_watchdogv1 -> v2
- Patch renamed from [PATCH V1 04/10] to [PATCH V2 08/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- Removal of the DA9061 compatible entries for this device driver.
- Additional explanation in the patch description for the use of a fall-back compatible DTS stringGuenter,
Alterations have been made in accordance with the previous e-mail thread on the use of compatible strings: https://lkml.org/lkml/2016/10/7/641
This patch now assumes the use of a fallback compatible string in the DTS. Of the form: compatible = "dlg,da9061-watchdog", "dlg,da9062-watchdog";Regards,
Steve Twiss, Dialog Semiconductor Ltd.drivers/watchdog/Kconfig | 4 ++-- drivers/watchdog/da9062_wdt.c | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-)drivers/watchdog/Kconfig +2
-2@@ -104,11 +104,11 @@ config DA9063_WATCHDOG This driver can be built as a module. The module name is da9063_wdt. config DA9062_WATCHDOG - tristate "Dialog DA9062 Watchdog" + tristate "Dialog DA9062/61 Watchdog" depends on MFD_DA9062 select WATCHDOG_CORE help - Support for the watchdog in the DA9062 PMIC. + Support for the watchdog in the DA9062 and DA9061 PMICs. This driver can be built as a module. The module name is da9062_wdt.drivers/watchdog/da9062_wdt.c +10
-2@@ -1,5 +1,5 @@/* -* da9062_wdt.c - WDT device driver for DA9062 +* Watchdog device driver for DA9062 and DA9061 PMICs * Copyright (C) 2015 Dialog Semiconductor Ltd. * * This program is free software; you can redistribute it and/or @@ -188,6 +188,13 @@ static const struct watchdog_ops da9062_watchdog_ops = { .set_timeout = da9062_wdt_set_timeout, }; +static const struct of_device_id da9062_compatible_id_table[] = { + { .compatible ="dlg,da9062-watchdog" , }, + { }, +}; + +MODULE_DEVICE_TABLE (of, da9062_compatible_id_table); +static int da9062_wdt_probe (struct platform_device *pdev) {int ret;@@ -244,11 +251,12 @@ static struct platform_driver da9062_wdt_driver = { .remove = da9062_wdt_remove, .driver = { .name = "da9062-watchdog", + .of_match_table = da9062_compatible_id_table, }, };module_platform_driver (da9062_wdt_driver);MODULE_AUTHOR ("S Twiss <[email protected]>" ); -MODULE_DESCRIPTION ("WDT device driver for Dialog DA9062" ); +MODULE_DESCRIPTION ("WDT device driver for Dialog DA9062 and DA9061" );MODULE_LICENSE ("GPL" );MODULE_ALIAS ("platform:da9062-watchdog" );
PATCH v3 8/9 thermal: da9062/61: Thermal junction temperature monitoring driver
In reply to Steve TwissFrom: Steve Twiss <[email protected]>
Add junction temperature monitoring supervisor device driver, compatible with the DA9062 and DA9061 PMICs. A MODULE_DEVICE_TABLE() macro is added.
If the PMIC's internal junction temperature rises above TEMP_WARN (125 degC) an interrupt is issued. This TEMP_WARN level is defined as the THERMAL_TRIP_HOT trip-wire inside the device driver.
The thermal triggering mechanism is interrupt based and happens when the temperature rises above a given threshold level. The component cannot return an exact temperature, it only has knowledge if the temperature is above or below a given threshold value. A status bit must be polled to detect when the temperature falls below that threshold level again. A kernel work queue is configured to repeatedly poll and detect when the temperature falls below this trip-wire, between 1 and 10 second intervals (defaulting at 3 seconds).
This first level of temperature supervision is intended for non-invasive temperature control, where the necessary measures for cooling the system down are left to the host software.
---
This patch applies against linux-next and v4.8
v2 -> v3
- Patch renamed from [PATCH V2 09/10] to [PATCH V3 8/9]
- Addition of MODULE_DEVICE_TABLE macro to allow modinfo additions
v1 -> v2
- Patch renamed from [PATCH V1 05/10] to [PATCH V2 09/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- List the header files in alphabetical order
- Remove "GPL v2" and replace with MODULE_LICENSE("GPL") to match the copyright "GNU Public License v2 or later" option in the header comment for this file. See the allowed identifiers in the file include/linux/module.h +170
- Remove notify function "da9062_thermal_notify" function.
- MODULE_AUTHOR() macros removes Company Name and just gives Name in accordance with include/linux/module.h +200
- Remove the compatible "dlg,da9061-thermal" option in the of_device_id struct table. This patch now assumes the use of a DA9062 fallback compatible string in the DTS when using the DA9061 thermal component of the DA9061 device.
- Re-ordered some assignments earlier in the probe() for thermal->hw, thermal->polling_period, thermal->mode, thermal->dev
- Added further information in the patch description to explain the use of the device driver's built-in work-queue.
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
drivers/thermal/Kconfig | 10 ++ drivers/thermal/Makefile | 1 + drivers/thermal/da9062-thermal.c | 291 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 302 insertions(+) create mode 100644 drivers/thermal/da9062-thermal.c
drivers/thermal/Kconfig +10 -0
@@ -272,6 +272,16 @@ config DB8500_CPUFREQ_COOLING bound cpufreq cooling device turns active to set CPU frequency low to cool down the CPU. +config DA9062_THERMAL + tristate "DA9062/DA9061 Dialog Semiconductor thermal driver" + depends on MFD_DA9062 + depends on OF + help + Enable this for the Dialog Semiconductor thermal sensor driver. + This will report PMIC junction over-temperature for one thermal trip + zone. + Compatible with the DA9062 and DA9061 PMICs. + config INTEL_POWERCLAMP tristate "Intel PowerClamp idle injection driver" depends on THERMAL
drivers/thermal/Makefile +1 -0
@@ -38,6 +38,7 @@ obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_TANGO_THERMAL) += tango_thermal.o obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o +obj-$(CONFIG_DA9062_THERMAL) += da9062-thermal.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o obj-$(CONFIG_INTEL_SOC_DTS_IOSF_CORE) += intel_soc_dts_iosf.o
drivers/thermal/da9062-thermal.c new file +291 -0
291 lines not on this page · raw message
Signature · 1 line
end-of-patch for PATCH V3
Lukasz Luba
reviewerRe: [PATCH V3 8/9] thermal: da9062/61: Thermal junction temperature monitoring driver
Hi Steve,
Please find my comments below.
Apart from these 2 comments, 10sec is not to long
(waiting for the temperature change)?
Quoted 298 lines · Steve Twiss
From: Steve Twiss <[email protected]>
Add junction temperature monitoring supervisor device driver, compatible with the DA9062 and DA9061 PMICs. A
MODULE_DEVICE_TABLE()macro is added.If the PMIC's internal junction temperature rises above
TEMP_WARN(125 degC) an interrupt is issued. ThisTEMP_WARNlevel is defined as theTHERMAL_TRIP_HOTtrip-wire inside the device driver.The thermal triggering mechanism is interrupt based and happens when the temperature rises above a given threshold level. The component cannot return an exact temperature, it only has knowledge if the temperature is above or below a given threshold value. A status bit must be polled to detect when the temperature falls below that threshold level again. A kernel work queue is configured to repeatedly poll and detect when the temperature falls below this trip-wire, between 1 and 10 second intervals (defaulting at 3 seconds).
This first level of temperature supervision is intended for non-invasive temperature control, where the necessary measures for cooling the system down are left to the host software.
Signed-off-by Steve Twiss <[email protected]>---
This patch applies against linux-next and v4.8v2 -> v3
- Patch renamed from [PATCH V2 09/10] to [PATCH V3 8/9]
- Addition ofMODULE_DEVICE_TABLEmacro to allow modinfo additionsv1 -> v2
- Patch renamed from [PATCH V1 05/10] to [PATCH V2 09/10] -- these changes were made to fix checkpatch warnings caused by the patch set dependency order
- List the header files in alphabetical order
- Remove "GPL v2" and replace withMODULE_LICENSE("GPL")to match the copyright "GNU Public License v2 or later" option in the header comment for this file. See the allowed identifiers in the fileinclude/linux/module.h+170
- Remove notify function "da9062_thermal_notify" function.
-MODULE_AUTHOR()macros removes Company Name and just gives Name in accordance withinclude/linux/module.h+200
- Remove the compatible "dlg,da9061-thermal" option in theof_device_idstruct table. This patch now assumes the use of a DA9062 fallback compatible string in the DTS when using the DA9061 thermal component of the DA9061 device.
- Re-ordered some assignments earlier in theprobe()forthermal->hw,thermal->polling_period,thermal->mode,thermal->dev
- Added further information in the patch description to explain the use of the device driver's built-in work-queue.Regards,
Steve Twiss, Dialog Semiconductor Ltd.drivers/thermal/Kconfig | 10 ++ drivers/thermal/Makefile | 1 + drivers/thermal/da9062-thermal.c | 291 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 302 insertions(+) create mode 100644 drivers/thermal/da9062-thermal.cdrivers/thermal/Kconfig +10
-0@@ -272,6 +272,16 @@ config DB8500_CPUFREQ_COOLING bound cpufreq cooling device turns active to set CPU frequency low to cool down the CPU. +config DA9062_THERMAL + tristate "DA9062/DA9061 Dialog Semiconductor thermal driver" + depends on MFD_DA9062 + depends on OF + help + Enable this for the Dialog Semiconductor thermal sensor driver. + This will report PMIC junction over-temperature for one thermal trip + zone. + Compatible with the DA9062 and DA9061 PMICs. + config INTEL_POWERCLAMP tristate "Intel PowerClamp idle injection driver" depends on THERMALdrivers/thermal/Makefile +1
-0@@ -38,6 +38,7 @@ obj-$(CONFIG_ARMADA_THERMAL) += armada_thermal.o obj-$(CONFIG_TANGO_THERMAL) += tango_thermal.o obj-$(CONFIG_IMX_THERMAL) += imx_thermal.o obj-$(CONFIG_DB8500_CPUFREQ_COOLING) += db8500_cpufreq_cooling.o +obj-$(CONFIG_DA9062_THERMAL) += da9062-thermal.o obj-$(CONFIG_INTEL_POWERCLAMP) += intel_powerclamp.o obj-$(CONFIG_X86_PKG_TEMP_THERMAL) += x86_pkg_temp_thermal.o obj-$(CONFIG_INTEL_SOC_DTS_IOSF_CORE) += intel_soc_dts_iosf.odrivers/thermal/da9062-thermal.c new file +197
-0@@ -0,0 +1,291 @@ +/* +* Thermal device driver for DA9062 and DA9061 +* Copyright (C) 2016 Dialog Semiconductor Ltd. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +*/ + +#include <linux/errno.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/thermal.h> +#include <linux/workqueue.h> + +#include <linux/mfd/da9062/core.h> +#include <linux/mfd/da9062/registers.h> + +#define DA9062_DEFAULT_POLLING_MS_PERIOD 3000 +#define DA9062_MAX_POLLING_MS_PERIOD 10000 +#define DA9062_MIN_POLLING_MS_PERIOD 1000 + +#define DA9062_MILLI_CELSIUS (t) ((t)*1000) + +struct da9062_thermal_config { +const char *name; +}; + +struct da9062_thermal { +struct da9062 *hw; +struct delayed_work work; +struct thermal_zone_device *zone; +enum thermal_device_mode mode; +unsigned int polling_period; +struct mutex lock; +int temperature; +int irq; +const struct da9062_thermal_config *config; +struct device *dev; +}; + +static void da9062_thermal_poll_on (struct work_struct *work) +{ +struct da9062_thermal *thermal =container_of (work, + struct da9062_thermal, + work.work); +unsigned int val; +int ret; + +/* clear E_TEMP */ + ret =regmap_write (thermal->hw->regmap, +DA9062AA_EVENT_B , +DA9062AA_E_TEMP_MASK ); +if (ret <0 ) { +dev_err (thermal->dev, +"Cannot clear the TJUNC temperature status\n" ); + goto err_enable_irq; + } + +/* Now read E_TEMP again: it is acting like a status bit. +* If over-temperature, then this status will be true. +* If not over-temperature, this status will be false. +*/ + ret =regmap_read (thermal->hw->regmap, +DA9062AA_EVENT_B , + &val); +if (ret <0 ) { +dev_err (thermal->dev, +"Cannot check the TJUNC temperature status\n" ); + goto err_enable_irq; + }else { +if (val &DA9062AA_E_TEMP_MASK ) { +mutex_lock (&thermal->lock); + thermal->temperature =DA9062_MILLI_CELSIUS (125 ); +mutex_unlock (&thermal->lock); +thermal_zone_device_update (thermal->zone); + +schedule_delayed_work (&thermal->work, +msecs_to_jiffies (thermal->polling_period)); +return ; + }else { +mutex_lock (&thermal->lock); + thermal->temperature =DA9062_MILLI_CELSIUS (0 ); +mutex_unlock (&thermal->lock); +thermal_zone_device_update (thermal->zone); + } + } + +err_enable_irq: +enable_irq (thermal->irq); +} + +static irqreturn_t da9062_thermal_irq_handler (int irq,void *data) +{ +struct da9062_thermal *thermal = data; + +disable_irq_nosync (thermal->irq); +schedule_delayed_work (&thermal->work,0 ); + +return IRQ_HANDLED ; +} + +static int da9062_thermal_get_mode (struct thermal_zone_device *z, +enum thermal_device_mode *mode) +{ +struct da9062_thermal *thermal = z->devdata; + *mode = thermal->mode; +return 0 ; +} + +static int da9062_thermal_get_trip_type (struct thermal_zone_device *z, +int trip, +enum thermal_trip_type *type) +{ +struct da9062_thermal *thermal = z->devdata; + +switch (trip) { +case 0 : + *type =THERMAL_TRIP_HOT ; +break ; +default : +dev_err (thermal->dev, +"Driver does not support more than 1 trip-wire\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int da9062_thermal_get_trip_temp (struct thermal_zone_device *z, +int trip, +int *temp) +{ +struct da9062_thermal *thermal = z->devdata; + +switch (trip) { +case 0 : + *temp =DA9062_MILLI_CELSIUS (125 ); +break ; +default : +dev_err (thermal->dev, +"Driver does not support more than 1 trip-wire\n" ); +return -EINVAL ; + } + +return 0 ; +} + +static int da9062_thermal_get_temp (struct thermal_zone_device *z, +int *temp) +{ +struct da9062_thermal *thermal = z->devdata; + +mutex_lock (&thermal->lock); + *temp = thermal->temperature; +mutex_unlock (&thermal->lock); + +return 0 ; +} + +static struct thermal_zone_device_ops da9062_thermal_ops = { + .get_temp = da9062_thermal_get_temp, + .get_mode = da9062_thermal_get_mode, + .get_trip_type = da9062_thermal_get_trip_type, + .get_trip_temp = da9062_thermal_get_trip_temp, +}; + +static const struct da9062_thermal_config da9062_config = { + .name ="da9062-thermal" , +}; + +static const struct of_device_id da9062_compatible_reg_id_table[] = { + { .compatible ="dlg,da9062-thermal" , .data = &da9062_config }, + { }, +}; + +MODULE_DEVICE_TABLE (of, da9062_compatible_reg_id_table); + +static int da9062_thermal_probe (struct platform_device *pdev) +{ +struct da9062 *chip =dev_get_drvdata (pdev->dev.parent); +struct da9062_thermal *thermal; +unsigned int pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ; +const struct of_device_id *match; +int ret =0 ; + + match =of_match_node (da9062_compatible_reg_id_table, + pdev->dev.of_node);
drivers/thermal/da9062-thermal.c line 207
Quoted 10 lines
drivers/thermal/da9062-thermal.c new file +10
-0+if (!match) +return -ENXIO ; + +if (pdev->dev.of_node) { +if (!of_property_read_u32 (pdev->dev.of_node, +"dlg,tjunc-temp-polling-period-ms" , + &pp_tmp)) { +if (pp_tmp <DA9062_MIN_POLLING_MS_PERIOD || + pp_tmp >DA9062_MAX_POLLING_MS_PERIOD ) + pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ;
Maybe it's worth to add some print here just to mention about the DT value out of range. When you saw a dmesg with this print on some bug report, you would know about wrong DT entry (even if debug was not set).
Quoted 56 lines
drivers/thermal/da9062-thermal.c new file +56
-0+ } + +dev_dbg (&pdev->dev, +"TJUNC temp polling period set at %d ms\n" , + pp_tmp); + } + + thermal =devm_kzalloc (&pdev->dev,sizeof (struct da9062_thermal ), +GFP_KERNEL ); +if (!thermal) { + ret = -ENOMEM ; + goto err; + } + + thermal->config = match->data; + thermal->hw = chip; + thermal->polling_period = pp_tmp; + thermal->mode =THERMAL_DEVICE_ENABLED ; + thermal->dev = &pdev->dev; + +INIT_DELAYED_WORK (&thermal->work, da9062_thermal_poll_on); +mutex_init (&thermal->lock); + + thermal->zone =thermal_zone_device_register (thermal->config->name, +1 ,0 , thermal, + &da9062_thermal_ops,NULL ,0 , +0 ); +if (IS_ERR (thermal->zone)) { +dev_err (&pdev->dev,"Cannot register thermal zone device\n" ); + ret =PTR_ERR (thermal->zone); + goto err; + } + + ret =platform_get_irq_byname (pdev,"THERMAL" ); +if (ret <0 ) { +dev_err (&pdev->dev,"Failed to get platform IRQ.\n" ); + goto err_zone; + } + thermal->irq = ret; + + ret =request_threaded_irq (thermal->irq,NULL , + da9062_thermal_irq_handler, +IRQF_TRIGGER_LOW |IRQF_ONESHOT , +"THERMAL" , thermal); +if (ret) { +dev_err (&pdev->dev, +"Failed to request thermal device IRQ.\n" ); + goto err_zone; + } + +platform_set_drvdata (pdev, thermal); +return 0 ; + +err_zone: +thermal_zone_device_unregister (thermal->zone); +err:
drivers/thermal/da9062-thermal.c line 273
Quoted 10 lines
drivers/thermal/da9062-thermal.c new file +10
-0+return ret; +} + +static int da9062_thermal_remove (struct platform_device *pdev) +{ +struct da9062_thermal *thermal =platform_get_drvdata (pdev); + +free_irq (thermal->irq, thermal); +thermal_zone_device_unregister (thermal->zone); +cancel_delayed_work_sync (&thermal->work);
You should change the order for these two functions and cancel the work before unregistering thermal zone device.
Quoted 9 lines
drivers/thermal/da9062-thermal.c new file +8
-0+return 0 ; +} + +static struct platform_driver da9062_thermal_driver = { + .probe = da9062_thermal_probe, + .remove = da9062_thermal_remove, + .driver = { + .name ="da9062-thermal" ,
drivers/thermal/da9062-thermal.c line 291
Quoted 10 lines
drivers/thermal/da9062-thermal.c new file +10
-0+ .of_match_table = da9062_compatible_reg_id_table, + }, +}; + +module_platform_driver (da9062_thermal_driver); + +MODULE_AUTHOR ("Steve Twiss" ); +MODULE_DESCRIPTION ("Thermal TJUNC device driver for Dialog DA9062 and DA9061" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:da9062-thermal" );
Regards,
Lukasz Luba
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH V3 8/9] thermal: da9062/61: Thermal junction temperature monitoring driver
On 02 November 2016 13:29, Lukasz Luba wrote:
[...]
Quoted 2 lines
Apart from these 2 comments, 10sec is not to long
(waiting for the temperature change)?
Hi Lukasz,
Are you saying the maximum polling time is too long or too short if it is fixed in the driver at 10 seconds?
Certainly 10 seconds can be seen as either too long or too short a time when waiting for the temperature to fall-back below a threshold. But, this maximum polling time will be application dependent I think.
However, this is a repeated polling event notifying of a warning over-temperature condition, so, it is already known that the temperature is above the threshold and action should already be in progress to reduce the temperature.
#define DA9062_DEFAULT_POLLING_MS_PERIOD 3000
#define DA9062_MAX_POLLING_MS_PERIOD 10000
#define DA9062_MIN_POLLING_MS_PERIOD 1000
The TEMP_WARN first level temperature supervision is intended for non-invasive temperature controlling measures for cooling the system and are left to the host software. This first level temperature TEMP_WARN (125 degC) is only +15degC off the next TEMP_CRIT (140 degC) temperature threshold. And this TEMP_CRIT is where the hardware will automatically shutdown.
I suppose it all depends on how fast the temperature is expected to rise and fall.
In any case, this 10 second polling maximum value was provided as part of guidance from a specific solution with this hardware. It would be expected that any final implementation will also include a notify() function and any of these settings could be altered to match the application where appropriate.
I've added a comment above these defined variables for the next code patch.
Quoted 20 lines · Steve Twiss
Quoted 19 lines
From: Steve Twiss <[email protected]>
drivers/thermal/da9062-thermal.c new file +17
-0+static int da9062_thermal_probe (struct platform_device *pdev) +{ +struct da9062 *chip =dev_get_drvdata (pdev->dev.parent); +struct da9062_thermal *thermal; +unsigned int pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ; +const struct of_device_id *match; +int ret =0 ; + + match =of_match_node (da9062_compatible_reg_id_table, + pdev->dev.of_node); +if (!match) +return -ENXIO ; + +if (pdev->dev.of_node) { +if (!of_property_read_u32 (pdev->dev.of_node, +"dlg,tjunc-temp-polling-period-ms" , + &pp_tmp)) {
Quoted 8 lines
drivers/thermal/da9062-thermal.c line 207
Quoted 3 lines
drivers/thermal/da9062-thermal.c new file +3
-0+if (pp_tmp <DA9062_MIN_POLLING_MS_PERIOD || + pp_tmp >DA9062_MAX_POLLING_MS_PERIOD ) + pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ;Maybe it's worth to add some print here just to mention about the DT value out of range. When you saw a dmesg with this print on some bug report, you would know about wrong DT entry (even if debug was not set).
I can add a dev_warn() here explaining the invalid configuration.
[...]
Quoted 10 lines
drivers/thermal/da9062-thermal.c line 273
Quoted 7 lines
drivers/thermal/da9062-thermal.c new file +7
-0+static int da9062_thermal_remove (struct platform_device *pdev) +{ +struct da9062_thermal *thermal =platform_get_drvdata (pdev); + +free_irq (thermal->irq, thermal); +thermal_zone_device_unregister (thermal->zone); +cancel_delayed_work_sync (&thermal->work);You should change the order for these two functions and cancel the work before unregistering thermal zone device.
ok
Regards,
Steve
Lukasz Luba
reviewerRe: [PATCH V3 8/9] thermal: da9062/61: Thermal junction temperature monitoring driver
Hi Steve,
Quoted 10 lines · Steve Twiss
On 02 November 2016 13:29, Lukasz Luba wrote:
[...]Quoted 2 lines
Apart from these 2 comments, 10sec is not to long
(waiting for the temperature change)?Hi Lukasz,
Are you saying the maximum polling time is too long or too short if it is fixed in the driver at 10 seconds?
In my opinion 10s is too long.
Quoted 9 lines
Certainly 10 seconds can be seen as either too long or too short a time when waiting for the temperature to fall-back below a threshold. But, this maximum polling time will be application dependent I think.
However, this is a repeated polling event notifying of a warning over-temperature condition, so, it is already known that the temperature is above the threshold and action should already be in progress to reduce the temperature.
In this case we have precise start time when we should e.g. throttle the CPU, because this interrupt will be fired by the hardware just after the real temperature change. We do not have precise end time for the throttling process, though. The function .get_temp may return stale data which was read out some time ago
(< 3s or max 10s).
The hole system performance may suffer for too long (because the temperature could drop to i.e. 100degC).
On the other hand, when we consider that this is just a binary flag reacting on 125degC threshold then maybe there is a point of cooling down the PMIC for longer time.
You are right it is application and system specific (i.e. how many other temperature sensors is registered in the system and what decisions we can make based on them i.e. in IPA).
Quoted 15 lines
#define
DA9062_DEFAULT_POLLING_MS_PERIOD3000
#defineDA9062_MAX_POLLING_MS_PERIOD10000
#defineDA9062_MIN_POLLING_MS_PERIOD1000The
TEMP_WARNfirst level temperature supervision is intended for non-invasive temperature controlling measures for cooling the system and are left to the host software. This first level temperatureTEMP_WARN(125 degC) is only +15degC off the nextTEMP_CRIT(140 degC) temperature threshold. And thisTEMP_CRITis where the hardware will automatically shutdown.I suppose it all depends on how fast the temperature is expected to rise and fall.
Quoted 8 lines
In any case, this 10 second polling maximum value was provided as part of guidance from a specific solution with this hardware. It would be expected that any final implementation will also include a
notify()function and any of these settings could be altered to match the application where appropriate.I've added a comment above these defined variables for the next code patch.
Fair enough. You can mention about the throttling side effect so that engineers working on bring-up will be aware of this particular knob during the experiments.
Best Regards,
Lukasz
Quoted 50 lines
Quoted 21 lines · Steve Twiss
Quoted 19 lines
From: Steve Twiss <[email protected]>
drivers/thermal/da9062-thermal.c new file +17
-0+static int da9062_thermal_probe (struct platform_device *pdev) +{ +struct da9062 *chip =dev_get_drvdata (pdev->dev.parent); +struct da9062_thermal *thermal; +unsigned int pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ; +const struct of_device_id *match; +int ret =0 ; + + match =of_match_node (da9062_compatible_reg_id_table, + pdev->dev.of_node); +if (!match) +return -ENXIO ; + +if (pdev->dev.of_node) { +if (!of_property_read_u32 (pdev->dev.of_node, +"dlg,tjunc-temp-polling-period-ms" , + &pp_tmp)) {Quoted 8 lines
drivers/thermal/da9062-thermal.c line 207
Quoted 3 lines
drivers/thermal/da9062-thermal.c new file +3
-0+if (pp_tmp <DA9062_MIN_POLLING_MS_PERIOD || + pp_tmp >DA9062_MAX_POLLING_MS_PERIOD ) + pp_tmp =DA9062_DEFAULT_POLLING_MS_PERIOD ;Maybe it's worth to add some print here just to mention about the DT value out of range. When you saw a dmesg with this print on some bug report, you would know about wrong DT entry (even if debug was not set).
I can add a
dev_warn()here explaining the invalid configuration.[...]
Quoted 10 lines
drivers/thermal/da9062-thermal.c line 273
Quoted 7 lines
drivers/thermal/da9062-thermal.c new file +7
-0+static int da9062_thermal_remove (struct platform_device *pdev) +{ +struct da9062_thermal *thermal =platform_get_drvdata (pdev); + +free_irq (thermal->irq, thermal); +thermal_zone_device_unregister (thermal->zone); +cancel_delayed_work_sync (&thermal->work);You should change the order for these two functions and cancel the work before unregistering thermal zone device.
ok
Regards,
Steve
PATCH v3 9/9 MAINTAINERS: da9062/61 updates to the Dialog Semiconductor search terms
In reply to Steve TwissFrom: Steve Twiss <[email protected]>
Hi,
Dialog Semiconductor support would like to add to the MAINTAINERS search terms. This update will allow us to follow files for device tree bindings and source code relating to input onkey drivers, chip thermal monitoring and watchdog timers.
---
This patch applies against linux-next and v4.8
v2 -> v3
- NO CHANGE
- Patch renamed from [PATCH V2 10/10] to [PATCH V3 9/9]
v1 -> v2
- NO CHANGE
Hi,
This patch depends on acceptance of the following from this patch set:
- [PATCH V3 8/9] PMIC temperature monitoring
and also from the following binding file changes:
- [PATCH V3 1/9] Binding for onkey
- [PATCH V3 2/9] Binding for watchdog
- [PATCH V3 3/9] Binding for thermal
Regards,
Steve Twiss, Dialog Semiconductor Ltd.
MAINTAINERS | 4 ++++ 1 file changed, 4 insertions(+)
MAINTAINERS +4 -0
@@ -3752,7 +3752,10 @@ W: http://www.dialog-semiconductor.com/products S: Supported F: Documentation/hwmon/da90?? F: Documentation/devicetree/bindings/mfd/da90*.txt +F: Documentation/devicetree/bindings/input/da90??-onkey.txt +F: Documentation/devicetree/bindings/thermal/da90??-thermal.txt F: Documentation/devicetree/bindings/regulator/da92*.txt +F: Documentation/devicetree/bindings/watchdog/da92??-wdt.txt F: Documentation/devicetree/bindings/sound/da[79]*.txt F: drivers/gpio/gpio-da90??.c F: drivers/hwmon/da90??-hwmon.c
@@ -3767,6 +3770,7 @@ F: drivers/power/da9052-battery.c F: drivers/power/da91??-*.c F: drivers/regulator/da903x.c F: drivers/regulator/da9???-regulator.[ch] +F: drivers/thermal/da90??-thermal.c F: drivers/rtc/rtc-da90??.c F: drivers/video/backlight/da90??_bl.c F: drivers/watchdog/da90??_wdt.c
Signature · 1 line
end-of-patch for PATCH V3