Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit cbcbf4f2d3c3288d3bcc8116ac337a8b37834efa

Authored by Ye Li
1 parent cbd4189400
Exists in smarc-n7.1.2_2.0.0-ga and in 4 other branches smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m

MLK-14326-5 mx6qpsabreauto: Enable OF_CONTROL and DM driver 

Update mx6qpsabreauto build configurations to use OF_CONTROL and DM driver.
Also add the imx6qpsabreauto DTS file for using DTB.

Signed-off-by: Ye Li <ye.li@nxp.com>

Showing 10 changed files with 303 additions and 19 deletions Side-by-side Diff

arch/arm/dts/Makefile
Diff comments   View file @ cbcbf4f
... ... @@ -325,6 +325,9 @@
325 325 imx6q-sabreauto.dtb \
326 326 imx6q-sabreauto-ecspi.dtb \
327 327 imx6q-sabreauto-gpmi-weim.dtb \
  328 + imx6qp-sabreauto.dtb \
  329 + imx6qp-sabreauto-ecspi.dtb \
  330 + imx6qp-sabreauto-gpmi-weim.dtb \
328 331 imx6sx-sabreauto.dtb \
329 332 imx6q-sabresd.dtb \
330 333 imx6qp-sabresd.dtb \
arch/arm/dts/imx6qp-sabreauto-ecspi.dts
Diff comments   View file @ cbcbf4f
  1 +/*
  2 + * Copyright (C) 2015 Freescale Semiconductor, Inc.
  3 + *
  4 + * This program is free software; you can redistribute it and/or modify
  5 + * it under the terms of the GNU General Public License version 2 as
  6 + * published by the Free Software Foundation.
  7 + */
  8 +
  9 +#include "imx6qp-sabreauto.dts"
  10 +
  11 +&ecspi1 {
  12 + pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_LOW>;
  13 + status = "okay";
  14 +};
  15 +
  16 +&can2 {
  17 + /* max7310_c on i2c3 is gone */
  18 + status = "disabled";
  19 +};
  20 +
  21 +&i2c3 {
  22 + /* pin conflict with ecspi1 */
  23 + status = "disabled";
  24 +};
  25 +
  26 +&uart3 {
  27 + /* the uart3 depends on the i2c3, so disable it too. */
  28 + status = "disabled";
  29 +};
  30 +
  31 +&usbh1 {
  32 + /* max7310_b on i2c3 is gone */
  33 + status = "disabled";
  34 +};
  35 +
  36 +&usbotg {
  37 + /* max7310_c on i2c3 is gone */
  38 + status = "okay";
  39 + dr_mode = "peripheral";
  40 +};
arch/arm/dts/imx6qp-sabreauto-gpmi-weim.dts
Diff comments   View file @ cbcbf4f
  1 +/*
  2 + * Copyright (C) 2015 Freescale Semiconductor, Inc.
  3 + *
  4 + * This program is free software; you can redistribute it and/or modify
  5 + * it under the terms of the GNU General Public License version 2 as
  6 + * published by the Free Software Foundation.
  7 + */
  8 +
  9 +#include "imx6qp-sabreauto.dts"
  10 +
  11 +&ecspi1 {
  12 + /* pin conflict with weim */
  13 + status = "disabled";
  14 +};
  15 +
  16 +&can2 {
  17 + /* max7310_c on i2c3 is gone */
  18 + status = "disabled";
  19 +};
  20 +
  21 +&gpmi {
  22 + compatible = "fsl,imx6qp-gpmi-nand";
  23 + status = "okay";
  24 +};
  25 +
  26 +&i2c3 {
  27 + /* pin conflict with weim */
  28 + status = "disabled";
  29 +};
  30 +
  31 +&uart3 {
  32 + /* pin conflict with gpmi and weim */
  33 + status = "disabled";
  34 +};
  35 +
  36 +&usbh1 {
  37 + /* max7310_b on i2c3 is gone */
  38 + status = "disabled";
  39 +};
  40 +
  41 +&usbotg {
  42 + /* max7310_c on i2c3 is gone */
  43 + status = "okay";
  44 + dr_mode = "peripheral";
  45 +};
  46 +
  47 +&weim {
  48 + pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_LOW>;
  49 + status = "okay";
  50 +};
