Add missing DT bindings for STM32 and a resource leak fix for DaVinci
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEOZGx6rniZ1Gk92RdFA3kzBSgKbYFAmM5dQwACgkQFA3kzBSg KbZaLw/+KM4ITFAzE9JqCp51Mf/KIKI9LpnGie5yOB6aXogx8DHS9tpUAjS8AWql u8GDlyV0P2lek16pyJF0f/7bdMur5qKthLg8VY/cUDcejs+6BIkDasffH1UpMzM4 ZnDq5FpuRlHjrFA8vAqTFJfd8kClRNgt8J6DvXx+n3jvM4zZdq/FuzIjbuTuDGMF yCaKBQoKAi0dlKz6lT25hrEsrgVgD7QXwwWKsAERV1GTfBVGY/MGXGBotTxuRRbw Dlc0Bb/SUlFJg6dXvY5Khh2obo4B676nx07M1Hh5iL3aYfcdeoKMsHDM0fAayWiL xdQvTsUxVrn7dSqPL1uWMfOohacmOhbi90llO/2isG2mu/+jW4rctk9ovYORgb8Q auK4xqHBI+XLin3+R3UFIO5csMZ7POKYUPljChEvKIUsMv0RdS8od+TCRFll8NFl OeJtlHZwt5HFwj7Jl7JZfHMXNFLWz0KM+QbggWOX6H2MpDWx19C1h3WhExae6Jfg omeQHE5EtIdzDK20vZcnEF3Clvz035PnHlD48TPQM+4cmw7Axq2R0HBklW0O18O+ S6KTFbUVvxo6qIHr/rexirosPWc98cpSILxjesH9y+syuZPOiqMGuxtpEqqmxBWI gEYQy3sStnMCkJMHm2sojasMX7ce2UCExZpybY1Im0j3z+ipU7U= =k3of -----END PGP SIGNATURE----- Merge tag 'i2c-for-6.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux Pull i2c fixes from Wolfram Sang: "Add missing DT bindings for STM32 and a resource leak fix for DaVinci" * tag 'i2c-for-6.0-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: i2c: davinci: fix PM disable depth imbalance in davinci_i2c_probe dt-bindings: i2c: st,stm32-i2c: Document wakeup-source property dt-bindings: i2c: st,stm32-i2c: Document interrupt-names property
This commit is contained in:
commit
a962b54e16
@ -57,6 +57,11 @@ properties:
|
||||
- description: interrupt ID for I2C event
|
||||
- description: interrupt ID for I2C error
|
||||
|
||||
interrupt-names:
|
||||
items:
|
||||
- const: event
|
||||
- const: error
|
||||
|
||||
resets:
|
||||
maxItems: 1
|
||||
|
||||
@ -92,6 +97,8 @@ properties:
|
||||
- description: register offset within syscfg
|
||||
- description: register bitmask for FMP bit
|
||||
|
||||
wakeup-source: true
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
|
@ -823,7 +823,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
|
||||
r = pm_runtime_resume_and_get(dev->dev);
|
||||
if (r < 0) {
|
||||
dev_err(dev->dev, "failed to runtime_get device: %d\n", r);
|
||||
return r;
|
||||
goto err_pm;
|
||||
}
|
||||
|
||||
i2c_davinci_init(dev);
|
||||
@ -882,6 +882,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
|
||||
err_unuse_clocks:
|
||||
pm_runtime_dont_use_autosuspend(dev->dev);
|
||||
pm_runtime_put_sync(dev->dev);
|
||||
err_pm:
|
||||
pm_runtime_disable(dev->dev);
|
||||
|
||||
return r;
|
||||
|
Loading…
x
Reference in New Issue
Block a user