[PATCH 0/9] arm: dts: ls1028a: sync device tree with linux

Vladimir Oltean vladimir.oltean at nxp.com
Tue Aug 31 20:22:07 CEST 2021


On Tue, Aug 31, 2021 at 05:40:19PM +0200, Michael Walle wrote:
> This series sync the device tree of the LS1028A SoC with the linux one.
> To ease future debugging and reviewing, we first clean up the existing one,
> removing bogus nodes, moving all CCSR related nodes in /soc and update the
> drivers to accept the offical compatible strings.
>
> This was tested on a sl28 board, but the ls1028a.dtsi sync also affects the
> LS1028A-RDB and -QDS. It would be nice if someone could actually test it on
> such a board.
>
> I didn't sync the device trees for the NXP boards because u-boot related
> things aren't split into its own -u-boot.dtsi file. So I'll leave that task
> to NXP :)

No apparent regression apart from a failure to build.

LS1028A-RDB:

Before:
=> dm tree
 Class     Index  Probed  Driver                Name
-----------------------------------------------------------
 root          0  [ + ]   root_driver           root_driver
 irq           0  [   ]   gic-v3                |-- interrupt-controller at 6000000
 spi           0  [   ]   nxp_fspi              |-- flexspi at 20c0000
 spi_flash     0  [   ]   jedec_spi_nor         |   `-- flash at 0
 pci           0  [ + ]   pci_layerscape        |-- pcie at 3400000
 pci           3  [ + ]   pci_bridge_drv        |   `-- pci_0:0.0
 pci           1  [ + ]   pci_layerscape        |-- pcie at 3500000
 pci           4  [ + ]   pci_bridge_drv        |   `-- pci_2:0.0
 pci           2  [ + ]   pci_generic_ecam      |-- pcie at 1f0000000
 ethernet      0  [ + ]   enetc_eth             |   |-- enetc-0
 ethernet      1  [ + ]   enetc_eth             |   |-- enetc-2
 mdio          0  [ + ]   enetc_mdio            |   |-- emdio-3
 pci_generi    0  [   ]   pci_generic_drv       |   |-- pci_4:0.4
 dsa           0  [ + ]   felix-switch          |   |-- felix-switch
 ethernet      2  [ + ]   dsa-port              |   |   |-- swp0
 ethernet      3  [ + ]   dsa-port              |   |   |-- swp1
 ethernet      4  [ + ]   dsa-port              |   |   |-- swp2
 ethernet      5  [ + ]   dsa-port              |   |   `-- swp3
 pci_generi    1  [   ]   pci_generic_drv       |   `-- pci_4:1f.0
 i2c           0  [ + ]   i2c_mxc               |-- i2c at 2000000
 i2c_mux       0  [ + ]   pca954x               |   |-- i2c-mux at 77
 i2c           1  [   ]   i2c_mux_bus_drv       |   |   `-- i2c at 2000000->i2c-mux at 77->i2c at 3
 rtc           0  [   ]   rtc-pcf2127           |   |       `-- rtc at 51
 i2c_generi    0  [ + ]   i2c_generic_chip_drv  |   |-- generic_66
 i2c_generi    1  [ + ]   i2c_generic_chip_drv  |   `-- generic_57
 i2c           2  [   ]   i2c_mxc               |-- i2c at 2010000
 i2c           3  [   ]   i2c_mxc               |-- i2c at 2020000
 i2c           4  [   ]   i2c_mxc               |-- i2c at 2030000
 i2c           5  [   ]   i2c_mxc               |-- i2c at 2040000
 i2c           6  [   ]   i2c_mxc               |-- i2c at 2050000
 i2c           7  [   ]   i2c_mxc               |-- i2c at 2060000
 i2c           8  [   ]   i2c_mxc               |-- i2c at 2070000
 usb           0  [   ]   xhci_fsl              |-- usb3 at 3100000
 usb           1  [   ]   xhci_fsl              |-- usb3 at 3110000
 spi           1  [   ]   fsl_dspi              |-- dspi at 2100000
 spi           2  [   ]   fsl_dspi              |-- dspi at 2110000
 spi           3  [   ]   fsl_dspi              |-- dspi at 2120000
 mmc           0  [ + ]   fsl-esdhc-mmc         |-- esdhc at 2140000
 blk           0  [ + ]   mmc_blk               |   `-- esdhc at 2140000.blk
 mmc           1  [ + ]   fsl-esdhc-mmc         |-- esdhc at 2150000
 blk           1  [   ]   mmc_blk               |   `-- esdhc at 2150000.blk
 gpio          0  [   ]   gpio_mpc8xxx          |-- gpio at 2300000
 gpio          1  [   ]   gpio_mpc8xxx          |-- gpio at 2310000
 gpio          2  [   ]   gpio_mpc8xxx          |-- gpio at 2320000
 ahci          0  [   ]   ceva_sata             |-- sata at 3200000
 scsi          0  [   ]   ahci_scsi             |   `-- ahci_scsi
 watchdog      0  [ + ]   sp805_wdt             `-- wdt at c000000