arch/arm/dts/imx6qp-sabreauto.dts
Diff comments   View file @ cbcbf4f
  1 +/*
  2 + * Copyright (C) 2015 Freescale Semiconductor, Inc.
  3 + *
  4 + * This program is free software; you can redistribute it and/or modify
  5 + * it under the terms of the GNU General Public License version 2 as
  6 + * published by the Free Software Foundation.
  7 + */
  8 +
  9 +#include "imx6q-sabreauto.dts"
  10 +#include "imx6qp.dtsi"
  11 +
  12 +/ {
  13 + model = "Freescale i.MX6 Quad Plus SABRE Automotive Board";
  14 +};
  15 +
  16 +&mxcfb1 {
  17 + prefetch;
  18 +};
  19 +
  20 +&mxcfb2 {
  21 + prefetch;
  22 +};
  23 +
  24 +&mxcfb3 {
  25 + prefetch;
  26 +};
  27 +
  28 +&mxcfb4 {
  29 + prefetch;
  30 +};
  31 +
  32 +&fec {
  33 + pinctrl-assert-gpios = <&max7322 0 GPIO_ACTIVE_HIGH>;
  34 +};
  35 +
  36 +&i2c2 {
  37 + max7322: gpio@68 {
  38 + compatible = "maxim,max7322";
  39 + reg = <0x68>;
  40 + gpio-controller;
  41 + #gpio-cells = <2>;
  42 + };
  43 +};
  44 +
  45 +&pcie {
  46 + reset-gpio = <&max7310_c 5 GPIO_ACTIVE_LOW>;
  47 + status = "okay";
  48 +};
  49 +
  50 +&pre1 {
  51 + status = "okay";
  52 +};
  53 +
  54 +&pre2 {
  55 + status = "okay";
  56 +};
  57 +
  58 +&pre3 {
  59 + status = "okay";
  60 +};
  61 +
  62 +&pre4 {
  63 + status = "okay";
  64 +};
  65 +
  66 +&prg1 {
  67 + memory-region = <&memory>;
  68 + status = "okay";
  69 +};
  70 +
  71 +&prg2 {
  72 + memory-region = <&memory>;
  73 + status = "okay";
  74 +};
  75 +
  76 +&reg_sd3_vmmc {
  77 + status = "okay";
  78 +};
  79 +
  80 +&sata {
  81 + status = "okay";
  82 +};
  83 +
  84 +&usdhc3 {
  85 + vmmc-supply = <&reg_sd3_vmmc>;
  86 +};
  87 +
  88 +&vgen3_reg {
  89 + regulator-always-on;
  90 +};
configs/mx6qpsabreauto_defconfig
Diff comments   View file @ cbcbf4f
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_HUSH_PARSER=y
11 11 CONFIG_CMD_BOOTZ=y
12 12 # CONFIG_CMD_IMLS is not set
  13 +# CONFIG_CMD_FLASH is not set
13 14 CONFIG_CMD_MEMTEST=y
14 15 CONFIG_CMD_MMC=y
15 16 CONFIG_CMD_I2C=y
... ... @@ -36,5 +37,24 @@
36 37 CONFIG_G_DNL_VENDOR_NUM=0x0525
37 38 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
38 39 # CONFIG_VIDEO_SW_CURSOR is not set
39   -CONFIG_OF_LIBFDT=y
  40 +# CONFIG_OF_LIBFDT=y
  41 +
  42 +CONFIG_DEFAULT_DEVICE_TREE="imx6qp-sabreauto"
  43 +CONFIG_OF_CONTROL=y
  44 +# CONFIG_BLK is not set
  45 +CONFIG_DM_GPIO=y
  46 +CONFIG_DM_PCA953X=y
  47 +CONFIG_DM_I2C=y
  48 +CONFIG_DM_MMC=y
  49 +# CONFIG_DM_MMC_OPS is not set
  50 +CONFIG_PINCTRL=y
  51 +CONFIG_PINCTRL_IMX6=y
  52 +CONFIG_DM_PMIC=y
  53 +CONFIG_DM_PMIC_PFUZE100=y
  54 +CONFIG_DM_REGULATOR=y
  55 +CONFIG_DM_REGULATOR_PFUZE100=y
  56 +CONFIG_DM_REGULATOR_FIXED=y
  57 +CONFIG_DM_REGULATOR_GPIO=y
  58 +CONFIG_DM_ETH=y
  59 +CONFIG_DM_USB=y
configs/mx6qpsabreauto_eimnor_defconfig
Diff comments   View file @ cbcbf4f
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_TARGET_MX6QSABREAUTO=y
4 4 CONFIG_VIDEO=y
5 5 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6qp.cfg,MX6QP"
  6 +CONFIG_NOR=y
