Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux...

diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
index 6bdcd055e76397bef6c3ec0b7a90a01c5611d16e,73a49d50c4ef7bbad8d484507acd9d38b467dca8..7d07b08b145980ae4f891da8aa53c6d3ea062195
--- 1/Documentation/devicetree/bindings/trivial-devices.yaml
--- 2/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@@ -147,10 -147,10 +147,12 @@@ properties
            - injoinic,ip5207
              # Injoinic IP5209 2.4A Power Bank IC with I2C
            - injoinic,ip5209
+             # Injoinic IP5306 2.1A Power Bank IC with I2C option
+           - injoinic,ip5306
              # Inspur Power System power supply unit version 1
            - inspur,ipsps1
 +            # Intel common redudant power supply crps185
 +          - intel,crps185
              # Intersil ISL29028 Ambient Light and Proximity Sensor
            - isil,isl29028
              # Intersil ISL29030 Ambient Light and Proximity Sensor

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/power/supply/bq24190_charger.c
Simple merge