Hi Bryan,
> -----Original Message-----
> From: Bryan O'Donoghue [mailto:bryan.odonog...@linaro.org]
> Sent: 2019年1月3日 9:45
> To: u-boot@lists.denx.de
> Cc: Fabio Estevam <fabio.este...@nxp.com>; Peng Fan
> <peng....@nxp.com>; Bryan O'Donoghue <bryan.odonog...@linaro.org>;
> Albert Aribaud <albert.u.b...@aribaud.net>; Stefano Babic
> <sba...@denx.de>
> Subject: [PATCH 1/8] arm: dts: imx7s-warp: Import Linux warp7 dts
>
> This patch imports the Linux kernel warp7 dts as at upstream kernel commit
> cf76c364a1e1.
>
> The following was dropped from the incoming kernel DTS file
U-Boot dts synced from Linux Kernel DTS file. If there is issue, it should be
fixed in Linux side and imported to U-Boot.
Regards,
Peng
>
> -&wdog1 {
> - pinctrl-names = "default";
> - pinctrl-0 = <&pinctrl_wdog>;
> - fsl,ext-reset-output;
> - status = "okay";
> -};
> -
> -
> -&iomuxc_lpsr {
> - pinctrl_wdog: wdoggrp {
> - fsl,pins = <
> -
> MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74
> - >;
> - };
> -};
>
> it causes a DTC compile error for me and isn't needed for u-boot in any case.
>
> Signed-off-by: Bryan O'Donoghue <bryan.odonog...@linaro.org>
> Cc: Albert Aribaud <albert.u.b...@aribaud.net>
> Cc: Peng Fan <peng....@nxp.com>
> Cc: Fabio Estevam <fabio.este...@nxp.com>
> Cc: Stefano Babic <sba...@denx.de>
> ---
> arch/arm/dts/imx7s-warp.dts | 423
> ++++++++++++++++++++++++++++++++++++
> 1 file changed, 423 insertions(+)
> create mode 100644 arch/arm/dts/imx7s-warp.dts
>
> diff --git a/arch/arm/dts/imx7s-warp.dts b/arch/arm/dts/imx7s-warp.dts
> new file mode 100644 index 0000000000..c44db20734
> --- /dev/null
> +++ b/arch/arm/dts/imx7s-warp.dts
> @@ -0,0 +1,423 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Copyright (C) 2016 NXP Semiconductors.
> + * Author: Fabio Estevam <fabio.este...@nxp.com> */
> +
> +/dts-v1/;
> +
> +#include <dt-bindings/input/input.h>
> +#include "imx7s.dtsi"
> +
> +/ {
> + model = "Warp i.MX7 Board";
> + compatible = "warp,imx7s-warp", "fsl,imx7s";
> +
> + memory@80000000 {
> + reg = <0x80000000 0x20000000>;
> + };
> +
> + gpio-keys {
> + compatible = "gpio-keys";
> + pinctrl-0 = <&pinctrl_gpio>;
> + autorepeat;
> +
> + back {
> + label = "Back";
> + gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>;
> + linux,code = <KEY_BACK>;
> + wakeup-source;
> + };
> + };
> +
> + reg_brcm: regulator-brcm {
> + compatible = "regulator-fixed";
> + enable-active-high;
> + gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_brcm_reg>;
> + regulator-name = "brcm_reg";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + startup-delay-us = <200000>;
> + };
> +
> + reg_bt: regulator-bt {
> + compatible = "regulator-fixed";
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_bt_reg>;
> + enable-active-high;
> + gpio = <&gpio5 17 GPIO_ACTIVE_HIGH>;
> + regulator-name = "bt_reg";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + sound {
> + compatible = "simple-audio-card";
> + simple-audio-card,name = "imx7-sgtl5000";
> + simple-audio-card,format = "i2s";
> + simple-audio-card,bitclock-master = <&dailink_master>;
> + simple-audio-card,frame-master = <&dailink_master>;
> + simple-audio-card,cpu {
> + sound-dai = <&sai1>;
> + };
> +
> + dailink_master: simple-audio-card,codec {
> + sound-dai = <&codec>;
> + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
> + };
> + };
> +};
> +
> +&clks {
> + assigned-clocks = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
> + assigned-clock-rates = <884736000>;
> +};
> +
> +&i2c1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c1>;
> + status = "okay";
> +
> + pmic: pfuze3000@8 {
> + compatible = "fsl,pfuze3000";
> + reg = <0x08>;
> +
> + regulators {
> + sw1a_reg: sw1a {
> + regulator-min-microvolt = <700000>;
> + regulator-max-microvolt = <1475000>;
> + regulator-boot-on;
> + regulator-always-on;
> + regulator-ramp-delay = <6250>;
> + };
> +
> + /* use sw1c_reg to align with pfuze100/pfuze200 */
> + sw1c_reg: sw1b {
> + regulator-min-microvolt = <700000>;
> + regulator-max-microvolt = <1475000>;
> + regulator-boot-on;
> + regulator-always-on;
> + regulator-ramp-delay = <6250>;
> + };
> +
> + sw2_reg: sw2 {
> + regulator-min-microvolt = <1500000>;
> + regulator-max-microvolt = <1850000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + sw3a_reg: sw3 {
> + regulator-min-microvolt = <900000>;
> + regulator-max-microvolt = <1650000>;
> + regulator-boot-on;
> + 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: vldo1 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + vgen2_reg: vldo2 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1550000>;
> + };
> +
> + vgen3_reg: vccsd {
> + regulator-min-microvolt = <2850000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + vgen4_reg: v33 {
> + regulator-min-microvolt = <2850000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + vgen5_reg: vldo3 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> +
> + vgen6_reg: vldo4 {
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-always-on;
> + };
> + };
> + };
> +};
> +
> +&i2c2 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c2>;
> + status = "okay";
> +};
> +
> +&i2c3 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c3>;
> + status = "okay";
> +};
> +
> +&i2c4 {
> + clock-frequency = <100000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c4>;
> + status = "okay";
> +
> + codec: sgtl5000@a {
> + #sound-dai-cells = <0>;
> + reg = <0x0a>;
> + compatible = "fsl,sgtl5000";
> + clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_sai1_mclk>;
> + VDDA-supply = <&vgen4_reg>;
> + VDDIO-supply = <&vgen4_reg>;
> + VDDD-supply = <&vgen2_reg>;
> + };
> +
> + mpl3115@60 {
> + compatible = "fsl,mpl3115";
> + reg = <0x60>;
> + };
> +};
> +
> +&sai1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_sai1>;
> + assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>,
> + <&clks IMX7D_SAI1_ROOT_CLK>;
> + assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
> + assigned-clock-rates = <0>, <36864000>;
> + status = "okay";
> +};
> +
> +&uart1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart1>;
> + assigned-clocks = <&clks IMX7D_UART1_ROOT_SRC>;
> + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
> + status = "okay";
> +};
> +
> +&uart3 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart3>;
> + assigned-clocks = <&clks IMX7D_UART3_ROOT_SRC>;
> + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
> + uart-has-rtscts;
> + status = "okay";
> +};
> +
> +&uart6 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart6>;
> + assigned-clocks = <&clks IMX7D_UART6_ROOT_SRC>;
> + assigned-clock-parents = <&clks IMX7D_PLL_SYS_MAIN_240M_CLK>;
> + fsl,dte-mode;
> + status = "okay";
> +};
> +
> +&usbotg1 {
> + dr_mode = "peripheral";
> + status = "okay";
> +};
> +
> +&usdhc1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc1>;
> + bus-width = <4>;
> + keep-power-in-suspend;
> + no-1-8-v;
> + non-removable;
> + vmmc-supply = <®_brcm>;
> + status = "okay";
> +};
> +
> +&usdhc3 {
> + pinctrl-names = "default", "state_100mhz", "state_200mhz";
> + pinctrl-0 = <&pinctrl_usdhc3>;
> + pinctrl-1 = <&pinctrl_usdhc3_100mhz>;
> + pinctrl-2 = <&pinctrl_usdhc3_200mhz>;
> + assigned-clocks = <&clks IMX7D_USDHC3_ROOT_CLK>;
> + assigned-clock-rates = <400000000>;
> + bus-width = <8>;
> + no-1-8-v;
> + fsl,tuning-step = <2>;
> + non-removable;
> + status = "okay";
> +};
> +
> +&iomuxc {
> + pinctrl_brcm_reg: brcmreggrp {
> + fsl,pins = <
> + MX7D_PAD_SD2_WP__GPIO5_IO10 0x14 /* WL_REG_ON */
> + >;
> + };
> +
> + pinctrl_bt_reg: btreggrp {
> + fsl,pins = <
> + MX7D_PAD_SD2_DATA3__GPIO5_IO17 0x14 /*
> BT_REG_ON */
> + >;
> + };
> +
> + pinctrl_gpio: gpiogrp {
> + fsl,pins = <
> + MX7D_PAD_ENET1_RGMII_RD1__GPIO7_IO1 0x14
> + >;
> + };
> +
> + pinctrl_i2c1: i2c1grp {
> + fsl,pins = <
> + MX7D_PAD_I2C1_SDA__I2C1_SDA 0x4000007f
> + MX7D_PAD_I2C1_SCL__I2C1_SCL 0x4000007f
> + >;
> + };
> +
> + pinctrl_i2c2: i2c2grp {
> + fsl,pins = <
> + MX7D_PAD_I2C2_SDA__I2C2_SDA 0x4000007f
> + MX7D_PAD_I2C2_SCL__I2C2_SCL 0x4000007f
> + >;
> + };
> +
> + pinctrl_i2c3: i2c3grp {
> + fsl,pins = <
> + MX7D_PAD_I2C3_SDA__I2C3_SDA 0x4000007f
> + MX7D_PAD_I2C3_SCL__I2C3_SCL 0x4000007f
> + >;
> + };
> +
> + pinctrl_i2c4: i2c4grp {
> + fsl,pins = <
> + MX7D_PAD_I2C4_SCL__I2C4_SCL 0x4000007f
> + MX7D_PAD_I2C4_SDA__I2C4_SDA 0x4000007f
> + >;
> + };
> +
> + pinctrl_sai1: sai1grp {
> + fsl,pins = <
> + MX7D_PAD_SAI1_RX_DATA__SAI1_RX_DATA0 0x1f
> + MX7D_PAD_SAI1_TX_BCLK__SAI1_TX_BCLK 0x1f
> + MX7D_PAD_SAI1_TX_SYNC__SAI1_TX_SYNC 0x1f
> + MX7D_PAD_SAI1_TX_DATA__SAI1_TX_DATA0 0x30
> + >;
> + };
> +
> + pinctrl_sai1_mclk: sai1mclkgrp {
> + fsl,pins = <
> + MX7D_PAD_SAI1_MCLK__SAI1_MCLK 0x1f
> + >;
> + };
> +
> + pinctrl_uart1: uart1grp {
> + fsl,pins = <
> + MX7D_PAD_UART1_TX_DATA__UART1_DCE_TX 0x79
> + MX7D_PAD_UART1_RX_DATA__UART1_DCE_RX 0x79
> + >;
> + };
> +
> + pinctrl_uart3: uart3grp {
> + fsl,pins = <
> + MX7D_PAD_UART3_TX_DATA__UART3_DCE_TX 0x79
> + MX7D_PAD_UART3_RX_DATA__UART3_DCE_RX 0x79
> + MX7D_PAD_UART3_CTS_B__UART3_DCE_CTS 0x79
> + MX7D_PAD_UART3_RTS_B__UART3_DCE_RTS 0x79
> + >;
> + };
> +
> + pinctrl_uart6: uart6grp {
> + fsl,pins = <
> + MX7D_PAD_ECSPI1_MOSI__UART6_DTE_RX 0x79
> + MX7D_PAD_ECSPI1_SCLK__UART6_DTE_TX 0x79
> + >;
> + };
> +
> + pinctrl_usdhc1: usdhc1grp {
> + fsl,pins = <
> + MX7D_PAD_SD1_CMD__SD1_CMD 0x59
> + MX7D_PAD_SD1_CLK__SD1_CLK 0x19
> + MX7D_PAD_SD1_DATA0__SD1_DATA0 0x59
> + MX7D_PAD_SD1_DATA1__SD1_DATA1 0x59
> + MX7D_PAD_SD1_DATA2__SD1_DATA2 0x59
> + MX7D_PAD_SD1_DATA3__SD1_DATA3 0x59
> + MX7D_PAD_SD2_RESET_B__GPIO5_IO11 0x14 /*
> WL_HOST_WAKE */
> + >;
> + };
> +
> + pinctrl_usdhc3: usdhc3grp {
> + fsl,pins = <
> + MX7D_PAD_SD3_CMD__SD3_CMD 0x59
> + MX7D_PAD_SD3_CLK__SD3_CLK 0x19
> + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x59
> + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x59
> + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x59
> + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x59
> + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x59
> + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x59
> + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x59
> + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x59
> + MX7D_PAD_SD3_RESET_B__SD3_RESET_B 0x19
> + >;
> + };
> +
> + pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
> + fsl,pins = <
> + MX7D_PAD_SD3_CMD__SD3_CMD 0x5a
> + MX7D_PAD_SD3_CLK__SD3_CLK 0x1a
> + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5a
> + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5a
> + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5a
> + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5a
> + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5a
> + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5a
> + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5a
> + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5a
> + MX7D_PAD_SD3_RESET_B__SD3_RESET_B 0x1a
> + >;
> + };
> +
> + pinctrl_usdhc3_200mhz: usdhc3grp_200mhz {
> + fsl,pins = <
> + MX7D_PAD_SD3_CMD__SD3_CMD 0x5b
> + MX7D_PAD_SD3_CLK__SD3_CLK 0x1b
> + MX7D_PAD_SD3_DATA0__SD3_DATA0 0x5b
> + MX7D_PAD_SD3_DATA1__SD3_DATA1 0x5b
> + MX7D_PAD_SD3_DATA2__SD3_DATA2 0x5b
> + MX7D_PAD_SD3_DATA3__SD3_DATA3 0x5b
> + MX7D_PAD_SD3_DATA4__SD3_DATA4 0x5b
> + MX7D_PAD_SD3_DATA5__SD3_DATA5 0x5b
> + MX7D_PAD_SD3_DATA6__SD3_DATA6 0x5b
> + MX7D_PAD_SD3_DATA7__SD3_DATA7 0x5b
> + MX7D_PAD_SD3_RESET_B__SD3_RESET_B 0x1b
> + >;
> + };
> +};
> --
> 2.20.0
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