After:
=> dm tree
 Class     Index  Probed  Driver                Name
-----------------------------------------------------------
 root          0  [ + ]   root_driver           root_driver
 irq           0  [   ]   gic-v3                |-- interrupt-controller at 6000000
 simple_bus    0  [ + ]   simple_bus            `-- soc
 syscon        0  [   ]   syscon                    |-- syscon at 1e00000
 syscon        1  [   ]   syscon                    |-- syscon at 1e60000
 syscon        2  [   ]   syscon                    |-- syscon at 1fc0000
 i2c           0  [ + ]   i2c_mxc                   |-- i2c at 2000000
 i2c_mux       0  [ + ]   pca954x                   |   |-- i2c-mux at 77
 i2c           1  [   ]   i2c_mux_bus_drv           |   |   `-- i2c at 2000000->i2c-mux at 77->i2c at 3
 rtc           0  [   ]   rtc-pcf2127               |   |       `-- rtc at 51
 i2c_generi    0  [ + ]   i2c_generic_chip_drv      |   |-- generic_66
 i2c_generi    1  [ + ]   i2c_generic_chip_drv      |   `-- generic_57
 i2c           2  [   ]   i2c_mxc                   |-- i2c at 2010000
 i2c           3  [   ]   i2c_mxc                   |-- i2c at 2020000
 i2c           4  [   ]   i2c_mxc                   |-- i2c at 2030000
 i2c           5  [   ]   i2c_mxc                   |-- i2c at 2040000
 i2c           6  [   ]   i2c_mxc                   |-- i2c at 2050000
 i2c           7  [   ]   i2c_mxc                   |-- i2c at 2060000
 i2c           8  [   ]   i2c_mxc                   |-- i2c at 2070000
 spi           0  [   ]   nxp_fspi                  |-- spi at 20c0000
 spi_flash     0  [   ]   jedec_spi_nor             |   `-- flash at 0
 spi           1  [   ]   fsl_dspi                  |-- spi at 2100000
 spi           2  [   ]   fsl_dspi                  |-- spi at 2110000
 spi           3  [   ]   fsl_dspi                  |-- spi at 2120000
 mmc           0  [ + ]   fsl-esdhc-mmc             |-- mmc at 2140000
 blk           0  [ + ]   mmc_blk                   |   `-- mmc at 2140000.blk
 mmc           1  [ + ]   fsl-esdhc-mmc             |-- mmc at 2150000
 blk           1  [   ]   mmc_blk                   |   `-- mmc at 2150000.blk
 gpio          0  [   ]   gpio_mpc8xxx              |-- gpio at 2300000
 gpio          1  [   ]   gpio_mpc8xxx              |-- gpio at 2310000
 gpio          2  [   ]   gpio_mpc8xxx              |-- gpio at 2320000
 usb           0  [   ]   xhci-dwc3                 |-- usb at 3100000
 usb           1  [   ]   xhci-dwc3                 |-- usb at 3110000
 ahci          0  [   ]   ceva_sata                 |-- sata at 3200000
 scsi          0  [   ]   ahci_scsi                 |   `-- ahci_scsi
 watchdog      0  [ + ]   sp805_wdt                 |-- watchdog at c000000
 watchdog      1  [   ]   sp805_wdt                 |-- watchdog at c010000
 pci           0  [ + ]   pci_generic_ecam          `-- pcie at 1f0000000
 ethernet      0  [ + ]   enetc_eth                     |-- enetc-0
 ethernet      1  [ + ]   enetc_eth                     |-- enetc-2
 mdio          0  [ + ]   enetc_mdio                    |-- emdio-3
 pci_generi    0  [   ]   pci_generic_drv               |-- pci_0:0.4
 dsa           0  [ + ]   felix-switch                  |-- felix-switch
 ethernet      2  [ + ]   dsa-port                      |   |-- swp0
 ethernet      3  [ + ]   dsa-port                      |   |-- swp1
 ethernet      4  [ + ]   dsa-port                      |   |-- swp2
 ethernet      5  [ + ]   dsa-port                      |   `-- swp3
 pci_generi    1  [   ]   pci_generic_drv               `-- pci_0:1f.0

LS1028A-QDS:

Before:
=> dm tree
 Class     Index  Probed  Driver                Name
-----------------------------------------------------------
 root          0  [ + ]   root_driver           root_driver
 irq           0  [   ]   gic-v3                |-- interrupt-controller at 6000000
 spi           0  [ + ]   nxp_fspi              |-- flexspi at 20c0000
 spi_flash     0  [ + ]   jedec_spi_nor         |   `-- flash at 0
 pci           0  [ + ]   pci_layerscape        |-- pcie at 3400000
 pci           1  [ + ]   pci_layerscape        |-- pcie at 3500000
 pci           2  [ + ]   pci_generic_ecam      |-- pcie at 1f0000000
 ethernet      0  [ + ]   enetc_eth             |   |-- enetc-1
 ethernet      1  [ + ]   enetc_eth             |   |-- enetc-2
 mdio          5  [ + ]   enetc_mdio            |   |-- emdio-3
 pci_generi    0  [   ]   pci_generic_drv       |   |-- pci_2:0.4
 dsa           0  [ + ]   felix-switch          |   |-- felix-switch
 ethernet      2  [ + ]   dsa-port              |   |   |-- felix-switch at 0
 ethernet      3  [   ]   dsa-port              |   |   |-- felix-switch at 1
 ethernet      4  [   ]   dsa-port              |   |   |-- felix-switch at 2
 ethernet      5  [ + ]   dsa-port              |   |   `-- felix-switch at 3
 pci_generi    1  [   ]   pci_generic_drv       |   `-- pci_2:1f.0
 i2c           0  [ + ]   i2c_mxc               |-- i2c at 2000000
 simple_bus    0  [ + ]   simple_bus            |   |-- fpga at 66
 mdio-mux      0  [ + ]   mdio_mux_i2creg       |   |   `-- mux-mdio at 54
 mdio          0  [ + ]   mdio-mux-bus-drv      |   |       |-- mdio at 00
 mdio          1  [ + ]   mdio-mux-bus-drv      |   |       |-- mdio at 40
 mdio          2  [ + ]   mdio-mux-bus-drv      |   |       |-- mdio at 50
 mdio          3  [ + ]   mdio-mux-bus-drv      |   |       |-- mdio at 60
 mdio          4  [ + ]   mdio-mux-bus-drv      |   |       `-- mdio at 70
 i2c_mux       0  [   ]   pca954x               |   |-- i2c-mux at 77
 i2c_generi    0  [ + ]   i2c_generic_chip_drv  |   `-- generic_57
 i2c           1  [   ]   i2c_mxc               |-- i2c at 2010000
 rtc           0  [   ]   rtc-pcf2127           |   `-- rtc at 51
 i2c           2  [   ]   i2c_mxc               |-- i2c at 2020000
 i2c           3  [   ]   i2c_mxc               |-- i2c at 2030000
 i2c           4  [   ]   i2c_mxc               |-- i2c at 2040000
 i2c           5  [   ]   i2c_mxc               |-- i2c at 2050000
 i2c           6  [   ]   i2c_mxc               |-- i2c at 2060000
 i2c           7  [   ]   i2c_mxc               |-- i2c at 2070000
 usb           0  [   ]   xhci_fsl              |-- usb3 at 3100000
 usb           1  [   ]   xhci_fsl              |-- usb3 at 3110000
 spi           1  [   ]   fsl_dspi              |-- dspi at 2100000
 spi           2  [   ]   fsl_dspi              |-- dspi at 2110000
 spi           3  [   ]   fsl_dspi              |-- dspi at 2120000
 mmc           0  [ + ]   fsl-esdhc-mmc         |-- esdhc at 2140000
 blk           0  [   ]   mmc_blk               |   `-- esdhc at 2140000.blk
 mmc           1  [ + ]   fsl-esdhc-mmc         |-- esdhc at 2150000
 blk           1  [   ]   mmc_blk               |   `-- esdhc at 2150000.blk
 gpio          0  [   ]   gpio_mpc8xxx          |-- gpio at 2300000
 gpio          1  [   ]   gpio_mpc8xxx          |-- gpio at 2310000
 gpio          2  [   ]   gpio_mpc8xxx          |-- gpio at 2320000
 ahci          0  [   ]   ceva_sata             |-- sata at 3200000
 scsi          0  [   ]   ahci_scsi             |   `-- ahci_scsi
 watchdog      0  [ + ]   sp805_wdt             `-- wdt at c000000

