Merge branches 'ib-mfd-cros-watchdog-6.9' and 'ib-mfd-input-thermal-6.9' into ibs-for-mfd-merged

-47

Documentation/devicetree/bindings/input/da9062-onkey.txt

··· 1 - * Dialog DA9061/62/63 OnKey Module 2 - 3 - This module is part of the DA9061/DA9062/DA9063. For more details about entire 4 - DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt 5 - For DA9063 see Documentation/devicetree/bindings/mfd/dlg,da9063.yaml 6 - 7 - This module provides the KEY_POWER event. 8 - 9 - Required properties: 10 - 11 - - compatible: should be one of the following valid compatible string lines: 12 - "dlg,da9061-onkey", "dlg,da9062-onkey" 13 - "dlg,da9062-onkey" 14 - "dlg,da9063-onkey" 15 - 16 - Optional properties: 17 - 18 - - dlg,disable-key-power : Disable power-down using a long key-press. If this 19 - entry exists the OnKey driver will remove support for the KEY_POWER key 20 - press when triggered using a long press of the OnKey. 21 - 22 - Example: DA9063 23 - 24 - pmic0: da9063@58 { 25 - onkey { 26 - compatible = "dlg,da9063-onkey"; 27 - dlg,disable-key-power; 28 - }; 29 - }; 30 - 31 - Example: DA9062 32 - 33 - pmic0: da9062@58 { 34 - onkey { 35 - compatible = "dlg,da9062-onkey"; 36 - dlg,disable-key-power; 37 - }; 38 - }; 39 - 40 - Example: DA9061 using a fall-back compatible for the DA9062 onkey driver 41 - 42 - pmic0: da9061@58 { 43 - onkey { 44 - compatible = "dlg,da9061-onkey", "dlg,da9062-onkey"; 45 - dlg,disable-key-power; 46 - }; 47 - };

+38

Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml

··· 1 + # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/input/dlg,da9062-onkey.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Dialog DA9061/62/63 OnKey Module 8 + 9 + maintainers: 10 + - Biju Das <biju.das.jz@bp.renesas.com> 11 + 12 + description: | 13 + This module is part of the DA9061/DA9062/DA9063. For more details about entire 14 + DA906{1,2,3} chips see Documentation/devicetree/bindings/mfd/dlg,da9063.yaml 15 + 16 + This module provides the KEY_POWER event. 17 + 18 + properties: 19 + compatible: 20 + oneOf: 21 + - enum: 22 + - dlg,da9062-onkey 23 + - dlg,da9063-onkey 24 + - items: 25 + - const: dlg,da9061-onkey 26 + - const: dlg,da9062-onkey 27 + 28 + dlg,disable-key-power: 29 + type: boolean 30 + description: 31 + Disable power-down using a long key-press. If this entry exists 32 + the OnKey driver will remove support for the KEY_POWER key press 33 + when triggered using a long press of the OnKey. 34 + 35 + required: 36 + - compatible 37 + 38 + additionalProperties: false

-124

Documentation/devicetree/bindings/mfd/da9062.txt

