From patchwork Wed Oct 13 16:13:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 1540486 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=walle.cc header.i=@walle.cc header.a=rsa-sha256 header.s=mail2016061301 header.b=nX4YRdM1; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HTyKm3Nplz9sR4 for ; Thu, 14 Oct 2021 03:14:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7CE0E835D7; Wed, 13 Oct 2021 18:14:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=walle.cc Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=walle.cc header.i=@walle.cc header.b="nX4YRdM1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2B0F8835CD; Wed, 13 Oct 2021 18:14:38 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from ssl.serverraum.org (ssl.serverraum.org [176.9.125.105]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 793F4835A2 for ; Wed, 13 Oct 2021 18:14:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=walle.cc Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=michael@walle.cc Received: from mwalle01.kontron.local. (unknown [213.135.10.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 956E422247; Wed, 13 Oct 2021 18:14:32 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1634141673; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=CqdgqywG+nXTzLabgYJN4mlf7Al7G695xFHoYRJ6y2M=; b=nX4YRdM1a3LArnGnQ+DnBopZMfg9uQ+QQ2KWOzvNpfIJQAXJHBLr72v/aNZ6yqixdDVySW BTcwJlebuPOZpDz/RcD0jwvPqIPvdTwa6WuAeHAOiRBAL2hPtadNjSpsE90TmTNfFSLmI/ naP3sV3GAVEWgLH03FZfUEf9piErMh8= From: Michael Walle To: u-boot@lists.denx.de Cc: Jagan Teki , Priyanka Jain , Vladimir Oltean , Tom Rini , Peter Griffin , Manivannan Sadhasivam , Michael Walle Subject: [PATCH v5 00/28] arm: dts: ls1028a: sync device tree with linux Date: Wed, 13 Oct 2021 18:13:59 +0200 Message-Id: <20211013161427.612033-1-michael@walle.cc> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 :) The following patch is a prerequisite for this series: https://patchwork.ozlabs.org/project/uboot/patch/20210825210510.24766-1-trini@konsulko.com/ changes since v4: - drop the following patch which isn't needed anymore, because it was fixed in the linux dtsi: arm: dts: ls1028a: drop non-removable property from esdhc controller - sync dtsi with linux 5.14.12 changes since v3: - rebase to latest master - don't support fsl,ls1028a-gpu anymore, use the upstream compatible string changes since v2: - move the device tree nodes piece by piece and sort them to ease reviewing - fix PCI driver (bindings) - fix SATA driver (bindings) - fix USB driver (bindings) - split most changes which are caused by the sync of the linux device tree to own patches, eg. pcie io window, spi chip selects The final diff for the sync is much nicer now ;) changes since v1: - remove u-boot,dm-pre-reloc from rdb and qds boards - fix enetc0 and enetc2 labels Michael Walle (28): armv8: ls1028a: use the official compatible string for the GPU arm: dts: ls1028a: remove /memory node arm: dts: ls1028a-{rdb,qds}: remove dm-pre-reloc property arm: dts: ls1028a: add an empty /soc arm: dts: ls1028a: move the clockgen node into /soc arm: dts: ls1028a: move I2C controller nodes into /soc arm: dts: ls1028a: move the FlexSPI controller node arm: dts: ls1028a: move the SPI and eSDHC controller nodes into /soc arm: dts: ls1028a: move the UART controller nodes into /soc arm: dts: ls1028a: move the low-power UART nodes into /soc arm: dts: ls1028a: move the GPIO controller nodes into /soc arm: dts: ls1028a: move SATA and USB controller nodes into /soc arm: dts: ls1028a: move the PCIe controller nodes into /soc arm: dts: ls1028a: move the watchdog node into /soc arm: dts: ls1028a: move the iRC node and its devices into /soc arm: dts: ls1028a: update the labels watchdog: sp805_wdt: use correct compatible string spi: fsl_dspi: add new compatible fsl,ls1021a-v1.0-dspi spi: fsl_dspi: rename num-cs to spi-num-chipselects serial: lpuart: add new compatible fsl,ls1028a-lpuart scsi: ceva: rename the resource name to match the linux kernel one usb: xhci: fsl: add new compatible fsl,ls1028a-dwc3 pci: layerscape: add official ls1028a binding support arm: dts: ls1028a: remove num-lanes in the PCIe controller nodes arm: dts: ls1028a: move the PCI I/O window to match arm: dts: ls1028a: disable the PCIe controller by default arm: dts: ls1028a: sync the fsl-ls1028a.dtsi with linux arm: dts: sl28: sync dtbs arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +- .../arm/cpu/armv8/fsl-layerscape/ls1028_ids.c | 2 +- arch/arm/dts/fsl-ls1012a.dtsi | 4 +- .../dts/fsl-ls1028a-kontron-sl28-u-boot.dtsi | 37 +- .../fsl-ls1028a-kontron-sl28-var1-u-boot.dtsi | 2 +- .../arm/dts/fsl-ls1028a-kontron-sl28-var1.dts | 31 +- .../fsl-ls1028a-kontron-sl28-var2-u-boot.dtsi | 8 + .../arm/dts/fsl-ls1028a-kontron-sl28-var2.dts | 46 +- .../fsl-ls1028a-kontron-sl28-var3-u-boot.dtsi | 2 +- .../fsl-ls1028a-kontron-sl28-var4-u-boot.dtsi | 4 +- .../arm/dts/fsl-ls1028a-kontron-sl28-var4.dts | 18 +- arch/arm/dts/fsl-ls1028a-kontron-sl28.dts | 256 ++- .../dts/fsl-ls1028a-qds-1xxx-sch-30842.dtsi | 4 +- .../dts/fsl-ls1028a-qds-6xxx-sch-30842.dtsi | 4 +- .../dts/fsl-ls1028a-qds-7777-sch-30841.dtsi | 12 +- .../dts/fsl-ls1028a-qds-7xx7-sch-30841R.dtsi | 8 +- .../dts/fsl-ls1028a-qds-8xxx-sch-24801.dtsi | 4 +- .../fsl-ls1028a-qds-9999-sch-24801-LBRW.dtsi | 12 +- .../dts/fsl-ls1028a-qds-9999-sch-24801.dtsi | 12 +- arch/arm/dts/fsl-ls1028a-qds-duart.dts | 2 +- .../fsl-ls1028a-qds-x3xx-sch-30841-LBRW.dtsi | 12 +- .../fsl-ls1028a-qds-x5xx-sch-28021-LBRW.dtsi | 12 +- .../dts/fsl-ls1028a-qds-x7xx-sch-30842.dtsi | 6 +- .../dts/fsl-ls1028a-qds-xx7x-sch-30842.dtsi | 6 +- arch/arm/dts/fsl-ls1028a-qds.dtsi | 25 +- arch/arm/dts/fsl-ls1028a-rdb.dts | 31 +- arch/arm/dts/fsl-ls1028a.dtsi | 1443 ++++++++++++----- arch/arm/dts/fsl-ls1043a.dtsi | 6 +- arch/arm/dts/fsl-ls1046a.dtsi | 6 +- arch/arm/dts/fsl-ls1088a.dtsi | 4 +- arch/arm/dts/fsl-ls2080a.dtsi | 2 +- arch/arm/dts/fsl-lx2160a.dtsi | 6 +- arch/arm/dts/hi3660.dtsi | 4 +- arch/arm/dts/ls1021a.dtsi | 6 +- arch/arm/dts/vf.dtsi | 4 +- drivers/ata/sata_ceva.c | 2 +- drivers/pci/pcie_layerscape_rc.c | 61 +- drivers/serial/serial_lpuart.c | 2 + drivers/spi/fsl_dspi.c | 6 +- drivers/usb/host/xhci-fsl.c | 1 + drivers/watchdog/sp805_wdt.c | 2 +- .../dt-bindings/clock/fsl,qoriq-clockgen.h | 15 + 42 files changed, 1530 insertions(+), 602 deletions(-) create mode 100644 include/dt-bindings/clock/fsl,qoriq-clockgen.h