imx6ull-somdevices.dts: Added support to pf1510/pf1550 PMIC and removed other I2C...

TODO: Check if the PMIC has full functionallity.

Signed-off-by: Josep Orga <jorga@somdevices.com>

diff --git a/arch/arm/boot/dts/imx6ull-somdevices.dts b/arch/arm/boot/dts/imx6ull-somdevices.dts
index 8f500e8..14ca231 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-somdevices.dts
+++ b/arch/arm/boot/dts/imx6ull-somdevices.dts
@@ -88,43 +88,6 @@
                };
        };
 
-       sound {
-               compatible = "fsl,imx6ul-evk-wm8960",
-                          "fsl,imx-audio-wm8960";
-               model = "wm8960-audio";
-               cpu-dai = <&sai2>;
-               audio-codec = <&codec>;
-               asrc-controller = <&asrc>;
-               codec-master;
-               gpr = <&gpr 4 0x100000 0x100000>;
-               /*
-                 * hp-det = <hp-det-pin hp-det-polarity>;
-                * hp-det-pin: JD1 JD2  or JD3
-                * hp-det-polarity = 0: hp detect high for headphone
-                * hp-det-polarity = 1: hp detect high for speaker
-                */
-               hp-det = <3 0>;
-               hp-det-gpios = <&gpio5 4 0>;
-               mic-det-gpios = <&gpio5 4 0>;
-               audio-routing =
-                       "Headphone Jack", "HP_L",
-                       "Headphone Jack", "HP_R",
-                       "Ext Spk", "SPK_LP",
-                       "Ext Spk", "SPK_LN",
-                       "Ext Spk", "SPK_RP",
-                       "Ext Spk", "SPK_RN",
-                       "LINPUT2", "Mic Jack",
-                       "LINPUT3", "Mic Jack",
-                       "RINPUT1", "Main MIC",
-                       "RINPUT2", "Main MIC",
-                       "Mic Jack", "MICB",
-                       "Main MIC", "MICB",
-                       "CPU-Playback", "ASRC-Playback",
-                       "Playback", "CPU-Playback",
-                       "ASRC-Capture", "CPU-Capture",
-                       "CPU-Capture", "Capture";
-       };
-
        spi4 {
                compatible = "spi-gpio";
                pinctrl-names = "default";
@@ -159,16 +122,6 @@
        assigned-clock-rates = <786432000>;
 };
 
-&csi {
-       status = "okay";
-
-       port {
-               csi1_ep: endpoint {
-                       remote-endpoint = <&ov5640_ep>;
-               };
-       };
-};
-
 &fec1 {
        pinctrl-names = "default";
 #ifdef DUAL_ETH
@@ -255,51 +208,78 @@
        pinctrl-0 = <&pinctrl_i2c1>;
        status = "okay";
 
-       mag3110@0e {
-               compatible = "fsl,mag3110";
-               reg = <0x0e>;
-               position = <2>;
-       };
-
-       fxls8471@1e {
-               compatible = "fsl,fxls8471";
-               reg = <0x1e>;
-               position = <0>;
+       pmic: pf1550@08 {
+               compatible = "fsl,pf1550";
                interrupt-parent = <&gpio5>;
-               interrupts = <0 8>;
-       };
-};
+               interrupts = <4 8>;
+               reg = <0x08>;
+               //pinctrl-0 = <&pinctrl_pf1550>;
+
+               onkey {
+                       compatible = "fsl,pf1550-onkey";
+                       linux,keycode = <KEY_POWER>;
+                       wakeup;
+               };
 
-&i2c2 {
-       clock_frequency = <100000>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2>;
-       status = "okay";
+               charger {
+                       compatible = "fsl,pf1550-charger";
+               };
 
-       codec: wm8960@1a {
-               compatible = "wlf,wm8960";
-               reg = <0x1a>;
-               clocks = <&clks IMX6UL_CLK_SAI2>;
-               clock-names = "mclk";
-               wlf,shared-lrclk;
-       };
+               regulators {
+                       compatible = "fsl,pf1550-regulator";
 
-       ov5640: ov5640@3c {
-               compatible = "ovti,ov5640";
-               reg = <0x3c>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_csi1>;
-               clocks = <&clks IMX6UL_CLK_CSI>;
-               clock-names = "csi_mclk";
-               pwn-gpios = <&gpio_spi 6 1>;
-               rst-gpios = <&gpio_spi 5 0>;
-               csi_id = <0>;
-               mclk = <24000000>;
-               mclk_source = <0>;
-               status = "okay";
-               port {
-                       ov5640_ep: endpoint {
-                               remote-endpoint = <&csi1_ep>;
+                       sw1_reg: SW1 {
+                               regulator-name = "SW1";
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <1387500>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+
+                       sw2_reg: SW2 {
+                               regulator-name = "SW2";
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <1387500>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       sw3_reg: SW3 {
+                               regulator-name = "SW3";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       vref_reg: VREFDDR {
+                               regulator-name = "VREFDDR";
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1200000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+
+                       vldo1_reg: LDO1 {
+                               regulator-name = "LDO1";
+                               regulator-min-microvolt = <750000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       vldo2_reg: LDO2 {
+                               regulator-name = "LDO2";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       vldo3_reg: LDO3 {
+                               regulator-name = "LDO3";
+                               regulator-min-microvolt = <750000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
                        };
                };
        };
@@ -391,15 +371,8 @@
 
        pinctrl_i2c1: i2c1grp {
                fsl,pins = <
-                       MX6UL_PAD_UART4_TX_DATA__I2C1_SCL 0x4001b8b0
-                       MX6UL_PAD_UART4_RX_DATA__I2C1_SDA 0x4001b8b0
-               >;
-       };
-
-       pinctrl_i2c2: i2c2grp {
-               fsl,pins = <
-                       MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
-                       MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
+                       MX6UL_PAD_GPIO1_IO02__I2C1_SCL 0x4001b8b0
+                       MX6UL_PAD_GPIO1_IO03__I2C1_SDA 0x4001b8b0
                >;
        };