··· 1 - * Dialog DA9062 Power Management Integrated Circuit (PMIC) 2 - 3 - Product information for the DA9062 and DA9061 devices can be found here: 4 - - https://www.dialog-semiconductor.com/products/da9062 5 - - https://www.dialog-semiconductor.com/products/da9061 6 - 7 - The DA9062 PMIC consists of: 8 - 9 - Device Supply Names Description 10 - ------ ------------ ----------- 11 - da9062-regulator : : LDOs & BUCKs 12 - da9062-rtc : : Real-Time Clock 13 - da9062-onkey : : On Key 14 - da9062-watchdog : : Watchdog Timer 15 - da9062-thermal : : Thermal 16 - da9062-gpio : : GPIOs 17 - 18 - The DA9061 PMIC consists of: 19 - 20 - Device Supply Names Description 21 - ------ ------------ ----------- 22 - da9062-regulator : : LDOs & BUCKs 23 - da9062-onkey : : On Key 24 - da9062-watchdog : : Watchdog Timer 25 - da9062-thermal : : Thermal 26 - 27 - ====== 28 - 29 - Required properties: 30 - 31 - - compatible : Should be 32 - "dlg,da9062" for DA9062 33 - "dlg,da9061" for DA9061 34 - - reg : Specifies the I2C slave address (this defaults to 0x58 but it can be 35 - modified to match the chip's OTP settings). 36 - 37 - Optional properties: 38 - 39 - - gpio-controller : Marks the device as a gpio controller. 40 - - #gpio-cells : Should be two. The first cell is the pin number and the 41 - second cell is used to specify the gpio polarity. 42 - 43 - See Documentation/devicetree/bindings/gpio/gpio.txt for further information on 44 - GPIO bindings. 45 - 46 - - interrupts : IRQ line information. 47 - - interrupt-controller 48 - 49 - See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for 50 - further information on IRQ bindings. 51 - 52 - Sub-nodes: 53 - 54 - - regulators : This node defines the settings for the LDOs and BUCKs. 55 - The DA9062 regulators are bound using their names listed below: 56 - 57 - buck1 : BUCK_1 58 - buck2 : BUCK_2 59 - buck3 : BUCK_3 60 - buck4 : BUCK_4 61 - ldo1 : LDO_1 62 - ldo2 : LDO_2 63 - ldo3 : LDO_3 64 - ldo4 : LDO_4 65 - 66 - The DA9061 regulators are bound using their names listed below: 67 - 68 - buck1 : BUCK_1 69 - buck2 : BUCK_2 70 - buck3 : BUCK_3 71 - ldo1 : LDO_1 72 - ldo2 : LDO_2 73 - ldo3 : LDO_3 74 - ldo4 : LDO_4 75 - 76 - The component follows the standard regulator framework and the bindings 77 - details of individual regulator device can be found in: 78 - Documentation/devicetree/bindings/regulator/regulator.txt 79 - 80 - regulator-initial-mode may be specified for buck regulators using mode values 81 - from include/dt-bindings/regulator/dlg,da9063-regulator.h. 82 - 83 - - rtc : This node defines settings required for the Real-Time Clock associated 84 - with the DA9062. There are currently no entries in this binding, however 85 - compatible = "dlg,da9062-rtc" should be added if a node is created. 86 - 87 - - onkey : See ../input/da9062-onkey.txt 88 - 89 - - watchdog: See ../watchdog/da9062-wdt.txt 90 - 91 - - thermal : See ../thermal/da9062-thermal.txt 92 - 93 - Example: 94 - 95 - pmic0: da9062@58 { 96 - compatible = "dlg,da9062"; 97 - reg = <0x58>; 98 - interrupt-parent = <&gpio6>; 99 - interrupts = <11 IRQ_TYPE_LEVEL_LOW>; 100 - interrupt-controller; 101 - 102 - rtc { 103 - compatible = "dlg,da9062-rtc"; 104 - }; 105 - 106 - regulators { 107 - DA9062_BUCK1: buck1 { 108 - regulator-name = "BUCK1"; 109 - regulator-min-microvolt = <300000>; 110 - regulator-max-microvolt = <1570000>; 111 - regulator-min-microamp = <500000>; 112 - regulator-max-microamp = <2000000>; 113 - regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; 114 - regulator-boot-on; 115 - }; 116 - DA9062_LDO1: ldo1 { 117 - regulator-name = "LDO_1"; 118 - regulator-min-microvolt = <900000>; 119 - regulator-max-microvolt = <3600000>; 120 - regulator-boot-on; 121 - }; 122 - }; 123 - }; 124 -

+215 -35

Documentation/devicetree/bindings/mfd/dlg,da9063.yaml

