lkml.org 
[lkml]   [2020]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 102/151] MIPS: DTS: CI20: fix PMU definitions for ACT8600
    Date
    From: H. Nikolaus Schaller <hns@goldelico.com>

    commit e8d87a0b822d4b3d9a94a5da915f93aa1b674c93 upstream.

    There is a ACT8600 on the CI20 board and the bindings of the
    ACT8865 driver have changed without updating the CI20 device
    tree. Therefore the PMU can not be probed successfully and
    is running in power-on reset state.

    Fix DT to match the latest act8865-regulator bindings.

    Fixes: 73f2b940474d ("MIPS: CI20: DTS: Add I2C nodes")
    Cc: stable@vger.kernel.org
    Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
    Reviewed-by: Paul Cercueil <paul@crapouillou.net>
    Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/mips/boot/dts/ingenic/ci20.dts | 39 ++++++++++++++++++++++--------------
    1 file changed, 24 insertions(+), 15 deletions(-)

    --- a/arch/mips/boot/dts/ingenic/ci20.dts
    +++ b/arch/mips/boot/dts/ingenic/ci20.dts
    @@ -4,6 +4,7 @@
    #include "jz4780.dtsi"
    #include <dt-bindings/clock/ingenic,tcu.h>
    #include <dt-bindings/gpio/gpio.h>
    +#include <dt-bindings/regulator/active-semi,8865-regulator.h>

    / {
    compatible = "img,ci20", "ingenic,jz4780";
    @@ -163,63 +164,71 @@

    regulators {
    vddcore: SUDCDC1 {
    - regulator-name = "VDDCORE";
    + regulator-name = "DCDC_REG1";
    regulator-min-microvolt = <1100000>;
    regulator-max-microvolt = <1100000>;
    regulator-always-on;
    };
    vddmem: SUDCDC2 {
    - regulator-name = "VDDMEM";
    + regulator-name = "DCDC_REG2";
    regulator-min-microvolt = <1500000>;
    regulator-max-microvolt = <1500000>;
    regulator-always-on;
    };
    vcc_33: SUDCDC3 {
    - regulator-name = "VCC33";
    + regulator-name = "DCDC_REG3";
    regulator-min-microvolt = <3300000>;
    regulator-max-microvolt = <3300000>;
    regulator-always-on;
    };
    vcc_50: SUDCDC4 {
    - regulator-name = "VCC50";
    + regulator-name = "SUDCDC_REG4";
    regulator-min-microvolt = <5000000>;
    regulator-max-microvolt = <5000000>;
    regulator-always-on;
    };
    vcc_25: LDO_REG5 {
    - regulator-name = "VCC25";
    + regulator-name = "LDO_REG5";
    regulator-min-microvolt = <2500000>;
    regulator-max-microvolt = <2500000>;
    regulator-always-on;
    };
    wifi_io: LDO_REG6 {
    - regulator-name = "WIFIIO";
    + regulator-name = "LDO_REG6";
    regulator-min-microvolt = <2500000>;
    regulator-max-microvolt = <2500000>;
    regulator-always-on;
    };
    vcc_28: LDO_REG7 {
    - regulator-name = "VCC28";
    + regulator-name = "LDO_REG7";
    regulator-min-microvolt = <2800000>;
    regulator-max-microvolt = <2800000>;
    regulator-always-on;
    };
    vcc_15: LDO_REG8 {
    - regulator-name = "VCC15";
    + regulator-name = "LDO_REG8";
    regulator-min-microvolt = <1500000>;
    regulator-max-microvolt = <1500000>;
    regulator-always-on;
    };
    - vcc_18: LDO_REG9 {
    - regulator-name = "VCC18";
    - regulator-min-microvolt = <1800000>;
    - regulator-max-microvolt = <1800000>;
    + vrtc_18: LDO_REG9 {
    + regulator-name = "LDO_REG9";
    + /* Despite the datasheet stating 3.3V
    + * for REG9 and the driver expecting that,
    + * REG9 outputs 1.8V.
    + * Likely the CI20 uses a proprietary
    + * factory programmed chip variant.
    + * Since this is a simple on/off LDO the
    + * exact values do not matter.
    + */
    + regulator-min-microvolt = <3300000>;
    + regulator-max-microvolt = <3300000>;
    regulator-always-on;
    };
    vcc_11: LDO_REG10 {
    - regulator-name = "VCC11";
    - regulator-min-microvolt = <1100000>;
    - regulator-max-microvolt = <1100000>;
    + regulator-name = "LDO_REG10";
    + regulator-min-microvolt = <1200000>;
    + regulator-max-microvolt = <1200000>;
    regulator-always-on;
    };
    };

    \
     
     \ /
      Last update: 2020-03-17 12:14    [W:3.433 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site