]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
imx6sx: synchronise device tree with linux
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>
Sat, 22 Oct 2022 21:59:35 +0000 (23:59 +0200)
committerStefano Babic <sbabic@denx.de>
Mon, 24 Oct 2022 11:43:21 +0000 (13:43 +0200)
Synchronise device tree with linux v6.0-rc1.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
arch/arm/dts/imx6sx-sabreauto.dts
arch/arm/dts/imx6sx-sdb.dts
arch/arm/dts/imx6sx-sdb.dtsi
arch/arm/dts/imx6sx-softing-vining-2000.dts
arch/arm/dts/imx6sx-udoo-neo.dtsi
arch/arm/dts/imx6sx.dtsi

index 9643d1fe0642bfbcb3cf7b3ccec53366950319c9..83ee97252ff11fd1266985713e67ea451512f1e1 100644 (file)
@@ -1,10 +1,6 @@
-/*
- * Copyright (C) 2014 Freescale Semiconductor, Inc.
- *
- * 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.
- */
+// SPDX-License-Identifier: GPL-2.0
+//
+// Copyright (C) 2014 Freescale Semiconductor, Inc.
 
 /dts-v1/;
 
        model = "Freescale i.MX6 SoloX Sabre Auto Board";
        compatible = "fsl,imx6sx-sabreauto", "fsl,imx6sx";
 
-       memory {
+       memory@80000000 {
+               device_type = "memory";
                reg = <0x80000000 0x80000000>;
        };
 
-       regulators {
-               compatible = "simple-bus";
+       leds {
+               compatible = "gpio-leds";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_led>;
+
+               user {
+                       label = "debug";
+                       gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "heartbeat";
+               };
+       };
+
+       vcc_sd3: regulator-vcc-sd3 {
+               compatible = "regulator-fixed";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_vcc_sd3>;
+               regulator-name = "VCC_SD3";
+               regulator-min-microvolt = <3000000>;
+               regulator-max-microvolt = <3000000>;
+               gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       reg_can_wake: regulator-can-wake {
+               compatible = "regulator-fixed";
+               regulator-name = "can-wake";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&max7310_b 7 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       reg_can_en: regulator-can-en {
+               compatible = "regulator-fixed";
+               regulator-name = "can-en";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&max7310_b 5 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&reg_can_wake>;
+       };
+
+       reg_can_stby: regulator-can-stby {
+               compatible = "regulator-fixed";
+               regulator-name = "can-stby";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               gpio = <&max7310_b 4 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+               vin-supply = <&reg_can_en>;
+       };
+
+       reg_cs42888: cs42888_supply {
+               compatible = "regulator-fixed";
+               regulator-name = "cs42888_supply";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+       };
+
+       sound-cs42888 {
+               compatible = "fsl,imx6-sabreauto-cs42888",
+                            "fsl,imx-audio-cs42888";
+               model = "imx-cs42888";
+               audio-cpu = <&esai>;
+               audio-asrc = <&asrc>;
+               audio-codec = <&cs42888>;
+               audio-routing =
+                       "Line Out Jack", "AOUT1L",
+                       "Line Out Jack", "AOUT1R",
+                       "Line Out Jack", "AOUT2L",
+                       "Line Out Jack", "AOUT2R",
+                       "Line Out Jack", "AOUT3L",
+                       "Line Out Jack", "AOUT3R",
+                       "Line Out Jack", "AOUT4L",
+                       "Line Out Jack", "AOUT4R",
+                       "AIN1L", "Line In Jack",
+                       "AIN1R", "Line In Jack",
+                       "AIN2L", "Line In Jack",
+                       "AIN2R", "Line In Jack";
+       };
+
+       sound-spdif {
+               compatible = "fsl,imx-audio-spdif";
+               model = "imx-spdif";
+               spdif-controller = <&spdif>;
+               spdif-in;
+       };
+};
+
+&anaclk2 {
+       clock-frequency = <24576000>;
+};
+
+&clks {
+       assigned-clocks = <&clks IMX6SX_PLL4_BYPASS_SRC>,
+                         <&clks IMX6SX_PLL4_BYPASS>,
+                         <&clks IMX6SX_CLK_PLL4_POST_DIV>;
+       assigned-clock-parents = <&clks IMX6SX_CLK_LVDS2_IN>,
+                                <&clks IMX6SX_PLL4_BYPASS_SRC>;
+       assigned-clock-rates = <0>, <0>, <24576000>;
+};
+
+&esai {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_esai>;
+       assigned-clocks = <&clks IMX6SX_CLK_ESAI_SEL>,
+                       <&clks IMX6SX_CLK_ESAI_EXTAL>;
+       assigned-clock-parents = <&clks IMX6SX_CLK_PLL4_AUDIO_DIV>;
+       assigned-clock-rates = <0>, <24576000>;
+       status = "okay";
+};
+
+&fec1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet1>;
+       phy-mode = "rgmii-id";
+       phy-handle = <&ethphy1>;
+       fsl,magic-packet;
+       status = "okay";
+
+       mdio {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               vcc_sd3: regulator@0 {
-                       compatible = "regulator-fixed";
+               ethphy0: ethernet-phy@0 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
                        reg = <0>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&pinctrl_vcc_sd3>;
-                       regulator-name = "VCC_SD3";
-                       regulator-min-microvolt = <3000000>;
-                       regulator-max-microvolt = <3000000>;
-                       gpio = <&gpio2 11 GPIO_ACTIVE_HIGH>;
-                       enable-active-high;
+               };
+
+               ethphy1: ethernet-phy@1 {
+                       compatible = "ethernet-phy-ieee802.3-c22";
+                       reg = <1>;
                };
        };
 };
 
+&fec2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_enet2>;
+       phy-mode = "rgmii-id";
+       phy-handle = <&ethphy0>;
+       fsl,magic-packet;
+       status = "okay";
+};
+
+&flexcan1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan1>;
+       xceiver-supply = <&reg_can_stby>;
+       status = "okay";
+};
+
+&flexcan2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_flexcan2>;
+       xceiver-supply = <&reg_can_stby>;
+       status = "okay";
+};
+
 &uart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1>;
        status = "okay";
 };
 