··· 4 4 $id: http://devicetree.org/schemas/mfd/dlg,da9063.yaml# 5 5 $schema: http://devicetree.org/meta-schemas/core.yaml# 6 6 7 - title: Dialog DA9063/DA9063L Power Management Integrated Circuit (PMIC) 7 + title: Dialog DA906{3L,3,2,1} Power Management Integrated Circuit (PMIC) 8 8 9 9 maintainers: 10 10 - Steve Twiss <stwiss.opensource@diasemi.com> ··· 17 17 moment where all voltage monitors are disabled. Next, as da9063 only supports 18 18 UV *and* OV monitoring, both must be set to the same severity and value 19 19 (0: disable, 1: enable). 20 + Product information for the DA906{3L,3,2,1} devices can be found here: 21 + - https://www.dialog-semiconductor.com/products/da9063l 22 + - https://www.dialog-semiconductor.com/products/da9063 23 + - https://www.dialog-semiconductor.com/products/da9062 24 + - https://www.dialog-semiconductor.com/products/da9061 20 25 21 26 properties: 22 27 compatible: 23 28 enum: 29 + - dlg,da9061 30 + - dlg,da9062 24 31 - dlg,da9063 25 32 - dlg,da9063l 26 33 ··· 42 35 "#interrupt-cells": 43 36 const: 2 44 37 45 - dlg,use-sw-pm: 46 - type: boolean 47 - description: 48 - Disable the watchdog during suspend. 49 - Only use this option if you can't use the watchdog automatic suspend 50 - function during a suspend (see register CONTROL_B). 38 + gpio-controller: true 51 39 52 - watchdog: 40 + "#gpio-cells": 41 + const: 2 42 + 43 + gpio: 53 44 type: object 54 - $ref: /schemas/watchdog/watchdog.yaml# 55 - unevaluatedProperties: false 45 + additionalProperties: false 56 46 properties: 57 47 compatible: 58 - const: dlg,da9063-watchdog 48 + const: dlg,da9062-gpio 49 + 50 + onkey: 51 + $ref: /schemas/input/dlg,da9062-onkey.yaml 52 + 53 + regulators: 54 + type: object 55 + additionalProperties: false 56 + patternProperties: 57 + "^(ldo([1-9]|1[01])|bcore([1-2]|s-merged)|b(pro|mem|io|peri)|bmem-bio-merged|buck[1-4])$": 58 + $ref: /schemas/regulator/regulator.yaml 59 + unevaluatedProperties: false 59 60 60 61 rtc: 61 62 type: object ··· 71 56 unevaluatedProperties: false 72 57 properties: 73 58 compatible: 74 - const: dlg,da9063-rtc 59 + enum: 60 + - dlg,da9062-rtc 61 + - dlg,da9063-rtc 75 62 76 - onkey: 63 + thermal: 64 + $ref: /schemas/thermal/dlg,da9062-thermal.yaml 65 + 66 + watchdog: 67 + $ref: /schemas/watchdog/dlg,da9062-watchdog.yaml 68 + 69 + patternProperties: 70 + "^(.+-hog(-[0-9]+)?)$": 77 71 type: object 78 - $ref: /schemas/input/input.yaml# 79 - unevaluatedProperties: false 80 - properties: 81 - compatible: 82 - const: dlg,da9063-onkey 83 72 84 - dlg,disable-key-power: 85 - type: boolean 86 - description: | 87 - Disable power-down using a long key-press. 88 - If this entry does not exist then by default the key-press triggered 89 - power down is enabled and the OnKey will support both KEY_POWER and 90 - KEY_SLEEP. 91 - 92 - regulators: 93 - type: object 94 - additionalProperties: false 95 - patternProperties: 96 - "^(ldo([1-9]|1[01])|bcore([1-2]|s-merged)|b(pro|mem|io|peri)|bmem-bio-merged)$": 97 - $ref: /schemas/regulator/regulator.yaml 98 - unevaluatedProperties: false 73 + required: 74 + - gpio-hog 99 75 100 76 required: 101 77 - compatible 102 78 - reg 103 - - interrupts 104 - - interrupt-controller 79 + 80 + allOf: 81 + - if: 82 + properties: 83 + compatible: 84 + contains: 85 + enum: 86 + - dlg,da9063 87 + - dlg,da9063l 88 + then: 89 + properties: 90 + gpio-controller: false 91 + "#gpio-cells": false 92 + gpio: false 93 + regulators: 94 + patternProperties: 95 + "^buck[1-4]$": false 96 + thermal: false 97 + required: 98 + - interrupts 99 + - interrupt-controller 100 + 101 + - if: 102 + properties: 103 + compatible: 104 + contains: 105 + enum: 106 + - dlg,da9062 107 + then: 108 + properties: 109 + regulators: 110 + patternProperties: 111 + "^(ldo([5-9]|10|11)|bcore([1-2]|s-merged)|b(pro|mem|io|peri)|bmem-bio-merged)$": false 112 + required: 113 + - gpio 114 + - onkey 115 + - rtc 116 + - thermal 117 + - watchdog 118 + 119 + - if: 120 + properties: 121 + compatible: 122 + contains: 123 + enum: 124 + - dlg,da9061 125 + then: 126 + properties: 127 + gpio-controller: false 128 + "#gpio-cells": false 129 + gpio: false 130 + regulators: 131 + patternProperties: 132 + "^(ldo([5-9]|10|11)|bcore([1-2]|s-merged)|b(pro|mem|io|peri)|bmem-bio-merged|buck4)$": false 133 + rtc: false 134 + required: 135 + - onkey 136 + - thermal 137 + - watchdog 105 138 106 139 additionalProperties: false 107 140 ··· 203 140 regulator-ov-protection-microvolt = <1>; 204 141 regulator-always-on; 205 142 }; 143 + }; 144 + }; 145 + }; 146 + 147 + - | 148 + #include <dt-bindings/interrupt-controller/irq.h> 149 + #include <dt-bindings/regulator/dlg,da9063-regulator.h> 150 + i2c { 151 + #address-cells = <1>; 152 + #size-cells = <0>; 153 + pmic@58 { 154 + compatible = "dlg,da9062"; 155 + reg = <0x58>; 156 + gpio-controller; 157 + #gpio-cells = <2>; 158 + 159 + sd0-pwr-sel-hog { 160 + gpio-hog; 161 + gpios = <1 0>; 162 + input; 163 + line-name = "SD0_PWR_SEL"; 164 + }; 165 + 166 + sd1-pwr-sel-hog { 167 + gpio-hog; 168 + gpios = <2 0>; 169 + input; 170 + line-name = "SD1_PWR_SEL"; 171 + }; 172 + 173 + sw-et0-en-hog { 174 + gpio-hog; 175 + gpios = <3 0>; 176 + input; 177 + line-name = "SW_ET0_EN#"; 178 + }; 179 + 180 + pmic-good-hog { 181 + gpio-hog; 182 + gpios = <4 0>; 183 + output-high; 184 + line-name = "PMIC_PGOOD"; 185 + }; 186 + 187 + gpio { 188 + compatible = "dlg,da9062-gpio"; 189 + }; 190 + 191 + onkey { 192 + compatible = "dlg,da9062-onkey"; 193 + }; 194 + 195 + regulators { 196 + buck1 { 197 + regulator-name = "vdd_arm"; 198 + regulator-min-microvolt = <925000>; 199 + regulator-max-microvolt = <1380000>; 200 + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; 201 + regulator-always-on; 202 + }; 203 + buck2 { 204 + regulator-name = "vdd_soc"; 205 + regulator-min-microvolt = <1150000>; 206 + regulator-max-microvolt = <1380000>; 207 + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; 208 + regulator-always-on; 209 + }; 210 + buck3 { 211 + regulator-name = "vdd_ddr3"; 212 + regulator-min-microvolt = <1500000>; 213 + regulator-max-microvolt = <1500000>; 214 + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; 215 + regulator-always-on; 216 + }; 217 + buck4 { 218 + regulator-name = "vdd_eth"; 219 + regulator-min-microvolt = <1200000>; 220 + regulator-max-microvolt = <1200000>; 221 + regulator-initial-mode = <DA9063_BUCK_MODE_SYNC>; 222 + regulator-always-on; 223 + }; 224 + ldo1 { 225 + regulator-name = "vdd_snvs"; 226 + regulator-min-microvolt = <3000000>; 227 + regulator-max-microvolt = <3000000>; 228 + regulator-always-on; 229 + }; 230 + ldo2 { 231 + regulator-name = "vdd_high"; 232 + regulator-min-microvolt = <3000000>; 233 + regulator-max-microvolt = <3000000>; 234 + regulator-always-on; 235 + }; 236 + ldo3 { 237 + regulator-name = "vdd_eth_io"; 238 + regulator-min-microvolt = <2500000>; 239 + regulator-max-microvolt = <2500000>; 240 + }; 241 + ldo4 { 242 + regulator-name = "vdd_emmc"; 243 + regulator-min-microvolt = <1800000>; 244 + regulator-max-microvolt = <1800000>; 245 + regulator-always-on; 246 + }; 247 + }; 248 + 249 + rtc { 250 + compatible = "dlg,da9062-rtc"; 251 + }; 252 + 253 + thermal { 254 + compatible = "dlg,da9062-thermal"; 255 + }; 256 + 257 + watchdog { 258 + compatible = "dlg,da9062-watchdog"; 259 + dlg,use-sw-pm; 206 260 }; 207 261 }; 208 262 };