6 7 CONFIG_NOR_BOOT=y
7 8 CONFIG_BOOTDELAY=3
8 9 # CONFIG_CONSOLE_MUX is not set
... ... @@ -11,7 +12,6 @@
11 12 CONFIG_HUSH_PARSER=y
12 13 CONFIG_CMD_BOOTZ=y
13 14 # CONFIG_CMD_IMLS is not set
14   -# CONFIG_CMD_FLASH is not set
15 15 CONFIG_CMD_MEMTEST=y
16 16 CONFIG_CMD_MMC=y
17 17 CONFIG_CMD_I2C=y
... ... @@ -26,5 +26,23 @@
26 26 CONFIG_CMD_FAT=y
27 27 CONFIG_CMD_FS_GENERIC=y
28 28 # CONFIG_VIDEO_SW_CURSOR is not set
29   -CONFIG_OF_LIBFDT=y
  29 +# CONFIG_OF_LIBFDT=y
  30 +
  31 +CONFIG_DEFAULT_DEVICE_TREE="imx6qp-sabreauto-gpmi-weim"
  32 +CONFIG_OF_CONTROL=y
  33 +# CONFIG_BLK is not set
  34 +CONFIG_DM_GPIO=y
  35 +CONFIG_DM_PCA953X=y
  36 +CONFIG_DM_I2C=y
  37 +CONFIG_DM_MMC=y
  38 +# CONFIG_DM_MMC_OPS is not set
  39 +CONFIG_PINCTRL=y
  40 +CONFIG_PINCTRL_IMX6=y
  41 +CONFIG_DM_PMIC=y
  42 +CONFIG_DM_PMIC_PFUZE100=y
  43 +CONFIG_DM_REGULATOR=y
  44 +CONFIG_DM_REGULATOR_PFUZE100=y
  45 +CONFIG_DM_REGULATOR_FIXED=y
  46 +CONFIG_DM_REGULATOR_GPIO=y
  47 +CONFIG_DM_ETH=y
configs/mx6qpsabreauto_nand_defconfig
Diff comments   View file @ cbcbf4f
... ... @@ -15,9 +15,6 @@
15 15 CONFIG_CMD_MEMTEST=y
16 16 CONFIG_CMD_MMC=y
17 17 CONFIG_CMD_I2C=y
18   -CONFIG_CMD_USB=y
19   -CONFIG_CMD_DFU=y
20   -CONFIG_CMD_USB_MASS_STORAGE=y
21 18 CONFIG_CMD_GPIO=y
22 19 CONFIG_CMD_DHCP=y
23 20 CONFIG_CMD_MII=y
24 21  
... ... @@ -28,15 +25,23 @@
28 25 CONFIG_CMD_EXT4_WRITE=y
29 26 CONFIG_CMD_FAT=y
30 27 CONFIG_CMD_FS_GENERIC=y
31   -CONFIG_DFU_MMC=y
32   -CONFIG_USB=y
33   -CONFIG_USB_STORAGE=y
34   -CONFIG_USB_GADGET=y
35   -CONFIG_CI_UDC=y
36   -CONFIG_USB_GADGET_DOWNLOAD=y
37   -CONFIG_G_DNL_MANUFACTURER="FSL"
38   -CONFIG_G_DNL_VENDOR_NUM=0x0525
39   -CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
40 28 # CONFIG_VIDEO_SW_CURSOR is not set
41   -CONFIG_OF_LIBFDT=y
  29 +# CONFIG_OF_LIBFDT=y
  30 +
  31 +CONFIG_DEFAULT_DEVICE_TREE="imx6qp-sabreauto-gpmi-weim"
  32 +CONFIG_OF_CONTROL=y
  33 +# CONFIG_BLK is not set
  34 +CONFIG_DM_GPIO=y
  35 +CONFIG_DM_I2C=y
  36 +CONFIG_DM_MMC=y
  37 +# CONFIG_DM_MMC_OPS is not set
  38 +CONFIG_PINCTRL=y
  39 +CONFIG_PINCTRL_IMX6=y
  40 +CONFIG_DM_PMIC=y
  41 +CONFIG_DM_PMIC_PFUZE100=y
  42 +CONFIG_DM_REGULATOR=y
  43 +CONFIG_DM_REGULATOR_PFUZE100=y
  44 +CONFIG_DM_REGULATOR_FIXED=y
  45 +CONFIG_DM_REGULATOR_GPIO=y
  46 +CONFIG_DM_ETH=y
configs/mx6qpsabreauto_plugin_defconfig
Diff comments   View file @ cbcbf4f
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_HUSH_PARSER=y
12 12 CONFIG_CMD_BOOTZ=y
13 13 # CONFIG_CMD_IMLS is not set
  14 +# CONFIG_CMD_FLASH is not set