+&iomuxc {
+       pinctrl_egalax_int: egalax-intgrp {
+               fsl,pins = <
+                       MX6SX_PAD_SD4_RESET_B__GPIO6_IO_22      0x10b0
+               >;
+       };
+
+       pinctrl_enet1: enet1grp {
+               fsl,pins = <
+                       MX6SX_PAD_ENET1_MDIO__ENET1_MDIO        0xa0b1
+                       MX6SX_PAD_ENET1_MDC__ENET1_MDC          0xa0b1
+                       MX6SX_PAD_RGMII1_TXC__ENET1_RGMII_TXC   0xa0b9
+                       MX6SX_PAD_RGMII1_TD0__ENET1_TX_DATA_0   0xa0b1
+                       MX6SX_PAD_RGMII1_TD1__ENET1_TX_DATA_1   0xa0b1
+                       MX6SX_PAD_RGMII1_TD2__ENET1_TX_DATA_2   0xa0b1
+                       MX6SX_PAD_RGMII1_TD3__ENET1_TX_DATA_3   0xa0b1
+                       MX6SX_PAD_RGMII1_TX_CTL__ENET1_TX_EN    0xa0b1
+                       MX6SX_PAD_RGMII1_RXC__ENET1_RX_CLK      0x3081
+                       MX6SX_PAD_RGMII1_RD0__ENET1_RX_DATA_0   0x3081
+                       MX6SX_PAD_RGMII1_RD1__ENET1_RX_DATA_1   0x3081
+                       MX6SX_PAD_RGMII1_RD2__ENET1_RX_DATA_2   0x3081
+                       MX6SX_PAD_RGMII1_RD3__ENET1_RX_DATA_3   0x3081
+                       MX6SX_PAD_RGMII1_RX_CTL__ENET1_RX_EN    0x3081
+               >;
+       };
+
+       pinctrl_enet2: enet2grp {
+               fsl,pins = <
+                       MX6SX_PAD_RGMII2_TXC__ENET2_RGMII_TXC   0xa0b9
+                       MX6SX_PAD_RGMII2_TD0__ENET2_TX_DATA_0   0xa0b1
+                       MX6SX_PAD_RGMII2_TD1__ENET2_TX_DATA_1   0xa0b1
+                       MX6SX_PAD_RGMII2_TD2__ENET2_TX_DATA_2   0xa0b1
+                       MX6SX_PAD_RGMII2_TD3__ENET2_TX_DATA_3   0xa0b1
+                       MX6SX_PAD_RGMII2_TX_CTL__ENET2_TX_EN    0xa0b1
+                       MX6SX_PAD_RGMII2_RXC__ENET2_RX_CLK      0x3081
+                       MX6SX_PAD_RGMII2_RD0__ENET2_RX_DATA_0   0x3081
+                       MX6SX_PAD_RGMII2_RD1__ENET2_RX_DATA_1   0x3081
+                       MX6SX_PAD_RGMII2_RD2__ENET2_RX_DATA_2   0x3081
+                       MX6SX_PAD_RGMII2_RD3__ENET2_RX_DATA_3   0x3081
+                       MX6SX_PAD_RGMII2_RX_CTL__ENET2_RX_EN    0x3081
+               >;
+       };
+
+       pinctrl_esai: esaigrp {
+               fsl,pins = <
+                       MX6SX_PAD_CSI_DATA00__ESAI_TX_CLK   0x1b030
+                       MX6SX_PAD_CSI_DATA01__ESAI_TX_FS    0x1b030
+                       MX6SX_PAD_CSI_HSYNC__ESAI_TX0       0x1b030
+                       MX6SX_PAD_CSI_DATA04__ESAI_TX1      0x1b030
+                       MX6SX_PAD_CSI_DATA06__ESAI_TX2_RX3  0x1b030
+                       MX6SX_PAD_CSI_DATA07__ESAI_TX3_RX2  0x1b030
+                       MX6SX_PAD_CSI_DATA02__ESAI_RX_CLK   0x1b030
+                       MX6SX_PAD_CSI_DATA03__ESAI_RX_FS    0x1b030
+                       MX6SX_PAD_CSI_VSYNC__ESAI_TX5_RX0   0x1b030
+                       MX6SX_PAD_CSI_DATA05__ESAI_TX4_RX1  0x1b030
+               >;
+       };
+
+       pinctrl_flexcan1: flexcan1grp {
+               fsl,pins = <
+                       MX6SX_PAD_QSPI1B_DQS__CAN1_TX   0x1b020
+                       MX6SX_PAD_QSPI1A_SS1_B__CAN1_RX 0x1b020
+               >;
+       };
+
+       pinctrl_flexcan2: flexcan2grp {
+               fsl,pins = <
+                       MX6SX_PAD_QSPI1B_SS1_B__CAN2_RX 0x1b020
+                       MX6SX_PAD_QSPI1A_DQS__CAN2_TX   0x1b020
+               >;
+       };
+
+       pinctrl_i2c2: i2c2grp {
+               fsl,pins = <
+                       MX6SX_PAD_GPIO1_IO03__I2C2_SDA          0x4001b8b1
+                       MX6SX_PAD_GPIO1_IO02__I2C2_SCL          0x4001b8b1
+               >;
+       };
+
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX6SX_PAD_KEY_ROW4__I2C3_SDA            0x4001b8b1
+                       MX6SX_PAD_KEY_COL4__I2C3_SCL            0x4001b8b1
+               >;
+       };
+
+       pinctrl_led: ledgrp {
+               fsl,pins = <
+                       MX6SX_PAD_CSI_PIXCLK__GPIO1_IO_24 0x17059
+               >;
+       };
+
+       pinctrl_spdif: spdifgrp {
+               fsl,pins = <
+                       MX6SX_PAD_ENET2_COL__SPDIF_IN           0x1b0b0
+               >;
+       };
+
+       pinctrl_uart1: uart1grp {
+               fsl,pins = <
+                       MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX              0x1b0b1
+                       MX6SX_PAD_GPIO1_IO05__UART1_DCE_RX              0x1b0b1
+               >;
+       };
+
+       pinctrl_usdhc3: usdhc3grp {
+               fsl,pins = <
+                       MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x17059
+                       MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x10059
+                       MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x17059
+                       MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x17059
+                       MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x17059
+                       MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x17059
+                       MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x17059
+                       MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x17059
+                       MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x17059
+                       MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x17059
+                       MX6SX_PAD_KEY_COL0__GPIO2_IO_10         0x17059 /* CD */
+                       MX6SX_PAD_KEY_ROW0__GPIO2_IO_15         0x17059 /* WP */
+               >;
+       };
+
+       pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
+               fsl,pins = <
+                       MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x170b9
+                       MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x100b9
+                       MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x170b9
+                       MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x170b9
+                       MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x170b9
+                       MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x170b9
+                       MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x170b9
+                       MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x170b9
+                       MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x170b9
+                       MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x170b9
+               >;
+       };
+
+       pinctrl_usdhc3_200mhz: usdhc3grp-200mhz {
+               fsl,pins = <
+                       MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x170f9
+                       MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x100f9
+                       MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x170f9
+                       MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x170f9
+                       MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x170f9
+                       MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x170f9
+                       MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x170f9
+                       MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x170f9
+                       MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x170f9
+                       MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x170f9
+               >;
+       };
+
+       pinctrl_usdhc4: usdhc4grp {
+               fsl,pins = <
+                       MX6SX_PAD_SD4_CMD__USDHC4_CMD           0x17059
+                       MX6SX_PAD_SD4_CLK__USDHC4_CLK           0x10059
+                       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_DATA7__GPIO6_IO_21        0x17059 /* CD */
+                       MX6SX_PAD_SD4_DATA6__GPIO6_IO_20        0x17059 /* WP */
+               >;
+       };
+
+       pinctrl_vcc_sd3: vccsd3grp {
+               fsl,pins = <
+                       MX6SX_PAD_KEY_COL1__GPIO2_IO_11         0x17059
+               >;
+       };
+
+       pinctrl_wdog: wdoggrp {
+               fsl,pins = <
+                       MX6SX_PAD_GPIO1_IO13__WDOG1_WDOG_ANY    0x30b0
+               >;
+       };
+};
+
 &i2c2 {
        clock-frequency = <100000>;
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c2_1>;
+       pinctrl-0 = <&pinctrl_i2c2>;
        status = "okay";
+
+       cs42888: cs42888@48 {
+               compatible = "cirrus,cs42888";
+               reg = <0x48>;
+               clocks = <&anaclk2 0>;
+               clock-names = "mclk";
+               VA-supply = <&reg_cs42888>;
+               VD-supply = <&reg_cs42888>;
+               VLS-supply = <&reg_cs42888>;
+               VLC-supply = <&reg_cs42888>;
+       };
+
+       touchscreen@4 {
+               compatible = "eeti,egalax_ts";
+               reg = <0x04>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_egalax_int>;
+               interrupt-parent = <&gpio6>;
+               interrupts = <22 IRQ_TYPE_EDGE_FALLING>;
+               wakeup-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>;
+       };
+
+       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 = <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;
+                       };
+
+                       sw4_reg: sw4 {
+                               regulator-min-microvolt = <800000>;
+                               regulator-max-microvolt = <3300000>;
+                               regulator-always-on;
+                       };
+
+                       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>;
+                               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;
+                       };
+               };
+       };
+
+       max7322: gpio@68 {
+               compatible = "maxim,max7322";
+               reg = <0x68>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
 };
 
 &i2c3 {
-        clock-frequency = <100000>;
+       clock-frequency = <100000>;
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_i2c3_2>;
+       pinctrl-0 = <&pinctrl_i2c3>;
        status = "okay";
 
        max7310_a: gpio@30 {
        };
 };
 