-36

Documentation/devicetree/bindings/thermal/da9062-thermal.txt

··· 1 - * Dialog DA9062/61 TJUNC Thermal Module 2 - 3 - This module is part of the DA9061/DA9062. For more details about entire 4 - DA9062 and DA9061 chips see Documentation/devicetree/bindings/mfd/da9062.txt 5 - 6 - Junction temperature thermal module uses an interrupt signal to identify 7 - high THERMAL_TRIP_HOT temperatures for the PMIC device. 8 - 9 - Required properties: 10 - 11 - - compatible: should be one of the following valid compatible string lines: 12 - "dlg,da9061-thermal", "dlg,da9062-thermal" 13 - "dlg,da9062-thermal" 14 - 15 - Optional properties: 16 - 17 - - polling-delay-passive : Specify the polling period, measured in 18 - milliseconds, between thermal zone device update checks. 19 - 20 - Example: DA9062 21 - 22 - pmic0: da9062@58 { 23 - thermal { 24 - compatible = "dlg,da9062-thermal"; 25 - polling-delay-passive = <3000>; 26 - }; 27 - }; 28 - 29 - Example: DA9061 using a fall-back compatible for the DA9062 onkey driver 30 - 31 - pmic0: da9061@58 { 32 - thermal { 33 - compatible = "dlg,da9061-thermal", "dlg,da9062-thermal"; 34 - polling-delay-passive = <3000>; 35 - }; 36 - };

