code.ossystems Code Review - meta-freescale.git/blob

   1 From 37e501e8c4e1f1511e017aa0a7def38895a47fa6 Mon Sep 17 00:00:00 2001
   2 From: Robin Gong <b38343@freescale.com>
   3 Date: Thu, 6 Mar 2014 18:59:30 +0800
   4 Subject: [PATCH 08/10] ENGR00301078-1: ARM: dts: imx6dl-sabresd: add support
   5  for pfuze200 on mx6dl-sabresd
   6 Organization: O.S. Systems Software LTDA.
   7
   8 move pmic device node from imx6qdl-sabresd.dtsi to up-level, and add
   9 another layer on imx6dl-sabresd to diff pfuze100 or pfuze200. Meanwhile
  10 only work in ldo-enable mode if using pfuze200,since 'SW1C' switch
  11 regulator is cut for cost-down which means VDDARM_IN and VDDSOC_IN have
  12 to share the same switch regulator
  13
  14 Signed-off-by: Robin Gong <b38343@freescale.com>
  15 (cherry picked from commit 32e4e161b087bfdcea74bd80f0b24c341092c96b)
  16
  17 Upstream-Status: Pending
  18 ---
  19  arch/arm/boot/dts/Makefile                   |   1 +
  20  arch/arm/boot/dts/imx6dl-sabresd-common.dtsi | 130 ++++++++++++++++++++
  21  arch/arm/boot/dts/imx6dl-sabresd-pf200.dts   | 126 +++++++++++++++++++
  22  arch/arm/boot/dts/imx6dl-sabresd.dts         | 175 ++++++++++++---------------
  23  arch/arm/boot/dts/imx6q-sabresd.dts          | 101 ++++++++++++++++
  24  arch/arm/boot/dts/imx6qdl-sabresd.dtsi       |  99 ---------------
  25  6 files changed, 435 insertions(+), 197 deletions(-)
  26  create mode 100644 arch/arm/boot/dts/imx6dl-sabresd-common.dtsi
  27  create mode 100644 arch/arm/boot/dts/imx6dl-sabresd-pf200.dts
  28
  29 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
  30 index f43b68b..c744cda 100644
  31 --- a/arch/arm/boot/dts/Makefile
  32 +++ b/arch/arm/boot/dts/Makefile
  33 @@ -120,6 +120,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
  34         imx6dl-sabresd.dtb \
  35         imx6dl-sabresd-hdcp.dtb \
  36         imx6dl-sabresd-ldo.dtb \
  37 +       imx6dl-sabresd-pf200.dtb \
  38         imx6dl-wandboard.dtb \
  39         imx6q-arm2.dtb \
  40         imx6q-sabreauto.dtb \
  41 diff --git a/arch/arm/boot/dts/imx6dl-sabresd-common.dtsi b/arch/arm/boot/dts/imx6dl-sabresd-common.dtsi
  42 new file mode 100644
  43 index 0000000..2a07534
  44 --- /dev/null
  45 +++ b/arch/arm/boot/dts/imx6dl-sabresd-common.dtsi
  46 @@ -0,0 +1,130 @@
  47 +/*
  48 + * Copyright (C) 2014 Freescale Semiconductor, Inc.
  49 + *
  50 + * This program is free software; you can redistribute it and/or modify
  51 + * it under the terms of the GNU General Public License version 2 as
  52 + * published by the Free Software Foundation.
  53 + */
  54 +
  55 +&battery {
  56 +       offset-charger = <1485>;
  57 +       offset-discharger = <1464>;
  58 +       offset-usb-charger = <1285>;
  59 +};
  60 +
  61 +&i2c3 {
  62 +       max17135@48 {
  63 +               compatible = "maxim,max17135";
  64 +               reg = <0x48>;
  65 +               vneg_pwrup = <1>;
  66 +               gvee_pwrup = <1>;
  67 +               vpos_pwrup = <2>;
  68 +               gvdd_pwrup = <1>;
  69 +               gvdd_pwrdn = <1>;
  70 +               vpos_pwrdn = <2>;
  71 +               gvee_pwrdn = <1>;
  72 +               vneg_pwrdn = <1>;
  73 +               SENSOR-supply = <&reg_sensor>;
  74 +               gpio_pmic_pwrgood = <&gpio2 21 0>;
  75 +               gpio_pmic_vcom_ctrl = <&gpio3 17 0>;
  76 +               gpio_pmic_wakeup = <&gpio3 20 0>;
  77 +               gpio_pmic_v3p3 = <&gpio2 20 0>;
  78 +               gpio_pmic_intr = <&gpio2 25 0>;
  79 +
  80 +               regulators {
  81 +                       DISPLAY_reg: DISPLAY {
  82 +                               regulator-name = "DISPLAY";
  83 +                       };
  84 +
  85 +                       GVDD_reg: GVDD {
  86 +                               /* 20v */
  87 +                               regulator-name = "GVDD";
  88 +                       };
  89 +
  90 +                       GVEE_reg: GVEE {
  91 +                               /* -22v */
  92 +                               regulator-name = "GVEE";
  93 +                       };
  94 +
  95 +                       HVINN_reg: HVINN {
  96 +                               /* -22v */
  97 +                               regulator-name = "HVINN";
  98 +                       };
  99 +
 100 +                       HVINP_reg: HVINP {
 101 +                               /* 20v */
 102 +                               regulator-name = "HVINP";
 103 +                       };
 104 +
 105 +                       VCOM_reg: VCOM {
 106 +                               regulator-name = "VCOM";
 107 +                               /* 2's-compliment, -4325000 */
 108 +                               regulator-min-microvolt = <0xffbe0178>;
 109 +                               /* 2's-compliment, -500000 */
 110 +                               regulator-max-microvolt = <0xfff85ee0>;
 111 +                       };
 112 +
 113 +                       VNEG_reg: VNEG {
 114 +                               /* -15v */
 115 +                               regulator-name = "VNEG";
 116 +                       };
 117 +
 118 +                       VPOS_reg: VPOS {
 119 +                               /* 15v */
 120 +                               regulator-name = "VPOS";
 121 +                       };
 122 +
 123 +                       V3P3_reg: V3P3 {
 124 +                               regulator-name = "V3P3";
 125 +                       };
 126 +               };
 127 +       };
 128 +};
 129 +
 130 +&iomuxc {
 131 +       pinctrl-names = "default";
 132 +       pinctrl-0 = <&pinctrl_hog_1>, <&pinctrl_hog_2>;
 133 +
 134 +       hog {
 135 +               pinctrl_hog_2: hoggrp-2 {
 136 +                       fsl,pins = <
 137 +                               /* MAX17135 */
 138 +                               MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000
 139 +                               MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x80000000
 140 +                               MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x80000000
 141 +                               MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x80000000
 142 +                               MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x80000000
 143 +                               /* elan touch */
 144 +                               MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x80000000
 145 +                               MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x80000000
 146 +                               MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x170b0
 147 +                       >;
 148 +               };
 149 +       };
 150 +};
 151 +
 152 +&epdc {
 153 +       pinctrl-names = "default";
 154 +       pinctrl-0 = <&pinctrl_epdc_0>;
 155 +       V3P3-supply = <&V3P3_reg>;
 156 +       VCOM-supply = <&VCOM_reg>;
 157 +       DISPLAY-supply = <&DISPLAY_reg>;
 158 +       status = "okay";
 159 +};
 160 +
 161 +&ldb {
 162 +       ipu_id = <0>;
 163 +       sec_ipu_id = <0>;
 164 +};
 165 +
 166 +&mxcfb1 {
 167 +       status = "okay";
 168 +};
 169 +
 170 +&mxcfb2 {
 171 +       status = "okay";
 172 +};
 173 +
 174 +&pxp {
 175 +       status = "okay";
 176 +};
 177 diff --git a/arch/arm/boot/dts/imx6dl-sabresd-pf200.dts b/arch/arm/boot/dts/imx6dl-sabresd-pf200.dts
 178 new file mode 100644
 179 index 0000000..499f7d3
 180 --- /dev/null
 181 +++ b/arch/arm/boot/dts/imx6dl-sabresd-pf200.dts
 182 @@ -0,0 +1,126 @@
 183 +/*
 184 + * Copyright (C) 2014 Freescale Semiconductor, Inc.
 185 + *
 186 + * This program is free software; you can redistribute it and/or modify
 187 + * it under the terms of the GNU General Public License version 2 as
 188 + * published by the Free Software Foundation.
 189 + */
 190 +
 191 +/dts-v1/;
 192 +
 193 +#include "imx6dl.dtsi"
 194 +#include "imx6qdl-sabresd.dtsi"
 195 +#include "imx6dl-sabresd-common.dtsi"
 196 +
 197 +/ {
 198 +       model = "Freescale i.MX6 DualLite SABRE Smart Device Board(PFUZE200)";
 199 +       compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
 200 +};
 201 +
 202 +&cpu0 {
 203 +       arm-supply = <&reg_arm>;
 204 +       soc-supply = <&reg_soc>;
 205 +       pu-supply = <&reg_pu>; /* use pu_dummy if VDDSOC share with VDDPU */
 206 +};
 207 +
 208 +&gpc {
 209 +       fsl,ldo-bypass = <0>; /* use ldo-bypass, u-boot will check it and configure */
 210 +       fsl,wdog-reset = <1>; /* watchdog select of reset source */
 211 +       pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
 212 +};
 213 +
 214 +&gpu {
 215 +       pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
 216 +};
 217 +
 218 +&vpu {
 219 +       pu-supply = <&reg_pu>; /* ldo-bypass:use pu_dummy if VDDSOC share with VDDPU */
 220 +};
 221 +
 222 +&i2c2 {
 223 +       pmic: pfuze200@08 {
 224 +               compatible = "fsl,pfuze200";
 225 +               reg = <0x08>;
 226 +
 227 +               regulators {
 228 +                       sw1a_reg: sw1ab {
 229 +                               regulator-min-microvolt = <300000>;
 230 +                               regulator-max-microvolt = <1875000>;
 231 +                               regulator-boot-on;
 232 +                               regulator-always-on;
 233 +                               regulator-ramp-delay = <6250>;
 234 +                       };
 235 +
 236 +                       sw2_reg: sw2 {
 237 +                               regulator-min-microvolt = <800000>;
 238 +                               regulator-max-microvolt = <3300000>;
 239 +                               regulator-boot-on;
 240 +                               regulator-always-on;
 241 +                       };
 242 +
 243 +                       sw3a_reg: sw3a {
 244 +                               regulator-min-microvolt = <400000>;
 245 +                               regulator-max-microvolt = <1975000>;
 246 +                               regulator-boot-on;
 247 +                               regulator-always-on;
 248 +                       };
 249 +
 250 +                       sw3b_reg: sw3b {
 251 +                               regulator-min-microvolt = <400000>;
 252 +                               regulator-max-microvolt = <1975000>;
 253 +                               regulator-boot-on;
 254 +                               regulator-always-on;
 255 +                       };
 256 +
 257 +                       swbst_reg: swbst {
 258 +                               regulator-min-microvolt = <5000000>;
 259 +                               regulator-max-microvolt = <5150000>;
 260 +                       };
 261 +
 262 +                       snvs_reg: vsnvs {
 263 +                               regulator-min-microvolt = <1000000>;
 264 +                               regulator-max-microvolt = <3000000>;
 265 +                               regulator-boot-on;
 266 +                               regulator-always-on;
 267 +                       };
 268 +
 269 +                       vref_reg: vrefddr {
 270 +                               regulator-boot-on;
 271 +                               regulator-always-on;
 272 +                       };
 273 +
 274 +                       vgen1_reg: vgen1 {
 275 +                               regulator-min-microvolt = <800000>;
 276 +                               regulator-max-microvolt = <1550000>;
 277 +                       };
 278 +
 279 +                       vgen2_reg: vgen2 {
 280 +                               regulator-min-microvolt = <800000>;
 281 +                               regulator-max-microvolt = <1550000>;
 282 +                       };
 283 +
 284 +                       vgen3_reg: vgen3 {
 285 +                               regulator-min-microvolt = <1800000>;
 286 +                               regulator-max-microvolt = <3300000>;
 287 +                       };
 288 +
 289 +                       vgen4_reg: vgen4 {
 290 +                               regulator-min-microvolt = <1800000>;
 291 +                               regulator-max-microvolt = <3300000>;
 292 +                               regulator-always-on;
 293 +                       };
 294 +
 295 +                       vgen5_reg: vgen5 {
 296 +                               regulator-min-microvolt = <1800000>;
 297 +                               regulator-max-microvolt = <3300000>;
 298 +                               regulator-always-on;
 299 +                       };
 300 +
 301 +                       vgen6_reg: vgen6 {
 302 +                               regulator-min-microvolt = <1800000>;
 303 +                               regulator-max-microvolt = <3300000>;
 304 +                               regulator-always-on;
 305 +                       };
 306 +               };
 307 +       };
 308 +};
 309 diff --git a/arch/arm/boot/dts/imx6dl-sabresd.dts b/arch/arm/boot/dts/imx6dl-sabresd.dts
 310 index 5713c71..b4c738d 100644
 311 --- a/arch/arm/boot/dts/imx6dl-sabresd.dts
 312 +++ b/arch/arm/boot/dts/imx6dl-sabresd.dts
 313 @@ -1,5 +1,5 @@
 314  /*
 315 - * Copyright (C) 2013 Freescale Semiconductor, Inc.
 316 + * Copyright (C) 2013-2014 Freescale Semiconductor, Inc.
 317   *
 318   * This program is free software; you can redistribute it and/or modify
 319   * it under the terms of the GNU General Public License version 2 as
 320 @@ -10,131 +10,110 @@
 321
 322  #include "imx6dl.dtsi"
 323  #include "imx6qdl-sabresd.dtsi"
 324 +#include "imx6dl-sabresd-common.dtsi"
 325
 326  / {
 327 -       model = "Freescale i.MX6 DualLite SABRE Smart Device Board";
 328 +       model = "Freescale i.MX6 DualLite SABRE Smart Device Board(PFUZE100)";
 329         compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
 330  };
 331
 332 -&battery {
 333 -       offset-charger = <1485>;
 334 -       offset-discharger = <1464>;
 335 -       offset-usb-charger = <1285>;
 336 -};
 337 -
 338 -&i2c3 {
 339 -       max17135@48 {
 340 -               compatible = "maxim,max17135";
 341 -               reg = <0x48>;
 342 -               vneg_pwrup = <1>;
 343 -               gvee_pwrup = <1>;
 344 -               vpos_pwrup = <2>;
 345 -               gvdd_pwrup = <1>;
 346 -               gvdd_pwrdn = <1>;
 347 -               vpos_pwrdn = <2>;
 348 -               gvee_pwrdn = <1>;
 349 -               vneg_pwrdn = <1>;
 350 -               SENSOR-supply = <&reg_sensor>;
 351 -               gpio_pmic_pwrgood = <&gpio2 21 0>;
 352 -               gpio_pmic_vcom_ctrl = <&gpio3 17 0>;
 353 -               gpio_pmic_wakeup = <&gpio3 20 0>;
 354 -               gpio_pmic_v3p3 = <&gpio2 20 0>;
 355 -               gpio_pmic_intr = <&gpio2 25 0>;
 356 +&i2c2 {
 357 +       pmic: pfuze100@08 {
 358 +               compatible = "fsl,pfuze100";
 359 +               reg = <0x08>;
 360
 361                 regulators {
 362 -                       DISPLAY_reg: DISPLAY {
 363 -                               regulator-name = "DISPLAY";
 364 +                       sw1a_reg: sw1ab {
 365 +                               regulator-min-microvolt = <300000>;
 366 +                               regulator-max-microvolt = <1875000>;
 367 +                               regulator-boot-on;
 368 +                               regulator-always-on;
 369 +                               regulator-ramp-delay = <6250>;
 370                         };
 371
 372 -                       GVDD_reg: GVDD {
 373 -                               /* 20v */
 374 -                               regulator-name = "GVDD";
 375 +                       sw1c_reg: sw1c {
 376 +                               regulator-min-microvolt = <300000>;
 377 +                               regulator-max-microvolt = <1875000>;
 378 +                               regulator-boot-on;
 379 +                               regulator-always-on;
 380 +                               regulator-ramp-delay = <6250>;
 381                         };
 382
 383 -                       GVEE_reg: GVEE {
 384 -                               /* -22v */
 385 -                               regulator-name = "GVEE";
 386 +                       sw2_reg: sw2 {
 387 +                               regulator-min-microvolt = <800000>;
 388 +                               regulator-max-microvolt = <3300000>;
 389 +                               regulator-boot-on;
 390 +                               regulator-always-on;
 391                         };
 392
 393 -                       HVINN_reg: HVINN {
 394 -                               /* -22v */
 395 -                               regulator-name = "HVINN";
 396 +                       sw3a_reg: sw3a {
 397 +                               regulator-min-microvolt = <400000>;
 398 +                               regulator-max-microvolt = <1975000>;
 399 +                               regulator-boot-on;
 400 +                               regulator-always-on;
 401                         };
 402
 403 -                       HVINP_reg: HVINP {
 404 -                               /* 20v */
 405 -                               regulator-name = "HVINP";
 406 +                       sw3b_reg: sw3b {
 407 +                               regulator-min-microvolt = <400000>;
 408 +                               regulator-max-microvolt = <1975000>;
 409 +                               regulator-boot-on;
 410 +                               regulator-always-on;
 411                         };
 412
 413 -                       VCOM_reg: VCOM {
 414 -                               regulator-name = "VCOM";
 415 -                               /* 2's-compliment, -4325000 */
 416 -                               regulator-min-microvolt = <0xffbe0178>;
 417 -                               /* 2's-compliment, -500000 */
 418 -                               regulator-max-microvolt = <0xfff85ee0>;
 419 +                       sw4_reg: sw4 {
 420 +                               regulator-min-microvolt = <800000>;
 421 +                               regulator-max-microvolt = <3300000>;
 422                         };
 423
 424 -                       VNEG_reg: VNEG {
 425 -                               /* -15v */
 426 -                               regulator-name = "VNEG";
 427 +                       swbst_reg: swbst {
 428 +                               regulator-min-microvolt = <5000000>;
 429 +                               regulator-max-microvolt = <5150000>;
 430                         };
 431
 432 -                       VPOS_reg: VPOS {
 433 -                               /* 15v */
 434 -                               regulator-name = "VPOS";
 435 +                       snvs_reg: vsnvs {
 436 +                               regulator-min-microvolt = <1000000>;
 437 +                               regulator-max-microvolt = <3000000>;
 438 +                               regulator-boot-on;
 439 +                               regulator-always-on;
 440                         };
 441
 442 -                       V3P3_reg: V3P3 {
 443 -                               regulator-name = "V3P3";
 444 +                       vref_reg: vrefddr {
 445 +                               regulator-boot-on;
 446 +                               regulator-always-on;
 447                         };
 448 -               };
 449 -       };
 450 -};
 451
 452 -&iomuxc {
 453 -       pinctrl-names = "default";
 454 -       pinctrl-0 = <&pinctrl_hog_1>, <&pinctrl_hog_2>;
 455 -
 456 -       hog {
 457 -               pinctrl_hog_2: hoggrp-2 {
 458 -                       fsl,pins = <
 459 -                               /* MAX17135 */
 460 -                               MX6QDL_PAD_EIM_A17__GPIO2_IO21 0x80000000
 461 -                               MX6QDL_PAD_EIM_D17__GPIO3_IO17 0x80000000
 462 -                               MX6QDL_PAD_EIM_D20__GPIO3_IO20 0x80000000
 463 -                               MX6QDL_PAD_EIM_A18__GPIO2_IO20 0x80000000
 464 -                               MX6QDL_PAD_EIM_OE__GPIO2_IO25 0x80000000
 465 -                               /* elan touch */
 466 -                               MX6QDL_PAD_EIM_A20__GPIO2_IO18 0x80000000
 467 -                               MX6QDL_PAD_EIM_DA8__GPIO3_IO08 0x80000000
 468 -                               MX6QDL_PAD_EIM_D28__GPIO3_IO28 0x170b0
 469 -                       >;
 470 -               };
 471 -       };
 472 -};
 473 +                       vgen1_reg: vgen1 {
 474 +                               regulator-min-microvolt = <800000>;
 475 +                               regulator-max-microvolt = <1550000>;
 476 +                       };
 477
 478 -&epdc {
 479 -       pinctrl-names = "default";
 480 -       pinctrl-0 = <&pinctrl_epdc_0>;
 481 -       V3P3-supply = <&V3P3_reg>;
 482 -       VCOM-supply = <&VCOM_reg>;
 483 -       DISPLAY-supply = <&DISPLAY_reg>;
 484 -       status = "okay";
 485 -};
 486 +                       vgen2_reg: vgen2 {
 487 +                               regulator-min-microvolt = <800000>;
 488 +                               regulator-max-microvolt = <1550000>;
 489 +                       };
 490
 491 -&ldb {
 492 -       ipu_id = <0>;
 493 -       sec_ipu_id = <0>;
 494 -};
 495 +                       vgen3_reg: vgen3 {
 496 +                               regulator-min-microvolt = <1800000>;
 497 +                               regulator-max-microvolt = <3300000>;
 498 +                       };
 499
 500 -&mxcfb1 {
 501 -       status = "okay";
 502 -};
 503 +                       vgen4_reg: vgen4 {
 504 +                               regulator-min-microvolt = <1800000>;
 505 +                               regulator-max-microvolt = <3300000>;
 506 +                               regulator-always-on;
 507 +                       };
 508
 509 -&mxcfb2 {
 510 -       status = "okay";
 511 -};
 512 +                       vgen5_reg: vgen5 {
 513 +                               regulator-min-microvolt = <1800000>;
 514 +                               regulator-max-microvolt = <3300000>;
 515 +                               regulator-always-on;
 516 +                       };
 517
 518 -&pxp {
 519 -       status = "okay";
 520 +                       vgen6_reg: vgen6 {
 521 +                               regulator-min-microvolt = <1800000>;
 522 +                               regulator-max-microvolt = <3300000>;
 523 +                               regulator-always-on;
 524 +                       };
 525 +               };
 526 +       };
 527  };
 528 diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts
 529 index 072e7d3..5e5ff56 100644
 530 --- a/arch/arm/boot/dts/imx6q-sabresd.dts
 531 +++ b/arch/arm/boot/dts/imx6q-sabresd.dts
 532 @@ -26,6 +26,107 @@
 533         offset-usb-charger = <1685>;
 534  };
 535
 536 +&i2c2 {
 537 +       pmic: pfuze100@08 {
 538 +               compatible = "fsl,pfuze100";
 539 +               reg = <0x08>;
 540 +
 541 +               regulators {
 542 +                       sw1a_reg: sw1ab {
 543 +                               regulator-min-microvolt = <300000>;
 544 +                               regulator-max-microvolt = <1875000>;
 545 +                               regulator-boot-on;
 546 +                               regulator-always-on;
 547 +                               regulator-ramp-delay = <6250>;
 548 +                       };
 549 +
 550 +                       sw1c_reg: sw1c {
 551 +                               regulator-min-microvolt = <300000>;
 552 +                               regulator-max-microvolt = <1875000>;
 553 +                               regulator-boot-on;
 554 +                               regulator-always-on;
 555 +                               regulator-ramp-delay = <6250>;
 556 +                       };
 557 +
 558 +                       sw2_reg: sw2 {
 559 +                               regulator-min-microvolt = <800000>;
 560 +                               regulator-max-microvolt = <3300000>;
 561 +                               regulator-boot-on;
 562 +                               regulator-always-on;
 563 +                       };
 564 +
 565 +                       sw3a_reg: sw3a {
 566 +                               regulator-min-microvolt = <400000>;
 567 +                               regulator-max-microvolt = <1975000>;
 568 +                               regulator-boot-on;
 569 +                               regulator-always-on;
 570 +                       };
 571 +
 572 +                       sw3b_reg: sw3b {
 573 +                               regulator-min-microvolt = <400000>;
 574 +                               regulator-max-microvolt = <1975000>;
 575 +                               regulator-boot-on;
 576 +                               regulator-always-on;
 577 +                       };
 578 +
 579 +                       sw4_reg: sw4 {
 580 +                               regulator-min-microvolt = <800000>;
 581 +                               regulator-max-microvolt = <3300000>;
 582 +                       };
 583 +
 584 +                       swbst_reg: swbst {
 585 +                               regulator-min-microvolt = <5000000>;
 586 +                               regulator-max-microvolt = <5150000>;
 587 +                       };
 588 +
 589 +                       snvs_reg: vsnvs {
 590 +                               regulator-min-microvolt = <1000000>;
 591 +                               regulator-max-microvolt = <3000000>;
 592 +                               regulator-boot-on;
 593 +                               regulator-always-on;
 594 +                       };
 595 +
 596 +                       vref_reg: vrefddr {
 597 +                               regulator-boot-on;
 598 +                               regulator-always-on;
 599 +                       };
 600 +
 601 +                       vgen1_reg: vgen1 {
 602 +                               regulator-min-microvolt = <800000>;
 603 +                               regulator-max-microvolt = <1550000>;
 604 +                       };
 605 +
 606 +                       vgen2_reg: vgen2 {
 607 +                               regulator-min-microvolt = <800000>;
 608 +                               regulator-max-microvolt = <1550000>;
 609 +                       };
 610 +
 611 +                       vgen3_reg: vgen3 {
 612 +                               regulator-min-microvolt = <1800000>;
 613 +                               regulator-max-microvolt = <3300000>;
 614 +                       };
 615 +
 616 +                       vgen4_reg: vgen4 {
 617 +                               regulator-min-microvolt = <1800000>;
 618 +                               regulator-max-microvolt = <3300000>;
 619 +                               regulator-always-on;
 620 +                       };
 621 +
 622 +                       vgen5_reg: vgen5 {
 623 +                               regulator-min-microvolt = <1800000>;
 624 +                               regulator-max-microvolt = <3300000>;
 625 +                               regulator-always-on;
 626 +                       };
 627 +
 628 +                       vgen6_reg: vgen6 {
 629 +                               regulator-min-microvolt = <1800000>;
 630 +                               regulator-max-microvolt = <3300000>;
 631 +                               regulator-always-on;
 632 +                       };
 633 +               };
 634 +       };
 635 +};
 636 +
 637  &mxcfb1 {
 638         status = "okay";
 639  };
 640 diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
 641 index 66b6145..5d774e5 100644
 642 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
 643 +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
 644 @@ -405,105 +405,6 @@
 645                 mclk_source = <0>;
 646         };
 647
 648 -       pmic: pfuze100@08 {
 649 -               compatible = "fsl,pfuze100";
 650 -               reg = <0x08>;
 651 -
 652 -               regulators {
 653 -                       sw1a_reg: sw1ab {
 654 -                               regulator-min-microvolt = <300000>;
 655 -                               regulator-max-microvolt = <1875000>;
 656 -                               regulator-boot-on;
 657 -                               regulator-always-on;
 658 -                               regulator-ramp-delay = <6250>;
 659 -                       };
 660 -
 661 -                       sw1c_reg: sw1c {
 662 -                               regulator-min-microvolt = <300000>;
 663 -                               regulator-max-microvolt = <1875000>;
 664 -                               regulator-boot-on;
 665 -                               regulator-always-on;
 666 -                               regulator-ramp-delay = <6250>;
 667 -                       };
 668 -
 669 -                       sw2_reg: sw2 {
 670 -                               regulator-min-microvolt = <800000>;
 671 -                               regulator-max-microvolt = <3300000>;
 672 -                               regulator-boot-on;
 673 -                               regulator-always-on;
 674 -                       };
 675 -
 676 -                       sw3a_reg: sw3a {
 677 -                               regulator-min-microvolt = <400000>;
 678 -                               regulator-max-microvolt = <1975000>;
 679 -                               regulator-boot-on;
 680 -                               regulator-always-on;
 681 -                       };
 682 -
 683 -                       sw3b_reg: sw3b {
 684 -                               regulator-min-microvolt = <400000>;
 685 -                               regulator-max-microvolt = <1975000>;
 686 -                               regulator-boot-on;
 687 -                               regulator-always-on;
 688 -                       };
 689 -
 690 -                       sw4_reg: sw4 {
 691 -                               regulator-min-microvolt = <800000>;
 692 -                               regulator-max-microvolt = <3300000>;
 693 -                       };
 694 -
 695 -                       swbst_reg: swbst {
 696 -                               regulator-min-microvolt = <5000000>;
 697 -                               regulator-max-microvolt = <5150000>;
 698 -                       };
 699 -
 700 -                       snvs_reg: vsnvs {
 701 -                               regulator-min-microvolt = <1000000>;
 702 -                               regulator-max-microvolt = <3000000>;
 703 -                               regulator-boot-on;
 704 -                               regulator-always-on;
 705 -                       };
 706 -
 707 -                       vref_reg: vrefddr {
 708 -                               regulator-boot-on;
 709 -                               regulator-always-on;
 710 -                       };
 711 -
 712 -                       vgen1_reg: vgen1 {
 713 -                               regulator-min-microvolt = <800000>;
 714 -                               regulator-max-microvolt = <1550000>;
 715 -                       };
 716 -
 717 -                       vgen2_reg: vgen2 {
 718 -                               regulator-min-microvolt = <800000>;
 719 -                               regulator-max-microvolt = <1550000>;
 720 -                       };
 721 -
 722 -                       vgen3_reg: vgen3 {
 723 -                               regulator-min-microvolt = <1800000>;
 724 -                               regulator-max-microvolt = <3300000>;
 725 -                       };
 726 -
 727 -                       vgen4_reg: vgen4 {
 728 -                               regulator-min-microvolt = <1800000>;
 729 -                               regulator-max-microvolt = <3300000>;
 730 -                               regulator-always-on;
 731 -                       };
 732 -
 733 -                       vgen5_reg: vgen5 {
 734 -                               regulator-min-microvolt = <1800000>;
 735 -                               regulator-max-microvolt = <3300000>;
 736 -                               regulator-always-on;
 737 -                       };
 738 -
 739 -                       vgen6_reg: vgen6 {
 740 -                               regulator-min-microvolt = <1800000>;
 741 -                               regulator-max-microvolt = <3300000>;
 742 -                               regulator-always-on;
 743 -                       };
 744 -               };
 745 -       };
 746 -
 747          egalax_ts@04 {
 748                  compatible = "eeti,egalax_ts";
 749                  reg = <0x04>;
 750 --
 751 2.1.0
 752