-&qspi1 {
+&spdif {
        pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_qspi1_1>;
+       pinctrl-0 = <&pinctrl_spdif>;
+       assigned-clocks = <&clks IMX6SX_CLK_SPDIF_PODF>;
+       assigned-clock-rates = <24576000>;
        status = "okay";
-       ddrsmp=<2>;
-
-       flash0: n25q256a@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "micron,n25q256a";
-               spi-max-frequency = <29000000>;
-               reg = <0>;
-       };
-
-       flash1: n25q256a@1 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "micron,n25q256a";
-               spi-max-frequency = <29000000>;
-               reg = <1>;
-       };
 };
 
-&iomuxc {
-       imx6x-sabreauto {
-               pinctrl_i2c2_1: i2c2grp-1 {
-                       fsl,pins = <
-                               MX6SX_PAD_GPIO1_IO03__I2C2_SDA          0x4001b8b1
-                               MX6SX_PAD_GPIO1_IO02__I2C2_SCL          0x4001b8b1
-                       >;
-               };
-
-               pinctrl_i2c3_2: i2c3grp-2 {
-                       fsl,pins = <
-                               MX6SX_PAD_KEY_ROW4__I2C3_SDA            0x4001b8b1
-                               MX6SX_PAD_KEY_COL4__I2C3_SCL            0x4001b8b1
-                       >;
-               };
-
-               pinctrl_qspi1_1: qspi1grp_1 {
-                       fsl,pins = <
-                               MX6SX_PAD_QSPI1A_DATA0__QSPI1_A_DATA_0  0x70a1
-                               MX6SX_PAD_QSPI1A_DATA1__QSPI1_A_DATA_1  0x70a1
-                               MX6SX_PAD_QSPI1A_DATA2__QSPI1_A_DATA_2  0x70a1
-                               MX6SX_PAD_QSPI1A_DATA3__QSPI1_A_DATA_3  0x70a1
-                               MX6SX_PAD_QSPI1A_SCLK__QSPI1_A_SCLK     0x70a1
-                               MX6SX_PAD_QSPI1A_SS0_B__QSPI1_A_SS0_B   0x70a1
-                               MX6SX_PAD_QSPI1B_DATA0__QSPI1_B_DATA_0  0x70a1
-                               MX6SX_PAD_QSPI1B_DATA1__QSPI1_B_DATA_1  0x70a1
-                               MX6SX_PAD_QSPI1B_DATA2__QSPI1_B_DATA_2  0x70a1
-                               MX6SX_PAD_QSPI1B_DATA3__QSPI1_B_DATA_3  0x70a1
-                               MX6SX_PAD_QSPI1B_SCLK__QSPI1_B_SCLK     0x70a1
-                               MX6SX_PAD_QSPI1B_SS0_B__QSPI1_B_SS0_B   0x70a1
-                       >;
-               };
-
-               pinctrl_uart1: uart1grp {
-                       fsl,pins = <
-                               MX6SX_PAD_GPIO1_IO04__UART1_TX          0x1b0b1
-                               MX6SX_PAD_GPIO1_IO05__UART1_RX          0x1b0b1
-                       >;
-               };
-
-               pinctrl_usdhc3: usdhc3grp {
-                       fsl,pins = <
-                               MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x17059
-                               MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x10059
-                               MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x17059
-                               MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x17059
-                               MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x17059
-                               MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x17059
-                               MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x17059
-                               MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x17059
-                               MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x17059
-                               MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x17059
-                               MX6SX_PAD_KEY_COL0__GPIO2_IO_10         0x17059 /* CD */
-                               MX6SX_PAD_KEY_ROW0__GPIO2_IO_15         0x17059 /* WP */
-                       >;
-               };
-
-               pinctrl_usdhc3_100mhz: usdhc3grp-100mhz {
-                       fsl,pins = <
-                               MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x170b9
-                               MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x100b9
-                               MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x170b9
-                               MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x170b9
-                               MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x170b9
-                               MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x170b9
-                               MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x170b9
-                               MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x170b9
-                               MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x170b9
-                               MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x170b9
-                       >;
-               };
-
-               pinctrl_usdhc3_200mhz: usdhc3grp-200mhz {
-                       fsl,pins = <
-                               MX6SX_PAD_SD3_CMD__USDHC3_CMD           0x170f9
-                               MX6SX_PAD_SD3_CLK__USDHC3_CLK           0x100f9
-                               MX6SX_PAD_SD3_DATA0__USDHC3_DATA0       0x170f9
-                               MX6SX_PAD_SD3_DATA1__USDHC3_DATA1       0x170f9
-                               MX6SX_PAD_SD3_DATA2__USDHC3_DATA2       0x170f9
-                               MX6SX_PAD_SD3_DATA3__USDHC3_DATA3       0x170f9
-                               MX6SX_PAD_SD3_DATA4__USDHC3_DATA4       0x170f9
-                               MX6SX_PAD_SD3_DATA5__USDHC3_DATA5       0x170f9
-                               MX6SX_PAD_SD3_DATA6__USDHC3_DATA6       0x170f9
-                               MX6SX_PAD_SD3_DATA7__USDHC3_DATA7       0x170f9
-                       >;
-               };
-
-               pinctrl_usdhc4: usdhc4grp {
-                       fsl,pins = <
-                               MX6SX_PAD_SD4_CMD__USDHC4_CMD           0x17059
-                               MX6SX_PAD_SD4_CLK__USDHC4_CLK           0x10059
-                               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_DATA7__GPIO6_IO_21        0x17059 /* CD */
-                               MX6SX_PAD_SD4_DATA6__GPIO6_IO_20        0x17059 /* WP */
-                       >;
-               };
-
-               pinctrl_vcc_sd3: vccsd3grp {
-                       fsl,pins = <
-                               MX6SX_PAD_KEY_COL1__GPIO2_IO_11         0x17059
-                       >;
-               };
-       };
+&wdog1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_wdog>;
+       fsl,ext-reset-output;
 };