+35

Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml

··· 1 + # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) 2 + %YAML 1.2 3 + --- 4 + $id: http://devicetree.org/schemas/thermal/dlg,da9062-thermal.yaml# 5 + $schema: http://devicetree.org/meta-schemas/core.yaml# 6 + 7 + title: Dialog DA9062/61 TJUNC Thermal Module 8 + 9 + maintainers: 10 + - Biju Das <biju.das.jz@bp.renesas.com> 11 + 12 + description: | 13 + This module is part of the DA9061/DA9062. For more details about entire 14 + DA906{1,2} chips see Documentation/devicetree/bindings/mfd/dlg,da9063.yaml 15 + 16 + Junction temperature thermal module uses an interrupt signal to identify 17 + high THERMAL_TRIP_HOT temperatures for the PMIC device. 18 + 19 + properties: 20 + compatible: 21 + oneOf: 22 + - const: dlg,da9062-thermal 23 + - items: 24 + - const: dlg,da9061-thermal 25 + - const: dlg,da9062-thermal 26 + 27 + polling-delay-passive: 28 + description: 29 + Specify the polling period, measured in milliseconds, between 30 + thermal zone device update checks. 31 + 32 + required: 33 + - compatible 34 + 35 + additionalProperties: false

+3 -3

MAINTAINERS

··· 6152 6152 M: Support Opensource <support.opensource@diasemi.com> 6153 6153 S: Supported 6154 6154 W: http://www.dialog-semiconductor.com/products 6155 - F: Documentation/devicetree/bindings/input/da90??-onkey.txt 6156 6155 F: Documentation/devicetree/bindings/input/dlg,da72??.txt 6156 + F: Documentation/devicetree/bindings/input/dlg,da9062-onkey.yaml 6157 6157 F: Documentation/devicetree/bindings/mfd/da90*.txt 6158 6158 F: Documentation/devicetree/bindings/mfd/dlg,da90*.yaml 6159 6159 F: Documentation/devicetree/bindings/regulator/da92*.txt 6160 6160 F: Documentation/devicetree/bindings/regulator/dlg,da9*.yaml 6161 6161 F: Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml 6162 6162 F: Documentation/devicetree/bindings/sound/da[79]*.txt 6163 - F: Documentation/devicetree/bindings/thermal/da90??-thermal.txt 6164 - F: Documentation/devicetree/bindings/watchdog/dlg,da90??-watchdog.yaml 6163 + F: Documentation/devicetree/bindings/thermal/dlg,da9062-thermal.yaml 6164 + F: Documentation/devicetree/bindings/watchdog/dlg,da9062-watchdog.yaml 6165 6165 F: Documentation/hwmon/da90??.rst 6166 6166 F: drivers/gpio/gpio-da90??.c 6167 6167 F: drivers/hwmon/da90??-hwmon.c

Configure Feed

Configure Feed