After:
=> dm tree
 Class     Index  Probed  Driver                Name
-----------------------------------------------------------
 root          0  [ + ]   root_driver           root_driver
 irq           0  [   ]   gic-v3                |-- interrupt-controller at 6000000
 simple_bus    0  [ + ]   simple_bus            `-- soc
 syscon        0  [   ]   syscon                    |-- syscon at 1e00000
 syscon        1  [   ]   syscon                    |-- syscon at 1e60000
 syscon        2  [   ]   syscon                    |-- syscon at 1fc0000
 i2c           0  [ + ]   i2c_mxc                   |-- i2c at 2000000
 simple_bus    1  [ + ]   simple_bus                |   |-- fpga at 66
 mdio-mux      0  [ + ]   mdio_mux_i2creg           |   |   `-- mux-mdio at 54
 mdio          0  [ + ]   mdio-mux-bus-drv          |   |       |-- mdio at 00
 mdio          1  [ + ]   mdio-mux-bus-drv          |   |       |-- mdio at 40
 mdio          2  [ + ]   mdio-mux-bus-drv          |   |       |-- mdio at 50
 mdio          3  [ + ]   mdio-mux-bus-drv          |   |       |-- mdio at 60
 mdio          4  [   ]   mdio-mux-bus-drv          |   |       `-- mdio at 70
 i2c_mux       0  [   ]   pca954x                   |   |-- i2c-mux at 77
 i2c_generi    0  [ + ]   i2c_generic_chip_drv      |   `-- generic_57
 i2c           1  [   ]   i2c_mxc                   |-- i2c at 2010000
 rtc           0  [   ]   rtc-pcf2127               |   `-- rtc at 51
 i2c           2  [   ]   i2c_mxc                   |-- i2c at 2020000
 i2c           3  [   ]   i2c_mxc                   |-- i2c at 2030000
 i2c           4  [   ]   i2c_mxc                   |-- i2c at 2040000
 i2c           5  [   ]   i2c_mxc                   |-- i2c at 2050000
 i2c           6  [   ]   i2c_mxc                   |-- i2c at 2060000
 i2c           7  [   ]   i2c_mxc                   |-- i2c at 2070000
 spi           0  [ + ]   nxp_fspi                  |-- spi at 20c0000
 spi_flash     0  [ + ]   jedec_spi_nor             |   `-- flash at 0
 spi           1  [   ]   fsl_dspi                  |-- spi at 2100000
 spi           2  [   ]   fsl_dspi                  |-- spi at 2110000
 spi           3  [   ]   fsl_dspi                  |-- spi at 2120000
 mmc           0  [ + ]   fsl-esdhc-mmc             |-- mmc at 2140000
 blk           0  [   ]   mmc_blk                   |   `-- mmc at 2140000.blk
 mmc           1  [ + ]   fsl-esdhc-mmc             |-- mmc at 2150000
 blk           1  [   ]   mmc_blk                   |   `-- mmc at 2150000.blk
 gpio          0  [   ]   gpio_mpc8xxx              |-- gpio at 2300000
 gpio          1  [   ]   gpio_mpc8xxx              |-- gpio at 2310000
 gpio          2  [   ]   gpio_mpc8xxx              |-- gpio at 2320000
 usb           0  [   ]   xhci-dwc3                 |-- usb at 3100000
 usb           1  [   ]   xhci-dwc3                 |-- usb at 3110000
 ahci          0  [   ]   ceva_sata                 |-- sata at 3200000
 scsi          0  [   ]   ahci_scsi                 |   `-- ahci_scsi
 watchdog      0  [ + ]   sp805_wdt                 |-- watchdog at c000000
 watchdog      1  [   ]   sp805_wdt                 |-- watchdog at c010000
 pci           0  [ + ]   pci_generic_ecam          `-- pcie at 1f0000000
 ethernet      0  [ + ]   enetc_eth                     |-- enetc-1
 ethernet      1  [ + ]   enetc_eth                     |-- enetc-2
 mdio          5  [ + ]   enetc_mdio                    |-- emdio-3
 pci_generi    0  [   ]   pci_generic_drv               |-- pci_0:0.4
 dsa           0  [ + ]   felix-switch                  |-- felix-switch
 ethernet      2  [ + ]   dsa-port                      |   |-- felix-switch at 0
 ethernet      3  [   ]   dsa-port                      |   |-- felix-switch at 1
 ethernet      4  [   ]   dsa-port                      |   |-- felix-switch at 2
 ethernet      5  [ + ]   dsa-port                      |   `-- felix-switch at 3
 pci_generi    1  [   ]   pci_generic_drv               `-- pci_0:1f.0


More information about the U-Boot mailing list