index 5a63ca6157229ccc48d175f8045ef9446b203720..969cfe920d252f61cc71c38cc4f32492b4d61728 100644 (file)
        pinctrl-0 = <&pinctrl_qspi2>;
        status = "okay";
 
-       flash0: n25q256a@0 {
+       flash0: flash@0 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q256a", "jedec,spi-nor";
                spi-max-frequency = <29000000>;
                spi-rx-bus-width = <4>;
-               spi-tx-bus-width = <4>;
+               spi-tx-bus-width = <1>;
                reg = <0>;
        };
 
-       flash1: n25q256a@2 {
+       flash1: flash@2 {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "micron,n25q256a", "jedec,spi-nor";
                spi-max-frequency = <29000000>;
                spi-rx-bus-width = <4>;
-               spi-tx-bus-width = <4>;
+               spi-tx-bus-width = <1>;
                reg = <2>;
        };
 };
index f6972deb5e39ce17d6360ead6a1d4b7cae697050..c6e85e4a0883e0f233ba84dc0fe88357b2560d0e 100644 (file)
 
        sound {
                compatible = "fsl,imx6sx-sdb-wm8962", "fsl,imx-audio-wm8962";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_hp>;
                model = "wm8962-audio";
                ssi-controller = <&ssi2>;
                audio-codec = <&codec>;
                        "IN3R", "AMIC";
                mux-int-port = <2>;
                mux-ext-port = <6>;
+               hp-det-gpio = <&gpio1 17 GPIO_ACTIVE_LOW>;
        };
 
        panel {
                        };
                };
        };
+
+       sound-spdif {
+               compatible = "fsl,imx-audio-spdif",
+                          "fsl,imx6sx-sdb-spdif";
+               model = "imx-spdif";
+               spdif-controller = <&spdif>;
+               spdif-out;
+       };
+
 };
 
 &audmux {
        phy-mode = "rgmii-id";
        phy-handle = <&ethphy1>;
        phy-reset-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
+       fsl,magic-packet;
        status = "okay";
 
        mdio {
 &fec2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_enet2>;
-       phy-mode = "rgmii";
+       phy-mode = "rgmii-id";
        phy-handle = <&ethphy2>;
+       fsl,magic-packet;
        status = "okay";
 };
 
 };
 
 &pwm3 {
+       #pwm-cells = <2>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm3>;
        status = "okay";
        status = "disabled";
 };
 
+&spdif {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_spdif>;
+       assigned-clocks = <&clks IMX6SX_CLK_SPDIF_PODF>;
+       assigned-clock-rates = <24576000>;
+       status = "okay";
+};
+
 &ssi2 {
        status = "okay";
 };
                        >;
                };
 