14 15 CONFIG_CMD_MEMTEST=y
15 16 CONFIG_CMD_MMC=y
16 17 CONFIG_CMD_I2C=y
... ... @@ -37,5 +38,24 @@
37 38 CONFIG_G_DNL_VENDOR_NUM=0x0525
38 39 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
39 40 # CONFIG_VIDEO_SW_CURSOR is not set
40   -CONFIG_OF_LIBFDT=y
  41 +# CONFIG_OF_LIBFDT=y
  42 +
  43 +CONFIG_DEFAULT_DEVICE_TREE="imx6qp-sabreauto"
  44 +CONFIG_OF_CONTROL=y
  45 +# CONFIG_BLK is not set
  46 +CONFIG_DM_GPIO=y
  47 +CONFIG_DM_PCA953X=y
  48 +CONFIG_DM_I2C=y
  49 +CONFIG_DM_MMC=y
  50 +# CONFIG_DM_MMC_OPS is not set
  51 +CONFIG_PINCTRL=y
  52 +CONFIG_PINCTRL_IMX6=y
  53 +CONFIG_DM_PMIC=y
  54 +CONFIG_DM_PMIC_PFUZE100=y
  55 +CONFIG_DM_REGULATOR=y
  56 +CONFIG_DM_REGULATOR_PFUZE100=y
  57 +CONFIG_DM_REGULATOR_FIXED=y
  58 +CONFIG_DM_REGULATOR_GPIO=y
  59 +CONFIG_DM_ETH=y
  60 +CONFIG_DM_USB=y
configs/mx6qpsabreauto_sata_defconfig
Diff comments   View file @ cbcbf4f
... ... @@ -38,5 +38,24 @@
38 38 CONFIG_G_DNL_VENDOR_NUM=0x0525
39 39 CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
40 40 # CONFIG_VIDEO_SW_CURSOR is not set
41   -CONFIG_OF_LIBFDT=y
  41 +# CONFIG_OF_LIBFDT=y
  42 +
  43 +CONFIG_DEFAULT_DEVICE_TREE="imx6qp-sabreauto"
  44 +CONFIG_OF_CONTROL=y
  45 +# CONFIG_BLK is not set
  46 +CONFIG_DM_GPIO=y
  47 +CONFIG_DM_PCA953X=y
  48 +CONFIG_DM_I2C=y
  49 +CONFIG_DM_MMC=y
  50 +# CONFIG_DM_MMC_OPS is not set
  51 +CONFIG_PINCTRL=y
  52 +CONFIG_PINCTRL_IMX6=y
  53 +CONFIG_DM_PMIC=y
  54 +CONFIG_DM_PMIC_PFUZE100=y
  55 +CONFIG_DM_REGULATOR=y
  56 +CONFIG_DM_REGULATOR_PFUZE100=y
  57 +CONFIG_DM_REGULATOR_FIXED=y
  58 +CONFIG_DM_REGULATOR_GPIO=y
  59 +CONFIG_DM_ETH=y
  60 +CONFIG_DM_USB=y
configs/mx6qpsabreauto_spinor_defconfig
Diff comments   View file @ cbcbf4f
... ... @@ -26,5 +26,23 @@
26 26 CONFIG_CMD_FAT=y
27 27 CONFIG_CMD_FS_GENERIC=y
28 28 # CONFIG_VIDEO_SW_CURSOR is not set
29   -CONFIG_OF_LIBFDT=y
  29 +# CONFIG_OF_LIBFDT=y
  30 +
  31 +CONFIG_DEFAULT_DEVICE_TREE="imx6qp-sabreauto-ecspi"
  32 +CONFIG_OF_CONTROL=y
  33 +# CONFIG_BLK is not set
  34 +CONFIG_DM_GPIO=y
  35 +CONFIG_DM_PCA953X=y
  36 +CONFIG_DM_I2C=y
  37 +CONFIG_DM_MMC=y
  38 +# CONFIG_DM_MMC_OPS is not set
  39 +CONFIG_PINCTRL=y
  40 +CONFIG_PINCTRL_IMX6=y
  41 +CONFIG_DM_PMIC=y
  42 +CONFIG_DM_PMIC_PFUZE100=y
  43 +CONFIG_DM_REGULATOR=y
  44 +CONFIG_DM_REGULATOR_PFUZE100=y
  45 +CONFIG_DM_REGULATOR_FIXED=y
  46 +CONFIG_DM_REGULATOR_GPIO=y
  47 +CONFIG_DM_ETH=y