Merge tag 'imx-dt-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 13:06:39 +0000 (14:06 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 30 Oct 2017 13:06:39 +0000 (14:06 +0100)
Pull "i.MX device tree updates for 4.15" from Shawn Guo:

 - New board support: i.MX51 ZII RDU1, i.MX53 GE Healthcare PPD, i.MX6
   TX modules for MB7 from  Ka-Ro Electronics, i.MX6 Wandboard revd1
   variants, i.MX6 LWN DISPLAY5 board, Pistachio i.MX6Q board, i.MX6SX
   Vining-2000 board.
 - Use the 'vpcie-supply' property for PCIe device for boards
   imx6qdl-sabresd, imx6q-novena and imx6q-cm-fx6.
 - A series from Jagan Teki to update imx6qdl-icore board with audio,
   touch and CAN support.
 - Switch to nvmem for accessing OCOTP from tempmon for i.MX6SX and add
   tempmon support for i.MX6UL.
 - A bunch of patches from Lothar WaƟmann updating Ka-Ro i.MX28, i.MX53
   and i.MX6 TX modules.
 - Fix DTC warnings in i.MX device trees, dropping leading zeros from
   unit address, correcting display nodes notation and display port
   names, fixing nodes with unit name and no reg property.
 - Other random device updates for various board support.

* tag 'imx-dt-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (63 commits)
  ARM: dts: imx53-tx53: fix interrupt flags
  ARM: dts: imx28-tx28: fix interrupt flags
  ARM: dts: display5: Device tree description of LWN's DISPLAY5 board
  ARM: dts: imx53-qsb-common: Fix 'led_gpio7_7@0' node with unit name and no reg property
  ARM: dts: imx53-m53evk: Fix 'led_gpio@0' node with unit name and no reg property
  ARM: dts: imx53: Fix 'usbphy@x' node with unit name and no reg property
  ARM: dts: imx51-ts4800: Fix 'port@0' node with unit name and no reg property
  ARM: dts: imx51-apf51dev: Fix 'backlight@bl1' node with unit name and no reg property
  ARM: dts: imx: add ZII RDU1 board
  ARM: dts: imx: add support for TX6 modules on MB7 baseboard
  ARM: dts: imx: add support for TX6QP
  ARM: dts: imx6-tx6: add a .dtsi file for the MB7 baseboard
  ARM: dts: imx6-tx6: move display configuration to .dtsi file
  ARM: dts: imx6-tx6: add support for I2C bus recovery
  ARM: dts: imx6-tx6: convert to using simple-audio-card
  ARM: dts: imx6-tx6: specify ethernet phy reset post-delay
  ARM: dts: imx6-tx6: improve ethernet related pinctrl setup
  ARM: dts: imx6-tx6: add trickle-charge config for DS1339
  ARM: dts: imx6-tx6: remove obsolete ipu1 alias
  ARM: dts: imx6-tx6: remove obsolete eeti,egalax_ts
  ...

[arnd: made sure we have no new leading zeroes in unit address during merge]