+               pinctrl_hp: hpgrp {
+                       fsl,pins = <
+                               MX6SX_PAD_CSI_DATA03__GPIO1_IO_17 0x17059
+                       >;
+               };
+
                pinctrl_i2c1: i2c1grp {
                        fsl,pins = <
                                MX6SX_PAD_GPIO1_IO01__I2C1_SDA          0x4001b8b1
                        >;
                };
 
+               pinctrl_mqs: mqsgrp {
+                       fsl,pins = <
+                               MX6SX_PAD_SD2_CLK__MQS_RIGHT 0x120b0
+                               MX6SX_PAD_SD2_CMD__MQS_LEFT  0x120b0
+                       >;
+               };
+
                pinctrl_pcie: pciegrp {
                        fsl,pins = <
                                MX6SX_PAD_ENET1_COL__GPIO2_IO_0 0x10b0
                        >;
                };
 
+               pinctrl_spdif: spdifgrp {
+                       fsl,pins = <
+                               MX6SX_PAD_SD4_DATA4__SPDIF_OUT          0x1b0b0
+                       >;
+               };
+
                pinctrl_uart1: uart1grp {
                        fsl,pins = <
-                               MX6SX_PAD_GPIO1_IO04__UART1_TX          0x1b0b1
-                               MX6SX_PAD_GPIO1_IO05__UART1_RX          0x1b0b1
+                               MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX      0x1b0b1
+                               MX6SX_PAD_GPIO1_IO05__UART1_DCE_RX      0x1b0b1
                        >;
                };
 
                pinctrl_uart5: uart5grp {
                        fsl,pins = <
-                               MX6SX_PAD_KEY_ROW3__UART5_RX            0x1b0b1
-                               MX6SX_PAD_KEY_COL3__UART5_TX            0x1b0b1
-                               MX6SX_PAD_KEY_ROW2__UART5_CTS_B         0x1b0b1
-                               MX6SX_PAD_KEY_COL2__UART5_RTS_B         0x1b0b1
+                               MX6SX_PAD_KEY_ROW3__UART5_DCE_RX        0x1b0b1
+                               MX6SX_PAD_KEY_COL3__UART5_DCE_TX        0x1b0b1
+                               MX6SX_PAD_KEY_ROW2__UART5_DCE_CTS       0x1b0b1
+                               MX6SX_PAD_KEY_COL2__UART5_DCE_RTS       0x1b0b1
                        >;
                };
 
index 78dd5755a379b216ed6eab87779b22e39a65664c..b9a1401e6c6d2d0e8ffe2b019476ace076294925 100644 (file)
@@ -1,9 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * 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/;
        model = "Softing VIN|ING 2000";
        compatible = "samtec,imx6sx-vining-2000", "fsl,imx6sx";
 
-       aliases {
-               mmc0 = &usdhc4;
-               mmc1 = &usdhc2;
-       };
-
        chosen {
                stdout-path = &uart1;
        };
                regulator-max-microvolt = <3300000>;
        };
 
-       pwmleds {
+       led-controller {
                compatible = "pwm-leds";
 
-               red {
+               led-1 {
                        label = "red";
                        max-brightness = <255>;
                        pwms = <&pwm6 0 50000>;
                };
 
-               green {
+               led-2 {
                        label = "green";
                        max-brightness = <255>;
                        pwms = <&pwm2 0 50000>;
                };
 
-               blue {
+               led-3 {
                        label = "blue";
                        max-brightness = <255>;
                        pwms = <&pwm1 0 50000>;
 &ecspi4 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_ecspi4>;
-       cs-gpios = <&gpio7 4 GPIO_ACTIVE_HIGH>;
+       cs-gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
        status = "okay";
 };
 
        status = "okay";
 };
 
-&reg_pcie {
-       regulator-always-on;
-};
-
-&pcie {
-       pinctrl-names = "default";
-       pinctrl-0 = <&pinctrl_pcie>;
-       reset-gpio = <&gpio4 6 GPIO_ACTIVE_HIGH>;
-       status = "okay";
-};
-
 &iomuxc {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_gpios>;
 
        pinctrl_uart1: uart1grp {
                fsl,pins = <
-                       MX6SX_PAD_GPIO1_IO04__UART1_TX          0x1b0b1
-                       MX6SX_PAD_GPIO1_IO05__UART1_RX          0x1b0b1
+                       MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX      0x1b0b1
+                       MX6SX_PAD_GPIO1_IO05__UART1_DCE_RX      0x1b0b1
                >;
        };
 
        pinctrl_uart2: uart2grp {
                fsl,pins = <
-                       MX6SX_PAD_GPIO1_IO06__UART2_TX          0x1b0b1
-                       MX6SX_PAD_GPIO1_IO07__UART2_RX          0x1b0b1
+                       MX6SX_PAD_GPIO1_IO06__UART2_DCE_TX      0x1b0b1
+                       MX6SX_PAD_GPIO1_IO07__UART2_DCE_RX      0x1b0b1
                >;
        };
 
        };
 };
 
+&pcie {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_pcie>;
+       reset-gpio = <&gpio4 6 GPIO_ACTIVE_HIGH>;
+       reset-gpio-active-high;
+       status = "okay";
+};
+
 &pwm1 {
+       #pwm-cells = <2>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm1>;
        status = "okay";
 };
 
 &pwm2 {
+       #pwm-cells = <2>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm2>;
        status = "okay";
 };
 
 &pwm6 {
+       #pwm-cells = <2>;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_pwm6>;
        status = "okay";
index ee645655090d246f0adfe215399e97263e3292e0..c84ea1fac5e98dd3206cbee2e02e80b3f84ded23 100644 (file)
        status = "okay";
 };
 
+&i2c3 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3>;
+       clock-frequency = <100000>;
+       status = "okay";
+
+       hdmi-transmitter@70 {
+               compatible = "nxp,tda998x";
+               reg = <0x70>;
+               interrupts-extended = <&gpio3 27 IRQ_TYPE_LEVEL_LOW>;
+
+               ports {
+                       port {
+                               hdmi: endpoint {
+                                       remote-endpoint = <&lcdc>;
+                               };
+                       };
+               };
+       };
+};
+
 &i2c4 { /* Onboard Motion sensors */
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_i2c4>;
        status = "disabled";
 };
 
+&lcdif1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_lcd>;
+       status = "okay";
+
+       port {
+               lcdc: endpoint {
+                       remote-endpoint = <&hdmi>;
+               };
+       };
+};
+
 &iomuxc {
        pinctrl_bt_reg: btreggrp {
                fsl,pins =
-                       <MX6SX_PAD_KEY_ROW2__GPIO2_IO_17        0x15059>;
+                       <MX6SX_PAD_KEY_ROW2__GPIO2_IO_17        0x15059>;
        };
 
        pinctrl_enet1: enet1grp {
                        <MX6SX_PAD_GPIO1_IO02__I2C2_SCL         0x4001b8b1>;
        };
 
+       pinctrl_i2c3: i2c3grp {
+               fsl,pins =
+                       <MX6SX_PAD_KEY_ROW4__I2C3_SDA                   0x4001b8b1>,
+                       <MX6SX_PAD_KEY_COL4__I2C3_SCL                   0x4001b8b1>;
+       };
+
        pinctrl_i2c4: i2c4grp {
                fsl,pins =
                        <MX6SX_PAD_USB_H_DATA__I2C4_SDA         0x4001b8b1>,
                        <MX6SX_PAD_USB_H_STROBE__I2C4_SCL       0x4001b8b1>;
        };
 
+       pinctrl_lcd: lcdgrp {
+               fsl,pins = <
+                       MX6SX_PAD_LCD1_DATA00__LCDIF1_DATA_0            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA01__LCDIF1_DATA_1            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA02__LCDIF1_DATA_2            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA03__LCDIF1_DATA_3            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA04__LCDIF1_DATA_4            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA05__LCDIF1_DATA_5            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA06__LCDIF1_DATA_6            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA07__LCDIF1_DATA_7            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA08__LCDIF1_DATA_8            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA09__LCDIF1_DATA_9            0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA10__LCDIF1_DATA_10           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA11__LCDIF1_DATA_11           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA12__LCDIF1_DATA_12           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA13__LCDIF1_DATA_13           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA14__LCDIF1_DATA_14           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA15__LCDIF1_DATA_15           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA16__LCDIF1_DATA_16           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA17__LCDIF1_DATA_17           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA18__LCDIF1_DATA_18           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA19__LCDIF1_DATA_19           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA20__LCDIF1_DATA_20           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA21__LCDIF1_DATA_21           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA22__LCDIF1_DATA_22           0x4001b0b0
+                       MX6SX_PAD_LCD1_DATA23__LCDIF1_DATA_23           0x4001b0b0
+                       MX6SX_PAD_LCD1_CLK__LCDIF1_CLK          0x4001b0b0
+                       MX6SX_PAD_LCD1_ENABLE__LCDIF1_ENABLE            0x4001b0b0
+                       MX6SX_PAD_LCD1_VSYNC__LCDIF1_VSYNC              0x4001b0b0
+                       MX6SX_PAD_LCD1_HSYNC__LCDIF1_HSYNC              0x4001b0b0
+                       MX6SX_PAD_LCD1_RESET__GPIO3_IO_27               0x4001b0b0
+               >;
+       };
+
        pinctrl_uart1: uart1grp {
                fsl,pins =
                        <MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX     0x1b0b1>,
 
        pinctrl_otg1_reg: otg1grp {
                fsl,pins =
-                       <MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9        0x10b0>;
+                       <MX6SX_PAD_GPIO1_IO09__GPIO1_IO_9       0x10b0>;
        };
 
-
        pinctrl_otg2_reg: otg2grp {
                fsl,pins =
-                       <MX6SX_PAD_NAND_RE_B__GPIO4_IO_12        0x10b0>;
+                       <MX6SX_PAD_NAND_RE_B__GPIO4_IO_12       0x10b0>;
        };
 
        pinctrl_usb_otg1: usbotg1grp {
                fsl,pins =
-                       <MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID    0x17059>,
-                       <MX6SX_PAD_GPIO1_IO08__USB_OTG1_OC       0x10b0>;
+                       <MX6SX_PAD_GPIO1_IO10__ANATOP_OTG1_ID   0x17059>,
+                       <MX6SX_PAD_GPIO1_IO08__USB_OTG1_OC      0x10b0>;
        };
 
        pinctrl_usb_otg2: usbot2ggrp {
                fsl,pins =
-                       <MX6SX_PAD_QSPI1A_DATA0__USB_OTG2_OC     0x10b0>;
+                       <MX6SX_PAD_QSPI1A_DATA0__USB_OTG2_OC    0x10b0>;
        };
 
        pinctrl_usdhc2: usdhc2grp {
index 8d2d396ad138e2dabd175edc78ad3308b166bc1c..4d075e2bf7496e016fc925948885b1d3640c1c94 100644 (file)
@@ -49,6 +49,9 @@
                spi2 = &ecspi3;
                spi3 = &ecspi4;
                spi4 = &ecspi5;
+               usb0 = &usbotg1;
+               usb1 = &usbotg2;
+               usb2 = &usbh;
                usbphy0 = &usbphy1;
                usbphy1 = &usbphy2;
        };
@@ -87,6 +90,8 @@
                                      "pll1_sw", "pll1_sys";
                        arm-supply = <&reg_arm>;
                        soc-supply = <&reg_soc>;
+                       nvmem-cells = <&cpu_speed_grade>;
+                       nvmem-cell-names = "speed_grade";
                };
        };
 
                clock-output-names = "anaclk2";
        };
 