32 files changed:
1  2 
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx25-pdk.dts
arch/arm/boot/dts/imx28-tx28.dts
arch/arm/boot/dts/imx50.dtsi
arch/arm/boot/dts/imx51-babbage.dts
arch/arm/boot/dts/imx51-zii-rdu1.dts
arch/arm/boot/dts/imx53-m53evk.dts
arch/arm/boot/dts/imx53-qsb-common.dtsi
arch/arm/boot/dts/imx53-tx53-x03x.dts
arch/arm/boot/dts/imx53-tx53-x13x.dts
arch/arm/boot/dts/imx53.dtsi
arch/arm/boot/dts/imx6q-display5.dtsi
arch/arm/boot/dts/imx6q-gw5400-a.dts
arch/arm/boot/dts/imx6q-novena.dts
arch/arm/boot/dts/imx6q-pistachio.dts
arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
arch/arm/boot/dts/imx6qdl-tx6.dtsi
arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi
arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
arch/arm/boot/dts/imx6sx-softing-vining-2000.dts
arch/arm/boot/dts/imx6sx.dtsi
arch/arm/boot/dts/imx6ul-pico-hobbit.dts
arch/arm/boot/dts/imx6ul-tx6ul.dtsi
arch/arm/boot/dts/imx7d-pico.dts

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,5809e683c0d02fe764b043fefd2555b0ea3279a3..49be0e1c812d21628920931f2c69579d37828908
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,834 +1,834 @@@
 -              sgtl5000: codec@0a {
+ /*
+  * Copyright (C) 2017 Zodiac Inflight Innovations
+  *
+  * This file is dual-licensed: you can use it either under the terms
+  * of the GPL or the X11 license, at your option. Note that this dual
+  * licensing only applies to this file, and not this project as a
+  * whole.
+  *
+  *  a) This file is free software; you can redistribute it and/or
+  *     modify it under the terms of the GNU General Public License
+  *     version 2 as published by the Free Software Foundation.
+  *
+  *     This file is distributed in the hope that it will be useful,
+  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *     GNU General Public License for more details.
+  *
+  * Or, alternatively,
+  *
+  *  b) Permission is hereby granted, free of charge, to any person
+  *     obtaining a copy of this software and associated documentation
+  *     files (the "Software"), to deal in the Software without
+  *     restriction, including without limitation the rights to use,
+  *     copy, modify, merge, publish, distribute, sublicense, and/or
+  *     sell copies of the Software, and to permit persons to whom the
+  *     Software is furnished to do so, subject to the following
+  *     conditions:
+  *
+  *     The above copyright notice and this permission notice shall be
+  *     included in all copies or substantial portions of the Software.
+  *
+  *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND,
+  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  *     OTHER DEALINGS IN THE SOFTWARE.
+  */
+ /dts-v1/;
+ #include "imx51.dtsi"
+ #include <dt-bindings/sound/fsl-imx-audmux.h>
+ / {
+       model = "ZII RDU1 Board";
+       compatible = "zii,imx51-rdu1", "fsl,imx51";
+       chosen {
+               stdout-path = &uart1;
+       };
+       aliases {
+               mdio-gpio0 = &mdio_gpio;
+               rtc0 = &ds1341;
+       };
+       clk_26M_osc: 26M_osc {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <26000000>;
+       };
+       clk_26M_osc_gate: 26M_gate {
+               compatible = "gpio-gate-clock";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_clk26mhz>;
+               clocks = <&clk_26M_osc>;
+               #clock-cells = <0>;
+               enable-gpios = <&gpio3 1 GPIO_ACTIVE_HIGH>;
+       };
+       clk_26M_usb: usbhost_gate {
+               compatible = "gpio-gate-clock";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_usbgate26mhz>;
+               clocks = <&clk_26M_osc_gate>;
+               #clock-cells = <0>;
+               enable-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
+       };
+       clk_26M_snd: snd_gate {
+               compatible = "gpio-gate-clock";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_sndgate26mhz>;
+               clocks = <&clk_26M_osc_gate>;
+               #clock-cells = <0>;
+               enable-gpios = <&gpio4 26 GPIO_ACTIVE_LOW>;
+       };
+       reg_5p0v_main: regulator-5p0v-main {
+               compatible = "regulator-fixed";
+               regulator-name = "5V_MAIN";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+       };
+       reg_3p3v: regulator-3p3v {
+               compatible = "regulator-fixed";
+               regulator-name = "3.3V";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+       disp0 {
+               compatible = "fsl,imx-parallel-display";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_ipu_disp1>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               port@0 {
+                       reg = <0>;
+                       display_in: endpoint {
+                               remote-endpoint = <&ipu_di0_disp1>;
+                       };
+               };
+               port@1 {
+                       reg = <1>;
+                       display_out: endpoint {
+                               remote-endpoint = <&panel_in>;
+                       };
+               };
+       };
+       panel {
+               /* no compatible here, bootloader will patch in correct one */
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_panel>;
+               power-supply = <&reg_3p3v>;
+               enable-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>;
+               status = "disabled";
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&display_out>;
+                       };
+               };
+       };
+       i2c_gpio: i2c-gpio {
+               compatible = "i2c-gpio";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_swi2c>;
+               gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>, /* sda */
+                       <&gpio3 4 GPIO_ACTIVE_HIGH>; /* scl */
+               i2c-gpio,delay-us = <50>;
+               status = "okay";
+               #address-cells = <1>;
+               #size-cells = <0>;
++              sgtl5000: codec@a {
+                       compatible = "fsl,sgtl5000";
+                       reg = <0x0a>;
+                       clocks = <&clk_26M_snd>;
+                       VDDA-supply = <&vdig_reg>;
+                       VDDIO-supply = <&vvideo_reg>;
+                       #sound-dai-cells = <0>;
+               };
+       };
+       spi_gpio: spi-gpio {
+               compatible = "spi-gpio";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpiospi0>;
+               status = "okay";
+               gpio-sck = <&gpio4 15 GPIO_ACTIVE_HIGH>;
+               gpio-mosi = <&gpio4 12 GPIO_ACTIVE_HIGH>;
+               gpio-miso = <&gpio4 11 GPIO_ACTIVE_HIGH>;
+               num-chipselects = <1>;
+               cs-gpios = <&gpio4 14 GPIO_ACTIVE_HIGH>;
+               eeprom@0 {
+                       compatible = "eeprom-93xx46";
+                       reg = <0>;
+                       spi-max-frequency = <1000000>;
+                       spi-cs-high;
+                       data-size = <8>;
+               };
+       };
+       mdio_gpio: mdio-gpio {
+               compatible = "virtual,mdio-gpio";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_swmdio>;
+               gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>, /* mdc */
+                       <&gpio3 25 GPIO_ACTIVE_HIGH>; /* mdio */
+               #address-cells = <1>;
+               #size-cells = <0>;
+               switch@0 {
+                       compatible = "marvell,mv88e6085";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0>;
+                       dsa,member = <0 0>;
+                       ports {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               port@0 {
+                                       reg = <0>;
+                                       label = "cpu";
+                                       ethernet = <&fec>;
+                                       fixed-link {
+                                               speed = <100>;
+                                               full-duplex;
+                                       };
+                               };
+                               port@1 {
+                                       reg = <1>;
+                                       label = "netaux";
+                               };
+                               port@3 {
+                                       reg = <3>;
+                                       label = "netright";
+                               };
+                               port@4 {
+                                       reg = <4>;
+                                       label = "netleft";
+                               };
+                       };
+               };
+       };
+       sound {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "RDU1 audio";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,bitclock-master = <&sound_codec>;
+               simple-audio-card,frame-master = <&sound_codec>;
+               simple-audio-card,widgets =
+                       "Headphone", "Headphone Jack";
+               simple-audio-card,routing =
+                       "Headphone Jack", "HPLEFT",
+                       "Headphone Jack", "HPRIGHT";
+               simple-audio-card,aux-devs = <&tpa6130a2>;
+               sound_cpu: simple-audio-card,cpu {
+                       sound-dai = <&ssi2>;
+               };
+               sound_codec: simple-audio-card,codec {
+                       sound-dai = <&sgtl5000>;
+                       clocks = <&clk_26M_snd>;
+               };
+       };
+       usbh1phy: usbphy1 {
+               compatible = "usb-nop-xceiv";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_usbh1phy>;
+               clocks = <&clk_26M_usb>;
+               clock-names = "main_clk";
+               reset-gpios = <&gpio4 8 GPIO_ACTIVE_LOW>;
+               vcc-supply = <&vusb_reg>;
+       };
+       usbh2phy: usbphy2 {
+               compatible = "usb-nop-xceiv";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_usbh2phy>;
+               clocks = <&clk_26M_usb>;
+               clock-names = "main_clk";
+               reset-gpios = <&gpio4 7 GPIO_ACTIVE_LOW>;
+               vcc-supply = <&vusb_reg>;
+       };
+ };
+ &audmux {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux>;
+       status = "okay";
+       ssi2 {
+               fsl,audmux-port = <1>;
+               fsl,port-config = <
+                       (IMX_AUDMUX_V2_PTCR_SYN |
+                        IMX_AUDMUX_V2_PTCR_TFSEL(2) |
+                        IMX_AUDMUX_V2_PTCR_TCSEL(2) |
+                        IMX_AUDMUX_V2_PTCR_TFSDIR |
+                        IMX_AUDMUX_V2_PTCR_TCLKDIR)
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(2)
+               >;
+       };
+       aud3 {
+               fsl,audmux-port = <2>;
+               fsl,port-config = <
+                       IMX_AUDMUX_V2_PTCR_SYN
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(1)
+               >;
+       };
+ };
+ &cpu {
+       cpu-supply = <&sw1_reg>;
+ };
+ &ecspi1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ecspi1>;
+       cs-gpios = <&gpio4 24 GPIO_ACTIVE_HIGH>,
+                  <&gpio4 25 GPIO_ACTIVE_LOW>;
+       status = "okay";
+       pmic@0 {
+               compatible = "fsl,mc13892";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_pmic>;
+               spi-max-frequency = <6000000>;
+               spi-cs-high;
+               reg = <0>;
+               interrupt-parent = <&gpio1>;
+               interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
+               fsl,mc13xxx-uses-adc;
+               regulators {
+                       sw1_reg: sw1 {
+                               regulator-min-microvolt = <600000>;
+                               regulator-max-microvolt = <1375000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw2_reg: sw2 {
+                               regulator-min-microvolt = <900000>;
+                               regulator-max-microvolt = <1850000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw3_reg: sw3 {
+                               regulator-min-microvolt = <1100000>;
+                               regulator-max-microvolt = <1850000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw4_reg: sw4 {
+                               regulator-min-microvolt = <1100000>;
+                               regulator-max-microvolt = <1850000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vpll_reg: vpll {
+                               regulator-min-microvolt = <1050000>;
+                               regulator-max-microvolt = <1800000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vdig_reg: vdig {
+                               regulator-min-microvolt = <1650000>;
+                               regulator-max-microvolt = <1650000>;
+                               regulator-boot-on;
+                       };
+                       vsd_reg: vsd {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3150000>;
+                       };
+                       vusb_reg: vusb {
+                               regulator-always-on;
+                       };
+                       vusb2_reg: vusb2 {
+                               regulator-min-microvolt = <2400000>;
+                               regulator-max-microvolt = <2775000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vvideo_reg: vvideo {
+                               regulator-min-microvolt = <2775000>;
+                               regulator-max-microvolt = <2775000>;
+                       };
+                       vaudio_reg: vaudio {
+                               regulator-min-microvolt = <2300000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+                       vcam_reg: vcam {
+                               regulator-min-microvolt = <2500000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+                       vgen1_reg: vgen1 {
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <1200000>;
+                       };
+                       vgen2_reg: vgen2 {
+                               regulator-min-microvolt = <1200000>;
+                               regulator-max-microvolt = <3150000>;
+                               regulator-always-on;
+                       };
+                       vgen3_reg: vgen3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <2900000>;
+                               regulator-always-on;
+                       };
+               };
+               leds {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       led-control = <0x0 0x0 0x3f83f8 0x0>;
+                       sysled0 {
+                               reg = <3>;
+                               label = "system:green:status";
+                               linux,default-trigger = "default-on";
+                       };
+                       sysled1 {
+                               reg = <4>;
+                               label = "system:green:act";
+                               linux,default-trigger = "heartbeat";
+                       };
+               };
+       };
+       flash@1 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "atmel,at45db642d", "atmel,at45", "atmel,dataflash";
+               spi-max-frequency = <25000000>;
+               reg = <1>;
+       };
+ };
+ &esdhc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_esdhc1>;
+       bus-width = <4>;
+       non-removable;
+       status = "okay";
+ };
+ &fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_fec>;
+       phy-mode = "mii";
+       phy-reset-gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
+       phy-supply = <&vgen3_reg>;
+       status = "okay";
+ };
+ &i2c2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2>;
+       status = "okay";
+       eeprom@50 {
+               compatible = "atmel,24c04";
+               pagesize = <16>;
+               reg = <0x50>;
+       };
+       tpa6130a2: amp@60 {
+               compatible = "ti,tpa6130a2";
+               reg = <0x60>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_ampgpio>;
+               power-gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+               Vdd-supply = <&reg_3p3v>;
+       };
+       ds1341: rtc@68 {
+               compatible = "maxim,ds1341";
+               reg = <0x68>;
+       };
+       /* touch nodes default disabled, bootloader will enable the right one */
+       touchscreen@4b {
+               compatible = "atmel,maxtouch";
+               reg = <0x4b>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_ts>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
+               status = "disabled";
+       };
+       touchscreen@4c {
+               compatible = "atmel,maxtouch";
+               reg = <0x4c>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_ts>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
+               status = "disabled";
+       };
+       touchscreen@20 {
+               compatible = "syna,rmi4_i2c";
+               reg = <0x20>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_ts>;
+               interrupt-parent = <&gpio3>;
+               interrupts = <12 IRQ_TYPE_LEVEL_LOW>;
+               status = "disabled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               rmi4-f01@1 {
+                       reg = <0x1>;
+                       syna,nosleep-mode = <2>;
+               };
+               rmi4-f11@11 {
+                       reg = <0x11>;
+                       touch-inverted-y;
+                       touch-swapped-x-y;
+                       syna,sensor-type = <1>;
+               };
+       };
+ };
+ &ipu_di0_disp1 {
+       remote-endpoint = <&display_in>;
+ };
+ &ssi2 {
+       status = "okay";
+ };
+ &uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1>;
+       status = "okay";
+ };
+ &uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2>;
+       status = "okay";
+ };
+ &uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart3>;
+       status = "okay";
+ };
+ &usbh1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbh1>;
+       dr_mode = "host";
+       phy_type = "ulpi";
+       fsl,usbphy = <&usbh1phy>;
+       disable-over-current;
+       vbus-supply = <&reg_5p0v_main>;
+       status = "okay";
+ };
+ &usbh2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbh2>;
+       dr_mode = "host";
+       phy_type = "ulpi";
+       fsl,usbphy = <&usbh2phy>;
+       disable-over-current;
+       vbus-supply = <&reg_5p0v_main>;
+       status = "okay";
+ };
+ &usbphy0 {
+       vcc-supply = <&vusb_reg>;
+ };
+ &usbotg {
+       dr_mode = "host";
+       disable-over-current;
+       phy_type = "utmi_wide";
+       vbus-supply = <&reg_5p0v_main>;
+       status = "okay";
+ };
+ &iomuxc {
+       pinctrl_ampgpio: ampgpiogrp {
+               fsl,pins = <
+                       MX51_PAD_GPIO1_9__GPIO1_9               0x5e
+               >;
+       };
+       pinctrl_audmux: audmuxgrp {
+               fsl,pins = <
+                       MX51_PAD_AUD3_BB_TXD__AUD3_TXD          0xa5
+                       MX51_PAD_AUD3_BB_RXD__AUD3_RXD          0x85
+                       MX51_PAD_AUD3_BB_CK__AUD3_TXC           0xa5
+                       MX51_PAD_AUD3_BB_FS__AUD3_TXFS          0x85
+               >;
+       };
+       pinctrl_clk26mhz: clk26mhzgrp {
+               fsl,pins = <
+                       MX51_PAD_DI1_PIN12__GPIO3_1             0x85
+               >;
+       };
+       pinctrl_ecspi1: ecspi1grp {
+               fsl,pins = <
+                       MX51_PAD_CSPI1_MISO__ECSPI1_MISO        0x185
+                       MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI        0x185
+                       MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK        0x185
+                       MX51_PAD_CSPI1_SS0__GPIO4_24            0x85
+                       MX51_PAD_CSPI1_SS1__GPIO4_25            0x85
+               >;
+       };
+       pinctrl_esdhc1: esdhc1grp {
+               fsl,pins = <
+                       MX51_PAD_SD1_CMD__SD1_CMD               0x400020d5
+                       MX51_PAD_SD1_CLK__SD1_CLK               0x20d5
+                       MX51_PAD_SD1_DATA0__SD1_DATA0           0x20d5
+                       MX51_PAD_SD1_DATA1__SD1_DATA1           0x20d5
+                       MX51_PAD_SD1_DATA2__SD1_DATA2           0x20d5
+                       MX51_PAD_SD1_DATA3__SD1_DATA3           0x20d5
+               >;
+       };
+       pinctrl_fec: fecgrp {
+               fsl,pins = <
+                       MX51_PAD_EIM_EB2__FEC_MDIO              0x1f5
+                       MX51_PAD_NANDF_D9__FEC_RDATA0           0x2180
+                       MX51_PAD_EIM_EB3__FEC_RDATA1            0x180
+                       MX51_PAD_EIM_CS2__FEC_RDATA2            0x180
+                       MX51_PAD_EIM_CS3__FEC_RDATA3            0x180
+                       MX51_PAD_EIM_CS4__FEC_RX_ER             0x180
+                       MX51_PAD_NANDF_D11__FEC_RX_DV           0x2084
+                       MX51_PAD_EIM_CS5__FEC_CRS               0x180
+                       MX51_PAD_NANDF_RB2__FEC_COL             0x2180
+                       MX51_PAD_NANDF_RB3__FEC_RX_CLK          0x2180
+                       MX51_PAD_NANDF_CS2__FEC_TX_ER           0x2004
+                       MX51_PAD_NANDF_CS3__FEC_MDC             0x2004
+                       MX51_PAD_NANDF_D8__FEC_TDATA0           0x2180
+                       MX51_PAD_NANDF_CS4__FEC_TDATA1          0x2004
+                       MX51_PAD_NANDF_CS5__FEC_TDATA2          0x2004
+                       MX51_PAD_NANDF_CS6__FEC_TDATA3          0x2004
+                       MX51_PAD_DISP2_DAT9__FEC_TX_EN          0x2004
+                       MX51_PAD_DISP2_DAT13__FEC_TX_CLK        0x2180
+                       MX51_PAD_EIM_A20__GPIO2_14              0x85
+               >;
+       };
+       pinctrl_gpiospi0: gpiospi0grp {
+               fsl,pins = <
+                       MX51_PAD_CSI2_D18__GPIO4_11             0x85
+                       MX51_PAD_CSI2_D19__GPIO4_12             0x85
+                       MX51_PAD_CSI2_HSYNC__GPIO4_14           0x85
+                       MX51_PAD_CSI2_PIXCLK__GPIO4_15          0x85
+               >;
+       };
+       pinctrl_i2c2: i2c2grp {
+               fsl,pins = <
+                       MX51_PAD_KEY_COL4__I2C2_SCL             0x400001ed
+                       MX51_PAD_KEY_COL5__I2C2_SDA             0x400001ed
+               >;
+       };
+       pinctrl_ipu_disp1: ipudisp1grp {
+               fsl,pins = <
+                       MX51_PAD_DISP1_DAT0__DISP1_DAT0         0x5
+                       MX51_PAD_DISP1_DAT1__DISP1_DAT1         0x5
+                       MX51_PAD_DISP1_DAT2__DISP1_DAT2         0x5
+                       MX51_PAD_DISP1_DAT3__DISP1_DAT3         0x5
+                       MX51_PAD_DISP1_DAT4__DISP1_DAT4         0x5
+                       MX51_PAD_DISP1_DAT5__DISP1_DAT5         0x5
+                       MX51_PAD_DISP1_DAT6__DISP1_DAT6         0x5
+                       MX51_PAD_DISP1_DAT7__DISP1_DAT7         0x5
+                       MX51_PAD_DISP1_DAT8__DISP1_DAT8         0x5
+                       MX51_PAD_DISP1_DAT9__DISP1_DAT9         0x5
+                       MX51_PAD_DISP1_DAT10__DISP1_DAT10       0x5
+                       MX51_PAD_DISP1_DAT11__DISP1_DAT11       0x5
+                       MX51_PAD_DISP1_DAT12__DISP1_DAT12       0x5
+                       MX51_PAD_DISP1_DAT13__DISP1_DAT13       0x5
+                       MX51_PAD_DISP1_DAT14__DISP1_DAT14       0x5
+                       MX51_PAD_DISP1_DAT15__DISP1_DAT15       0x5
+                       MX51_PAD_DISP1_DAT16__DISP1_DAT16       0x5
+                       MX51_PAD_DISP1_DAT17__DISP1_DAT17       0x5
+                       MX51_PAD_DISP1_DAT18__DISP1_DAT18       0x5
+                       MX51_PAD_DISP1_DAT19__DISP1_DAT19       0x5
+                       MX51_PAD_DISP1_DAT20__DISP1_DAT20       0x5
+                       MX51_PAD_DISP1_DAT21__DISP1_DAT21       0x5
+                       MX51_PAD_DISP1_DAT22__DISP1_DAT22       0x5
+                       MX51_PAD_DISP1_DAT23__DISP1_DAT23       0x5
+                       MX51_PAD_DI1_PIN2__DI1_PIN2             0x5
+                       MX51_PAD_DI1_PIN3__DI1_PIN3             0x5
+                       MX51_PAD_DI2_DISP_CLK__DI2_DISP_CLK     0x5
+               >;
+       };
+       pinctrl_panel: panelgrp {
+               fsl,pins = <
+                       MX51_PAD_DI1_D0_CS__GPIO3_3             0x85
+               >;
+       };
+       pinctrl_pmic: pmicgrp {
+               fsl,pins = <
+                       MX51_PAD_GPIO1_4__GPIO1_4               0x1e0
+                       MX51_PAD_GPIO1_8__GPIO1_8               0x21e2
+               >;
+       };
+       pinctrl_sndgate26mhz: sndgate26mhzgrp {
+               fsl,pins = <
+                       MX51_PAD_CSPI1_RDY__GPIO4_26            0x85
+               >;
+       };
+       pinctrl_swi2c: swi2cgrp {
+               fsl,pins = <
+                       MX51_PAD_GPIO1_2__GPIO1_2               0xc5
+                       MX51_PAD_DI1_D1_CS__GPIO3_4             0x400001f5
+               >;
+       };
+       pinctrl_swmdio: swmdiogrp {
+               fsl,pins = <
+                       MX51_PAD_NANDF_D14__GPIO3_26            0x21e6
+                       MX51_PAD_NANDF_D15__GPIO3_25            0x21e6
+               >;
+       };
+       pinctrl_ts: tsgrp {
+               fsl,pins = <
+                       MX51_PAD_CSI1_D8__GPIO3_12              0x85
+                       MX51_PAD_CSI1_D9__GPIO3_13              0x85
+               >;
+       };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX51_PAD_UART1_RXD__UART1_RXD           0x1c5
+                       MX51_PAD_UART1_TXD__UART1_TXD           0x1c5
+                       MX51_PAD_UART1_RTS__UART1_RTS           0x1c4
+                       MX51_PAD_UART1_CTS__UART1_CTS           0x1c4
+               >;
+       };
+       pinctrl_uart2: uart2grp {
+               fsl,pins = <
+                       MX51_PAD_UART2_RXD__UART2_RXD           0xc5
+                       MX51_PAD_UART2_TXD__UART2_TXD           0xc5
+               >;
+       };
+       pinctrl_uart3: uart3grp {
+               fsl,pins = <
+                       MX51_PAD_EIM_D25__UART3_RXD             0x1c5
+                       MX51_PAD_EIM_D26__UART3_TXD             0x1c5
+               >;
+       };
+       pinctrl_usbgate26mhz: usbgate26mhzgrp {
+               fsl,pins = <
+                       MX51_PAD_DISP2_DAT6__GPIO1_19           0x85
+               >;
+       };
+       pinctrl_usbh1: usbh1grp {
+               fsl,pins = <
+                       MX51_PAD_USBH1_STP__USBH1_STP           0x0
+                       MX51_PAD_USBH1_CLK__USBH1_CLK           0x0
+                       MX51_PAD_USBH1_DIR__USBH1_DIR           0x0
+                       MX51_PAD_USBH1_NXT__USBH1_NXT           0x0
+                       MX51_PAD_USBH1_DATA0__USBH1_DATA0       0x0
+                       MX51_PAD_USBH1_DATA1__USBH1_DATA1       0x0
+                       MX51_PAD_USBH1_DATA2__USBH1_DATA2       0x0
+                       MX51_PAD_USBH1_DATA3__USBH1_DATA3       0x0
+                       MX51_PAD_USBH1_DATA4__USBH1_DATA4       0x0
+                       MX51_PAD_USBH1_DATA5__USBH1_DATA5       0x0
+                       MX51_PAD_USBH1_DATA6__USBH1_DATA6       0x0
+                       MX51_PAD_USBH1_DATA7__USBH1_DATA7       0x0
+               >;
+       };
+       pinctrl_usbh1phy: usbh1phygrp {
+               fsl,pins = <
+                       MX51_PAD_NANDF_D0__GPIO4_8              0x85
+               >;
+       };
+       pinctrl_usbh2: usbh2grp {
+               fsl,pins = <
+                       MX51_PAD_EIM_A26__USBH2_STP             0x0
+                       MX51_PAD_EIM_A24__USBH2_CLK             0x0
+                       MX51_PAD_EIM_A25__USBH2_DIR             0x0
+                       MX51_PAD_EIM_A27__USBH2_NXT             0x0
+                       MX51_PAD_EIM_D16__USBH2_DATA0           0x0
+                       MX51_PAD_EIM_D17__USBH2_DATA1           0x0
+                       MX51_PAD_EIM_D18__USBH2_DATA2           0x0
+                       MX51_PAD_EIM_D19__USBH2_DATA3           0x0
+                       MX51_PAD_EIM_D20__USBH2_DATA4           0x0
+                       MX51_PAD_EIM_D21__USBH2_DATA5           0x0
+                       MX51_PAD_EIM_D22__USBH2_DATA6           0x0
+                       MX51_PAD_EIM_D23__USBH2_DATA7           0x0
+               >;
+       };
+       pinctrl_usbh2phy: usbh2phygrp {
+               fsl,pins = <
+                       MX51_PAD_NANDF_D1__GPIO4_7              0x85
+               >;
+       };
+ };
Simple merge
Simple merge
index be31c5d1db051d99d914f5617bcfa7a9ee9f9af2,a87a10b942cfcecad071024db86f2fdd8b2d89a1..f2b2ad3ce9e52d6084c31f8983dcf21108079159
  };
  
  &i2c3 {
-       pinctrl-names = "default";
+       pinctrl-names = "default", "gpio";
        pinctrl-0 = <&pinctrl_i2c3>;
+       pinctrl-1 = <&pinctrl_i2c3_gpio>;
+       scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>;
+       sda-gpios = <&gpio3 28 GPIO_ACTIVE_HIGH>;
        status = "okay";
  
 -      sgtl5000: codec@0a {
 +      sgtl5000: codec@a {
                compatible = "fsl,sgtl5000";
                reg = <0x0a>;
                VDDA-supply = <&reg_2v5>;
Simple merge
index 0000000000000000000000000000000000000000,5de337d36008b3dedbd91910a9aa57b09be47d75..4084de43d4d9c26ee83576a36130ac96e4ae483b
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,596 +1,596 @@@
 -      pfuze100: pmic@08 {
+ /*
+  * Copyright 2017
+  * Lukasz Majewski, DENX Software Engineering, lukma@denx.de
+  *
+  * This file is dual-licensed: you can use it either under the terms
+  * of the GPL or the X11 license, at your option. Note that this dual
+  * licensing only applies to this file, and not this project as a
+  * whole.
+  *
+  *  a) This file is licensed under the terms of the GNU General Public
+  *     License version 2.  This program is licensed "as is" without
+  *     any warranty of any kind, whether express or implied.
+  *
+  * Or, alternatively,
+  *
+  *  b) Permission is hereby granted, free of charge, to any person
+  *     obtaining a copy of this software and associated documentation
+  *     files (the "Software"), to deal in the Software without
+  *     restriction, including without limitation the rights to use,
+  *     copy, modify, merge, publish, distribute, sublicense, and/or
+  *     sell copies of the Software, and to permit persons to whom the
+  *     Software is furnished to do so, subject to the following
+  *     conditions:
+  *
+  *     The above copyright notice and this permission notice shall be
+  *     included in all copies or substantial portions of the Software.
+  *
+  *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  *     OTHER DEALINGS IN THE SOFTWARE.
+  */
+ /dts-v1/;
+ #include "imx6q.dtsi"
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/pwm/pwm.h>
+ #include <dt-bindings/sound/fsl-imx-audmux.h>
+ / {
+       model = "Liebherr (LWN) display5 i.MX6 Quad Board";
+       compatible = "lwn,display5", "fsl,imx6q";
+       memory {
+               reg = <0x10000000 0x40000000>;
+       };
+       backlight_lvds: backlight {
+               compatible = "pwm-backlight";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_backlight>;
+               pwms = <&pwm2 0 5000000 0>;
+               brightness-levels = <  0   1   2   3   4   5   6   7   8   9
+                                     10  11  12  13  14  15  16  17  18  19
+                                     20  21  22  23  24  25  26  27  28  29
+                                     30  31  32  33  34  35  36  37  38  39
+                                     40  41  42  43  44  45  46  47  48  49
+                                     50  51  52  53  54  55  56  57  58  59
+                                     60  61  62  63  64  65  66  67  68  69
+                                     70  71  72  73  74  75  76  77  78  79
+                                     80  81  82  83  84  85  86  87  88  89
+                                     90  91  92  93  94  95  96  97  98  99
+                                    100 101 102 103 104 105 106 107 108 109
+                                    110 111 112 113 114 115 116 117 118 119
+                                    120 121 122 123 124 125 126 127 128 129
+                                    130 131 132 133 134 135 136 137 138 139
+                                    140 141 142 143 144 145 146 147 148 149
+                                    150 151 152 153 154 155 156 157 158 159
+                                    160 161 162 163 164 165 166 167 168 169
+                                    170 171 172 173 174 175 176 177 178 179
+                                    180 181 182 183 184 185 186 187 188 189
+                                    190 191 192 193 194 195 196 197 198 199
+                                    200 201 202 203 204 205 206 207 208 209
+                                    210 211 212 213 214 215 216 217 218 219
+                                    220 221 222 223 224 225 226 227 228 229
+                                    230 231 232 233 234 235 236 237 238 239
+                                    240 241 242 243 244 245 246 247 248 249
+                                    250 251 252 253 254 255>;
+               default-brightness-level = <250>;
+               enable-gpios = <&gpio5 7 GPIO_ACTIVE_HIGH>;
+       };
+       reg_lvds: regulator-lvds {
+               compatible = "regulator-fixed";
+               regulator-name = "lvds_ppen";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-boot-on;
+               regulator-always-on;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_reg_lvds>;
+               gpio = <&gpio5 13 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+       reg_usbh1_vbus: usb-h1-vbus {
+               compatible = "regulator-fixed";
+               gpio = <&gpio3 31 GPIO_ACTIVE_LOW>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_usbh1_vbus>;
+               regulator-name = "usb_h1_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-enable-ramp-delay = <300000>;
+       };
+       sound {
+               compatible = "simple-audio-card";
+               label = "tfa9879-mono";
+               simple-audio-card,dai-link {
+                       /* DAC */
+                       format = "i2s";
+                       bitclock-master = <&dailink_master>;
+                       frame-master = <&dailink_master>;
+                       dailink_master: cpu {
+                           sound-dai = <&ssi2>;
+                       };
+                       codec {
+                           sound-dai = <&codec>;
+                       };
+               };
+       };
+       panel: panel-lvds0 {
+               backlight = <&backlight_lvds>;
+               power-supply = <&reg_lvds>;
+               port {
+                       panel_in_lvds0: endpoint {
+                               remote-endpoint = <&lvds0_out>;
+                       };
+               };
+       };
+ };
+ &audmux {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux>;
+       status = "okay";
+       ssi2 {
+               fsl,audmux-port = <1>;
+               fsl,port-config = <
+                       (IMX_AUDMUX_V2_PTCR_SYN |
+                        IMX_AUDMUX_V2_PTCR_TFSEL(5) |
+                        IMX_AUDMUX_V2_PTCR_TCSEL(5) |
+                        IMX_AUDMUX_V2_PTCR_TFSDIR |
+                        IMX_AUDMUX_V2_PTCR_TCLKDIR)
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(5)
+               >;
+       };
+       aud6 {
+               fsl,audmux-port = <5>;
+               fsl,port-config = <
+                       (IMX_AUDMUX_V2_PTCR_RFSEL(8) |
+                        IMX_AUDMUX_V2_PTCR_RCSEL(8) |
+                        IMX_AUDMUX_V2_PTCR_TFSEL(1) |
+                        IMX_AUDMUX_V2_PTCR_TCSEL(1) |
+                        IMX_AUDMUX_V2_PTCR_RFSDIR |
+                        IMX_AUDMUX_V2_PTCR_RCLKDIR |
+                        IMX_AUDMUX_V2_PTCR_TFSDIR |
+                        IMX_AUDMUX_V2_PTCR_TCLKDIR)
+                       IMX_AUDMUX_V2_PDCR_RXDSEL(1)
+               >;
+       };
+ };
+ &ecspi2 {
+       cs-gpios = <&gpio5 29 GPIO_ACTIVE_LOW>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ecspi2 &pinctrl_ecspi2_cs &pinctrl_ecspi2_flwp>;
+       status = "okay";
+       s25fl256s: flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <40000000>;
+               reg = <0>;
+               partition@0 {
+                       label = "SPL (spi)";
+                       reg = <0x0 0x20000>;
+                       read-only;
+               };
+               partition@1 {
+                       label = "u-boot (spi)";
+                       reg = <0x20000 0x100000>;
+                       read-only;
+               };
+               partition@2 {
+                       label = "uboot-env (spi)";
+                       reg = <0x120000 0x10000>;
+               };
+               partition@3 {
+                       label = "uboot-envr (spi)";
+                       reg = <0x130000 0x10000>;
+               };
+               partition@4 {
+                       label = "linux-recovery (spi)";
+                       reg = <0x140000 0x800000>;
+               };
+               partition@5 {
+                       label = "swupdate-fitImg (spi)";
+                       reg = <0x940000 0x400000>;
+               };
+               partition@6 {
+                       label = "swupdate-initramfs (spi)";
+                       reg = <0xD40000 0x800000>;
+               };
+       };
+ };
+ &ecspi3 {
+       cs-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ecspi3 &pinctrl_ecspi3_cs &pinctrl_ecspi3_flwp>;
+       status = "okay";
+ };
+ &fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet>;
+       phy-handle = <&ethernet_phy0>;
+       phy-mode = "rgmii-id";
+       status = "okay";
+       mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               ethernet_phy0: ethernet-phy@0 {
+                       compatible = "marvell,88E1510";
+                       device_type = "ethernet-phy";
+                       /* Set LED0 control: */
+                       /* On - Link, Blink - Activity, Off - No Link */
+                       marvell,reg-init = <3 0x10 0 0x1011>;
+                       max-speed = <100>;
+                       reg = <0>;
+               };
+       };
+ };
+ &i2c1 {
+       clock-frequency = <400000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1>;
+       status = "okay";
+       codec: tfa9879@6C {
+               #sound-dai-cells = <0>;
+               compatible = "nxp,tfa9879";
+               reg = <0x6C>;
+       };
+ };
+ &i2c2 {
+       clock-frequency = <400000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2>;
+       status = "okay";
+ };
+ &i2c3 {
+       clock-frequency = <400000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3>;
+       status = "okay";
+       at24@50 {
+               compatible = "atmel,24c256";
+               pagesize = <64>;
+               reg = <0x50>;
+       };
++      pfuze100: pmic@8 {
+               compatible = "fsl,pfuze100";
+               reg = <0x08>;
+               regulators {
+                       sw1a_reg: sw1ab {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw1c_reg: sw1c {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw2_reg: sw2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3950000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw3a_reg: sw3a {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw3b_reg: sw3b {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw4_reg: sw4 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+                       swbst_reg: swbst {
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5150000>;
+                       };
+                       snvs_reg: vsnvs {
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <3000000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vref_reg: vrefddr {
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vgen1_reg: vgen1 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+                       vgen2_reg: vgen2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+                       vgen3_reg: vgen3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+                       vgen4_reg: vgen4 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen5_reg: vgen5 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen6_reg: vgen6 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+               };
+       };
+ };
+ &ldb {
+       status = "okay";
+       lvds0: lvds-channel@0 {
+               status = "okay";
+               port@4 {
+                       reg = <4>;
+                       lvds0_out: endpoint {
+                               remote-endpoint = <&panel_in_lvds0>;
+                       };
+               };
+       };
+ };
+ &pwm2 {
+       #pwm-cells = <3>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm2>;
+       status = "okay";
+ };
+ &ssi2 {
+       status = "okay";
+ };
+ &uart4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart4>;
+       uart-has-rtscts;
+       status = "okay";
+ };
+ &uart5 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart5>;
+       status = "okay";
+ };
+ &usbh1 {
+       vbus-supply = <&reg_usbh1_vbus>;
+       pinctrl-0 = <&pinctrl_usbh1>;
+       status = "okay";
+ };
+ &usdhc4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc4>;
+       bus-width = <8>;
+       non-removable;
+       status = "okay";
+ };
+ &iomuxc {
+       pinctrl_audmux: audmuxgrp {
+               fsl,pins = <
+                       /* I2S OUTPUT AUD6*/
+                       MX6QDL_PAD_DI0_PIN4__AUD6_RXD  0x130b0
+                       MX6QDL_PAD_DI0_PIN2__AUD6_TXD  0x130b0
+                       MX6QDL_PAD_DI0_PIN3__AUD6_TXFS  0x130b0
+                       MX6QDL_PAD_DI0_PIN15__AUD6_TXC  0x130b0
+               >;
+       };
+       pinctrl_backlight: dispgrp {
+               fsl,pins = <
+                       /* BLEN_OUT */
+                       MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07    0x1b0b0
+               >;
+       };
+       pinctrl_ecspi2: ecspi2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT10__ECSPI2_MISO      0x100b1
+                       MX6QDL_PAD_CSI0_DAT9__ECSPI2_MOSI       0x100b1
+                       MX6QDL_PAD_CSI0_DAT8__ECSPI2_SCLK       0x100b1
+               >;
+       };
+       pinctrl_ecspi2_cs: ecspi2csgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT11__GPIO5_IO29 0x100b1
+               >;
+       };
+       pinctrl_ecspi2_flwp: ecspi2flwpgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x1b0b0
+               >;
+       };
+       pinctrl_ecspi3: ecspi3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO      0x100b1
+                       MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI      0x100b1
+                       MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK      0x100b1
+               >;
+       };
+       pinctrl_ecspi3_cs: ecspi3csgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24 0x1b0b0
+               >;
+       };
+       pinctrl_ecspi3_flwp: ecspi3flwpgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_DISP0_DAT6__GPIO4_IO27 0x1b0b0
+               >;
+       };
+       pinctrl_enet: enetgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
+                       MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
+                       MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b0b0
+                       MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b0b0
+                       MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b0b0
+                       MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b0b0
+                       MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b0b0
+                       MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b0b0
+                       MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
+                       MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b0b0
+                       MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b0b0
+                       MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b0b0
+                       MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b0b0
+                       MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b0b0
+                       MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b0b0
+                       MX6QDL_PAD_GPIO_16__ENET_REF_CLK 0x4001b0a8
+                       MX6QDL_PAD_GPIO_6__ENET_IRQ             0x000b1
+                       MX6QDL_PAD_ENET_RXD0__GPIO1_IO27        0x1b0b0
+               >;
+       };
+       pinctrl_i2c1: i2c1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D21__I2C1_SCL    0x4001b8b1
+                       MX6QDL_PAD_EIM_D28__I2C1_SDA    0x4001b8b1
+               >;
+       };
+       pinctrl_i2c2: i2c2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_EB2__I2C2_SCL    0x4001b8b1
+                       MX6QDL_PAD_EIM_D16__I2C2_SDA    0x4001b8b1
+               >;
+       };
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D17__I2C3_SCL    0x4001b8b1
+                       MX6QDL_PAD_EIM_D18__I2C3_SDA    0x4001b8b1
+               >;
+       };
+       pinctrl_pwm2: pwm2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_DISP0_DAT9__PWM2_OUT 0x1b0b1
+               >;
+       };
+       pinctrl_reg_lvds: reqlvdsgrp {
+               fsl,pins = <
+                       /* LVDS_PPEN_OUT */
+                       MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13      0x1b0b0
+               >;
+       };
+       pinctrl_uart4: uart4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B      0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B      0x1b0b1
+               >;
+       };
+       pinctrl_uart5: uart5grp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT14__UART5_TX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT15__UART5_RX_DATA    0x1b0b1
+               >;
+       };
+       pinctrl_usbh1: usbh1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D30__USB_H1_OC  0x030b0
+               >;
+       };
+       pinctrl_usbh1_vbus: usbh1_vbus_grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D31__GPIO3_IO31 0x1b0b0
+               >;
+       };
+       pinctrl_usdhc4: usdhc4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_CMD__SD4_CMD             0x17059
+                       MX6QDL_PAD_SD4_CLK__SD4_CLK             0x10059
+                       MX6QDL_PAD_SD4_DAT0__SD4_DATA0          0x17059
+                       MX6QDL_PAD_SD4_DAT1__SD4_DATA1          0x17059
+                       MX6QDL_PAD_SD4_DAT2__SD4_DATA2          0x17059
+                       MX6QDL_PAD_SD4_DAT3__SD4_DATA3          0x17059
+                       MX6QDL_PAD_SD4_DAT4__SD4_DATA4          0x17059
+                       MX6QDL_PAD_SD4_DAT5__SD4_DATA5          0x17059
+                       MX6QDL_PAD_SD4_DAT6__SD4_DATA6          0x17059
+                       MX6QDL_PAD_SD4_DAT7__SD4_DATA7          0x17059
+                       MX6QDL_PAD_NANDF_ALE__SD4_RESET 0x17059
+               >;
+       };
+ };
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,1dd7bab9fd667643286e49ae6a03c2666249ee13..1effb58f304c3f2c76750ff4452e0bec08e3c936
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,693 +1,693 @@@
 -      codec: sgtl5000@0a {
+ /*
+  * Copyright (C) 2017 NutsBoard.Org
+  *
+  * Author: Wig Cheng <onlywig@gmail.com>
+  *
+  * This file is dual-licensed: you can use it either under the terms
+  * of the GPL or the X11 license, at your option. Note that this dual
+  * licensing only applies to this file, and not this project as a
+  * whole.
+  *
+  *  a) This file is free software; you can redistribute it and/or
+  *     modify it under the terms of the GNU General Public License as
+  *     published by the Free Software Foundation; either version 2 of the
+  *     License, or (at your option) any later version.
+  *
+  *     This file is distributed in the hope that it will be useful,
+  *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  *     GNU General Public License for more details.
+  *
+  * Or, alternatively,
+  *
+  *  b) Permission is hereby granted, free of charge, to any person
+  *     obtaining a copy of this software and associated documentation
+  *     files (the "Software"), to deal in the Software without
+  *     restriction, including without limitation the rights to use,
+  *     copy, modify, merge, publish, distribute, sublicense, and/or
+  *     sell copies of the Software, and to permit persons to whom the
+  *     Software is furnished to do so, subject to the following
+  *     conditions:
+  *
+  *     The above copyright notice and this permission notice shall be
+  *     included in all copies or substantial portions of the Software.
+  *
+  *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  *     OTHER DEALINGS IN THE SOFTWARE.
+  */
+ /dts-v1/;
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
+ #include "imx6q.dtsi"
+ / {
+       model = "NutsBoard i.MX6 Quad Pistachio board";
+       compatible = "nutsboard,imx6q-pistachio", "fsl,imx6q";
+       chosen {
+               stdout-path = &uart4;
+       };
+       memory: memory {
+               reg = <0x10000000 0x80000000>;
+       };
+       reg_3p3v: regulator-3p3v {
+               compatible = "regulator-fixed";
+               regulator-name = "3P3V";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+       reg_1p8v: regulator-1p8v {
+               compatible = "regulator-fixed";
+               regulator-name = "1P8V";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+       };
+       wlan_en_reg: regulator-wlan_en {
+               compatible = "regulator-fixed";
+               regulator-name = "wlan-en-regulator";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               gpio = <&gpio2 24 GPIO_ACTIVE_HIGH>;
+               startup-delay-us = <70000>;
+               enable-active-high;
+       };
+       reg_usb_otg_vbus: regulator-usb_vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usb_otg_vbus";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&swbst_reg>;
+       };
+       gpio-keys {
+               compatible = "gpio-keys";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpio_keys>;
+               power {
+                       label = "Power Button";
+                       gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
+                       gpio-key,wakeup;
+                       linux,code = <KEY_POWER>;
+               };
+       };
+       sound {
+               compatible = "fsl,imx-sgtl5000",
+                          "fsl,imx-audio-sgtl5000";
+               model = "audio-sgtl5000";
+               ssi-controller = <&ssi1>;
+               audio-codec = <&codec>;
+               audio-routing =
+                       "MIC_IN", "Mic Jack",
+                       "Mic Jack", "Mic Bias",
+                       "Headphone Jack", "HP_OUT";
+               mux-int-port = <1>;
+               mux-ext-port = <3>;
+       };
+       backlight_lvds: backlight-lvds {
+               compatible = "pwm-backlight";
+               pwms = <&pwm1 0 50000>;
+               brightness-levels = <
+                       0  /*1  2  3  4  5  6*/  7  8  9
+                       10 11 12 13 14 15 16 17 18 19
+                       20 21 22 23 24 25 26 27 28 29
+                       30 31 32 33 34 35 36 37 38 39
+                       40 41 42 43 44 45 46 47 48 49
+                       50 51 52 53 54 55 56 57 58 59
+                       60 61 62 63 64 65 66 67 68 69
+                       70 71 72 73 74 75 76 77 78 79
+                       80 81 82 83 84 85 86 87 88 89
+                       90 91 92 93 94 95 96 97 98 99
+                       100
+               >;
+               default-brightness-level = <94>;
+               status = "okay";
+       };
+       panel {
+               compatible = "hannstar,hsd100pxn1";
+               backlight = <&backlight_lvds>;
+               port {
+                       panel_in: endpoint {
+                               remote-endpoint = <&lvds0_out>;
+                       };
+               };
+       };
+ };
+ &audmux {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux>;
+       status = "okay";
+ };
+ &can2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan2>;
+       status = "okay";
+ };
+ &clks {
+       assigned-clocks = <&clks IMX6QDL_CLK_LDB_DI0_SEL>,
+                         <&clks IMX6QDL_CLK_LDB_DI1_SEL>;
+       assigned-clock-parents = <&clks IMX6QDL_CLK_PLL3_USB_OTG>,
+                                <&clks IMX6QDL_CLK_PLL3_USB_OTG>;
+ };
+ &fec {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet>;
+       phy-mode = "rgmii";
+       status = "okay";
+ };
+ &hdmi {
+       ddc-i2c-bus = <&i2c2>;
+       status = "okay";
+ };
+ &i2c1 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1>;
+       status = "okay";
 -      pmic: pfuze100@08 {
++      codec: sgtl5000@a {
+               compatible = "fsl,sgtl5000";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_i2c1_sgtl5000>;
+               reg = <0x0a>;
+               clocks = <&clks IMX6QDL_CLK_CKO>;
+               VDDA-supply = <&reg_1p8v>;
+               VDDIO-supply = <&reg_1p8v>;
+       };
+ };
+ &i2c2 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c2>;
+       status = "okay";
++      pmic: pfuze100@8 {
+               compatible = "fsl,pfuze100";
+               reg = <0x08>;
+               regulators {
+                       sw1a_reg: sw1ab {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw1c_reg: sw1c {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw2_reg: sw2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw3a_reg: sw3a {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw3b_reg: sw3b {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw4_reg: sw4 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+                       swbst_reg: swbst {
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5150000>;
+                       };
+                       snvs_reg: vsnvs {
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <3000000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vref_reg: vrefddr {
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vgen1_reg: vgen1 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+                       vgen2_reg: vgen2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+                       vgen3_reg: vgen3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+                       vgen4_reg: vgen4 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen5_reg: vgen5 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen6_reg: vgen6 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+               };
+       };
+       ar1021@4d {
+               compatible = "microchip,ar1021-i2c";
+               reg = <0x4d>;
+               interrupt-parent = <&gpio6>;
+               interrupts = <8 IRQ_TYPE_EDGE_FALLING>;
+       };
+ };
+ &i2c3 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3>;
+       status = "okay";
+ };
+ &iomuxc {
+       pinctrl-names = "default";
+       pinctrl_hog: hoggrp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D22__GPIO3_IO22  0x1b0b0  /*pcie power*/
+                       MX6QDL_PAD_EIM_A25__GPIO5_IO02  0x1b0b0   /*LCD power*/
+                       MX6QDL_PAD_EIM_D16__GPIO3_IO16  0x1b0b0   /*backlight power*/
+                       MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x1b0b1 /*SD3 CD pin*/
+                       MX6QDL_PAD_KEY_COL2__GPIO4_IO10 0x1b0b0 /*codec power*/
+                       MX6QDL_PAD_EIM_A16__GPIO2_IO22  0x1b0b0 /*touch reset*/
+                       MX6QDL_PAD_NANDF_ALE__GPIO6_IO08        0x1b0b01 /*touch irq*/
+                       MX6QDL_PAD_GPIO_7__GPIO1_IO07    0x1b0b0/*backlight pwr*/
+                       MX6QDL_PAD_GPIO_16__GPIO7_IO11  0x1b0b0 /*gpio 5V_1*/
+                       MX6QDL_PAD_EIM_A19__GPIO2_IO19  0x1b0b0 /*gpio 5V_2*/
+                       MX6QDL_PAD_EIM_A24__GPIO5_IO04  0x1b0b0 /*gpio 5V_3*/
+                       MX6QDL_PAD_GPIO_17__GPIO7_IO12  0x1b0b0 /*gpio 5V_4*/
+                       MX6QDL_PAD_NANDF_CLE__GPIO6_IO07        0x1b0b0 /*AUX_5V_EN*/
+                       MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09       0x1b0b0 /*AUX_5VB_EN*/
+                       MX6QDL_PAD_NANDF_RB0__GPIO6_IO10        0x1b0b0 /*AUX_3V3_EN*/
+                       MX6QDL_PAD_EIM_D21__GPIO3_IO21  0x1b0b0 /*I2C expander pwr*/
+               >;
+       };
+       pinctrl_audmux: audmuxgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT7__AUD3_RXD          0x130b0
+                       MX6QDL_PAD_CSI0_DAT4__AUD3_TXC          0x130b0
+                       MX6QDL_PAD_CSI0_DAT5__AUD3_TXD          0x110b0
+                       MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS         0x130b0
+               >;
+       };
+       pinctrl_ecspi1: ecspi1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL1__ECSPI1_MISO        0x100b1
+                       MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI        0x100b1
+                       MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK        0x100b1
+                       MX6QDL_PAD_KEY_ROW1__GPIO4_IO09         0x1b0b0
+               >;
+       };
+       pinctrl_enet: enetgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b8b0
+                       MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
+                       /* AR8035 reset */
+                       MX6QDL_PAD_EIM_A20__GPIO2_IO18          0x130b0
+                       /* AR8035 interrupt */
+                       MX6QDL_PAD_EIM_CS0__GPIO2_IO23          0x1b0b1
+                       MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
+                       MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
+                       MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
+                       MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
+                       MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
+                       MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
+                       /* AR8035 CLK_25M --> ENET_REF_CLK (V22) */
+                       MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x0a0b1
+                       /* AR8035 pin strapping: IO voltage: pull up */
+                       MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
+                       /* AR8035 pin strapping: PHYADDR#0: pull down */
+                       MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x13030
+                       /* AR8035 pin strapping: PHYADDR#1: pull down */
+                       MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x13030
+                       /* AR8035 pin strapping: MODE#1: pull up */
+                       MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
+                       /* AR8035 pin strapping: MODE#3: pull up */
+                       MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
+                       /* AR8035 pin strapping: MODE#0: pull down */
+                       MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x13030
+               >;
+       };
+       pinctrl_flexcan2: flexcan2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX        0x1b0b0
+                       MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX        0x1b0b0
+               >;
+       };
+       pinctrl_gpio_keys: gpio_keysgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_DAT4__GPIO2_IO12 0x1b0b0
+               >;
+       };
+       pinctrl_hdmi_cec: hdmicecgrp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x108b0
+               >;
+       };
+       pinctrl_i2c1: i2c1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT8__I2C1_SDA          0x4001b8b1
+                       MX6QDL_PAD_CSI0_DAT9__I2C1_SCL          0x4001b8b1
+               >;
+       };
+       pinctrl_i2c2: i2c2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_KEY_COL3__I2C2_SCL           0x4001b8b1
+                       MX6QDL_PAD_KEY_ROW3__I2C2_SDA           0x4001b8b1
+               >;
+       };
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_3__I2C3_SCL             0x4001b8b1
+                       MX6QDL_PAD_GPIO_6__I2C3_SDA             0x4001b8b1
+               >;
+       };
+       pinctrl_i2c1_sgtl5000: i2c1-sgtl5000grp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_0__CCM_CLKO1                    0x000b0 /* sys_mclk */
+                       MX6QDL_PAD_SD3_RST__GPIO7_IO08          0x130b0 /*headphone det*/
+                       MX6QDL_PAD_GPIO_8__GPIO1_IO08                   0x130b0 /*microphone det*/
+               >;
+       };
+       pinctrl_pwm1: pwm1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_9__PWM1_OUT         0x1b0b1
+               >;
+       };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA    0x1b0b1
+                       MX6QDL_PAD_EIM_D20__UART1_CTS_B 0x1b0b1
+                       MX6QDL_PAD_EIM_D19__UART1_RTS_B 0x1b0b1
+                       MX6QDL_PAD_EIM_D23__UART1_DCD_B 0x1b0b0
+                       MX6QDL_PAD_EIM_D24__UART1_DTR_B 0x1b0b0
+                       MX6QDL_PAD_EIM_D25__UART1_DSR_B 0x1b0b0
+               >;
+       };
+       pinctrl_uart2: uart2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_EIM_D26__UART2_TX_DATA       0x1b0b1
+                       MX6QDL_PAD_EIM_D27__UART2_RX_DATA       0x1b0b1
+                       MX6QDL_PAD_EIM_D28__UART2_CTS_B 0x1b0b1
+                       MX6QDL_PAD_EIM_D29__UART2_RTS_B 0x1b0b1
+               >;
+       };
+       pinctrl_uart3: uart3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD4_CLK__UART3_RX_DATA       0x1b0b1
+                       MX6QDL_PAD_SD4_CMD__UART3_TX_DATA       0x1b0b1
+                       MX6QDL_PAD_EIM_D30__UART3_CTS_B         0x1b0b1
+                       MX6QDL_PAD_EIM_D31__UART3_RTS_B         0x1b0b1
+               >;
+       };
+       pinctrl_uart4: uart4grp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B      0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B      0x1b0b1
+               >;
+       };
+       pinctrl_uart5: uart5grp {
+               fsl,pins = <
+                       MX6QDL_PAD_CSI0_DAT14__UART5_TX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT15__UART5_RX_DATA    0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT18__UART5_RTS_B      0x1b0b1
+                       MX6QDL_PAD_CSI0_DAT19__UART5_CTS_B      0x1b0b1
+                       MX6QDL_PAD_EIM_A21__GPIO2_IO17           0x15059 /*BT_EN*/
+               >;
+       };
+       pinctrl_usbotg: usbotggrp {
+               fsl,pins = <
+                       MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID       0x17059
+               >;
+       };
+       pinctrl_usdhc1: usdhc1grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD1_CMD__SD1_CMD             0x17059
+                       MX6QDL_PAD_SD1_CLK__SD1_CLK             0x10059
+                       MX6QDL_PAD_SD1_DAT0__SD1_DATA0          0x17059
+                       MX6QDL_PAD_SD1_DAT1__SD1_DATA1          0x17059
+                       MX6QDL_PAD_SD1_DAT2__SD1_DATA2          0x17059
+                       MX6QDL_PAD_SD1_DAT3__SD1_DATA3          0x17059
+                       MX6QDL_PAD_NANDF_D0__SD1_DATA4          0x17059
+                       MX6QDL_PAD_NANDF_D1__SD1_DATA5          0x17059
+                       MX6QDL_PAD_NANDF_D2__SD1_DATA6          0x17059
+                       MX6QDL_PAD_NANDF_D3__SD1_DATA7          0x17059
+               >;
+       };
+       pinctrl_usdhc2: usdhc2grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD2_CMD__SD2_CMD             0x17059
+                       MX6QDL_PAD_SD2_CLK__SD2_CLK             0x10059
+                       MX6QDL_PAD_SD2_DAT0__SD2_DATA0          0x17059
+                       MX6QDL_PAD_SD2_DAT1__SD2_DATA1          0x17059
+                       MX6QDL_PAD_SD2_DAT2__SD2_DATA2          0x17059
+                       MX6QDL_PAD_SD2_DAT3__SD2_DATA3          0x17059
+                       MX6QDL_PAD_EIM_RW__GPIO2_IO26                   0x15059 /*WL_EN_LDO*/
+                       MX6QDL_PAD_EIM_CS1__GPIO2_IO24          0x15059 /*WL_EN*/
+                       MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18      0x15059 /*WL_IRQ*/
+               >;
+       };
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX6QDL_PAD_SD3_CMD__SD3_CMD             0x17071
+                       MX6QDL_PAD_SD3_CLK__SD3_CLK             0x10071
+                       MX6QDL_PAD_SD3_DAT0__SD3_DATA0          0x17071
+                       MX6QDL_PAD_SD3_DAT1__SD3_DATA1          0x17071
+                       MX6QDL_PAD_SD3_DAT2__SD3_DATA2          0x17071
+                       MX6QDL_PAD_SD3_DAT3__SD3_DATA3          0x17071
+               >;
+       };
+       pinctrl_wdog: wdoggrp {
+               fsl,pins = <
+                       MX6QDL_PAD_GPIO_1__WDOG2_B      0x1b0b00
+               >;
+       };
+ };
+ &ldb {
+       status = "okay";
+       lvds-channel@1 {
+               fsl,data-mapping = "spwg";
+               fsl,data-width = <18>;
+               status = "okay";
+               port@4 {
+                       reg = <4>;
+                       lvds0_out: endpoint {
+                               remote-endpoint = <&panel_in>;
+                       };
+               };
+       };
+ };
+ &pwm1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm1>;
+       status = "okay";
+ };
+ &snvs_poweroff {
+       status = "okay";
+ };
+ &ssi1 {
+       status = "okay";
+ };
+ &uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1>;
+       uart-has-rtscts;
+       fsl,dte-mode;
+       status = "okay";
+ };
+ &uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2>;
+       uart-has-rtscts;
+       status = "okay";
+ };
+ &uart3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart3>;
+       uart-has-rtscts;
+       status = "okay";
+ };
+ &uart4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart4>;
+       uart-has-rtscts;
+       status = "okay";
+ };
+ &uart5 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart5>;
+       fsl,uart-has-rtscts;
+       status = "okay";
+ };
+ &usbotg {
+       vbus-supply = <&reg_usb_otg_vbus>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usbotg>;
+       disable-over-current;
+       srp-disable;
+       hnp-disable;
+       adp-disable;
+       status = "okay";
+ };
+ &usbh1 {
+       status = "okay";
+ };
+ &usbphy1 {
+       fsl,tx-d-cal = <0x5>;
+ };
+ &usbphy2 {
+       fsl,tx-d-cal = <0x5>;
+ };
+ &usdhc1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc1>;
+       bus-width = <8>;
+       keep-power-in-suspend;
+       vmmc-supply = <&reg_3p3v>;
+       status = "okay";
+ };
+ &usdhc2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc2>;
+       bus-width = <4>;
+       vmmc-supply = <&wlan_en_reg>;
+       no-1-8-v;
+       keep-power-in-suspend;
+       non-removable;
+       cap-power-off-card;
+       status = "okay";
+       #address-cells = <1>;
+       #size-cells = <0>;
+       wlcore: wlcore@2 {
+               compatible = "ti,wl1835";
+               reg = <2>;
+               interrupt-parent = <&gpio5>;
+               interrupts = <18 IRQ_TYPE_LEVEL_HIGH>;
+               ref-clock-frequency = <38400000>;
+               tcxo-clock-frequency = <26000000>;
+       };
+ };
+ &usdhc3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc3>;
+       bus-width = <4>;
+       cd-gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+       no-1-8-v;
+       keep-power-in-suspend;
+       wakeup-source;
+       status = "okay";
+ };
+ &sata {
+       status = "okay";
+ };
+ &wdog1 {
+       status = "okay";
+ };
Simple merge
Simple merge
Simple merge
index 25fe6aef797b079da46f93a65237356cb802f4c5,6e24ac97b94b1eb555f888f5467f6c7e2fb7cc6c..6abb66cd7d4ac43ee9d837413f02c73f631a9885
        clock-frequency = <400000>;
        status = "okay";
  
 -      sgtl5000: sgtl5000@0a {
 +      sgtl5000: sgtl5000@a {
                compatible = "fsl,sgtl5000";
+               #sound-dai-cells = <0>;
                reg = <0x0a>;
                VDDA-supply = <&reg_2v5>;
                VDDIO-supply = <&reg_3v3>;
index 0000000000000000000000000000000000000000,1ae9696c4b9af4727e5f2277d66de40986ad622f..6d8d9ca966460a162a7bd0513db9862be5be4560
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,196 +1,196 @@@
 -      pmic: pfuze100@08 {
+ /*
+  * Copyright 2013 Freescale Semiconductor, Inc.
+  *
+  * Author: Fabio Estevam <fabio.estevam@freescale.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+  *
+  */
+ #include "imx6qdl-wandboard.dtsi"
+ / {
+       reg_eth_phy: regulator-eth-phy {
+               compatible = "regulator-fixed";
+               regulator-name = "ETH_PHY";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&gpio7 13 GPIO_ACTIVE_LOW>;
+       };
+ };
+ &i2c3 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3>;
+       status = "okay";
++      pmic: pfuze100@8 {
+               compatible = "fsl,pfuze100";
+               reg = <0x08>;
+               regulators {
+                       sw1a_reg: sw1ab {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw1c_reg: sw1c {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw2_reg: sw2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw3a_reg: sw3a {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw3b_reg: sw3b {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw4_reg: sw4 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                       };
+                       swbst_reg: swbst {
+                               regulator-min-microvolt = <5000000>;
+                               regulator-max-microvolt = <5150000>;
+                       };
+                       snvs_reg: vsnvs {
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <3000000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vref_reg: vrefddr {
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vgen1_reg: vgen1 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+                       vgen2_reg: vgen2 {
+                               regulator-min-microvolt = <1500000>;
+                               regulator-max-microvolt = <1500000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vgen3_reg: vgen3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen4_reg: vgen4 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen5_reg: vgen5 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen6_reg: vgen6 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+               };
+       };
+ };
+ &fec {
+       phy-supply = <&reg_eth_phy>;
+       status = "okay";
+ };
+ &iomuxc {
+       pinctrl-0 = <&pinctrl_hog>;
+       imx6qdl-wandboard {
+               pinctrl_hog: hoggrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_GPIO_0__CCM_CLKO1            0x130b0
+                               MX6QDL_PAD_EIM_D22__USB_OTG_PWR         0x80000000      /* USB Power Enable */
+                               MX6QDL_PAD_GPIO_2__GPIO1_IO02           0x80000000      /* USDHC1 CD */
+                               MX6QDL_PAD_EIM_DA9__GPIO3_IO09          0x80000000      /* uSDHC3 CD */
+                               MX6QDL_PAD_EIM_D29__GPIO3_IO29          0x1f0b1         /* RGMII PHY reset */
+                       >;
+               };
+               pinctrl_enet: enetgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_ENET_MDIO__ENET_MDIO         0x1b0b0
+                               MX6QDL_PAD_ENET_MDC__ENET_MDC           0x1b0b0
+                               MX6QDL_PAD_RGMII_TXC__RGMII_TXC         0x1b030
+                               MX6QDL_PAD_RGMII_TD0__RGMII_TD0         0x1b030
+                               MX6QDL_PAD_RGMII_TD1__RGMII_TD1         0x1b030
+                               MX6QDL_PAD_RGMII_TD2__RGMII_TD2         0x1b030
+                               MX6QDL_PAD_RGMII_TD3__RGMII_TD3         0x1b030
+                               MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL   0x1b030
+                               MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK    0x1b0b0
+                               MX6QDL_PAD_RGMII_RXC__RGMII_RXC         0x1b030
+                               MX6QDL_PAD_RGMII_RD0__RGMII_RD0         0x1b030
+                               MX6QDL_PAD_RGMII_RD1__RGMII_RD1         0x1b030
+                               MX6QDL_PAD_RGMII_RD2__RGMII_RD2         0x1b030
+                               MX6QDL_PAD_RGMII_RD3__RGMII_RD3         0x1b030
+                               MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL   0x1b030
+                               MX6QDL_PAD_GPIO_6__ENET_IRQ             0x000b1
+                       >;
+               };
+               pinctrl_i2c3: i2c3grp {
+                       fsl,pins = <
+                               MX6QDL_PAD_GPIO_5__I2C3_SCL             0x4001b8b1
+                               MX6QDL_PAD_GPIO_16__I2C3_SDA            0x4001b8b1
+                       >;
+               };
+               pinctrl_spdif: spdifgrp {
+                       fsl,pins = <
+                               MX6QDL_PAD_GPIO_19__SPDIF_OUT           0x1b0b0
+                       >;
+               };
+       };
+ };
+ &usdhc2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usdhc2>;
+       bus-width = <4>;
+       no-1-8-v;
+       non-removable;
+       status = "okay";
+ };
index 0000000000000000000000000000000000000000,44bfeacbb6331763e0a311f59a58c5182b36318e..4d8c6521845fd74849fcb7029fc03ec3f47a806c
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,572 +1,572 @@@
 -      pmic: pfuze100@08 {
+ /*
+  * Copyright (C) 2016 Christoph Fritz <chf.fritz@googlemail.com>
+  *
+  * This program is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License version 2 as
+  * published by the Free Software Foundation.
+  */
+ /dts-v1/;
+ #include <dt-bindings/gpio/gpio.h>
+ #include <dt-bindings/input/input.h>
+ #include "imx6sx.dtsi"
+ / {
+       model = "Softing VIN|ING 2000";
+       compatible = "samtec,imx6sx-vining-2000", "fsl,imx6sx";
+       chosen {
+               stdout-path = &uart1;
+       };
+       memory {
+               reg = <0x80000000 0x40000000>;
+       };
+       reg_usb_otg1_vbus: regulator-usb_otg1_vbus {
+               compatible = "regulator-fixed";
+               regulator-name = "usb_otg1_vbus";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_usb_otg1>;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+       reg_peri_3v3: regulator-peri_3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "peri_3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+       pwmleds {
+               compatible = "pwm-leds";
+               red {
+                       label = "red";
+                       max-brightness = <255>;
+                       pwms = <&pwm6 0 50000>;
+               };
+               green {
+                       label = "green";
+                       max-brightness = <255>;
+                       pwms = <&pwm2 0 50000>;
+               };
+               blue {
+                       label = "blue";
+                       max-brightness = <255>;
+                       pwms = <&pwm1 0 50000>;
+               };
+       };
+ };
+ &adc1 {
+       vref-supply = <&reg_peri_3v3>;
+       status = "okay";
+ };
+ &cpu0 {
+       /*
+        * This board has a shared rail of reg_arm and reg_soc (supplied by
+        * sw1a_reg) which is modeled below, but still this module behaves
+        * unstable without higher voltages. Hence, set higher voltages here.
+        */
+       operating-points = <
+               /* kHz    uV */
+               996000  1250000
+               792000  1175000
+               396000  1175000
+               198000  1175000
+               >;
+       fsl,soc-operating-points = <
+               /* ARM kHz  SOC uV */
+               996000  1250000
+               792000  1175000
+               396000  1175000
+               198000  1175000
+       >;
+ };
+ &ecspi4 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_ecspi4>;
+       cs-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
+       status = "okay";
+ };
+ &fec1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet1>;
+       phy-supply = <&reg_peri_3v3>;
+       phy-reset-gpios = <&gpio5 9 GPIO_ACTIVE_LOW>;
+       phy-reset-duration = <5>;
+       phy-mode = "rmii";
+       phy-handle = <&ethphy0>;
+       status = "okay";
+       mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               ethphy0: ethernet0-phy@0 {
+                       reg = <0>;
+                       max-speed = <100>;
+                       interrupt-parent = <&gpio2>;
+                       interrupts = <17 IRQ_TYPE_LEVEL_LOW>;
+               };
+       };
+ };
+ &fec2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet2>;
+       phy-supply = <&reg_peri_3v3>;
+       phy-reset-gpios = <&gpio5 21 GPIO_ACTIVE_LOW>;
+       phy-reset-duration = <5>;
+       phy-mode = "rmii";
+       phy-handle = <&ethphy1>;
+       status = "okay";
+       mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               ethphy1: ethernet1-phy@0 {
+                       reg = <0>;
+                       max-speed = <100>;
+                       interrupt-parent = <&gpio2>;
+                       interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
+               };
+       };
+ };
+ &flexcan1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan1>;
+       status = "okay";
+ };
+ &flexcan2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan2>;
+       status = "okay";
+ };
+ &i2c1 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c1>;
+       status = "okay";
+       proximity: sx9500@28 {
+               compatible = "semtech,sx9500";
+               reg = <0x28>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_sx9500>;
+               interrupt-parent = <&gpio2>;
+               interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
+               reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>;
+       };
++      pmic: pfuze100@8 {
+               compatible = "fsl,pfuze200";
+               reg = <0x08>;
+               regulators {
+                       sw1a_reg: sw1ab {
+                               regulator-min-microvolt = <300000>;
+                               regulator-max-microvolt = <1875000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                               regulator-ramp-delay = <6250>;
+                       };
+                       sw2_reg: sw2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw3a_reg: sw3a {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       sw3b_reg: sw3b {
+                               regulator-min-microvolt = <400000>;
+                               regulator-max-microvolt = <1975000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       snvs_reg: vsnvs {
+                               regulator-min-microvolt = <1000000>;
+                               regulator-max-microvolt = <3000000>;
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vref_reg: vrefddr {
+                               regulator-boot-on;
+                               regulator-always-on;
+                       };
+                       vgen1_reg: vgen1 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                               regulator-always-on;
+                       };
+                       vgen2_reg: vgen2 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <1550000>;
+                       };
+                       vgen3_reg: vgen3 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen4_reg: vgen4 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen5_reg: vgen5 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+                       vgen6_reg: vgen6 {
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+               };
+       };
+ };
+ &i2c3 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3>;
+       status = "okay";
+ };
+ &iomuxc {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_gpios>;
+       pinctrl_ecspi4: ecspi4grp {
+               fsl,pins = <
+                       MX6SX_PAD_SD3_CLK__ECSPI4_SCLK          0x130b1
+                       MX6SX_PAD_SD3_DATA3__ECSPI4_MISO        0x130b1
+                       MX6SX_PAD_SD3_CMD__ECSPI4_MOSI          0x130b1
+                       MX6SX_PAD_SD3_DATA2__GPIO7_IO_4         0x30b0
+               >;
+       };
+       pinctrl_enet1: enet1grp {
+               fsl,pins = <
+                       MX6SX_PAD_RGMII1_RD0__ENET1_RX_DATA_0   0x30c1
+                       MX6SX_PAD_RGMII1_RD1__ENET1_RX_DATA_1   0x30c1
+                       MX6SX_PAD_RGMII1_TD0__ENET1_TX_DATA_0   0xa0f9
+                       MX6SX_PAD_RGMII1_TD1__ENET1_TX_DATA_1   0xa0f9
+                       MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN    0x30c1
+                       MX6SX_PAD_RGMII1_TX_CTL__ENET1_TX_EN    0xa0f9
+                       MX6SX_PAD_ENET1_TX_CLK__ENET1_REF_CLK1  0x4000a038
+                       /* LAN8720 PHY Reset */
+                       MX6SX_PAD_RGMII1_TD3__GPIO5_IO_9        0x10b0
+                       /* MDIO */
+                       MX6SX_PAD_ENET1_MDC__ENET1_MDC          0xa0f9
+                       MX6SX_PAD_ENET1_MDIO__ENET1_MDIO        0xa0f9
+                       /* IRQ from PHY */
+                       MX6SX_PAD_KEY_ROW2__GPIO2_IO_17         0x10b0
+               >;
+       };
+       pinctrl_enet2: enet2grp {
+               fsl,pins = <
+                       MX6SX_PAD_RGMII2_TD0__ENET2_TX_DATA_0   0x1b0b0
+                       MX6SX_PAD_RGMII2_TD1__ENET2_TX_DATA_1   0x1b0b0
+                       MX6SX_PAD_RGMII2_RD0__ENET2_RX_DATA_0   0x1b0b0
+                       MX6SX_PAD_RGMII2_RD1__ENET2_RX_DATA_1   0x1b0b0
+                       MX6SX_PAD_RGMII2_RX_CTL__ENET2_RX_EN    0x1b0b0
+                       MX6SX_PAD_RGMII2_TX_CTL__ENET2_TX_EN    0x1b0b0
+                       MX6SX_PAD_ENET2_TX_CLK__ENET2_REF_CLK2  0x4000a038
+                       /* LAN8720 PHY Reset */
+                       MX6SX_PAD_RGMII2_TD3__GPIO5_IO_21       0x10b0
+                       /* MDIO */
+                       MX6SX_PAD_ENET1_COL__ENET2_MDC          0xa0f9
+                       MX6SX_PAD_ENET1_CRS__ENET2_MDIO         0xa0f9
+                       /* IRQ from PHY */
+                       MX6SX_PAD_KEY_ROW4__GPIO2_IO_19         0x10b0
+               >;
+       };
+       pinctrl_flexcan1: flexcan1grp {
+               fsl,pins = <
+                       MX6SX_PAD_QSPI1B_DQS__CAN1_TX           0x1b0b0
+                       MX6SX_PAD_QSPI1A_SS1_B__CAN1_RX         0x1b0b0
+               >;
+       };
+       pinctrl_flexcan2: flexcan2grp {
+               fsl,pins = <
+                       MX6SX_PAD_QSPI1B_SS1_B__CAN2_RX         0x1b0b0
+                       MX6SX_PAD_QSPI1A_DQS__CAN2_TX           0x1b0b0
+               >;
+       };
+       pinctrl_gpios: gpiosgrp {
+               fsl,pins = <
+                       /* reset external uC */
+                       MX6SX_PAD_QSPI1A_DATA3__GPIO4_IO_19     0x10b0
+                       /* IRQ from external uC */
+                       MX6SX_PAD_KEY_ROW0__GPIO2_IO_15         0x10b0
+                       /* overcurrent detection */
+                       MX6SX_PAD_GPIO1_IO08__GPIO1_IO_8        0x10b0
+               >;
+       };
+       pinctrl_i2c1: i2c1grp {
+               fsl,pins = <
+                       MX6SX_PAD_GPIO1_IO01__I2C1_SDA          0x4001b8b1
+                       MX6SX_PAD_GPIO1_IO00__I2C1_SCL          0x4001b8b1
+               >;
+       };
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX6SX_PAD_NAND_ALE__I2C3_SDA            0x4001b8b1
+                       MX6SX_PAD_NAND_CLE__I2C3_SCL            0x4001b8b1
+               >;
+       };
+       pinctrl_pwm1: pwm1grp-1 {
+               fsl,pins = <
+                       /* blue LED */
+                       MX6SX_PAD_RGMII2_RD3__PWM1_OUT          0x1b0b1
+               >;
+       };
+       pinctrl_pwm2: pwm2grp-1 {
+               fsl,pins = <
+                       /* green LED */
+                       MX6SX_PAD_RGMII2_RD2__PWM2_OUT          0x1b0b1
+               >;
+       };
+       pinctrl_pwm6: pwm6grp-1 {
+               fsl,pins = <
+                       /* red LED */
+                       MX6SX_PAD_RGMII2_TD2__PWM6_OUT          0x1b0b1
+               >;
+       };
+       pinctrl_sx9500: sx9500grp {
+               fsl,pins = <
+                       /* Reset */
+                       MX6SX_PAD_KEY_COL0__GPIO2_IO_10         0x838
+                       /* IRQ */
+                       MX6SX_PAD_KEY_ROW1__GPIO2_IO_16         0x70e0
+               >;
+       };
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX6SX_PAD_GPIO1_IO04__UART1_TX          0x1b0b1
+                       MX6SX_PAD_GPIO1_IO05__UART1_RX          0x1b0b1
+               >;
+       };
+       pinctrl_uart2: uart2grp {
+               fsl,pins = <
+                       MX6SX_PAD_GPIO1_IO06__UART2_TX          0x1b0b1
+                       MX6SX_PAD_GPIO1_IO07__UART2_RX          0x1b0b1
+               >;
+       };
+       pinctrl_usb_otg1: usbotg1grp {
+               fsl,pins = <
+                       MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9        0x10b0
+               >;
+       };
+       pinctrl_usb_otg1_id: usbotg1idgrp {
+               fsl,pins = <
+                       MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID    0x17059
+               >;
+       };
+       pinctrl_usdhc2_50mhz: usdhc2grp-50mhz {
+               fsl,pins = <
+                       MX6SX_PAD_SD2_CLK__USDHC2_CLK           0x10059
+                       MX6SX_PAD_SD2_CMD__USDHC2_CMD           0x17059
+                       MX6SX_PAD_SD2_DATA0__USDHC2_DATA0       0x17059
+                       MX6SX_PAD_SD2_DATA1__USDHC2_DATA1       0x17059
+                       MX6SX_PAD_SD2_DATA2__USDHC2_DATA2       0x17059
+                       MX6SX_PAD_SD2_DATA3__USDHC2_DATA3       0x17059
+                       MX6SX_PAD_LCD1_VSYNC__GPIO3_IO_28       0x1b000
+                       MX6SX_PAD_LCD1_HSYNC__GPIO3_IO_26       0x10b0
+               >;
+       };
+       pinctrl_usdhc2_100mhz: usdhc2grp-100mhz {
+               fsl,pins = <
+                       MX6SX_PAD_SD2_CLK__USDHC2_CLK           0x100b9
+                       MX6SX_PAD_SD2_CMD__USDHC2_CMD           0x170b9
+                       MX6SX_PAD_SD2_DATA0__USDHC2_DATA0       0x170b9
+                       MX6SX_PAD_SD2_DATA1__USDHC2_DATA1       0x170b9
+                       MX6SX_PAD_SD2_DATA2__USDHC2_DATA2       0x170b9
+                       MX6SX_PAD_SD2_DATA3__USDHC2_DATA3       0x170b9
+               >;
+       };
+       pinctrl_usdhc2_200mhz: usdhc2grp-200mhz {
+               fsl,pins = <
+                       MX6SX_PAD_SD2_CLK__USDHC2_CLK           0x100f9
+                       MX6SX_PAD_SD2_CMD__USDHC2_CMD           0x170f9
+                       MX6SX_PAD_SD2_DATA0__USDHC2_DATA0       0x170f9
+                       MX6SX_PAD_SD2_DATA1__USDHC2_DATA1       0x170f9
+                       MX6SX_PAD_SD2_DATA2__USDHC2_DATA2       0x170f9
+                       MX6SX_PAD_SD2_DATA3__USDHC2_DATA3       0x170f9
+               >;
+       };
+       pinctrl_usdhc4_50mhz: usdhc4grp-50mhz {
+               fsl,pins = <
+                       MX6SX_PAD_SD4_CLK__USDHC4_CLK           0x10059
+                       MX6SX_PAD_SD4_CMD__USDHC4_CMD           0x17059
+                       MX6SX_PAD_SD4_DATA0__USDHC4_DATA0       0x17059
+                       MX6SX_PAD_SD4_DATA1__USDHC4_DATA1       0x17059
+                       MX6SX_PAD_SD4_DATA2__USDHC4_DATA2       0x17059
+                       MX6SX_PAD_SD4_DATA3__USDHC4_DATA3       0x17059
+                       MX6SX_PAD_SD4_DATA4__USDHC4_DATA4       0x17059
+                       MX6SX_PAD_SD4_DATA5__USDHC4_DATA5       0x17059
+                       MX6SX_PAD_SD4_DATA6__USDHC4_DATA6       0x17059
+                       MX6SX_PAD_SD4_DATA7__USDHC4_DATA7       0x17059
+                       MX6SX_PAD_SD4_RESET_B__USDHC4_RESET_B   0x17068
+               >;
+       };
+       pinctrl_usdhc4_100mhz: usdhc4-100mhz {
+               fsl,pins = <
+                       MX6SX_PAD_SD4_CLK__USDHC4_CLK           0x100b9
+                       MX6SX_PAD_SD4_CMD__USDHC4_CMD           0x170b9
+                       MX6SX_PAD_SD4_DATA0__USDHC4_DATA0       0x170b9
+                       MX6SX_PAD_SD4_DATA1__USDHC4_DATA1       0x170b9
+                       MX6SX_PAD_SD4_DATA2__USDHC4_DATA2       0x170b9
+                       MX6SX_PAD_SD4_DATA3__USDHC4_DATA3       0x170b9
+                       MX6SX_PAD_SD4_DATA4__USDHC4_DATA4       0x170b9
+                       MX6SX_PAD_SD4_DATA5__USDHC4_DATA5       0x170b9
+                       MX6SX_PAD_SD4_DATA6__USDHC4_DATA6       0x170b9
+                       MX6SX_PAD_SD4_DATA7__USDHC4_DATA7       0x170b9
+               >;
+       };
+       pinctrl_usdhc4_200mhz: usdhc4-200mhz {
+               fsl,pins = <
+                       MX6SX_PAD_SD4_CLK__USDHC4_CLK           0x100f9
+                       MX6SX_PAD_SD4_CMD__USDHC4_CMD           0x170f9
+                       MX6SX_PAD_SD4_DATA0__USDHC4_DATA0       0x170f9
+                       MX6SX_PAD_SD4_DATA1__USDHC4_DATA1       0x170f9
+                       MX6SX_PAD_SD4_DATA2__USDHC4_DATA2       0x170f9
+                       MX6SX_PAD_SD4_DATA3__USDHC4_DATA3       0x170f9
+                       MX6SX_PAD_SD4_DATA4__USDHC4_DATA4       0x170f9
+                       MX6SX_PAD_SD4_DATA5__USDHC4_DATA5       0x170f9
+                       MX6SX_PAD_SD4_DATA6__USDHC4_DATA6       0x170f9
+                       MX6SX_PAD_SD4_DATA7__USDHC4_DATA7       0x170f9
+               >;
+       };
+ };
+ &pwm1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm1>;
+       status = "okay";
+ };
+ &pwm2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm2>;
+       status = "okay";
+ };
+ &pwm6 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pwm6>;
+       status = "okay";
+ };
+ &reg_arm {
+       vin-supply = <&sw1a_reg>;
+ };
+ &reg_soc {
+       vin-supply = <&sw1a_reg>;
+ };
+ &snvs_poweroff {
+       status = "okay";
+ };
+ &uart1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart1>;
+       status = "okay";
+ };
+ &uart2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_uart2>;
+       status = "okay";
+ };
+ &usbotg1 {
+       vbus-supply = <&reg_usb_otg1_vbus>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_usb_otg1_id>;
+       status = "okay";
+ };
+ &usbotg2 {
+       dr_mode = "host";
+       status = "okay";
+ };
+ &usdhc2 {
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
+       pinctrl-0 = <&pinctrl_usdhc2_50mhz>;
+       pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
+       cd-gpios = <&gpio3 28 GPIO_ACTIVE_LOW>;
+       keep-power-in-suspend;
+       status = "okay";
+ };
+ &usdhc4 {
+       /* hs200-mode is currently unsupported because Vccq is on 3.1V, but
+        * not on necessary 1.8V.
+        */
+       pinctrl-names = "default", "state_100mhz", "state_200mhz";
+       pinctrl-0 = <&pinctrl_usdhc4_50mhz>;
+       pinctrl-1 = <&pinctrl_usdhc4_100mhz>;
+       pinctrl-2 = <&pinctrl_usdhc4_200mhz>;
+       bus-width = <8>;
+       keep-power-in-suspend;
+       non-removable;
+       cap-mmc-hw-reset;
+       status = "okay";
+ };
index 32d71245b2a6214934458672266872853098d4eb,375efa3f547e615d5be079099b7edc4fb7a24115..5b03ba3beda9e91d47d1bf7ad8e5ed25fc1f347d
                                status = "disabled";
                        };
  
 -                      ocotp: ocotp@021bc000 {
 +                      ocotp: ocotp@21bc000 {
+                               #address-cells = <1>;
+                               #size-cells = <1>;
                                compatible = "fsl,imx6sx-ocotp", "syscon";
                                reg = <0x021bc000 0x4000>;
                                clocks = <&clks IMX6SX_CLK_OCOTP>;
+                               tempmon_calib: calib@38 {
+                                       reg = <0x38 4>;
+                               };
+                               tempmon_temp_grade: temp-grade@20 {
+                                       reg = <0x20 4>;
+                               };
                        };
  
 -                      sai1: sai@021d4000 {
 +                      sai1: sai@21d4000 {
                                compatible = "fsl,imx6sx-sai";
                                reg = <0x021d4000 0x4000>;
                                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
Simple merge
Simple merge