-       tempmon: tempmon {
-               compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
-               interrupt-parent = <&gpc>;
-               interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
-               fsl,tempmon = <&anatop>;
-               nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
-               nvmem-cell-names = "calib", "temp_grade";
-               clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
+       mqs: mqs {
+               compatible = "fsl,imx6sx-mqs";
+               gpr = <&gpr>;
+               status = "disabled";
        };
 
        pmu {
                #phy-cells = <0>;
        };
 
-       soc {
+       soc: soc {
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "simple-bus";
                        interrupt-parent = <&intc>;
                };
 
-               L2: l2-cache@a02000 {
+               L2: cache-controller@a02000 {
                        compatible = "arm,pl310-cache";
                        reg = <0x00a02000 0x1000>;
                        interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&clks IMX6SX_CLK_APBH_DMA>;
                };
 
-               gpmi: gpmi-nand@1806000{
+               gpmi: nand-controller@1806000{
                        compatible = "fsl,imx6sx-gpmi-nand";
                        #address-cells = <1>;
                        #size-cells = <1>;
                                };
 
                                esai: esai@2024000 {
+                                       compatible = "fsl,imx6sx-esai", "fsl,imx35-esai";
                                        reg = <0x02024000 0x4000>;
                                        interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6SX_CLK_ESAI_IPG>,
                                                 <&clks IMX6SX_CLK_SPBA>;
                                        clock-names = "core", "mem", "extal",
                                                      "fsys", "spba";
+                                       dmas = <&sdma 23 21 0>,
+                                              <&sdma 24 21 0>;
+                                       dma-names = "rx", "tx";
                                        status = "disabled";
                                };
 
                                };
 
                                asrc: asrc@2034000 {
+                                       compatible = "fsl,imx6sx-asrc", "fsl,imx53-asrc";
                                        reg = <0x02034000 0x4000>;
                                        interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
-                                       clocks = <&clks IMX6SX_CLK_ASRC_MEM>,
-                                                <&clks IMX6SX_CLK_ASRC_IPG>,
-                                                <&clks IMX6SX_CLK_SPDIF>,
-                                                <&clks IMX6SX_CLK_SPBA>;
-                                       clock-names = "mem", "ipg", "asrck", "spba";
-                                       dmas = <&sdma 17 20 1>, <&sdma 18 20 1>,
-                                              <&sdma 19 20 1>, <&sdma 20 20 1>,
-                                              <&sdma 21 20 1>, <&sdma 22 20 1>;
+                                       clocks = <&clks IMX6SX_CLK_ASRC_IPG>,
+                                               <&clks IMX6SX_CLK_ASRC_MEM>, <&clks 0>,
+                                               <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
+                                               <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
+                                               <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>,
+                                               <&clks IMX6SX_CLK_SPDIF>, <&clks 0>, <&clks 0>,
+                                               <&clks IMX6SX_CLK_SPBA>;
+                                       clock-names = "mem", "ipg", "asrck_0",
+                                               "asrck_1", "asrck_2", "asrck_3", "asrck_4",
+                                               "asrck_5", "asrck_6", "asrck_7", "asrck_8",
+                                               "asrck_9", "asrck_a", "asrck_b", "asrck_c",
+                                               "asrck_d", "asrck_e", "asrck_f", "spba";
+                                       dmas = <&sdma 17 23 1>, <&sdma 18 23 1>,
+                                              <&sdma 19 23 1>, <&sdma 20 23 1>,
+                                              <&sdma 21 23 1>, <&sdma 22 23 1>;
                                        dma-names = "rxa", "rxb", "rxc",
                                                    "txa", "txb", "txc";
+                                       fsl,asrc-rate  = <48000>;
+                                       fsl,asrc-width = <16>;
                                        status = "okay";
                                };
                        };
                                clocks = <&clks IMX6SX_CLK_PWM1>,
                                         <&clks IMX6SX_CLK_PWM1>;
                                clock-names = "ipg", "per";
-                               #pwm-cells = <2>;
+                               #pwm-cells = <3>;
                        };
 
                        pwm2: pwm@2084000 {
                                clocks = <&clks IMX6SX_CLK_PWM2>,
                                         <&clks IMX6SX_CLK_PWM2>;
                                clock-names = "ipg", "per";
-                               #pwm-cells = <2>;
+                               #pwm-cells = <3>;
                        };
 
                        pwm3: pwm@2088000 {
                                clocks = <&clks IMX6SX_CLK_PWM3>,
                                         <&clks IMX6SX_CLK_PWM3>;
                                clock-names = "ipg", "per";
-                               #pwm-cells = <2>;
+                               #pwm-cells = <3>;
                        };
 
                        pwm4: pwm@208c000 {
                                clocks = <&clks IMX6SX_CLK_PWM4>,
                                         <&clks IMX6SX_CLK_PWM4>;
                                clock-names = "ipg", "per";
-                               #pwm-cells = <2>;
+                               #pwm-cells = <3>;
                        };
 
                        flexcan1: can@2090000 {
                                clocks = <&clks IMX6SX_CLK_CAN1_IPG>,
                                         <&clks IMX6SX_CLK_CAN1_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
+                               fsl,stop-mode = <&gpr 0x10 1>;
                                status = "disabled";
                        };
 
                                clocks = <&clks IMX6SX_CLK_CAN2_IPG>,
                                         <&clks IMX6SX_CLK_CAN2_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
+                               fsl,stop-mode = <&gpr 0x10 2>;
                                status = "disabled";
                        };
 
-                       gpt: gpt@2098000 {
+                       gpt: timer@2098000 {
                                compatible = "fsl,imx6sx-gpt", "fsl,imx6dl-gpt";
                                reg = <0x02098000 0x4000>;
                                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
                                gpio-ranges = <&iomuxc 0 148 10>, <&iomuxc 10 169 2>;
                        };
 
-                       kpp: kpp@20b8000 {
+                       kpp: keypad@20b8000 {
                                compatible = "fsl,imx6sx-kpp", "fsl,imx21-kpp";
                                reg = <0x020b8000 0x4000>;
                                interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
-                       wdog1: wdog@20bc000 {
+                       wdog1: watchdog@20bc000 {
                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
                                reg = <0x020bc000 0x4000>;
                                interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_IPG>;
                        };
 
-                       wdog2: wdog@20c0000 {
+                       wdog2: watchdog@20c0000 {
                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
                                reg = <0x020c0000 0x4000>;
                                interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
-                       clks: ccm@20c4000 {
+                       clks: clock-controller@20c4000 {
                                compatible = "fsl,imx6sx-ccm";
                                reg = <0x020c4000 0x4000>;
                                interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
 
                        anatop: anatop@20c8000 {
                                compatible = "fsl,imx6sx-anatop", "fsl,imx6q-anatop",
-                                            "syscon", "simple-bus";
+                                            "syscon", "simple-mfd";
                                reg = <0x020c8000 0x1000>;
                                interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>,
                                             <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
                                        anatop-min-voltage = <725000>;
                                        anatop-max-voltage = <1450000>;
                                };
+
+                               tempmon: tempmon {
+                                       compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
+                                       interrupt-parent = <&gpc>;
+                                       interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
+                                       fsl,tempmon = <&anatop>;
+                                       nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
+                                       nvmem-cell-names = "calib", "temp_grade";
+                                       clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
+                               };
                        };
 
                        usbphy1: usbphy@20c9000 {
                                interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
-                       src: src@20d8000 {
+                       src: reset-controller@20d8000 {
                                compatible = "fsl,imx6sx-src", "fsl,imx51-src";
                                reg = <0x020d8000 0x4000>;
                                interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>,
                                };
                        };
 
-                       iomuxc: iomuxc@20e0000 {
+                       iomuxc: pinctrl@20e0000 {
                                compatible = "fsl,imx6sx-iomuxc";
                                reg = <0x020e0000 0x4000>;
                        };
                        reg = <0x02100000 0x100000>;
                        ranges;
 
-                       crypto: caam@2100000 {
+                       crypto: crypto@2100000 {
                                compatible = "fsl,sec-v4.0";
                                #address-cells = <1>;
                                #size-cells = <1>;
                                         <&clks IMX6SX_CLK_EIM_SLOW>;
                                clock-names = "mem", "aclk", "ipg", "emi_slow";
 
-                               sec_jr0: jr0@1000 {
+                               sec_jr0: jr@1000 {
                                        compatible = "fsl,sec-v4.0-job-ring";
                                        reg = <0x1000 0x1000>;
                                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
                                };
 
-                               sec_jr1: jr1@2000 {
+                               sec_jr1: jr@2000 {
                                        compatible = "fsl,sec-v4.0-job-ring";
                                        reg = <0x2000 0x1000>;
                                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
                                              "enet_clk_ref", "enet_out";
                                fsl,num-tx-queues = <3>;
                                fsl,num-rx-queues = <3>;
+                               fsl,stop-mode = <&gpr 0x10 3>;
                                status = "disabled";
                        };
 
                                status = "disabled";
                        };
 
-                       usdhc1: usdhc@2190000 {
+                       usdhc1: mmc@2190000 {
                                compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
                                reg = <0x02190000 0x4000>;
                                interrupts = <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
-                       usdhc2: usdhc@2194000 {
+                       usdhc2: mmc@2194000 {
                                compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
                                reg = <0x02194000 0x4000>;
                                interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
-                       usdhc3: usdhc@2198000 {
+                       usdhc3: mmc@2198000 {
                                compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
                                reg = <0x02198000 0x4000>;
                                interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
                                status = "disabled";
                        };
 
-                       usdhc4: usdhc@219c000 {
+                       usdhc4: mmc@219c000 {
                                compatible = "fsl,imx6sx-usdhc", "fsl,imx6sl-usdhc";
                                reg = <0x0219c000 0x4000>;
                                interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
                                         <&clks IMX6SX_CLK_ENET_PTP>;
                                clock-names = "ipg", "ahb", "ptp",
                                              "enet_clk_ref", "enet_out";
+                               fsl,stop-mode = <&gpr 0x10 4>;
                                status = "disabled";
                        };
 
                                status = "disabled";
                        };
 
-                       ocotp: ocotp@21bc000 {
+                       ocotp: efuse@21bc000 {
                                #address-cells = <1>;
                                #size-cells = <1>;
                                compatible = "fsl,imx6sx-ocotp", "syscon";
                                reg = <0x021bc000 0x4000>;
                                clocks = <&clks IMX6SX_CLK_OCOTP>;
 
+                               cpu_speed_grade: speed-grade@10 {
+                                       reg = <0x10 4>;
+                               };
+
                                tempmon_calib: calib@38 {
                                        reg = <0x38 4>;
                                };
                                status = "disabled";
                        };
 
-                       wdog3: wdog@2288000 {
+                       wdog3: watchdog@2288000 {
                                compatible = "fsl,imx6sx-wdt", "fsl,imx21-wdt";
                                reg = <0x02288000 0x4000>;
                                interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_PWM5>,
                                         <&clks IMX6SX_CLK_PWM5>;
                                clock-names = "ipg", "per";
-                               #pwm-cells = <2>;
+                               #pwm-cells = <3>;
                        };
 
                        pwm6: pwm@22a8000 {
                                clocks = <&clks IMX6SX_CLK_PWM6>,
                                         <&clks IMX6SX_CLK_PWM6>;
                                clock-names = "ipg", "per";
-                               #pwm-cells = <2>;
+                               #pwm-cells = <3>;
                        };
 
                        pwm7: pwm@22ac000 {
                                clocks = <&clks IMX6SX_CLK_PWM7>,
                                         <&clks IMX6SX_CLK_PWM7>;
                                clock-names = "ipg", "per";
-                               #pwm-cells = <2>;
+                               #pwm-cells = <3>;
                        };
 
                        pwm8: pwm@22b0000 {
                                clocks = <&clks IMX6SX_CLK_PWM8>,
                                         <&clks IMX6SX_CLK_PWM8>;
                                clock-names = "ipg", "per";
-                               #pwm-cells = <2>;
+                               #pwm-cells = <3>;
                        };
                };
 
                pcie: pcie@8ffc000 {
-                       compatible = "fsl,imx6sx-pcie", "snps,dw-pcie";
+                       compatible = "fsl,imx6sx-pcie";
                        reg = <0x08ffc000 0x04000>, <0x08f00000 0x80000>;
                        reg-names = "dbi", "config";
                        #address-cells = <3>;
                        #size-cells = <2>;
                        device_type = "pci";
                        bus-range = <0x00 0xff>;
-                       ranges = <0x81000000 0 0          0x08f80000 0 0x00010000 /* downstream I/O */
-                                 0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */
+                       ranges = <0x81000000 0 0          0x08f80000 0 0x00010000>, /* downstream I/O */
+                                <0x82000000 0 0x08000000 0x08000000 0 0x00f00000>; /* non-prefetchable memory */
                        num-lanes = <1>;
                        interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
                        interrupt-names = "msi";