From patchwork Sun Oct 27 15:53:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185049 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="lKp9ROEu"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471Msn2b2dz9sP4 for ; Mon, 28 Oct 2019 02:56:45 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BC8FAC21EF0; Sun, 27 Oct 2019 15:56:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 56524C21DF9; Sun, 27 Oct 2019 15:55:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 073EBC21E02; Sun, 27 Oct 2019 15:55:00 +0000 (UTC) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by lists.denx.de (Postfix) with ESMTPS id 3A334C21C57 for ; Sun, 27 Oct 2019 15:54:27 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id y5so5866672ilb.5 for ; Sun, 27 Oct 2019 08:54:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LknPfO2Vb7Wp5Qm/RDcnkZpwLfXV8f9iP0mkmmGr0c0=; b=lKp9ROEu4U0r3nFFDvG8BVRyNMT2zpfm4qh+asrNhxlad0lOUiio8I9CAFSn5y9DAu VisJT/dzMhDpjfYPfx+ibTum1STFh+0S2JhSlTXTet2omn9jqlf6w2V506jP0wt3be2R zj3a6uSXqoh6fWw0WaU/RvbhSV6Y0cJEWv3qI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=LknPfO2Vb7Wp5Qm/RDcnkZpwLfXV8f9iP0mkmmGr0c0=; b=APF68VwSpOBTDlBilc30CxPUryC0XGv4K/dvi8EmdBJ9A0qM3gr0Km614zXat2oKJe MJMenFgqWZmG23hla1JcK5WQAtxSQRhLvCIWLfa6ocCaYJCgVrAYegDwyFSRUzbcl89i Whs9XiS6Ue5T13lQOYtpFmIpUkdmS/eGuwDChhOMyzxIMsEExAW7SOIhTJw3Ebb915RW el2ovpki1tPgM7Kd/lbOGsXbyoxg+esDayq/etRZH7dQx6Qh0nV6YP0Ss0Tu9ANePtMH i3F56drnyp5qWeoYVXr7U/7pD4HLZ7QX6X4Z4/lErIrCy44ifprlPpqXID+SZANr/Lrz TETw== X-Gm-Message-State: APjAAAUWCVzX0q98O/NCqpnxBC2fV6FZV7T7Ngf0CHXGaTWyowKMAHsS 1vkCawoIpjivXBZGb466vGV0HQ50/TQjYw== X-Google-Smtp-Source: APXvYqwXIpbqz0LCvCvqN57+6eUhKtyeofPq9do16BYBdWwjcGPsZUyLCOc2r2PurOTua+91/gI40Q== X-Received: by 2002:a92:b308:: with SMTP id p8mr14729061ilh.182.1572191666003; Sun, 27 Oct 2019 08:54:26 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:25 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:41 -0600 Message-Id: <20191027155410.187957-1-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog MIME-Version: 1.0 Cc: Tom Rini , Heinrich Schuchardt , Boris Brezillon , Alexander Graf , Chris Packham , Marek Vasut Subject: [U-Boot] [PATCH 01/30] lib: Allow crc32 to be disabled. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Unfortunately this table seems to appear in TPL with gcc 7.3 even if it is not used. Fix it by creating a Kconfig that can be used to disable this routine. It is enabled by default, since most boards use it. Signed-off-by: Simon Glass --- lib/Kconfig | 29 +++++++++++++++++++++++++++++ lib/Makefile | 2 +- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/lib/Kconfig b/lib/Kconfig index 135f0b372b..be5f9d343a 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -353,6 +353,35 @@ config SHA_PROG_HW_ACCEL config MD5 bool +config CRC32 + bool "Enable crc32 routine" + default y + help + This enables a 32-bit CRC (cyclic-redundancy check) routine. It is + typically used to check for changes in a group of bytes. Even a + small change typically produces a very different CRC value. This + algorithm is simple and quite fast. + +config SPL_CRC32 + bool "Enable crc32 routine in SPL" + depends on SPL + default y + help + This enables a 32-bit CRC (cyclic-redundancy check) routine in SPL. It + is typically used to check for changes in a group of bytes. Even a + small change typically produces a very different CRC value. This + algorithm is simple and quite fast. + +config TPL_CRC32 + bool "Enable crc32 routine in SPL" + depends on TPL + default y + help + This enables a 32-bit CRC (cyclic-redundancy check) routine in SPL. It + is typically used to check for changes in a group of bytes. Even a + small change typically produces a very different CRC value. This + algorithm is simple and quite fast. + config CRC32C bool diff --git a/lib/Makefile b/lib/Makefile index d248d8626c..8adc08fd73 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -84,7 +84,7 @@ obj-y += errno.o obj-y += display_options.o CFLAGS_display_options.o := $(if $(BUILD_TAG),-DBUILD_TAG='"$(BUILD_TAG)"') obj-$(CONFIG_BCH) += bch.o -obj-y += crc32.o +obj-$(CONFIG_$(SPL_TPL_)CRC32) += crc32.o obj-$(CONFIG_CRC32C) += crc32c.o obj-y += ctype.o obj-y += div64.o From patchwork Sun Oct 27 15:53:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185050 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="fIB6gQFv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471MtS6XQGz9sP4 for ; Mon, 28 Oct 2019 02:57:20 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 8AEA7C21DCA; Sun, 27 Oct 2019 15:56:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B94BDC21DAF; Sun, 27 Oct 2019 15:55:05 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1ECD9C21DF9; Sun, 27 Oct 2019 15:55:02 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id 08778C21DA1 for ; Sun, 27 Oct 2019 15:54:29 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id i26so7710853iog.9 for ; Sun, 27 Oct 2019 08:54:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cT4uVWA5Xw7NGF7bINDXuaiLO+vhHDfRIiChhxv3W1w=; b=fIB6gQFvCqPWkYPxlrz7YBsEbfCdPA3jc/sS9ccm1xrz6rWBMK6no8EyzI3P2jxYUQ H+FF47ecLa6IP2vz/Rd8hLIW9bhK6Y4d8NjZ7Mb3iPk+u+Gl6PBgdvyj9WecaP71LMKU VBxcZk14yAXALfAH3WIdeWqCWnPj2QcNgLV3k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cT4uVWA5Xw7NGF7bINDXuaiLO+vhHDfRIiChhxv3W1w=; b=C2PkrDWvwwVgr1avu0ediq7Bwq0uaJofPQU9DHzJDif9zBw1Z3WA1O/chzVB+KuFFL amadM/76GldAICGQ4brXzQrjSqJzomkQdEao4j3gChbdpavpzbM82du93akY05lNZf1M t+6NYn2Lc5KadF4o0MJhy3Ojqu2z/isaRE7iE7NWMs9auQyW3FqKq3WM9HB2Bt98Ed+H 1rBmhQQWSnZdZX6WLSBcDoSPZWS+n4YYdkkIX7sXZ3jH76W+hl3oXc5jfTMZoyjwtv14 GZT5a9ZMQxRtduUnXCVb+lowyg2dW2YwylA7Nmn+h5+SLYczJak/wBn0u/EK8RJHF64M md/w== X-Gm-Message-State: APjAAAXXGbblaZmRujOEbFl8ly81Ex3aZg9vVNpqFLNRlsg21rVl5kt2 6zerQE9Xp1EEfATcKsBUMkCldNv23jVamg== X-Google-Smtp-Source: APXvYqwtosmnKxmqxxQzis5LCTYzvmRyROXK/OzGQHr1D97Y8HUFZ7MFvyPPVgdsYFJ3q6HHSoUtrQ== X-Received: by 2002:a02:330e:: with SMTP id c14mr13635172jae.5.1572191667797; Sun, 27 Oct 2019 08:54:27 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:27 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:42 -0600 Message-Id: <20191027155410.187957-2-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Tien Fong Chee , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH 02/30] spi: Allow separate control of SPI_FLASH_TINY for SPL/TPL X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" In some cases SPL needs to be able to erase but TPL just needs to read. Allow these to have separate settings for SPI_FLASH_TINY. Signed-off-by: Simon Glass --- common/spl/Kconfig | 10 ++++++++++ drivers/mtd/spi/Makefile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 86d7edfee1..604bb69d69 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -1423,6 +1423,16 @@ config TPL_SPI_FLASH_SUPPORT Enable support for using SPI flash in TPL. See SPL_SPI_FLASH_SUPPORT for details. +config TPL_SPI_FLASH_TINY + bool "Enable low footprint TPL SPI Flash support" + depends on TPL_SPI_FLASH_SUPPORT && !SPI_FLASH_BAR + default y if SPI_FLASH + help + Enable lightweight TPL SPI Flash support that supports just reading + data/images from flash. No support to write/erase flash. Enable + this if you have TPL size limitations and don't need full-fledged + SPI flash support. + config TPL_SPI_LOAD bool "Support loading from SPI flash" depends on TPL_SPI_FLASH_SUPPORT diff --git a/drivers/mtd/spi/Makefile b/drivers/mtd/spi/Makefile index 20db1015d9..df04297671 100644 --- a/drivers/mtd/spi/Makefile +++ b/drivers/mtd/spi/Makefile @@ -8,7 +8,7 @@ spi-nor-y := sf_probe.o spi-nor-ids.o ifdef CONFIG_SPL_BUILD obj-$(CONFIG_SPL_SPI_BOOT) += fsl_espi_spl.o -ifeq ($(CONFIG_SPL_SPI_FLASH_TINY),y) +ifeq ($(CONFIG_$(SPL_TPL_)SPI_FLASH_TINY),y) spi-nor-y += spi-nor-tiny.o else spi-nor-y += spi-nor-core.o From patchwork Sun Oct 27 15:53:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185051 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="egsiABkG"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471MwL1NgGz9sPK for ; Mon, 28 Oct 2019 02:58:58 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CD336C21DDC; Sun, 27 Oct 2019 15:57:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2BF5BC21E07; Sun, 27 Oct 2019 15:55:06 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 54F92C21E07; Sun, 27 Oct 2019 15:55:03 +0000 (UTC) Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by lists.denx.de (Postfix) with ESMTPS id E2A20C21DAF for ; Sun, 27 Oct 2019 15:54:30 +0000 (UTC) Received: by mail-il1-f194.google.com with SMTP id o16so5855356ilq.9 for ; Sun, 27 Oct 2019 08:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ITytcLd2eMJihKPWbDwzNJBFEqqvy4Q+D3UHF+VTROM=; b=egsiABkGg2XfqNjv/96Qn1znMyOSCkNWnEYzWH3rxH1YsuEGt7Ys+EKCR61u57s6M2 Uv6I1tGX+dSBFWeA+JKQIrT7QpQOw3DylEwcsQy/57Mmg5Xv6JdONf3BjaierQQgfRoy l6tK28U6mghZtdgHJshOdDJ7yPW848QTHrqxA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ITytcLd2eMJihKPWbDwzNJBFEqqvy4Q+D3UHF+VTROM=; b=KzN5udbLhBRUU53YOYzL5GXJNNHZ8hTd0X42m3V27NAtrRVAFm6UCI5/R0mFCW9gNx zYDbcle6UodC0jZUR0pVmw8B+B2K/OWaYVLxDKMjvyiFOZdNUBzRqsK8v8ryqmRMTtXh x0bobEYBGqTi6bPw4maDUym9+E08sUB70NjRZ5ErnVcTyrbSOMGlb+r99/d9+AgD5ag+ /gYqgD76hhnHju+zT/JL4TkJBWhhqJ9vuPkZGuki1VOELnCHRDypaBV1NnPW0X3euw/p /SeVrTx/gyKSeNJxDy4N/RNZdeIs+nJLI0j4PtIN8Pf9hcrO2rg8pP/TRg1/If5FBObq 1R2A== X-Gm-Message-State: APjAAAUiT1F50urzaeyXjAVP5QwmRpsA58TUj15CmmphTI6s1vErC3nq jG8sif+CERo4YYq8RV/7OoGHo8mgoOEamg== X-Google-Smtp-Source: APXvYqwwB6Jsw9QvzmNsgXRf/btaz0on9/KJnixa1MIXiRrinHv7EcI/sM4T6LDY6+d3LQRR6p3S0g== X-Received: by 2002:a92:ab08:: with SMTP id v8mr14514365ilh.215.1572191669726; Sun, 27 Oct 2019 08:54:29 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:29 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:43 -0600 Message-Id: <20191027155410.187957-3-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 03/30] mtd: spi-nor: Tidy up error handling / debug code X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The -ENODEV error value in spi_nor_read_id() is incorrect since there clearly is a device - it just cannot be supported. Use -ENOMEDIUM instead which has the virtue of being less common. Fix the return value in spi_nor_scan(). Also there are a few printf() statements which should be debug() since they bloat the code with unused strings at present. Fix those while here. Signed-off-by: Simon Glass --- drivers/mtd/spi/sf_probe.c | 2 +- drivers/mtd/spi/spi-nor-core.c | 2 +- drivers/mtd/spi/spi-nor-tiny.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 73297e1a0a..277241d6f6 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -119,7 +119,7 @@ static int spi_flash_std_erase(struct udevice *dev, u32 offset, size_t len) struct erase_info instr; if (offset % mtd->erasesize || len % mtd->erasesize) { - printf("SF: Erase offset/length not multiple of erase size\n"); + debug("SF: Erase offset/length not multiple of erase size\n"); return -EINVAL; } diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 990e39d7c2..98405d421d 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -2399,7 +2399,7 @@ static int spi_nor_init(struct spi_nor *nor) * designer) that this is bad. */ if (nor->flags & SNOR_F_BROKEN_RESET) - printf("enabling reset hack; may not recover from unexpected reboots\n"); + debug("enabling reset hack; may not recover from unexpected reboots\n"); set_4byte(nor, nor->info, 1); } diff --git a/drivers/mtd/spi/spi-nor-tiny.c b/drivers/mtd/spi/spi-nor-tiny.c index c19d468d62..d8fcd6db24 100644 --- a/drivers/mtd/spi/spi-nor-tiny.c +++ b/drivers/mtd/spi/spi-nor-tiny.c @@ -375,7 +375,7 @@ static const struct flash_info *spi_nor_read_id(struct spi_nor *nor) } dev_dbg(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n", id[0], id[1], id[2]); - return ERR_PTR(-ENODEV); + return ERR_PTR(-EMEDIUMTYPE); } static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, @@ -731,7 +731,7 @@ int spi_nor_scan(struct spi_nor *nor) info = spi_nor_read_id(nor); if (IS_ERR_OR_NULL(info)) - return -ENOENT; + return PTR_ERR(info); /* Parse the Serial Flash Discoverable Parameters table. */ ret = spi_nor_init_params(nor, info, ¶ms); if (ret) From patchwork Sun Oct 27 15:53:44 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185070 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="bctBq7Yk"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N7m73pVz9sPK for ; Mon, 28 Oct 2019 03:08:52 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A7FFDC21D56; Sun, 27 Oct 2019 15:57:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 92CD9C21E0F; Sun, 27 Oct 2019 15:55:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 3111BC21DA6; Sun, 27 Oct 2019 15:55:05 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id D9F59C21DA6 for ; Sun, 27 Oct 2019 15:54:32 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id 18so757386ion.6 for ; Sun, 27 Oct 2019 08:54:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sZswZ4HVTp/gy5q1eU+1RgEuTOOyfERYKLxlh32RAMY=; b=bctBq7Ykn5aXOjsqdADhPJ9hO84viHVTMxzqux4mrSCfKaMRvuplMPqlLCVEW0WKjj RFbF80RjGRtmqlSaolcuHl2UX6b+H2grKU7zyNUIfAquY9a9W3rlUl75EQCgQGRKCARo Z9Ym2TC5bxw7EW2FR2od7fEWKVcwTWm0psE/4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sZswZ4HVTp/gy5q1eU+1RgEuTOOyfERYKLxlh32RAMY=; b=hDp4A7VeW7xf6HXMk86lq7sQTlfjE16ARAFNaNred11uX5944c4wJdv137sGkxG7HH cFNbeoy5n0FVXgNSQZxzU0avMiW1GkqykmECrRfeyIPWaYMs83bQ2ErSvSEyp+sxixYa elxtNfZQ460kPgcp0kC+ayx+Om+9JeF/6T9rj2r1JpH4OEIgagwWR1zNL7C9Br+zkO6M BaDzZVHY1P+iKtr8fqg3vqtIUZW2+kLLLWIonf3eNyOE+30qSG5NA+MR/AZjyY0jBoBu +ypUVuLC/+wHhPLvbiL0OamPuh9Y457nM4e5O1ceGi5MJw+l4jS79uftzYZsZ7FVPnvd fjrg== X-Gm-Message-State: APjAAAWHCY8gYq4tiA18UgZUatlAUKA12910tSczfoR/CAr58OMDcO/v 64mF5faF/w1I6tAGxVbVJWLPm+i9xQCfSg== X-Google-Smtp-Source: APXvYqyJTdNdQ1u3KCiVKPLip0gRtDOlTlc956XNeCauvG703AGEw3cLYrALsa8nWhHWk2Wm3S4YlA== X-Received: by 2002:a02:c855:: with SMTP id r21mr9650050jao.120.1572191671738; Sun, 27 Oct 2019 08:54:31 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:31 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:44 -0600 Message-Id: <20191027155410.187957-4-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH 04/30] mtd: spi: Export spi_flash_std_probe() X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" With of-platdata we need to create drivers for particular chips, or at least drivers that are separate from the standard code, since C structures are created by dtoc which are private to that driver. To avoid duplicating the probing code, export this probe function for use by these drivers. Signed-off-by: Simon Glass --- drivers/mtd/spi/sf_probe.c | 2 +- include/spi_flash.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/mtd/spi/sf_probe.c b/drivers/mtd/spi/sf_probe.c index 277241d6f6..7ab8b69c2b 100644 --- a/drivers/mtd/spi/sf_probe.c +++ b/drivers/mtd/spi/sf_probe.c @@ -137,7 +137,7 @@ static int spi_flash_std_get_sw_write_prot(struct udevice *dev) return spi_flash_cmd_get_sw_write_prot(flash); } -static int spi_flash_std_probe(struct udevice *dev) +int spi_flash_std_probe(struct udevice *dev) { struct spi_slave *slave = dev_get_parent_priv(dev); struct dm_spi_slave_platdata *plat = dev_get_parent_platdata(dev); diff --git a/include/spi_flash.h b/include/spi_flash.h index 55b4721813..0b23f57a71 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -102,6 +102,18 @@ int spi_flash_erase_dm(struct udevice *dev, u32 offset, size_t len); */ int spl_flash_get_sw_write_prot(struct udevice *dev); +/** + * spi_flash_std_probe() - Probe a SPI flash device + * + * This is the standard internal method for probing a SPI flash device to + * determine its type. It can be used in chip-specific drivers which need to + * do this, typically with of-platdata + * + * @dev: SPI-flash device to probe + * @return 0 if OK, -ve on error + */ +int spi_flash_std_probe(struct udevice *dev); + int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, struct udevice **devp); From patchwork Sun Oct 27 15:53:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185056 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="jLVL9dIV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N1m4TJ0z9sPK for ; Mon, 28 Oct 2019 03:03:40 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4CB97C21DD4; Sun, 27 Oct 2019 15:57:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 044DDC21E30; Sun, 27 Oct 2019 15:55:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D8191C21DB6; Sun, 27 Oct 2019 15:55:33 +0000 (UTC) Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by lists.denx.de (Postfix) with ESMTPS id 7696FC21DCA for ; Sun, 27 Oct 2019 15:54:43 +0000 (UTC) Received: by mail-il1-f194.google.com with SMTP id p8so5883855ilp.2 for ; Sun, 27 Oct 2019 08:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EE8dt7ceTRbdTcty6pscSS8MV2EkNPTvLOS0Jyyaw+8=; b=jLVL9dIVNAIIU5g9IIsOC+V8SsyCL7Vz77+QkP6rGXPhaUri99SWnTgjd65wQqwbMA vUozIKW4WdSEnMWfLacrldcCJX5Qtuoqg1ZoXcj7i/Gvw9RsHKNjR50orq8Owonwp799 ur+aOscoD1s6IgaJXT+UUbtt872ffj4T0LG58= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EE8dt7ceTRbdTcty6pscSS8MV2EkNPTvLOS0Jyyaw+8=; b=NLLZDdjFiRd3bz3cRjlBTouSkmHzKnY5g4XTXytCdMt6ele3I0JyyU0rgv5SGd+Bwi cHo5A76g8IJFE59mQLHQmnPIeTxKhLi1h3KpvXq7aDRH/+FQ2GrMs1Hy9D8pKMwSnL1+ 3puoft8WPgOA8Udve+qQgq7KSUTge8adX5AxudkIFSzCjLbOeAzzhwZyvpbLFbg3WaP6 uH/NeUirG7qvTLlgQIkYNzYZu6xxMppmwlO0y2VIoyTJ3eNwfbJzLm5rOy8VQx0EbQGE abFDU0FBqLEQ31I2qx8e43nFQUUg+xQFoNLyJOpXPy7R9rQV1D4fxH3qILHLXstKCDh+ e63Q== X-Gm-Message-State: APjAAAUoIbVB+GODUtxYypHPGF9xl1nJDre7x6Oull4rAUF/Kfz0d79W J+NJkdyjk2K+PenRNx4m9KhLWYe/b6hTlg== X-Google-Smtp-Source: APXvYqzUwz3e/DTePfRDQTtrClu9gzTIC6Sii41Kg3bp/FEJaR/Ug276/Z++RgokfKakvkfPL14Vfg== X-Received: by 2002:a05:6e02:608:: with SMTP id t8mr6212923ils.297.1572191682292; Sun, 27 Oct 2019 08:54:42 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:41 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:45 -0600 Message-Id: <20191027155410.187957-5-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Marek Vasut , Tom Rini , Stefan Roese , Michal Simek Subject: [U-Boot] [PATCH 05/30] wdt: Move code out of the header X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" We should not have C code in a header file. Move it into a shared C file so it can be used by U-Boot and SPL. Signed-off-by: Simon Glass Reviewed-by: Stefan Roese --- common/init/Makefile | 1 + common/init/wdt.c | 46 ++++++++++++++++++++++++++++++++++++++++++++ include/init.h | 7 +++++++ include/wdt.h | 38 ------------------------------------ 4 files changed, 54 insertions(+), 38 deletions(-) create mode 100644 common/init/wdt.c diff --git a/common/init/Makefile b/common/init/Makefile index 853b56d1e5..a76dedf350 100644 --- a/common/init/Makefile +++ b/common/init/Makefile @@ -6,3 +6,4 @@ obj-y += board_init.o obj-$(CONFIG_$(SPL_TPL_)HANDOFF) += handoff.o +obj-$(CONFIG_$(SPL_TPL_)WDT) += wdt.o diff --git a/common/init/wdt.c b/common/init/wdt.c new file mode 100644 index 0000000000..79146fb293 --- /dev/null +++ b/common/init/wdt.c @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2017 Google, Inc + */ + +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS +#define CONFIG_WATCHDOG_TIMEOUT_MSECS (60 * 1000) +#endif +#define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) + +int initr_watchdog(void) +{ + u32 timeout = WATCHDOG_TIMEOUT_SECS; + + /* + * Init watchdog: This will call the probe function of the + * watchdog driver, enabling the use of the device + */ + if (uclass_get_device_by_seq(UCLASS_WDT, 0, + (struct udevice **)&gd->watchdog_dev)) { + debug("WDT: Not found by seq!\n"); + if (uclass_get_device(UCLASS_WDT, 0, + (struct udevice **)&gd->watchdog_dev)) { + printf("WDT: Not found!\n"); + return 0; + } + } + + if (CONFIG_IS_ENABLED(OF_CONTROL)) { + timeout = dev_read_u32_default(gd->watchdog_dev, "timeout-sec", + WATCHDOG_TIMEOUT_SECS); + } + + wdt_start(gd->watchdog_dev, timeout * 1000, 0); + gd->flags |= GD_FLG_WDT_READY; + printf("WDT: Started with%s servicing (%ds timeout)\n", + IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", timeout); + + return 0; +} diff --git a/include/init.h b/include/init.h index afc953d51e..3e5857f07f 100644 --- a/include/init.h +++ b/include/init.h @@ -181,6 +181,13 @@ int init_func_vid(void); int checkboard(void); int show_board_info(void); +/** + * initr_watchdog() - Init the watchdog + * + * @return 0 if OK, -ve on error + */ +int initr_watchdog(void); + #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ diff --git a/include/wdt.h b/include/wdt.h index 5bcff24ab3..5698605c02 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -106,42 +106,4 @@ struct wdt_ops { int (*expire_now)(struct udevice *dev, ulong flags); }; -#if CONFIG_IS_ENABLED(WDT) -#ifndef CONFIG_WATCHDOG_TIMEOUT_MSECS -#define CONFIG_WATCHDOG_TIMEOUT_MSECS (60 * 1000) -#endif -#define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) - -static inline int initr_watchdog(void) -{ - u32 timeout = WATCHDOG_TIMEOUT_SECS; - - /* - * Init watchdog: This will call the probe function of the - * watchdog driver, enabling the use of the device - */ - if (uclass_get_device_by_seq(UCLASS_WDT, 0, - (struct udevice **)&gd->watchdog_dev)) { - debug("WDT: Not found by seq!\n"); - if (uclass_get_device(UCLASS_WDT, 0, - (struct udevice **)&gd->watchdog_dev)) { - printf("WDT: Not found!\n"); - return 0; - } - } - - if (CONFIG_IS_ENABLED(OF_CONTROL)) { - timeout = dev_read_u32_default(gd->watchdog_dev, "timeout-sec", - WATCHDOG_TIMEOUT_SECS); - } - - wdt_start(gd->watchdog_dev, timeout * 1000, 0); - gd->flags |= GD_FLG_WDT_READY; - printf("WDT: Started with%s servicing (%ds timeout)\n", - IS_ENABLED(CONFIG_WATCHDOG) ? "" : "out", timeout); - - return 0; -} -#endif - #endif /* _WDT_H_ */ From patchwork Sun Oct 27 15:53:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185057 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="N8tferl/"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N2G0g2Jz9sPK for ; Mon, 28 Oct 2019 03:04:06 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id BFD6FC21E07; Sun, 27 Oct 2019 15:57:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 490C3C21E2B; Sun, 27 Oct 2019 15:55:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id DED1DC21E1D; Sun, 27 Oct 2019 15:55:34 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 7360AC21DB5 for ; Sun, 27 Oct 2019 15:54:45 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id 1so7736969iou.4 for ; Sun, 27 Oct 2019 08:54:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2vHKDmp/7wxED1o+3IwzkHXh+HMUrL4aZDWkd3t+N40=; b=N8tferl/wGmmuefU8hfjietACFi0hh9F21Yv1jsuLGHNyzCdWFn3lLwnAQpmAuPAbL LWHezrnB4eLTKWdQ/CwfFhIM43UZSGGJfXmgnBGA3nqY8FK5giqYIRm2r3yF0LyggLxH u/ndGwAD8svoUpK0M9WwT6uwbHca8vcVoh6/8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2vHKDmp/7wxED1o+3IwzkHXh+HMUrL4aZDWkd3t+N40=; b=FWxvFJ72v1b5a83HJqtbXmCYOCrmjlJzjdoYPu6VdQFVIQ+QndW/vVAsy1mHpgrDWm 9T/uvLlk8dcUr55h+0roxw9b0iB9uJwVdipUC0Ak5qdjwyTaJ8nJLL+us0VPi54jxbdU 3Ghy82j9O3wibdQi4HdLKvljV00ROp3/Vk5Rm625LJTDlZykRAme/sw/yAxK3/UCaKuW wp4bqKAPztKsRSTTXQS73iOueKvjsFnUuewSLNQFp8PShY8s9ls0tP6m+XnJpWKaGF7q aJ3UU+UW2XpjVBtTtVOTi3vRIsIz30M4xnumgFKVmntRjNaMj5Zw/SQpQtdRovEAv6yF ZcDg== X-Gm-Message-State: APjAAAWFzfFZ0MG8e7OiRHALF7CwEjC4SDGUNzxO2BwqeJ0TIUsh0Xut Lgg2gwbGR5waT9tmM1nW2boc5rkB2MXx3w== X-Google-Smtp-Source: APXvYqyupcM2vMbvHRB1xH0nST+TwX8mux/mq91ZI8WmczY5rnMbv/ss8vQV9siK8lwlxhodygeBFw== X-Received: by 2002:a02:cdd1:: with SMTP id m17mr919894jap.61.1572191684225; Sun, 27 Oct 2019 08:54:44 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:43 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:46 -0600 Message-Id: <20191027155410.187957-6-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Marek Vasut , Tom Rini , Stefan Roese , Michal Simek Subject: [U-Boot] [PATCH 06/30] wdt: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Signed-off-by: Simon Glass Reviewed-by: Stefan Roese --- include/wdt.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/wdt.h b/include/wdt.h index 5698605c02..62f4b34c30 100644 --- a/include/wdt.h +++ b/include/wdt.h @@ -6,8 +6,7 @@ #ifndef _WDT_H_ #define _WDT_H_ -#include -#include +struct udevice; /* * Implement a simple watchdog uclass. Watchdog is basically a timer that From patchwork Sun Oct 27 15:53:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185052 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="iGesvudf"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471My41SWFz9sP4 for ; Mon, 28 Oct 2019 03:00:28 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CB4BCC21DAF; Sun, 27 Oct 2019 15:57:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A7C43C21E1D; Sun, 27 Oct 2019 15:55:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AE669C21D56; Sun, 27 Oct 2019 15:55:34 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id B1AF0C21D56 for ; Sun, 27 Oct 2019 15:54:47 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id z19so7771883ior.0 for ; Sun, 27 Oct 2019 08:54:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JR4zO8IYUKiuWg90QawCmaS5NAtT734px/58MnBIV8s=; b=iGesvudf0NwwYwixRAjY7C3CHGTYhf2gr/ynTSh8nbneX1G4rFeQKpYRvgHf3SklTi ER41abxDmhGTyZem4Gulj+JQut9jWZ7p+uGoXsIt9Zs5viHt9J0Ch4DaCsJm3kf2EMJp RC7FUD0J3ejd+visYmIV9yPRRN6BP2mEq8HCQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JR4zO8IYUKiuWg90QawCmaS5NAtT734px/58MnBIV8s=; b=ecyaLwoXVet+PrmpJRdS9m2pU18pwdkRw/Tzl0k3Npk/cOfxTnucPtMaFLNq7TxyXv AGOeotrxnzxbW0c6ewL8G/BZeYhEnzvLqzATyRBCbqgj7l3KQYZTrtGjBLSuUPDc8VUk xHYJEB7Su2emGbO7D5f5PaCSNiY1lmxLLZAmrW3NYNvFv3ocg/DZwXYdh7GdfHn2TfHa Gwwtsbd9rBAf8vlEoeFs4ucnGGWb0jO3DcN5XopiXEe5jdHg54Pu7V10REMX5+ILeIBC bVXaB0G0gWa/oCkDoyP+navXZED6tpLbctt55HFsFqoYICxYneezS38VVd0lr2fxbSIn QWfw== X-Gm-Message-State: APjAAAVDN6Ol8akWZ4M/ciw2Nw/KDLLRu7Bejai0sMZ8gQRHIsqTpd1J aP/Q9Qtf8yWrQql073TKBVkav61vODc+0g== X-Google-Smtp-Source: APXvYqyDL36rKAiEK5KSAEh+UbJRTIhAtos61paxV8QdANfCqkhjYjDGCvrRfhDjv0hpoOAeBd4I3w== X-Received: by 2002:a02:c98c:: with SMTP id b12mr13350598jap.40.1572191686521; Sun, 27 Oct 2019 08:54:46 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:46 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:47 -0600 Message-Id: <20191027155410.187957-7-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , uboot-stm32@st-md-mailman.stormreply.com Subject: [U-Boot] [PATCH 07/30] mtd: spi-mem: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Signed-off-by: Simon Glass --- drivers/spi/spi-mem-nodm.c | 1 + drivers/spi/spi-mem.c | 5 +++++ drivers/spi/stm32_qspi.c | 2 ++ include/spi-mem.h | 5 +---- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-mem-nodm.c b/drivers/spi/spi-mem-nodm.c index 4447d44991..83dde4806e 100644 --- a/drivers/spi/spi-mem-nodm.c +++ b/drivers/spi/spi-mem-nodm.c @@ -3,6 +3,7 @@ * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ */ +#include #include #include diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index 7788ab9953..e5a8109058 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -11,6 +11,11 @@ #include #include "internals.h" #else +#include +#include +#include +#include +#include #include #include #endif diff --git a/drivers/spi/stm32_qspi.c b/drivers/spi/stm32_qspi.c index 958c394a1a..c8c81396c5 100644 --- a/drivers/spi/stm32_qspi.c +++ b/drivers/spi/stm32_qspi.c @@ -9,7 +9,9 @@ #include #include +#include #include +#include #include #include #include diff --git a/include/spi-mem.h b/include/spi-mem.h index 36814efa86..2f3f0156d0 100644 --- a/include/spi-mem.h +++ b/include/spi-mem.h @@ -11,10 +11,7 @@ #ifndef __UBOOT_SPI_MEM_H #define __UBOOT_SPI_MEM_H -#include -#include -#include -#include +struct udevice; #define SPI_MEM_OP_CMD(__opcode, __buswidth) \ { \ From patchwork Sun Oct 27 15:53:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185063 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="EBbq3OiU"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N4D6z1Vz9sPK for ; Mon, 28 Oct 2019 03:05:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B9049C21D83; Sun, 27 Oct 2019 15:58:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C9FFDC21E3B; Sun, 27 Oct 2019 15:55:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 60534C21D83; Sun, 27 Oct 2019 15:55:35 +0000 (UTC) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by lists.denx.de (Postfix) with ESMTPS id AEA1BC21D83 for ; Sun, 27 Oct 2019 15:54:49 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id m16so5835532iln.13 for ; Sun, 27 Oct 2019 08:54:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9b99Qg/jBZ57J0KNpoS7/NqcSnilXENrU+dbnb90QJY=; b=EBbq3OiUL5l6kct8XBya+P6SnmtP2kDMlCMPsCcc5K1QIo1zBfDvO9Ev0QFKo8YrqU ymNMJxPn7yy//7wKuEt33vtknN3b/gy/0tGAkdNH3fY5VEndtvoQma1yhIuYG3xTeeDF Stlh6kGmPDAn7eO8Xx9GNeMslqUcW8UaGhZe0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9b99Qg/jBZ57J0KNpoS7/NqcSnilXENrU+dbnb90QJY=; b=FjazHUb0ZXBojX/VXoNxixHE7p97uIcTIM4S8R61uYWY0V5I0i7LLJK/xQ3/+/Vwkd L9GZIDJVS2mFE78YtZz66ar6PqTERaUoXSj3GhpXNI9K7GvaKsCwvdIBFZTw/2JuW07Z bohqiwYYGOwbgEMFXlFBJYrwIS9FKj0y/E3VZr64nSO1REE8uNdIAsPvgQt4JMCYuKcA lvL4UirD5GongY1e620wSrWCQeoXQH58/+izYQznVvluSMNDtpuQsYPprYz+PZ6vQ9Ix JzQb6WxUzTE0h4aKw+J6fjbqyiSXychpNCEz7QLgix7HipJSfmLDKyTI8axnwUo52l5N Jeiw== X-Gm-Message-State: APjAAAXou+kftc6wkEdNiN1Tsn3E0orCE9uCcevLwQBnY05ys4jNY33Q xqK/QDRB/1uuWnsShbBZpZ/rNrfkwIsmQg== X-Google-Smtp-Source: APXvYqxhpnvOd0WbjgIcBpwVucqHvKGW4ZrZCEDIGvBAsyDikosbwarmOkUHeHWpZk2B/4P1iLFqzw== X-Received: by 2002:a92:9843:: with SMTP id l64mr14612660ili.154.1572191688504; Sun, 27 Oct 2019 08:54:48 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:48 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:48 -0600 Message-Id: <20191027155410.187957-8-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH 08/30] mtd: spi: Drop SPI_XFER_MMAP* X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" These two defines are no-longer supported. Drop them. Signed-off-by: Simon Glass --- include/spi.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/spi.h b/include/spi.h index 5eec0c4775..f5001a2cb2 100644 --- a/include/spi.h +++ b/include/spi.h @@ -113,8 +113,6 @@ struct spi_slave { #define SPI_XFER_BEGIN BIT(0) /* Assert CS before transfer */ #define SPI_XFER_END BIT(1) /* Deassert CS after transfer */ #define SPI_XFER_ONCE (SPI_XFER_BEGIN | SPI_XFER_END) -#define SPI_XFER_MMAP BIT(2) /* Memory Mapped start */ -#define SPI_XFER_MMAP_END BIT(3) /* Memory Mapped End */ }; /** From patchwork Sun Oct 27 15:53:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185061 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="FY3eQ4X8"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N3t1JYCz9sPK for ; Mon, 28 Oct 2019 03:05:30 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D2ED7C21D56; Sun, 27 Oct 2019 15:58:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 547E7C21E45; Sun, 27 Oct 2019 15:55:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B107FC21DE8; Sun, 27 Oct 2019 15:55:35 +0000 (UTC) Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by lists.denx.de (Postfix) with ESMTPS id 9165FC21DD7 for ; Sun, 27 Oct 2019 15:54:51 +0000 (UTC) Received: by mail-il1-f196.google.com with SMTP id y5so5867117ilb.5 for ; Sun, 27 Oct 2019 08:54:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CxegMGage7XdQ6QSlFsnTYp+Nopq4cmD4YWpAqXw6kw=; b=FY3eQ4X87LAr9s0lZzh2vHHuILyfdaOOdtimQaf4w+uvhhUN01GNs6RIUKqRdge/vB 4IQ6EBMtRs/5ZqvqjPcl9RFt48M55SZu/HxCHpW34BIrrdWhIi3GfzD5obCsEIOJj5dI YILKid+VvPYWs8VtyuGHNMs+nvZRKXguYVSJU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CxegMGage7XdQ6QSlFsnTYp+Nopq4cmD4YWpAqXw6kw=; b=ueQsBNYNtZ1pVfVCrbSG4APaKhKtCQQ2Wd7JqHAwUJsFQz4j4EzdO1RlngBNqv9SQO Bd3gCO5yHnqNPz2L2+Pi7W6p6bLpRQkczCM+Wo2FWrPwc/8mRj0r1Ha01eSYmLesu91Q wZSGATvqu5Wq9l5CT2731Z6fDE7KANDRh/n5zTID6EN65EdwLhAwq1NE0nX0up0fgWpk AVK3xyCVLrPz6DSinc3QAkCKVtQVYmC9cu/O5LNFn2CC+pAb4LuAf/u9Gtok5HyHIF2C oUtZ9qkvmSbf+VoGwpA8Z2/A9l/bkwTaCrp8A+tgSx53m0HCuDFYYt6ignHyuwewKIeB OR6w== X-Gm-Message-State: APjAAAXbUaCJYLI1r4Npi/SQj76Rch1bOAEbOky2gRVqFgJr4VTEnZcN WA7mgTqDdj9BTGTNMQFiPWBq23U6N0Ahxg== X-Google-Smtp-Source: APXvYqzfhsUCCsJ31twopPVsqUkgVV1tYCzw2pxWcMosCQhoje7DvJ+ahl9b5TRhrqyM2MGWp5rk0Q== X-Received: by 2002:a92:d18d:: with SMTP id z13mr1807440ilz.62.1572191690461; Sun, 27 Oct 2019 08:54:50 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:50 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:49 -0600 Message-Id: <20191027155410.187957-9-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Pavel Herrmann Subject: [U-Boot] [PATCH 09/30] dm: core: Drop dm.h header file from dm-demo.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and add it to the cmd file instead. Signed-off-by: Simon Glass --- cmd/demo.c | 1 + include/dm-demo.h | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/demo.c b/cmd/demo.c index 52c6e7ec15..2c81bf2822 100644 --- a/cmd/demo.c +++ b/cmd/demo.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include diff --git a/include/dm-demo.h b/include/dm-demo.h index c9a82c7e52..7b6d0d80ff 100644 --- a/include/dm-demo.h +++ b/include/dm-demo.h @@ -6,8 +6,6 @@ #ifndef __DM_DEMO_H #define __DM_DEMO_H -#include - /** * struct dm_demo_pdata - configuration data for demo instance * From patchwork Sun Oct 27 15:53:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185073 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="glJJtpHh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N8X6tXKz9sPK for ; Mon, 28 Oct 2019 03:09:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A26CCC21E73; Sun, 27 Oct 2019 15:58:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 91456C21DA6; Sun, 27 Oct 2019 15:55:41 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 90DB4C21E1E; Sun, 27 Oct 2019 15:55:36 +0000 (UTC) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by lists.denx.de (Postfix) with ESMTPS id 3A69DC21DF8 for ; Sun, 27 Oct 2019 15:54:54 +0000 (UTC) Received: by mail-il1-f193.google.com with SMTP id z10so5856662ilo.8 for ; Sun, 27 Oct 2019 08:54:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2gk6dOl9ugMuh74zjQMoXTK8XcKxixxZCaKms+5Zdfw=; b=glJJtpHhLq1QrDWDVViIvc72+Elay/WX8wSctoW+nwsccDth0ixPuEuzGm8kCmvmUZ +NcyXH1Thm2zsq02WZSVvZKB63UrPtXq4q87bOfZVdd6MijrPP4JXLSMAfSlKtUhYP1y sXwcaSpcWUUFO3eF2R3j0xckPzvpTOo6ax54Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2gk6dOl9ugMuh74zjQMoXTK8XcKxixxZCaKms+5Zdfw=; b=M8bB7JR9vWc9bYiAGQMA+x1GkwlrbeDzXf7Ire/AAw/KqycZAf/25gCI+Oqfjygyqu 4ixczA1laNv+OIw2FcBBDDIAwpWBK/5sFI2TcIXk70UvxMy2iVXVFS/0BmUcuqaa4YRY 9qtxZWO215I4EsHyiyAXgm+oLa9jrCnYpsphpFsHY7sZ2X2+A1APNoZSV0pw1qJRLL89 1NGLrvq/pCFy6KVyH/yWGGQrKRq/TaOBGrqB7OMJEC0NoqmQfELWc4Jy6dVTi/scBAcO iLx5fay/3Eb9FyMNZeS6//O+ujfG607BoX4eWC9FMusVRNi5w4YSKy6FWi8phOWL9uW/ vwng== X-Gm-Message-State: APjAAAVPpnbmxvCs8LcWFrJ4uaal+jIMubuld2tNAuVzheFiMGbEuzlm bA58ovGW0ccAeHxJJG/uz1Rou1cnXJEVsQ== X-Google-Smtp-Source: APXvYqw167SRBdbhJQqgu8/nC3v0JxXHujCCLdV6FLy/RWB7nAS6dFNOhAZ7c53J60Zfmwk8qwIZ9g== X-Received: by 2002:a92:5f0a:: with SMTP id t10mr16186570ilb.264.1572191692575; Sun, 27 Oct 2019 08:54:52 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:52 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:50 -0600 Message-Id: <20191027155410.187957-10-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Pavel Herrmann Subject: [U-Boot] [PATCH 10/30] dm: core: Drop header files from dm/test.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" These header file should not be included in other header files. Remove them and add to each individual file. Signed-off-by: Simon Glass --- include/dm/test.h | 3 --- test/dm/adc.c | 1 + test/dm/audio.c | 1 + test/dm/axi.c | 3 ++- test/dm/blk.c | 1 + test/dm/board.c | 1 + test/dm/bootcount.c | 1 + test/dm/bus.c | 1 + test/dm/clk.c | 1 + test/dm/clk_ccf.c | 1 + test/dm/core.c | 1 + test/dm/cpu.c | 1 + test/dm/dma.c | 1 + test/dm/dsi_host.c | 1 + test/dm/eth.c | 3 ++- test/dm/firmware.c | 1 + test/dm/gpio.c | 3 ++- test/dm/hwspinlock.c | 1 + test/dm/i2c.c | 1 + test/dm/i2s.c | 3 ++- test/dm/led.c | 1 + test/dm/mailbox.c | 1 + test/dm/mdio.c | 5 +++-- test/dm/mdio_mux.c | 5 +++-- test/dm/misc.c | 1 + test/dm/mmc.c | 1 + test/dm/nop.c | 1 + test/dm/ofnode.c | 1 + test/dm/osd.c | 5 +++-- test/dm/panel.c | 3 ++- test/dm/pch.c | 1 + test/dm/pci.c | 1 + test/dm/pci_ep.c | 5 +++-- test/dm/phy.c | 1 + test/dm/pmic.c | 5 +++-- test/dm/power-domain.c | 1 + test/dm/pwm.c | 1 + test/dm/ram.c | 1 + test/dm/regmap.c | 1 + test/dm/regulator.c | 1 + test/dm/remoteproc.c | 2 ++ test/dm/reset.c | 1 + test/dm/rtc.c | 1 + test/dm/serial.c | 1 + test/dm/sf.c | 1 + test/dm/smem.c | 1 + test/dm/sound.c | 1 + test/dm/spi.c | 1 + test/dm/spmi.c | 1 + test/dm/syscon.c | 1 + test/dm/sysreset.c | 1 + test/dm/tee.c | 1 + test/dm/test-driver.c | 3 ++- test/dm/test-fdt.c | 1 + test/dm/test-main.c | 2 ++ test/dm/test-uclass.c | 1 + test/dm/timer.c | 1 + test/dm/usb.c | 1 + test/dm/video.c | 1 + test/dm/virtio.c | 3 ++- test/dm/wdt.c | 1 + test/lib/lmb.c | 2 ++ 62 files changed, 81 insertions(+), 20 deletions(-) diff --git a/include/dm/test.h b/include/dm/test.h index 07385cd531..b528b35617 100644 --- a/include/dm/test.h +++ b/include/dm/test.h @@ -6,9 +6,6 @@ #ifndef __DM_TEST_H #define __DM_TEST_H -#include -#include - /** * struct dm_test_cdata - configuration data for test instance * diff --git a/test/dm/adc.c b/test/dm/adc.c index da7bd4bf1f..7fa1d48dd9 100644 --- a/test/dm/adc.c +++ b/test/dm/adc.c @@ -17,6 +17,7 @@ #include #include #include +#include #include static int dm_test_adc_bind(struct unit_test_state *uts) diff --git a/test/dm/audio.c b/test/dm/audio.c index 77c3a3625b..4bb86e3214 100644 --- a/test/dm/audio.c +++ b/test/dm/audio.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/test/dm/axi.c b/test/dm/axi.c index e234ab82e6..d84dfdeb4b 100644 --- a/test/dm/axi.c +++ b/test/dm/axi.c @@ -7,9 +7,10 @@ #include #include #include +#include #include +#include #include -#include /* Test that sandbox AXI works correctly */ static int dm_test_axi_base(struct unit_test_state *uts) diff --git a/test/dm/blk.c b/test/dm/blk.c index 9c71adc69d..e1a40a31d4 100644 --- a/test/dm/blk.c +++ b/test/dm/blk.c @@ -8,6 +8,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/board.c b/test/dm/board.c index 0f267a1926..f3fd51cac8 100644 --- a/test/dm/board.c +++ b/test/dm/board.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include "../../drivers/board/sandbox.h" diff --git a/test/dm/bootcount.c b/test/dm/bootcount.c index 0817b7d3ec..2d2aac6674 100644 --- a/test/dm/bootcount.c +++ b/test/dm/bootcount.c @@ -8,6 +8,7 @@ #include #include #include +#include #include static int dm_test_bootcount(struct unit_test_state *uts) diff --git a/test/dm/bus.c b/test/dm/bus.c index 1ad45adb60..f0e1cae7fc 100644 --- a/test/dm/bus.c +++ b/test/dm/bus.c @@ -13,6 +13,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/clk.c b/test/dm/clk.c index 676ef217f0..abb6531b50 100644 --- a/test/dm/clk.c +++ b/test/dm/clk.c @@ -9,6 +9,7 @@ #include #include #include +#include #include /* Base test of the clk uclass */ diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c index ae3a4d8a76..da2292a51a 100644 --- a/test/dm/clk_ccf.c +++ b/test/dm/clk_ccf.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/test/dm/core.c b/test/dm/core.c index f74c430843..9690dcb6d7 100644 --- a/test/dm/core.c +++ b/test/dm/core.c @@ -15,6 +15,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/cpu.c b/test/dm/cpu.c index f5f1caef71..36bd14c14e 100644 --- a/test/dm/cpu.c +++ b/test/dm/cpu.c @@ -9,6 +9,7 @@ #include #include #include +#include #include static int dm_test_cpu(struct unit_test_state *uts) diff --git a/test/dm/dma.c b/test/dm/dma.c index b56d17731d..4113519ecf 100644 --- a/test/dm/dma.c +++ b/test/dm/dma.c @@ -10,6 +10,7 @@ #include #include #include +#include #include static int dm_test_dma_m2m(struct unit_test_state *uts) diff --git a/test/dm/dsi_host.c b/test/dm/dsi_host.c index 59fcd5558f..97917a17c1 100644 --- a/test/dm/dsi_host.c +++ b/test/dm/dsi_host.c @@ -10,6 +10,7 @@ #include #include #include +#include #include static int dm_test_dsi_host_phy_init(void *priv_data) diff --git a/test/dm/eth.c b/test/dm/eth.c index ad5354b4bf..35c17ed7fb 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -12,10 +12,11 @@ #include #include #include +#include #include #include #include -#include +#include #include #define DM_TEST_ETH_NUM 4 diff --git a/test/dm/firmware.c b/test/dm/firmware.c index 60fdcbb33f..2b4f49af80 100644 --- a/test/dm/firmware.c +++ b/test/dm/firmware.c @@ -8,6 +8,7 @@ #include #include #include +#include #include /* Base test of firmware probe */ diff --git a/test/dm/gpio.c b/test/dm/gpio.c index bb4b20cea9..3caba9516e 100644 --- a/test/dm/gpio.c +++ b/test/dm/gpio.c @@ -6,10 +6,11 @@ #include #include #include +#include #include #include #include -#include +#include #include /* Test that sandbox GPIOs work correctly */ diff --git a/test/dm/hwspinlock.c b/test/dm/hwspinlock.c index 09ec38b4f3..49c52bcd63 100644 --- a/test/dm/hwspinlock.c +++ b/test/dm/hwspinlock.c @@ -9,6 +9,7 @@ #include #include #include +#include #include /* Test that hwspinlock driver functions are called */ diff --git a/test/dm/i2c.c b/test/dm/i2c.c index cbbd4aa29a..8a35c1be2e 100644 --- a/test/dm/i2c.c +++ b/test/dm/i2c.c @@ -15,6 +15,7 @@ #include #include #include +#include #include static const int busnum; diff --git a/test/dm/i2s.c b/test/dm/i2s.c index 49ebc3523c..7a017be064 100644 --- a/test/dm/i2s.c +++ b/test/dm/i2s.c @@ -7,9 +7,10 @@ #include #include #include +#include #include +#include #include -#include /* Basic test of the i2s codec uclass */ static int dm_test_i2s(struct unit_test_state *uts) diff --git a/test/dm/led.c b/test/dm/led.c index 00de7b3997..3d5ad9363b 100644 --- a/test/dm/led.c +++ b/test/dm/led.c @@ -8,6 +8,7 @@ #include #include #include +#include #include /* Base test of the led uclass */ diff --git a/test/dm/mailbox.c b/test/dm/mailbox.c index 4562d2ac4f..195b9a9695 100644 --- a/test/dm/mailbox.c +++ b/test/dm/mailbox.c @@ -7,6 +7,7 @@ #include #include #include +#include #include static int dm_test_mailbox(struct unit_test_state *uts) diff --git a/test/dm/mdio.c b/test/dm/mdio.c index dc229aed6d..9ad21ccde4 100644 --- a/test/dm/mdio.c +++ b/test/dm/mdio.c @@ -6,10 +6,11 @@ #include #include -#include +#include #include +#include +#include #include -#include /* macros copied over from mdio_sandbox.c */ #define SANDBOX_PHY_ADDR 5 diff --git a/test/dm/mdio_mux.c b/test/dm/mdio_mux.c index f962e09dbc..0b3f85a53b 100644 --- a/test/dm/mdio_mux.c +++ b/test/dm/mdio_mux.c @@ -6,10 +6,11 @@ #include #include -#include +#include #include +#include +#include #include -#include /* macros copied over from mdio_sandbox.c */ #define SANDBOX_PHY_ADDR 5 diff --git a/test/dm/misc.c b/test/dm/misc.c index 4d4232adf1..15f475abb3 100644 --- a/test/dm/misc.c +++ b/test/dm/misc.c @@ -8,6 +8,7 @@ #include #include #include +#include #include static int dm_test_misc(struct unit_test_state *uts) diff --git a/test/dm/mmc.c b/test/dm/mmc.c index 9ab0db1b66..204137b5ac 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -7,6 +7,7 @@ #include #include #include +#include #include /* diff --git a/test/dm/nop.c b/test/dm/nop.c index 2df29f3d15..8b3b646892 100644 --- a/test/dm/nop.c +++ b/test/dm/nop.c @@ -13,6 +13,7 @@ #include #include #include +#include #include static int noptest_bind(struct udevice *parent) diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 745de50c7b..9127cb1bbe 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -4,6 +4,7 @@ #include #include #include +#include #include static int dm_test_ofnode_compatible(struct unit_test_state *uts) diff --git a/test/dm/osd.c b/test/dm/osd.c index 6910690b3a..c63dfbcdb1 100644 --- a/test/dm/osd.c +++ b/test/dm/osd.c @@ -7,10 +7,11 @@ #include #include #include -#include -#include #include #include +#include +#include +#include #include "../../drivers/video/sandbox_osd.h" diff --git a/test/dm/panel.c b/test/dm/panel.c index 7e4ebd6d81..410e8f3907 100644 --- a/test/dm/panel.c +++ b/test/dm/panel.c @@ -14,8 +14,9 @@ #include #include #include -#include #include +#include +#include /* Basic test of the panel uclass */ static int dm_test_panel(struct unit_test_state *uts) diff --git a/test/dm/pch.c b/test/dm/pch.c index 54e33d187b..bf17a31ccf 100644 --- a/test/dm/pch.c +++ b/test/dm/pch.c @@ -8,6 +8,7 @@ #include #include #include +#include #include /* Test that sandbox PCH works correctly */ diff --git a/test/dm/pci.c b/test/dm/pci.c index fb93e4c78a..43b045d429 100644 --- a/test/dm/pci.c +++ b/test/dm/pci.c @@ -8,6 +8,7 @@ #include #include #include +#include #include /* Test that sandbox PCI works correctly */ diff --git a/test/dm/pci_ep.c b/test/dm/pci_ep.c index 101f861751..a29d00eebe 100644 --- a/test/dm/pci_ep.c +++ b/test/dm/pci_ep.c @@ -5,12 +5,13 @@ #include #include +#include +#include #include #include #include +#include #include -#include -#include /* Test that sandbox PCI EP works correctly */ static int dm_test_pci_ep_base(struct unit_test_state *uts) diff --git a/test/dm/phy.c b/test/dm/phy.c index 21d92194b9..c5761cf3e7 100644 --- a/test/dm/phy.c +++ b/test/dm/phy.c @@ -8,6 +8,7 @@ #include #include #include +#include #include /* Base test of the phy uclass */ diff --git a/test/dm/pmic.c b/test/dm/pmic.c index b582329a9c..8c2766aeac 100644 --- a/test/dm/pmic.c +++ b/test/dm/pmic.c @@ -10,16 +10,17 @@ #include #include #include +#include #include #include #include -#include #include #include +#include #include #include +#include #include -#include /* Test PMIC get method */ diff --git a/test/dm/power-domain.c b/test/dm/power-domain.c index 48318218a9..84b4c90f69 100644 --- a/test/dm/power-domain.c +++ b/test/dm/power-domain.c @@ -7,6 +7,7 @@ #include #include #include +#include #include /* This must match the specifier for power-domains in the DT node */ diff --git a/test/dm/pwm.c b/test/dm/pwm.c index b52ee21a69..8cc911e1ad 100644 --- a/test/dm/pwm.c +++ b/test/dm/pwm.c @@ -7,6 +7,7 @@ #include #include #include +#include #include /* Basic test of the pwm uclass */ diff --git a/test/dm/ram.c b/test/dm/ram.c index 3efdb6b80b..2456466b56 100644 --- a/test/dm/ram.c +++ b/test/dm/ram.c @@ -7,6 +7,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/regmap.c b/test/dm/regmap.c index 82de295cb8..64699dd792 100644 --- a/test/dm/regmap.c +++ b/test/dm/regmap.c @@ -10,6 +10,7 @@ #include #include #include +#include #include /* Base test of register maps */ diff --git a/test/dm/regulator.c b/test/dm/regulator.c index e510539542..91eebc6909 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -19,6 +19,7 @@ #include #include #include +#include #include enum { diff --git a/test/dm/remoteproc.c b/test/dm/remoteproc.c index 1d9a9b32d5..1ebb7c2466 100644 --- a/test/dm/remoteproc.c +++ b/test/dm/remoteproc.c @@ -10,7 +10,9 @@ #include #include #include +#include #include + /** * dm_test_remoteproc_base() - test the operations after initializations * @uts: unit test state diff --git a/test/dm/reset.c b/test/dm/reset.c index c61daed490..ab0a38a18e 100644 --- a/test/dm/reset.c +++ b/test/dm/reset.c @@ -8,6 +8,7 @@ #include #include #include +#include #include /* This must match the specifier for mbox-names="test" in the DT node */ diff --git a/test/dm/rtc.c b/test/dm/rtc.c index 7188742764..2653dd0fd2 100644 --- a/test/dm/rtc.c +++ b/test/dm/rtc.c @@ -11,6 +11,7 @@ #include #include #include +#include #include /* Simple RTC sanity check */ diff --git a/test/dm/serial.c b/test/dm/serial.c index 3d741a8c36..175e19dbc6 100644 --- a/test/dm/serial.c +++ b/test/dm/serial.c @@ -7,6 +7,7 @@ #include #include #include +#include #include static int dm_test_serial(struct unit_test_state *uts) diff --git a/test/dm/sf.c b/test/dm/sf.c index 3788d59052..e70bc78e91 100644 --- a/test/dm/sf.c +++ b/test/dm/sf.c @@ -14,6 +14,7 @@ #include #include #include +#include #include /* Simple test of sandbox SPI flash */ diff --git a/test/dm/smem.c b/test/dm/smem.c index 4099a5f66c..21dd96e409 100644 --- a/test/dm/smem.c +++ b/test/dm/smem.c @@ -7,6 +7,7 @@ #include #include #include +#include #include /* Basic test of the smem uclass */ diff --git a/test/dm/sound.c b/test/dm/sound.c index 3767abbd1c..bb2b7285e2 100644 --- a/test/dm/sound.c +++ b/test/dm/sound.c @@ -9,6 +9,7 @@ #include #include #include +#include #include /* Basic test of the sound codec uclass */ diff --git a/test/dm/spi.c b/test/dm/spi.c index ffd789cd7f..978997786a 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -13,6 +13,7 @@ #include #include #include +#include #include /* Test that we can find buses and chip-selects */ diff --git a/test/dm/spmi.c b/test/dm/spmi.c index e6a910859e..aa8d6961fd 100644 --- a/test/dm/spmi.c +++ b/test/dm/spmi.c @@ -13,6 +13,7 @@ #include #include #include +#include #include /* Test if bus childs got probed propperly*/ diff --git a/test/dm/syscon.c b/test/dm/syscon.c index 0ff9da7ec6..533e328449 100644 --- a/test/dm/syscon.c +++ b/test/dm/syscon.c @@ -9,6 +9,7 @@ #include #include #include +#include #include /* Base test of system controllers */ diff --git a/test/dm/sysreset.c b/test/dm/sysreset.c index 5b2358ef67..e5cd18cd82 100644 --- a/test/dm/sysreset.c +++ b/test/dm/sysreset.c @@ -9,6 +9,7 @@ #include #include #include +#include #include /* Test that we can use particular sysreset devices */ diff --git a/test/dm/tee.c b/test/dm/tee.c index 22f05a4219..c59a515b8b 100644 --- a/test/dm/tee.c +++ b/test/dm/tee.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include diff --git a/test/dm/test-driver.c b/test/dm/test-driver.c index abb5b7115a..3261a823f5 100644 --- a/test/dm/test-driver.c +++ b/test/dm/test-driver.c @@ -10,9 +10,10 @@ #include #include #include +#include #include +#include #include -#include int dm_testdrv_op_count[DM_TEST_OP_COUNT]; static struct unit_test_state *uts = &global_dm_test_state; diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 1fb8b5c248..b24d5056c3 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -16,6 +16,7 @@ #include #include #include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/test-main.c b/test/dm/test-main.c index 72648162a9..1441f029e7 100644 --- a/test/dm/test-main.c +++ b/test/dm/test-main.c @@ -13,6 +13,8 @@ #include #include #include +#include +#include #include DECLARE_GLOBAL_DATA_PTR; diff --git a/test/dm/test-uclass.c b/test/dm/test-uclass.c index 25271c6ba0..eabaca72e4 100644 --- a/test/dm/test-uclass.c +++ b/test/dm/test-uclass.c @@ -13,6 +13,7 @@ #include #include #include +#include #include static struct unit_test_state *uts = &global_dm_test_state; diff --git a/test/dm/timer.c b/test/dm/timer.c index 9367dab5d5..4aa5eeac75 100644 --- a/test/dm/timer.c +++ b/test/dm/timer.c @@ -7,6 +7,7 @@ #include #include #include +#include #include /* diff --git a/test/dm/usb.c b/test/dm/usb.c index ef454b0ae5..47cb9b9b49 100644 --- a/test/dm/usb.c +++ b/test/dm/usb.c @@ -13,6 +13,7 @@ #include #include #include +#include #include /* Test that sandbox USB works correctly */ diff --git a/test/dm/video.c b/test/dm/video.c index 3151ebb73f..5d93aefd34 100644 --- a/test/dm/video.c +++ b/test/dm/video.c @@ -13,6 +13,7 @@ #include #include #include +#include #include /* diff --git a/test/dm/virtio.c b/test/dm/virtio.c index 4b317d2ec3..a2ed36a2fe 100644 --- a/test/dm/virtio.c +++ b/test/dm/virtio.c @@ -9,9 +9,10 @@ #include #include #include -#include #include #include +#include +#include #include /* Basic test of the virtio uclass */ diff --git a/test/dm/wdt.c b/test/dm/wdt.c index 1d31ec55c6..c704098b24 100644 --- a/test/dm/wdt.c +++ b/test/dm/wdt.c @@ -9,6 +9,7 @@ #include #include #include +#include #include /* Test that watchdog driver functions are called */ diff --git a/test/lib/lmb.c b/test/lib/lmb.c index ec68227bb6..1f50a51cd6 100644 --- a/test/lib/lmb.c +++ b/test/lib/lmb.c @@ -4,8 +4,10 @@ */ #include +#include #include #include +#include #include static int check_lmb(struct unit_test_state *uts, struct lmb *lmb, From patchwork Sun Oct 27 15:53:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185059 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="aSWd1/ZY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N2t3zZLz9sPK for ; Mon, 28 Oct 2019 03:04:38 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1A4A7C21DF3; Sun, 27 Oct 2019 15:58:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DAB57C21E4E; Sun, 27 Oct 2019 15:55:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E0005C21DA6; Sun, 27 Oct 2019 15:55:36 +0000 (UTC) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by lists.denx.de (Postfix) with ESMTPS id A5676C21C3F for ; Sun, 27 Oct 2019 15:54:55 +0000 (UTC) Received: by mail-il1-f193.google.com with SMTP id b12so3960100ilf.12 for ; Sun, 27 Oct 2019 08:54:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uNbAXjaGvk2F+5Ls7wpwdkjF0lZO7+nf3t/plsDfa78=; b=aSWd1/ZYut6cxIg1+aXHY+MURUdheRpAodc4n9T6JFpv0GlaSKYw1/nKhZWzJnBzDs 5hWBBVAgONhgCxo0YgyefL8x4KEZ9Gi2h9QgZylkbLz/G4hEX2HzAe5DaM2A8LyFYuoC 4/Hrgm7Xckd0Oo2fISRZsdv0rXxyRau91/cXQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uNbAXjaGvk2F+5Ls7wpwdkjF0lZO7+nf3t/plsDfa78=; b=mSYOUwKcd6UZyGbU+RlKXW4r0s5Lm9y2CFrkjWIYuuzP0U0vCR4WH1lwgwlN4/iwVo /LdZ26bw9Lwu9u4KNE5t4SjdJ0eFNgIHgQN7WnHxPBLWErLKW0JTzcJL9ABF4VIbOp+o IqeKK8vIVIRhavEGG8OprAi/5swpQcTi3joM83jyJr+YPnpw5jLtapJxBsB6pMOop83S 7B0DaShEn3GwhLvs3T/4yepLeUgUNffrtXfgkH9/vcy98kMzdHAXq43bmkASafBe2brd 5KflFoHktCHmkxLjQdjPJL/clSKCnf5jGYsr4xNwrCHKBuKqfzH/56e7k05OoGTmY8m8 whSg== X-Gm-Message-State: APjAAAVXHdsw/Upzsiym4HQaH+4G5nu9As1tpzoyOdeWzLrag14K69jP DPUeIAH0j+S1B9vL3Qt+IFlvopKEGF7EJg== X-Google-Smtp-Source: APXvYqzJsSRvTc/8YQwzMLsk/2fKcXyz1SBSbbI4F/a21KODZJcJQr/hI0FFI1C88nOrGaBQlLwbgQ== X-Received: by 2002:a92:dc51:: with SMTP id x17mr11677007ilq.247.1572191694523; Sun, 27 Oct 2019 08:54:54 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:54 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:51 -0600 Message-Id: <20191027155410.187957-11-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Tien Fong Chee , Michal Simek Subject: [U-Boot] [PATCH 11/30] fs: fs-loader: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Signed-off-by: Simon Glass --- drivers/fpga/socfpga_arria10.c | 1 + include/fs_loader.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/fpga/socfpga_arria10.c b/drivers/fpga/socfpga_arria10.c index 5fb9d6a191..d94366a39a 100644 --- a/drivers/fpga/socfpga_arria10.c +++ b/drivers/fpga/socfpga_arria10.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include #include diff --git a/include/fs_loader.h b/include/fs_loader.h index b728c06fcf..1b3c58086f 100644 --- a/include/fs_loader.h +++ b/include/fs_loader.h @@ -6,7 +6,7 @@ #ifndef _FS_LOADER_H_ #define _FS_LOADER_H_ -#include +struct udevice; /** * struct phandle_part - A place for storing phandle of node and its partition From patchwork Sun Oct 27 15:53:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185072 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="JcLwUaqN"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N7z4v4Nz9sPK for ; Mon, 28 Oct 2019 03:09:03 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5D10AC21E70; Sun, 27 Oct 2019 15:59:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B6059C21E50; Sun, 27 Oct 2019 15:55:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D3462C21D83; Sun, 27 Oct 2019 15:55:43 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 75333C21DD4 for ; Sun, 27 Oct 2019 15:54:58 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id c16so7747824ioc.3 for ; Sun, 27 Oct 2019 08:54:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p6cj2vjb2kH0gLR6sNgSvC0qY21tkg/newqjCSQ5xY4=; b=JcLwUaqNwq0lZvN8QTUYrh2Zan3VJfrcmMs3wSFP/fUiR1hBRv2fj2r0VQoCDLTj3w OoOnKkMhzWtp8B34dLUmOeFRBPsaYKyF1TNZ/bhYyB6sVbEcYOYnPTVvRKPIyEc11gUq OyiFGqLKb2d2d+ZBmCfR8YvcDXL1PvYRxbw9U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p6cj2vjb2kH0gLR6sNgSvC0qY21tkg/newqjCSQ5xY4=; b=R8wMb9dgUZPF39zUJZPNnFDKg1oBSFcKfel1tK4Bt8/wNcievHG8iTPB08HMEkeeM+ 82cznRLDbR/bLWvAIInihTqm3A7H5eJtDvVLCWa2QrjdgOePn+NbPu88kpkgKpuPOOZp LgaINRHJl5rTo2BhPL6YIu7qdeV/i/iuvAbAa1Blcp/6U688YF5JctGsPGtaDNt9OVgm IQdeL1HGEj05X9S7DP2+Mw/zu1YsfzO9RCJLvbfYrJHSQA7seNO4AxlMd9c23inW0nZs wpUkc8njVC6TaAQYkmc2fG2BaCWk3pN+IS+mE6NiUOZyDwgz1+OjWFUBViHm/IoVG4Dn egng== X-Gm-Message-State: APjAAAXmR9K4eNnQ5y8TcF60inqjsfB9ZTSsikSmh4t7B5MOSjZ+nNCu 9AYcMA4L/mUERX0s4DdQrGGq1ofh5RXlhA== X-Google-Smtp-Source: APXvYqxFpmnNNx2A0Vq7t5sEJZhjbGM4Y+t9VexC3ob/qcffIojdyEreUa017wUSElBj+uSlc/oGbg== X-Received: by 2002:a05:6602:2284:: with SMTP id d4mr1827378iod.10.1572191697279; Sun, 27 Oct 2019 08:54:57 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:56 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:52 -0600 Message-Id: <20191027155410.187957-12-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Carlo Caione , Joe Hershberger , Trent Piepho Subject: [U-Boot] [PATCH 12/30] net: Drop dm.h header file from phy.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use other headers and C inclusions instead. Signed-off-by: Simon Glass --- cmd/mdio.c | 1 + cmd/mii.c | 1 + include/dm/read.h | 1 + include/phy.h | 5 ++++- net/eth_legacy.c | 1 + 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cmd/mdio.c b/cmd/mdio.c index 22c8fbe856..4e985302a4 100644 --- a/cmd/mdio.c +++ b/cmd/mdio.c @@ -10,6 +10,7 @@ #include #include +#include #include #include diff --git a/cmd/mii.c b/cmd/mii.c index 23ee1e6cfa..fb2769c138 100644 --- a/cmd/mii.c +++ b/cmd/mii.c @@ -10,6 +10,7 @@ #include #include +#include #include typedef struct _MII_field_desc_t { diff --git a/include/dm/read.h b/include/dm/read.h index d37fcb504d..75970619f1 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -9,6 +9,7 @@ #ifndef _DM_READ_H #define _DM_READ_H +#include #include #include #include diff --git a/include/phy.h b/include/phy.h index e50f56b6eb..4518ddad50 100644 --- a/include/phy.h +++ b/include/phy.h @@ -9,13 +9,16 @@ #ifndef _PHY_H #define _PHY_H -#include +#include +#include #include #include #include #include #include +struct udevice; + #define PHY_FIXED_ID 0xa5a55a5a /* * There is no actual id for this. diff --git a/net/eth_legacy.c b/net/eth_legacy.c index 41f5263526..8cdef5b827 100644 --- a/net/eth_legacy.c +++ b/net/eth_legacy.c @@ -7,6 +7,7 @@ #include #include +#include #include #include #include From patchwork Sun Oct 27 15:53:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185055 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="LsLCWoMF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N1C1m4Dz9sPK for ; Mon, 28 Oct 2019 03:03:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C59F1C21DF3; Sun, 27 Oct 2019 15:59:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2111DC21DA1; Sun, 27 Oct 2019 15:55:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 973CFC21C3F; Sun, 27 Oct 2019 15:55:43 +0000 (UTC) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by lists.denx.de (Postfix) with ESMTPS id 48A1EC21DFA for ; Sun, 27 Oct 2019 15:55:00 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id s6so2340400iln.0 for ; Sun, 27 Oct 2019 08:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WtDFFjVbxJJ7akmS9CJ79u16negaQQMlc09vYTShXis=; b=LsLCWoMFthaXW2aTxWLbAT0OaHDOryAyAuoTRV8UeVyX6c9ewfXb/clllIg8KbJOtt /0TL5jSV9tEWWVyOvTKmKamVmRalP1duNw3KFk2/doLHFjHQuZzndFydx46QU+Eis+8H hynVs9a4P9xKppfCpX+4OG+KHFuuu6tHGgi1s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WtDFFjVbxJJ7akmS9CJ79u16negaQQMlc09vYTShXis=; b=AyUk5RdfHre/vATxa+tTU+1Ydig4FFStISLQjT6UyBhvFArnNwgwfEu5pRmU9nJHF7 LBInDHMCxbiz+Kb32aL/zdN9TsRkX/KPCD6M1nKy5ZK618bQ5HI9VfFGaStcgavSwLJx 0hx8OpHuYFAQzrODlK/yI5Bu+ZA1Nk5EGDIlIAdwTHX0DiWFR7dqRaKBJqzoMcjnoxcf EvQHii6dPory5OZO5WlLyH5W0RVBE7XgPJb6HmbVl5LjgFTjfObgjIPUm7MrX2mn1LyE +rsPzNhAHW3iRSlV4PYnaioizoIMGxzi7K7ZOusmI1XtZHoorsZLx5rY+TiAS5Psvj+z tTMA== X-Gm-Message-State: APjAAAWRTrGhnhkFue6MvSL/Za42eIOFW2zFlikm4rmSSmLQMjF6UxrQ iA0ENeLTe8qQ4dSYBz3J8/poPS1RYcyJ2Q== X-Google-Smtp-Source: APXvYqwSyirsrdxpW3E2CjaxEJT6trcajsKKpddrfmRHBMHm+IfoM7dFzPP1r+WncW0Z7TytUHCybg== X-Received: by 2002:a92:b314:: with SMTP id p20mr15564521ilh.80.1572191699149; Sun, 27 Oct 2019 08:54:59 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.54.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:54:58 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:53 -0600 Message-Id: <20191027155410.187957-13-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Mike Frysinger Subject: [U-Boot] [PATCH 13/30] sf: Drop dm.h header file from spi_flash.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Signed-off-by: Simon Glass --- arch/x86/cpu/ivybridge/sdram.c | 1 + include/spi_flash.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c index 8a58d0383d..d2d51ebca1 100644 --- a/arch/x86/cpu/ivybridge/sdram.c +++ b/arch/x86/cpu/ivybridge/sdram.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include diff --git a/include/spi_flash.h b/include/spi_flash.h index 0b23f57a71..0d302a7938 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -9,10 +9,11 @@ #ifndef _SPI_FLASH_H_ #define _SPI_FLASH_H_ -#include /* Because we dereference struct udevice here */ #include #include +struct udevice; + /* by default ENV use the same parameters than SF command */ #ifndef CONFIG_ENV_SPI_BUS # define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS From patchwork Sun Oct 27 15:53:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185053 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ao2OmH6S"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N0p56C1z9sPK for ; Mon, 28 Oct 2019 03:02:48 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 6301FC21D56; Sun, 27 Oct 2019 15:59:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id F3810C21E1B; Sun, 27 Oct 2019 15:56:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D4948C21DF3; Sun, 27 Oct 2019 15:55:59 +0000 (UTC) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by lists.denx.de (Postfix) with ESMTPS id A72F1C21DFD for ; Sun, 27 Oct 2019 15:55:02 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id d83so5855612ilk.7 for ; Sun, 27 Oct 2019 08:55:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6+eGiV2rZvxdW1tKr7OmVt5swLAUqy5wGMCQi31tZ/w=; b=ao2OmH6SQZvT+DTFwLLZa9rjpmu8QO0PB24k08vallAcRItC/P7PhJAHuvIhbjSsvS tnEbFkrS+9+HgV5j5NkzEKGKpmWWHhSFo698jwNHs/Xa3whfRZ5KBLS7ohxJDoutZ/Nn sDAUcbHX3/c/cHcsfq3EFPBxN3McJ8CfxKBt8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6+eGiV2rZvxdW1tKr7OmVt5swLAUqy5wGMCQi31tZ/w=; b=LJezdr2kbMql7Qn4mN3pGWwmLIYAGlt5FBRjEcfWfzGRdyHFwFcfn6G3ZaDJEGgxnO Z56rUk7phs1ZP3D9j1uNivChtRANR6M9L/0tB903g3G/xc8j8K2LH5RVnBVlVUw5WMlK e66B5TfJLM2VsP1kgyqkfIcb9UAhACHE7UtItdqnKJVqVcpLv4bz4HijyvSK1YnkxBux dYeWTDcD4HuaTr0G3RnCDti11S0ZpE0k/hljLbZBCVFlLcg8b1QH3t/JXN83qacgc34K x6rP/d7poNslBfxs7gyJce9vqPQYDjjKHejulqhaJMB++nIsGzyFeEeZtr90Dn0Bpt2D IVyQ== X-Gm-Message-State: APjAAAWFdD39t38BX642gLvMwRQIYfHgFD5mD+w00EFRMRN/IPzunixH 3W44QD5wKesk9czdYYMPT0/rJtS8gW/CJg== X-Google-Smtp-Source: APXvYqwI6yRYwQfsVQftZUakwGPmLFLCyPTnE96Lr4LXLT7U5OlZY+Gs8FGgjOqAaMuspeL2wZW7yA== X-Received: by 2002:a92:7703:: with SMTP id s3mr15232729ilc.274.1572191701543; Sun, 27 Oct 2019 08:55:01 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:01 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:54 -0600 Message-Id: <20191027155410.187957-14-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , "NXP i.MX U-Boot Team" Subject: [U-Boot] [PATCH 14/30] thermal: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Signed-off-by: Simon Glass --- arch/arm/mach-imx/cpu.c | 1 + include/thermal.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/cpu.c b/arch/arm/mach-imx/cpu.c index d39f607e3f..68268bd515 100644 --- a/arch/arm/mach-imx/cpu.c +++ b/arch/arm/mach-imx/cpu.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff --git a/include/thermal.h b/include/thermal.h index 11d75256e0..52a3317fd5 100644 --- a/include/thermal.h +++ b/include/thermal.h @@ -7,7 +7,7 @@ #ifndef _THERMAL_H_ #define _THERMAL_H_ -#include +struct udevice; int thermal_get_temp(struct udevice *dev, int *temp); From patchwork Sun Oct 27 15:53:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185066 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="eD8ShUDH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N4h0r2sz9sPK for ; Mon, 28 Oct 2019 03:06:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B00D6C21E39; Sun, 27 Oct 2019 15:59:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4D90BC21C8B; Sun, 27 Oct 2019 15:56:01 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8AB9CC21DFD; Sun, 27 Oct 2019 15:55:59 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id E8200C21DB3 for ; Sun, 27 Oct 2019 15:55:04 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id z19so7772262ior.0 for ; Sun, 27 Oct 2019 08:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1eOQYQTEYEyYl9ZiGCbtSaEu5jAptC9jA7OEAvfpOBQ=; b=eD8ShUDHt/of8BXLrKMu9wNpoEV5lHeHAR5l4KiQ9lIrhu4IQyqsBxExYWGFKihBFp /tOnJUOMgnuXDZDDLdsaxhj6qZ6hGLqEpg4c2a0vlMiKK2+en+AuRIzFRuaW2B9LbeBq I7Fn20+N+ZrsTfpHRjN02A94wLxiHO97QuAYE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1eOQYQTEYEyYl9ZiGCbtSaEu5jAptC9jA7OEAvfpOBQ=; b=Yp8qs8yqebOSxXRnxdbJ3wYqcK/U8w1b6VPkCJpm9xCnEn2z7S1UPzoSVVA1HC9zVN i+/5J7QSGIgkS8GGa3lASp+vjzO6R1ZJS9+x5k2oCdqA7k8ER4zBOviTLJFhSpi+LRUV IGYNaTvSxMObnbZnuCCGXHd9+5PlENDMs+YFI04gZgsu7CvoM/a8b9l12C6grfPgJOOT 2gmI6oJ6Yo7If7aKR30Tg8b0CFsgVBJ2UV95TLUhLpexe6elf/mqyTBJOP8ERg5kbJkE Borwdac8mY4EA4qrmPfxYbXnpieSsUfAOy8XS7n50hB8rxEZs4hliwXmP6UhkpNvpp+q Rb/A== X-Gm-Message-State: APjAAAVXkxMs+ZJV4aSeUjYeUc9XYcWCeFp9JXgW2j3EwCcCnSpJADNb PpXZA82F3CrdCQNWoEeeyQUhEr99Z95ePA== X-Google-Smtp-Source: APXvYqwQbKraNDUhU4XWP6mZweF68zCEr74p7t+jFYGtEiaqINAladiq6H691UQfQJXBO6HNaiOxYQ== X-Received: by 2002:a6b:e20f:: with SMTP id z15mr13915429ioc.199.1572191703806; Sun, 27 Oct 2019 08:55:03 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:03 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:55 -0600 Message-Id: <20191027155410.187957-15-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Joe Hershberger , Tom Rini , Martin Fuzzey Subject: [U-Boot] [PATCH 15/30] w1: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Signed-off-by: Simon Glass --- board/atmel/common/board.c | 1 + cmd/w1.c | 1 + include/w1.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/board/atmel/common/board.c b/board/atmel/common/board.c index c41706c400..eee5c357bd 100644 --- a/board/atmel/common/board.c +++ b/board/atmel/common/board.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include diff --git a/cmd/w1.c b/cmd/w1.c index 9c95fcf9cd..c7e2b62bfa 100644 --- a/cmd/w1.c +++ b/cmd/w1.c @@ -6,6 +6,7 @@ */ #include #include +#include #include #include #include diff --git a/include/w1.h b/include/w1.h index b958b1c92c..77f439e587 100644 --- a/include/w1.h +++ b/include/w1.h @@ -8,7 +8,7 @@ #ifndef __W1_H #define __W1_H -#include +struct udevice; #define W1_FAMILY_DS24B33 0x23 #define W1_FAMILY_DS2431 0x2d From patchwork Sun Oct 27 15:53:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185076 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="mAm0vEdF"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N9g0shyz9sPK for ; Mon, 28 Oct 2019 03:10:31 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C4D19C21E9F; Sun, 27 Oct 2019 15:59:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8588CC21E60; Sun, 27 Oct 2019 15:56:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 01401C21DFD; Sun, 27 Oct 2019 15:55:59 +0000 (UTC) Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by lists.denx.de (Postfix) with ESMTPS id 0C9A6C21DF3 for ; Sun, 27 Oct 2019 15:55:07 +0000 (UTC) Received: by mail-il1-f196.google.com with SMTP id i12so5870594ils.6 for ; Sun, 27 Oct 2019 08:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ikQHl3biCI++3YxllFm5e8IEoBLnBeBAUgnlrhIeaIY=; b=mAm0vEdFMwgRNXuX3DtEk8cZB2IWEV2QC2FvvmNDfuL8a38HGrKr4qBGzKqEV2gLVx 25jsPeVJ/5qgjp0kEjciKBizBjBi9SCSTQZTpNYw2G9blpGo9nhdi61PHeSp/KeQgtZU DQ4V2WSCd4Kuu2YQUtYbMw2tv/E/adUlXi/n0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ikQHl3biCI++3YxllFm5e8IEoBLnBeBAUgnlrhIeaIY=; b=A6bsHfRHD5MV+vZ06Fikly1RbRxuqgMe06GFN9OGJMnVFyNSmYsIKU2px2ofkD7VtB a2uqlR8jMR1OC4324C8xHyhxWf4Hjc6Ze9oow9ROS1Qtm7y5MrwVKkxOgxdah5vUxRLQ 6w2iETqD//NhzID5n2VLnW95CiJ5KkSW51tYwoT/vA9k4zmWU7JHZVQ8LMVv8k2gZyuH mAb2N/XTpyZEJP5BOWfqj06fv4FMBn3fdr8keVZlZneqaI3gF6Z2Ed0cl9MuF1wa0sWO RgxN6KUulLjFp8wpbmXrul5nznYhuwXkOQYHPg2b//+N+pcLWtrCalF7e0wqEmqWvcFy WXGQ== X-Gm-Message-State: APjAAAUifQPXU6iAVbJsyPpQIFlohO/Y2XNcnN9L7I44F/jyDCDAv82/ gxcnHHQh20iENbY4AmQc0xbuibHrFnS5WA== X-Google-Smtp-Source: APXvYqwqzbmRJNyFbW2fPboziRVjcXmE9rEdgSo92BDREO2JUviF76VVncJbx8nohtn5rSFZxP/pWQ== X-Received: by 2002:a92:1793:: with SMTP id 19mr15476096ilx.3.1572191705835; Sun, 27 Oct 2019 08:55:05 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:05 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:56 -0600 Message-Id: <20191027155410.187957-16-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Alexander Graf , Heinrich Schuchardt Subject: [U-Boot] [PATCH 16/30] efi: Tidy up header includes X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Two files relay on efi_driver.h to include common.h and dm.h which is incorrect. The former should always be included in a non-host C file and the latter should be included if driver model is used. Signed-off-by: Simon Glass Reviewed-by: Heinrich Schuchardt --- include/efi_driver.h | 2 -- lib/efi_driver/efi_block_device.c | 2 ++ lib/efi_driver/efi_uclass.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/efi_driver.h b/include/efi_driver.h index 840483a416..2b62219c5b 100644 --- a/include/efi_driver.h +++ b/include/efi_driver.h @@ -8,8 +8,6 @@ #ifndef _EFI_DRIVER_H #define _EFI_DRIVER_H 1 -#include -#include #include /* diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index cf02341931..c7e7946cdd 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -28,6 +28,8 @@ * iPXE uses the simple file protocol to load Grub or the Linux Kernel. */ +#include +#include #include #include #include diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index b14746e6b1..c837db165c 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -17,6 +17,8 @@ * controllers. */ +#include +#include #include /** From patchwork Sun Oct 27 15:53:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185074 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="EtfW0Arz"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N9D0LWGz9sPL for ; Mon, 28 Oct 2019 03:10:07 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CEB6DC21E50; Sun, 27 Oct 2019 16:00:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 032B4C21E9F; Sun, 27 Oct 2019 15:56:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 726D9C21DF3; Sun, 27 Oct 2019 15:56:00 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id 48389C21C57 for ; Sun, 27 Oct 2019 15:55:09 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id r144so7718115iod.8 for ; Sun, 27 Oct 2019 08:55:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zrLbXeUK8GNk0uzvnILAjGsPP5Oiw8KUKykHO0sOkKA=; b=EtfW0ArzbRTVlZwQBghbwz/Pnb7tCuEWB6L6167oufbx/n2vQ7y9el9x+TERZ/p4Ha lKbfFcXBfeabL0LG4ANu+hftsrjQXFBaUCSg38dmk+dUfCT6NT9mSX8Zcd1P/YQrXdyC lPZYoVI7sWj7L9xbmSIbKaI6mX0+yov6vqyY0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zrLbXeUK8GNk0uzvnILAjGsPP5Oiw8KUKykHO0sOkKA=; b=dxX9W6FN0BzIH1Q2gwOGTZbJYiGLh87j8W4P51m1U7NzQBMbGstDvB9/QxOVHw+kO8 +NmSRyY8bCvsvbcv2k34rSRdzjtzhsEM7ZZqV0eAkZbSsB/wfxtcO5Zy+z9tcVd54FUx EAag32hnHnAVC+uBinF3OB6odp2P9jRALA40UtQGGnfkg1cXsjvw2ZuRTCroxi3Vzctu b4Lpy4WD8MncZ1LiSVT9COL673MqaugHd4xSkC8DiEw/2Xt8XupL+aw3ap/4BvQTdjHL EhoJ5UQbSDM7rVR3u6T7OM/X4V8PKo6W7L/ZeKG0Y7brQulRypmwOD47u1rJc1I+grFs uhAA== X-Gm-Message-State: APjAAAWiliPhnSjH0CbDghhdI7PyiOuTL7PDGyzXK9kJKDmWNPv8pxfC W3oZglq3e6BF4YAK5ZW1bKEixEGctRPGCw== X-Google-Smtp-Source: APXvYqzt9WfSxoJJB8nRQeaI5uGI/QIUQu9oalHJVOtmgyAQR3qgZnfNpP5OXK+FjfKfnerFTK1UYQ== X-Received: by 2002:a5d:87ce:: with SMTP id q14mr13029837ios.278.1572191708125; Sun, 27 Oct 2019 08:55:08 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:07 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:57 -0600 Message-Id: <20191027155410.187957-17-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Lukasz Majewski , Sven Schwermer Subject: [U-Boot] [PATCH 17/30] power: Tidy up inclusion of regulator_common.h X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This file should not include common.h and dm.h so remove them. Also move the inclusion of this file to after the normal includes. Signed-off-by: Simon Glass --- drivers/power/regulator/fixed.c | 3 ++- drivers/power/regulator/gpio-regulator.c | 3 ++- drivers/power/regulator/regulator_common.c | 4 +++- drivers/power/regulator/regulator_common.h | 2 -- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/power/regulator/fixed.c b/drivers/power/regulator/fixed.c index 763e671d54..5c93e6523b 100644 --- a/drivers/power/regulator/fixed.c +++ b/drivers/power/regulator/fixed.c @@ -5,13 +5,14 @@ * Przemyslaw Marczak */ -#include "regulator_common.h" #include #include #include #include #include +#include "regulator_common.h" + static int fixed_regulator_ofdata_to_platdata(struct udevice *dev) { struct dm_regulator_uclass_platdata *uc_pdata; diff --git a/drivers/power/regulator/gpio-regulator.c b/drivers/power/regulator/gpio-regulator.c index ec1dcb64b3..730aea833f 100644 --- a/drivers/power/regulator/gpio-regulator.c +++ b/drivers/power/regulator/gpio-regulator.c @@ -4,7 +4,6 @@ * Keerthy */ -#include "regulator_common.h" #include #include #include @@ -14,6 +13,8 @@ #include #include +#include "regulator_common.h" + #define GPIO_REGULATOR_MAX_STATES 2 DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index 2041086567..242668a55b 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -4,10 +4,12 @@ * Sven Schwermer */ -#include "regulator_common.h" #include +#include #include +#include "regulator_common.h" + int regulator_common_ofdata_to_platdata(struct udevice *dev, struct regulator_common_platdata *dev_pdata, const char *enable_gpio_name) { diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h index 18a525880a..bf80439c78 100644 --- a/drivers/power/regulator/regulator_common.h +++ b/drivers/power/regulator/regulator_common.h @@ -7,9 +7,7 @@ #ifndef _REGULATOR_COMMON_H #define _REGULATOR_COMMON_H -#include #include -#include struct regulator_common_platdata { struct gpio_desc gpio; /* GPIO for regulator enable control */ From patchwork Sun Oct 27 15:53:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185068 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="XtYRYMjT"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N6z0QVtz9sPK for ; Mon, 28 Oct 2019 03:08:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id C2E98C21E75; Sun, 27 Oct 2019 15:59:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 42999C21E74; Sun, 27 Oct 2019 15:56:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 64A40C21D65; Sun, 27 Oct 2019 15:56:00 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id 396B1C21D65 for ; Sun, 27 Oct 2019 15:55:11 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id p6so7729209iod.7 for ; Sun, 27 Oct 2019 08:55:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W8ce492DIGJDFyNts+AwAT2KpXCBR/DnxoCUn1ZzNYs=; b=XtYRYMjTTQRNQkLZ0slksAYurhExaNvnDmi9dYX43O1XzzVYVyEpezfmI+N+fHWdI4 7XOjCZtLubhIx0Nj2nmoK3gW7mQurfnYbLdehg3AYFI8YfTJWC8SBiGrr+5YztDR+Bri xqIVfzHPDmesu02TiVhFnYXHfa9j45ZNSGrUc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W8ce492DIGJDFyNts+AwAT2KpXCBR/DnxoCUn1ZzNYs=; b=YaZ3FHDP4F3izXrcZF8YqpxuHC0e/q7hJi/45IlgO9DZywkI+uf76+JRNpIZ2CBbwZ raZcH4s6J3xYkqBh8anD14uiUE/bIJu8c6MfefFtLuupIvSbrd0/zr9syNsC6BRK9kon QZwf4DN7Vs61TRQVGe9JOiAQ1wzTqyWgXN5tZGKzT8RcAZjMtFFu3vxtLTccaBnO97JF bD7OWH2qCjVNYT0quro1M2j1YykqpCr8LD5nTX4kPbs1vqGWkR8GDqM7V7DPKIcWRh5k ZTgzA6gQXu1daWYcj1Psi1MPJEytCki8NIsdgVwd3NR9i6s2XI9M+4FJnz2xeJjHvCda 5EvQ== X-Gm-Message-State: APjAAAUhMx5Fu+/2Uudqttzn6D2rujhMIOifVNBGWkPZBr8VZnTmKz33 njuvv04rdVKDz5/wq3fVZgR95dHmk9yxNQ== X-Google-Smtp-Source: APXvYqzOWquF/pPKtZDuTrqVJIUBjGNdJaLMoM/eRT+u7xHRaMzSZlerCY+gK0xFxnstocd4e5wajg== X-Received: by 2002:a02:cc4e:: with SMTP id i14mr13655779jaq.32.1572191710107; Sun, 27 Oct 2019 08:55:10 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:09 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:58 -0600 Message-Id: <20191027155410.187957-18-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 18/30] mmc: Drop duplicate dm.h inclusion X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" We only need to include this header once. Drop the duplicate. Signed-off-by: Simon Glass --- drivers/mmc/sdhci.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index fbc576fd72..c081bfde5f 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -13,7 +13,6 @@ #include #include #include -#include #if defined(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER) void *aligned_buffer = (void *)CONFIG_FIXED_SDHCI_ALIGNED_BUFFER; From patchwork Sun Oct 27 15:53:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185064 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="PmSSafni"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N4F2mJBz9sPL for ; Mon, 28 Oct 2019 03:05:49 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1AF0BC21E12; Sun, 27 Oct 2019 15:59:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DA234C21E68; Sun, 27 Oct 2019 15:56:02 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 242BEC21E57; Sun, 27 Oct 2019 15:56:00 +0000 (UTC) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by lists.denx.de (Postfix) with ESMTPS id 664A5C21E1B for ; Sun, 27 Oct 2019 15:55:13 +0000 (UTC) Received: by mail-il1-f193.google.com with SMTP id a13so5895288ilp.1 for ; Sun, 27 Oct 2019 08:55:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AlrN0w+7viWdqhUP1RAXFdOl59EuKpfbaI/k/9OdATE=; b=PmSSafniPFIZKlmbRs+Oh/S6SWC26r8rohu7DbMvfoEasiPaB0hI05wgQps9BVSKti iBbfvtYABvPA1z2Zb25SXPJgigF25jiIMxgHM2n5b40yA9GfeAiL8Z0JOMUvtrOZNXkk MCvwQXnrBgf/F2Q8Hanu1lvR6E4KeSus/EplU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AlrN0w+7viWdqhUP1RAXFdOl59EuKpfbaI/k/9OdATE=; b=p+vVkFI4a3CD/zpl76veChXFyf3vIblCdgyTlXU+JrMEVtCe9h/wLzMKVXXRQ5e7S3 m/tQZtbjdGsH1n85SqEBOMvswmqr5EIWdDd8mFqkxi+/teyBpmW5r+0rYuh1W6XTe67C eJVwZPgYMd+smFJ6zg4oysGhRuF9C8oWAwqFp2VIrkMXJpC8TuGHJZfnWnb+bnxkKlWg b6D+GSi74ZgpacRLn7EocGWx6YvF74nH6Oda5r4VgtElcoxZGsa3X8O+3MYczynnQ6Wp F6Ca2WdFaEPjsnK8lqa7huYVesZ6M2Pf3aopwRaOg5d46TaqGlx67VocD4rkaN1gvGM8 iTCg== X-Gm-Message-State: APjAAAUoezzrBbPKuuqhuJ6WbyLsNKRzAua9OV7lIR9lsTWG2KDs379B EuisV+jc4wdeZr4G0ukEY6msVeMBhR6j7Q== X-Google-Smtp-Source: APXvYqy7ClVDPB4IBOu5H5K8IP/2m6HdqEJZK60rxb5QO5D0CPQbaDyQWHFyo/v25csAdJQB7QlrrQ== X-Received: by 2002:a92:d2cb:: with SMTP id w11mr14933759ilg.155.1572191712224; Sun, 27 Oct 2019 08:55:12 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:11 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:53:59 -0600 Message-Id: <20191027155410.187957-19-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Jagannadha Sutradharudu Teki Subject: [U-Boot] [PATCH 19/30] spi: Drop duplicate dm.h inclusion X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" We only need to include this header once. Drop the duplicate. Signed-off-by: Simon Glass --- drivers/spi/mscc_bb_spi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/spi/mscc_bb_spi.c b/drivers/spi/mscc_bb_spi.c index c3c7b80426..22fa2efd34 100644 --- a/drivers/spi/mscc_bb_spi.c +++ b/drivers/spi/mscc_bb_spi.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include From patchwork Sun Oct 27 15:54:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185071 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="bgi+Da7h"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N7p5DhKz9sPK for ; Mon, 28 Oct 2019 03:08:54 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 7877BC21E30; Sun, 27 Oct 2019 16:00:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 8E5BBC21E75; Sun, 27 Oct 2019 15:56:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 08E60C21C8B; Sun, 27 Oct 2019 15:56:00 +0000 (UTC) Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by lists.denx.de (Postfix) with ESMTPS id 85691C21E26 for ; Sun, 27 Oct 2019 15:55:15 +0000 (UTC) Received: by mail-il1-f194.google.com with SMTP id t5so5852071ilh.10 for ; Sun, 27 Oct 2019 08:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QZcpOS/ya0F2x6/TjLgVNYmNuY9f5rQ06hRWfB+5uOU=; b=bgi+Da7hlvcvbmX7D1YmnAaXkKyKLI/Z2qcAiBSF9HV1jAwhbKwFR6GYqRniaMDGCI Y4eU6CJedZ5Vag5KhLZCz8QdX9LBbnpNeY3t9VoJyobSf2P5c/fOKSgwtI3njYLsOdj6 ZUWgRJlcPQhu1A/S4ErSSLy1OEFOgy2W1KPQI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QZcpOS/ya0F2x6/TjLgVNYmNuY9f5rQ06hRWfB+5uOU=; b=BS6tdvqcoFgmaqHrmvDPVQPJXksZ3EcMezimoICeDqA+7lg6bGausv/ynhsr9Ax8q6 bQHGuPW46ch9SLH1izd/hBSIoxxSZL+xrqNKVfc5C4RVNZXqofFW1KY7UtPnqVLuxJI9 VLTHUsJn1d/gct/kQ/mxKNh1gzCPBMWNbWqaAcoo2/a1+TVxUXCqpdxFAR+X+t1ktnvK HlkMd9lN3hOHRTJdcHc3lNn0K5g58bIrGBbsRz+eZRVaNDn4Rei9dzP1Ql1yrGB8RWXG RpW9xxwZXud6nLg5j9QIsQB50zBUrhY1x4fe2gHSWZn6JXS5qO6WDqLc4xWMh5EXFmbn QZiw== X-Gm-Message-State: APjAAAV0BfeDM3u3Eo8T8jQ+iBU3l6ec8kJKUFp5z79reR/sRdUPBX9L j0KZgREfU7ermnc3ETsu4p3Cf6/rWA3Olw== X-Google-Smtp-Source: APXvYqybacy7zHAXTF/L3/iNMUs13dUBd29wooP4O67kB4QVUx1vC+ngAa5EX5ki+xPe9nJ8lsvx/w== X-Received: by 2002:a05:6e02:812:: with SMTP id u18mr13838352ilm.69.1572191714393; Sun, 27 Oct 2019 08:55:14 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:14 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:00 -0600 Message-Id: <20191027155410.187957-20-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Schuyler Patton , James Doublesin Subject: [U-Boot] [PATCH 20/30] ti: am654: Drop duplicate dm.h inclusion X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" We only need to include this header once. Drop the duplicate. Signed-off-by: Simon Glass Reviewed-by: Lokesh Vutla --- drivers/ram/k3-am654-ddrss.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/ram/k3-am654-ddrss.c b/drivers/ram/k3-am654-ddrss.c index 7015d8cfe7..00673e80a9 100644 --- a/drivers/ram/k3-am654-ddrss.c +++ b/drivers/ram/k3-am654-ddrss.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include "k3-am654-ddrss.h" From patchwork Sun Oct 27 15:54:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185054 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="ggOnhezv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N181hrgz9sPK for ; Mon, 28 Oct 2019 03:03:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id CBC22C21DA1; Sun, 27 Oct 2019 16:00:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id F3403C21E7F; Sun, 27 Oct 2019 15:56:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2344FC21D65; Sun, 27 Oct 2019 15:56:00 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id 01D9CC21C8B for ; Sun, 27 Oct 2019 15:55:18 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id 1so7737720iou.4 for ; Sun, 27 Oct 2019 08:55:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YSndvRPkj+bx5+bWpEatC9/PDByaB3BdszL8gXuaEm8=; b=ggOnhezvIfB4kOPp7+hCz9/x45b1Uvtxm3AQ3vIG8vvvT6PS2/g/fkLJJIz0Y7ScH1 Y5cEQP7nmd/5JIhH7PajOLSFO+tjc4zT4Cb+h9i38/3tzCCGwotXvdjD7WA5iGFm6S+b CDijdJDEyjSe1PKZi4iZl5z+RX035GZyS8Kg4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=YSndvRPkj+bx5+bWpEatC9/PDByaB3BdszL8gXuaEm8=; b=J8Vq69D+CZTCIoqlxekRnWZxm5VxEOOf9hDefiwyvIJlOyiWZKoO1VMqH1DdENr58O lexA/a5o5Bf0BaY30YcFVhFusWs6bIPE6OO7KdYrqiO+s6/yVR7jTqG/pK42M9LfdMVb e3lEg4VxmuZz2fgmLyyKKS9R/n8biARpMI5gWWVjNbHcPeoEZM53GOl6Rpkx95VEmwpx yr2oqEehzqIby+Mk7BKTQEhzDW5ijuybXhyfAIc1goAUTPRbm+ufuboIqmpB9gpau9+S oLbYeReNton3ZN0dw5dKeSWLSi6eOh6B9O7nF1+AeJnUUc3/j77wkymVvjMRZkJ/P3cA 9fWw== X-Gm-Message-State: APjAAAWaTbbugcKyr2v66mgZAW2WKCUQFMVCwzfSrkMAaJmlvrKtDmRU PzN1FQYuVjNwMikA6uPWk+uBwA02aBxSWw== X-Google-Smtp-Source: APXvYqwX8rjkW6H2vZ0BpCjiR3Gee7ZsqCJIa+ajiSN39gOdCFMwiroB9VO5PVA86vEkLeaf+N4QwQ== X-Received: by 2002:a5d:9a98:: with SMTP id c24mr14049994iom.203.1572191716884; Sun, 27 Oct 2019 08:55:16 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:16 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:01 -0600 Message-Id: <20191027155410.187957-21-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 21/30] liebherr: Drop duplicate dm.h inclusion X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" We only need to include this header once. Drop the duplicate. Signed-off-by: Simon Glass Acked-by: Lukasz Majewski --- board/liebherr/display5/display5.c | 1 - 1 file changed, 1 deletion(-) diff --git a/board/liebherr/display5/display5.c b/board/liebherr/display5/display5.c index 85ca777c1d..14bae67886 100644 --- a/board/liebherr/display5/display5.c +++ b/board/liebherr/display5/display5.c @@ -23,7 +23,6 @@ #include #include -#include #include #include From patchwork Sun Oct 27 15:54:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185062 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="MGZhpzOl"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N464HvMz9sPK for ; Mon, 28 Oct 2019 03:05:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4A1E7C21E12; Sun, 27 Oct 2019 16:00:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 860CEC21E7E; Sun, 27 Oct 2019 15:56:04 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4C7F2C21DEC; Sun, 27 Oct 2019 15:56:00 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) by lists.denx.de (Postfix) with ESMTPS id 76E89C21E13 for ; Sun, 27 Oct 2019 15:55:20 +0000 (UTC) Received: by mail-io1-f67.google.com with SMTP id q1so7756178ion.1 for ; Sun, 27 Oct 2019 08:55:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dXz354bL83mDsfO+BDKqv8YyTuSaTAb/QUcTunFbuvo=; b=MGZhpzOl6hWhGeRprqwRu707rdug7CgD7BSjqjzqPtea6hjKGW3hNt2xWHK9LZFqj0 MAhfHBfDhasHXL4aThwF2uooUjITj5eGrSnWvsWAqlHImmvz8MrBe5R47Hh861/ks5uD cXuOxTP23ECWeC9J9vOUo6yk6egEAeuOEf3fI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dXz354bL83mDsfO+BDKqv8YyTuSaTAb/QUcTunFbuvo=; b=qR4/acOY/ZIkMtashuyuR052uEROsR1OPMgDke5WJN3DEX6r0Hcoq8BRVUxRBcBh+f WAIN1QsLSB0QpmdmAt6qD7VXlrq24PA2b0HrL4ASGqKe+uMcwoa8SZsx8ypuFE1GyKsU Y4cSZhE1KfCjcG2Tw0Pvh9BTBKZegoKuwg0is2DuSXI0EwVVKJ8qsPVjjIDLoRIEadw+ Afc4Q43n9n20cjHdTgqje9b/D3TA/6DhSa34a9503HCR/npLle7FqDjLaex3Aw70/i7E YDdYEmzm7JWlJK4yozHj8jgtlokQAQRTlU8xUxcRHtlnz9SUFhWbVQz83dd7Lrcq0toh NxCQ== X-Gm-Message-State: APjAAAXsORpuNffApA2UTRhZH9bwnH350J+YaCIBQMEWDuQNbFYxTZTz vp0o0wPbcZrZ6nIZX92lEzyMJnPtna8A0w== X-Google-Smtp-Source: APXvYqxJln2xzi9PTltWKYdV6cN0Sog472FMszsErMXT7w52N1ODTgDLahwqhS3ODe9WiOwnMRVt/w== X-Received: by 2002:a02:a584:: with SMTP id b4mr13270931jam.67.1572191719125; Sun, 27 Oct 2019 08:55:19 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:18 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:02 -0600 Message-Id: <20191027155410.187957-22-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Xiaowei Bao , York Sun , Hou Zhiqiang Subject: [U-Boot] [PATCH 22/30] pci: Drop dm.h inclusion from header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" The layerscape header should not include dm.h so remove it. Signed-off-by: Simon Glass --- drivers/pci/pcie_layerscape.h | 1 - drivers/pci/pcie_layerscape_fixup.c | 1 + drivers/pci/pcie_layerscape_gen4.h | 1 - drivers/pci/pcie_layerscape_gen4_fixup.c | 1 + 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/pcie_layerscape.h b/drivers/pci/pcie_layerscape.h index ddfbba6538..9423d963b1 100644 --- a/drivers/pci/pcie_layerscape.h +++ b/drivers/pci/pcie_layerscape.h @@ -8,7 +8,6 @@ #ifndef _PCIE_LAYERSCAPE_H_ #define _PCIE_LAYERSCAPE_H_ #include -#include #ifndef CONFIG_SYS_PCI_MEMORY_BUS #define CONFIG_SYS_PCI_MEMORY_BUS CONFIG_SYS_SDRAM_BASE diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index 089e031724..bd7c01d296 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -6,6 +6,7 @@ */ #include +#include #include #include #include diff --git a/drivers/pci/pcie_layerscape_gen4.h b/drivers/pci/pcie_layerscape_gen4.h index 27c2d09332..f681e63b30 100644 --- a/drivers/pci/pcie_layerscape_gen4.h +++ b/drivers/pci/pcie_layerscape_gen4.h @@ -9,7 +9,6 @@ #ifndef _PCIE_LAYERSCAPE_GEN4_H_ #define _PCIE_LAYERSCAPE_GEN4_H_ #include -#include #ifndef CONFIG_SYS_PCI_MEMORY_SIZE #define CONFIG_SYS_PCI_MEMORY_SIZE (4 * 1024 * 1024 * 1024ULL) diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c index 1c9e5750bd..e42a31da82 100644 --- a/drivers/pci/pcie_layerscape_gen4_fixup.c +++ b/drivers/pci/pcie_layerscape_gen4_fixup.c @@ -8,6 +8,7 @@ */ #include +#include #include #include #include From patchwork Sun Oct 27 15:54:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185078 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="F0MpRJ52"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N9t6wq5z9sPK for ; Mon, 28 Oct 2019 03:10:42 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id B76F3C21E6A; Sun, 27 Oct 2019 16:00:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 808D0C21E26; Sun, 27 Oct 2019 15:56:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 12B22C21E70; Sun, 27 Oct 2019 15:56:03 +0000 (UTC) Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by lists.denx.de (Postfix) with ESMTPS id 1D749C21E0B for ; Sun, 27 Oct 2019 15:55:22 +0000 (UTC) Received: by mail-il1-f193.google.com with SMTP id a13so5895441ilp.1 for ; Sun, 27 Oct 2019 08:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yo7it+q/6+9ZB/PjkPwSdzylweXnUrpL/nTgqZzaEKA=; b=F0MpRJ52kAgxIg3ICM8uJ9WDRGoCAydMd+tT93rFD7ZF9QO1dvBcT/hmZbMcN3yPmq vKRF4/M65aQUXt2Av2qvYJ3QWFFHyjmCZWnG6IagrKHPN0DxLXYCu4P+bYkhfgoDz+KF 0EETgE4LBL91BKKAXqPRZVQRnGnngGYPjrYRs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yo7it+q/6+9ZB/PjkPwSdzylweXnUrpL/nTgqZzaEKA=; b=VBAdtk0l2gK2RpWSZh8MtflqhH3hd9aqxDT0vJamFcNjrqQj1CP5tkYV+qmbOKYvi2 ijocd+xEA+jratTZ9ZnP2siNrIbHVoMjlesfGaV3wmnM5IKt1K9SyRJIhR3HmjAxUD7z 78sF9alxBaNkWqP3vo5cY2UEgR5EdBxK5dnzF2WUXaNO/+th6H2gM7xjDwJ5XpJHVyO3 L7+c9X4KgxQNvPxmeM472M5q3YWybzFwGpsh4U7HuAfqm6eeq+4HObaQp2zKwUp1Q9mY 1wl2Ykl6eahbhD+Y5g6Ba1tRHjhtKk19DbYntwl32mVjXD16FBbiZt9lIRk5iOTfJYoq xBww== X-Gm-Message-State: APjAAAWIIUblWeFNMIB0bWlPWE+afTuW5GgLuRWh+QR1Ulx27DnQ/4on 8IdMnCJeT5T2qCvzE3Ypk481jQe1LLhV8A== X-Google-Smtp-Source: APXvYqwg7PSSltZdb+geyB7NzCmp98fGin8z9/bJOU/ROvcdKSH2mo8N06pn1QQOQC3xEDN8eKbD9w== X-Received: by 2002:a92:8681:: with SMTP id l1mr4888827ilh.94.1572191720944; Sun, 27 Oct 2019 08:55:20 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:20 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:03 -0600 Message-Id: <20191027155410.187957-23-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , u-boot-amlogic@groups.io Subject: [U-Boot] [PATCH 23/30] video: meson: Drop unnecessary header includes X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" These files should not be included in meson header files. Drop them and tidy up the affected C files. Signed-off-by: Simon Glass Reviewed-by: Anatolij Gustschin Acked-by: Neil Armstrong --- drivers/video/meson/meson_canvas.c | 4 ++++ drivers/video/meson/meson_plane.c | 5 +++++ drivers/video/meson/meson_vclk.c | 2 ++ drivers/video/meson/meson_venc.c | 4 ++++ drivers/video/meson/meson_vpu.c | 18 +++++++++++++++--- drivers/video/meson/meson_vpu.h | 17 +++++------------ drivers/video/meson/meson_vpu_init.c | 4 ++++ include/video.h | 2 ++ 8 files changed, 41 insertions(+), 15 deletions(-) diff --git a/drivers/video/meson/meson_canvas.c b/drivers/video/meson/meson_canvas.c index b71cbfcc0b..eccac2f8f2 100644 --- a/drivers/video/meson/meson_canvas.c +++ b/drivers/video/meson/meson_canvas.c @@ -6,6 +6,10 @@ * Author: Neil Armstrong */ +#include +#include +#include + #include "meson_vpu.h" /* DMC Registers */ diff --git a/drivers/video/meson/meson_plane.c b/drivers/video/meson/meson_plane.c index 2bc9327e1e..8edf451f13 100644 --- a/drivers/video/meson/meson_plane.c +++ b/drivers/video/meson/meson_plane.c @@ -6,6 +6,11 @@ * Author: Neil Armstrong */ +#include +#include +#include +#include + #include "meson_vpu.h" /* OSDx_BLKx_CFG */ diff --git a/drivers/video/meson/meson_vclk.c b/drivers/video/meson/meson_vclk.c index 0f628e920b..01bfa4bcb8 100644 --- a/drivers/video/meson/meson_vclk.c +++ b/drivers/video/meson/meson_vclk.c @@ -6,6 +6,8 @@ * Author: Neil Armstrong */ +#include +#include #include #include "meson_vpu.h" #include diff --git a/drivers/video/meson/meson_venc.c b/drivers/video/meson/meson_venc.c index 5da4b3f096..89e859b02a 100644 --- a/drivers/video/meson/meson_venc.c +++ b/drivers/video/meson/meson_venc.c @@ -6,7 +6,11 @@ * Author: Neil Armstrong */ +#include +#include #include +#include +#include #include "meson_vpu.h" enum { diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c index c3af9b013c..4eb66398d0 100644 --- a/drivers/video/meson/meson_vpu.c +++ b/drivers/video/meson/meson_vpu.c @@ -6,13 +6,17 @@ * Author: Neil Armstrong */ -#include "meson_vpu.h" +#include +#include +#include #include -#include -#include #include #include #include +#include +#include + +#include "meson_vpu.h" #include "meson_registers.h" #include "simplefb_common.h" @@ -27,6 +31,14 @@ static struct meson_framebuffer { bool is_cvbs; } meson_fb = { 0 }; +bool meson_vpu_is_compatible(struct meson_vpu_priv *priv, + enum vpu_compatible family) +{ + enum vpu_compatible compat = dev_get_driver_data(priv->dev); + + return compat == family; +} + static int meson_vpu_setup_mode(struct udevice *dev, struct udevice *disp) { struct video_uc_platdata *uc_plat = dev_get_uclass_platdata(dev); diff --git a/drivers/video/meson/meson_vpu.h b/drivers/video/meson/meson_vpu.h index 0d9fddad2e..d9588c3775 100644 --- a/drivers/video/meson/meson_vpu.h +++ b/drivers/video/meson/meson_vpu.h @@ -9,14 +9,12 @@ #ifndef __MESON_VPU_H__ #define __MESON_VPU_H__ -#include -#include #include -#include -#include -#include #include "meson_registers.h" +struct display_timing; +struct udevice; + enum { /* Maximum size we support */ VPU_MAX_WIDTH = 3840, @@ -38,13 +36,8 @@ struct meson_vpu_priv { void __iomem *dmc_base; }; -static inline bool meson_vpu_is_compatible(struct meson_vpu_priv *priv, - enum vpu_compatible family) -{ - enum vpu_compatible compat = dev_get_driver_data(priv->dev); - - return compat == family; -} +bool meson_vpu_is_compatible(struct meson_vpu_priv *priv, + enum vpu_compatible family); #define hhi_update_bits(offset, mask, value) \ writel_bits(mask, value, priv->hhi_base + offset) diff --git a/drivers/video/meson/meson_vpu_init.c b/drivers/video/meson/meson_vpu_init.c index 12f8c4194a..8408c59eaa 100644 --- a/drivers/video/meson/meson_vpu_init.c +++ b/drivers/video/meson/meson_vpu_init.c @@ -8,6 +8,10 @@ #define DEBUG +#include +#include +#include + #include "meson_vpu.h" /* HHI Registers */ diff --git a/include/video.h b/include/video.h index 485071d072..e7c58e86cb 100644 --- a/include/video.h +++ b/include/video.h @@ -17,6 +17,8 @@ #include +struct udevice; + struct video_uc_platdata { uint align; uint size; From patchwork Sun Oct 27 15:54:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185077 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="JDWH3FuX"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N9m729Rz9sPK for ; Mon, 28 Oct 2019 03:10:36 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id A025BC21E57; Sun, 27 Oct 2019 16:01:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E9A26C21DB6; Sun, 27 Oct 2019 15:56:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0460DC21E2F; Sun, 27 Oct 2019 15:56:03 +0000 (UTC) Received: from mail-il1-f194.google.com (mail-il1-f194.google.com [209.85.166.194]) by lists.denx.de (Postfix) with ESMTPS id 53B0FC21E2F for ; Sun, 27 Oct 2019 15:55:24 +0000 (UTC) Received: by mail-il1-f194.google.com with SMTP id h5so2604971ilh.11 for ; Sun, 27 Oct 2019 08:55:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rW//XnoWDc3M/hpnTA08P0dnnAHekJtBNLZGHCUDcBU=; b=JDWH3FuX2Iw19JzYpW7Gcq7vRDTEC+zA8dvPDgul0Yizc/LDPxDFH+Xi0CxiSmJSFZ s+Gcdd1jHwfHL4AgRdORPRwkEodn480n/sSuRht+QY7EMorPdBnqs8LAz5hUgJWAZrs8 e2MU6n64vz4I+FhNSLxkPMdGvceLHctjTQU/g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rW//XnoWDc3M/hpnTA08P0dnnAHekJtBNLZGHCUDcBU=; b=d92qcAh0Q/pdMlfeJBd51dIXfH3cPMK1Rorytd//0+ATv3WVlv5IupCwqjpHMBcLLZ f3IIh9diRuiX3sopssZoW4FdKuHBKRzRzFtzeKLYyWy5Mbpn/DpDQXokVD1HC5zBpdhC rgnYyplOIjxotHVanCA4vweFT4ktOT7Dgde8DTsThu/77YebD3tQGgMlidw0zLgCcFV4 oIPevT7kNt3oWb36hJPdzg8A8DcSVwNZFnD3IYvdzJ3WyWGFHk+LSs8Ioaf4rbb2W500 hkzZw+0feq7VFtiw1V4Id/sb53FToAwAfNsdW2kKLIaglECMsZ+6u2SWRJuQbKFoYp3B Y8kw== X-Gm-Message-State: APjAAAVVw2v5yGTZcX4BeVvNmGLZ2Ke9U5s8d6C+SBRSDTWeVVaKjCUe bYhskesmfLLNQfwHaM+tsPkGncv9BQ6WpA== X-Google-Smtp-Source: APXvYqxvd0Od7AOnfBnqWx89CSutHkmVwJ7PmysO4QZe0/m5xzsZXgg2RxpJHJx9HzRr9zz0GWVoTA== X-Received: by 2002:a92:9e4c:: with SMTP id q73mr15601238ili.53.1572191723169; Sun, 27 Oct 2019 08:55:23 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:22 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:04 -0600 Message-Id: <20191027155410.187957-24-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Ryder Lee , GSS_MTK_Uboot_upstream Subject: [U-Boot] [PATCH 24/30] mediatek: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Signed-off-by: Simon Glass --- arch/arm/include/asm/arch-mediatek/reset.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-mediatek/reset.h b/arch/arm/include/asm/arch-mediatek/reset.h index 9704666d24..4ba0bad94e 100644 --- a/arch/arm/include/asm/arch-mediatek/reset.h +++ b/arch/arm/include/asm/arch-mediatek/reset.h @@ -6,7 +6,7 @@ #ifndef __MEDIATEK_RESET_H #define __MEDIATEK_RESET_H -#include +struct udevice; int mediatek_reset_bind(struct udevice *pdev, u32 regofs, u32 num_regs); From patchwork Sun Oct 27 15:54:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185058 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="YJm3yzVY"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N2m6sbkz9sPK for ; Mon, 28 Oct 2019 03:04:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 93524C21DFD; Sun, 27 Oct 2019 16:01:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4BF3FC21EB4; Sun, 27 Oct 2019 15:56:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 38257C21EA6; Sun, 27 Oct 2019 15:56:06 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id 57BA7C21E34 for ; Sun, 27 Oct 2019 15:55:26 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id p6so7729572iod.7 for ; Sun, 27 Oct 2019 08:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+2pA3Yi2oRTYFoIvRaFDjG6Bi2VjIvRjBhBDGfdcZhw=; b=YJm3yzVYdSUkXDrSnStEDntFBa/SmnrO8JRF762FuevyRjWEXDa0ubd1GRSkh//dNk JiJe15PkAsl2y+JT2k+jifM3cYjEDcNlasWbE4RNn7KCvBTAM+cV0bmbBS0MJDRy26sa a/84X3JmwNkWDNol05sR2UOXBYhn4Odm9uz/8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+2pA3Yi2oRTYFoIvRaFDjG6Bi2VjIvRjBhBDGfdcZhw=; b=EkOXphCakC35z7E6EMORQcwpadFgG7NZBMqJcsSDDcMXkOZ5oQZ83r+zIe9DbY22uz aeJ84JnArJHRS4vBlvZQGm8x9YtJetEl4e9R7MCHvCIvFrvSGctkV/oWqNRyrpgsJbTE NyyHyZykCHKsRZX/Hgzpi0PL+XsDaMhguD0lr1tnQ+dIwgrTJgg5h8KVSyDykDloIGKp 8Biujr8cg8M+KW1JZ8XzaI4qy8BG/yaVV2oL6H+GJeG5DFFqQyvJQ8KotII9ShSswnix amJs8CxvTjSb+8Si5bSx0htRkG4TCO2r4aI5agjEJjK/4kOXw1Soj/5z8wQIsK/mAgIS I8lA== X-Gm-Message-State: APjAAAWH1HGFBpbU5JBXcOWj+fXEYRYyfhRZRf8EqieEthGpMaJTrg6f YhAWIdKafA4V7wDQZOh3+cFLl6rP0bVaDw== X-Google-Smtp-Source: APXvYqz4tKCRd5GOfRjxCEtiJxRhRVLXv+LH0+27H0rmxKrCtluYOT+A8aU84kATDqcUk1MRt3lxbA== X-Received: by 2002:a02:300f:: with SMTP id q15mr13830330jaq.6.1572191725145; Sun, 27 Oct 2019 08:55:25 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:24 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:05 -0600 Message-Id: <20191027155410.187957-25-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 25/30] mscc: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it from each one and use a forward declaration instead. Signed-off-by: Simon Glass --- arch/mips/mach-mscc/include/mach/jr2/jr2.h | 3 --- arch/mips/mach-mscc/include/mach/luton/luton.h | 3 --- arch/mips/mach-mscc/include/mach/ocelot/ocelot.h | 3 --- arch/mips/mach-mscc/include/mach/serval/serval.h | 3 --- arch/mips/mach-mscc/include/mach/servalt/servalt.h | 3 --- board/mscc/servalt/servalt.c | 2 ++ 6 files changed, 2 insertions(+), 15 deletions(-) diff --git a/arch/mips/mach-mscc/include/mach/jr2/jr2.h b/arch/mips/mach-mscc/include/mach/jr2/jr2.h index 67244f63fa..3a779e7035 100644 --- a/arch/mips/mach-mscc/include/mach/jr2/jr2.h +++ b/arch/mips/mach-mscc/include/mach/jr2/jr2.h @@ -8,9 +8,6 @@ #ifndef _MSCC_JR2_H_ #define _MSCC_JR2_H_ -#include -#include - /* * Target offset base(s) */ diff --git a/arch/mips/mach-mscc/include/mach/luton/luton.h b/arch/mips/mach-mscc/include/mach/luton/luton.h index 19f02ede66..dda665fc15 100644 --- a/arch/mips/mach-mscc/include/mach/luton/luton.h +++ b/arch/mips/mach-mscc/include/mach/luton/luton.h @@ -8,9 +8,6 @@ #ifndef _MSCC_OCELOT_H_ #define _MSCC_OCELOT_H_ -#include -#include - /* * Target offset base(s) */ diff --git a/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h b/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h index 2cb2135d37..72b07c33cd 100644 --- a/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h +++ b/arch/mips/mach-mscc/include/mach/ocelot/ocelot.h @@ -8,9 +8,6 @@ #ifndef _MSCC_OCELOT_H_ #define _MSCC_OCELOT_H_ -#include -#include - /* * Target offset base(s) */ diff --git a/arch/mips/mach-mscc/include/mach/serval/serval.h b/arch/mips/mach-mscc/include/mach/serval/serval.h index 763d18fe62..a78c6e59bb 100644 --- a/arch/mips/mach-mscc/include/mach/serval/serval.h +++ b/arch/mips/mach-mscc/include/mach/serval/serval.h @@ -8,9 +8,6 @@ #ifndef _MSCC_SERVAL_H_ #define _MSCC_SERVAL_H_ -#include -#include - /* * Target offset base(s) */ diff --git a/arch/mips/mach-mscc/include/mach/servalt/servalt.h b/arch/mips/mach-mscc/include/mach/servalt/servalt.h index 9015bc7dad..4d7d0886dd 100644 --- a/arch/mips/mach-mscc/include/mach/servalt/servalt.h +++ b/arch/mips/mach-mscc/include/mach/servalt/servalt.h @@ -8,9 +8,6 @@ #ifndef _MSCC_SERVALT_H_ #define _MSCC_SERVALT_H_ -#include -#include - /* * Target offset base(s) */ diff --git a/board/mscc/servalt/servalt.c b/board/mscc/servalt/servalt.c index 566f9765c2..541a84c9cf 100644 --- a/board/mscc/servalt/servalt.c +++ b/board/mscc/servalt/servalt.c @@ -7,6 +7,8 @@ #include #include +DECLARE_GLOBAL_DATA_PTR; + enum { BOARD_TYPE_PCB116 = 0xAABBCE00, }; From patchwork Sun Oct 27 15:54:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185075 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="TagF1I9T"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N9D0J04z9sPK for ; Mon, 28 Oct 2019 03:10:06 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 5C1C3C21E57; Sun, 27 Oct 2019 16:01:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C611BC21EBF; Sun, 27 Oct 2019 15:56:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7790BC21E2C; Sun, 27 Oct 2019 15:56:08 +0000 (UTC) Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by lists.denx.de (Postfix) with ESMTPS id 7B49AC21E2C for ; Sun, 27 Oct 2019 15:55:28 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id p6so7729619iod.7 for ; Sun, 27 Oct 2019 08:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dicecm7+4fu8xeOyPARsm2XTm8EEK6mjhQw//W8q96o=; b=TagF1I9TwGrTiPd/b+WeJrUNiHPyJa9EaytnqBCrTKmuPf80QtKSi0feTy/OUIWVDr GBJRqE21Kb0e9EyMYV9abIWhgkzNPxQ/qA8OFyvjqLR/NXRsGn2lYGLL6NizjCWTX3Wy n6XmtAXOv7Ubyh89FK6ydI6fzkCFRsSdnuV/w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dicecm7+4fu8xeOyPARsm2XTm8EEK6mjhQw//W8q96o=; b=EY1Ec5ne7soeG1WbWIoFoCHKY5Qi+yVlOEKOPcIBpiCeSvh5myyfJBpneqw0XpwsaY dlnspTXoCGzT7qS3IwcV9vV20rviGZUTNerM5nkXrboknpn9OSFf6nB3656VNKuUoJ1r DiTyJ99LFNkZDDwuXnl4zKRGaKZBZj4loe/iskROJiXUV5E6e2r7eE8NItHNms4oQkVl U2ububyL2F5JOJB/SB38RsJU+PBrnaISaB6SyBHJ5Eyu123Uerlgk4xjmy01Y1gtiByL oY4D6dlEfsfj2zKRmN/BvFej1mxw6UuFRMPM86LKmoAxMHkZadkOq1rTuiOQy0ovl0Jv iv0g== X-Gm-Message-State: APjAAAWtxgsd8dW5AO5M/XVIqn6QoZAvJtjxlef96E/vNyY3ygJv630Z 1O5nZLtQuramnAqpHVllzVqOtrJaKShhvg== X-Google-Smtp-Source: APXvYqyo48wGOUmFODpfphvUAKjaCm7luBjAcmqOaXHwqFtHb0VAh+ltVtqWsSBki/vWkcgFX8MMkQ== X-Received: by 2002:a6b:cf13:: with SMTP id o19mr12817142ioa.182.1572191727291; Sun, 27 Oct 2019 08:55:27 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:26 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:06 -0600 Message-Id: <20191027155410.187957-26-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: uboot-stm32@st-md-mailman.stormreply.com, Tom Rini Subject: [U-Boot] [PATCH 26/30] adc: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Drop the common.h inclusion also. Signed-off-by: Simon Glass --- drivers/adc/stm32-adc-core.c | 1 + drivers/adc/stm32-adc-core.h | 4 ++-- drivers/adc/stm32-adc.c | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/adc/stm32-adc-core.c b/drivers/adc/stm32-adc-core.c index 04b6a8a2f5..d61c23b91a 100644 --- a/drivers/adc/stm32-adc-core.c +++ b/drivers/adc/stm32-adc-core.c @@ -7,6 +7,7 @@ */ #include +#include #include #include #include "stm32-adc-core.h" diff --git a/drivers/adc/stm32-adc-core.h b/drivers/adc/stm32-adc-core.h index ba0e10e6cc..05968dbcc8 100644 --- a/drivers/adc/stm32-adc-core.h +++ b/drivers/adc/stm32-adc-core.h @@ -26,9 +26,9 @@ #define STM32_ADC_MAX_ADCS 3 #define STM32_ADCX_COMN_OFFSET 0x300 -#include #include -#include + +struct udevice; /** * struct stm32_adc_common - stm32 ADC driver common data (for all instances) diff --git a/drivers/adc/stm32-adc.c b/drivers/adc/stm32-adc.c index 029338e4af..c928980e1d 100644 --- a/drivers/adc/stm32-adc.c +++ b/drivers/adc/stm32-adc.c @@ -8,6 +8,7 @@ #include #include +#include #include #include #include "stm32-adc-core.h" From patchwork Sun Oct 27 15:54:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185067 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="iEFMh0MV"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N4q2zXNz9sPK for ; Mon, 28 Oct 2019 03:06:19 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 17FADC21C3F; Sun, 27 Oct 2019 16:01:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 450B1C21EC9; Sun, 27 Oct 2019 15:56:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5EAD0C21D83; Sun, 27 Oct 2019 15:56:10 +0000 (UTC) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) by lists.denx.de (Postfix) with ESMTPS id 4C47EC21E16 for ; Sun, 27 Oct 2019 15:55:31 +0000 (UTC) Received: by mail-il1-f195.google.com with SMTP id d83so5856207ilk.7 for ; Sun, 27 Oct 2019 08:55:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UYCsPxMsn/DmYIV+ctmdT+HMmL0jtR0LyXuEjiLwGKY=; b=iEFMh0MVJzWr8906ShjSbpG3dgv9K8gZO1t6AJyoFg0NCUvtxy8f5Xqd4Suinpd8AC Ut8oQcayNznZAVDx/w97BkmeB1cb26Y9tPbYMsDUakinAQq9OfV0RKZT8ni0lM2T4gaN kNTo7X8zM+n3dRh9qJmQjmXUjIyQH3TLCF6L8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UYCsPxMsn/DmYIV+ctmdT+HMmL0jtR0LyXuEjiLwGKY=; b=tsbu6OQcf0X1CIm9nUP4mH8pxi9+0Uube9kiaUJWjcrqlvJozU1p595dXRzVPhpcAI OCQGEMZnvFrCY1gw8Xd1vYCMX8gxjQZR3oXIsd3M3Z+b3ZoHtTL7F4kaKLSVMbZzlxJk 1Uz3VHJmmIYYSOGBNPBuzUezXYyxr27Ib1B+6PquUCHG7ZP0yRKME57bbAbF6i3d474g 1e59GiOok5kqOtsvE6HV70Y0u0mTh3iRzOLY5KfknioXj5VXRdXQBTY7n+WT3QDZApq4 ttWOWD34jM5ROtcMZcwzXbCm5e1jh9KMwiT6gdOjJGucgU01qAit3ilNe7FyAXlC4WeH ZHFw== X-Gm-Message-State: APjAAAVs2hhCpQqxS5yCC74lEOrZq/zPgFo0COkxcuGO6SyyhuHNFpS3 kV8fcU+zdaXgjEXFlv4f4ar2BreSgh9ayg== X-Google-Smtp-Source: APXvYqzp6r5HqoCUfPG2K6ETXDL8RuJ5hJYBG0NKxXKcRN3stKpkk9dAiR8lm5E0irfu9q4+J25WMw== X-Received: by 2002:a92:d102:: with SMTP id a2mr2572215ilb.136.1572191729240; Sun, 27 Oct 2019 08:55:29 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:28 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:07 -0600 Message-Id: <20191027155410.187957-27-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 27/30] nand: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Signed-off-by: Simon Glass --- drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c | 4 ++++ drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c index 96b27e6e5a..01c2b922c8 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.c @@ -1,6 +1,10 @@ // SPDX-License-Identifier: GPL-2.0+ #include +#include +#include +#include + #include "brcmnand_compat.h" struct clk *devm_clk_get(struct udevice *dev, const char *id) diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h index 02cab0f828..408b2d809a 100644 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand_compat.h @@ -3,8 +3,8 @@ #ifndef __BRCMNAND_COMPAT_H #define __BRCMNAND_COMPAT_H -#include -#include +struct clk; +struct udevice; struct clk *devm_clk_get(struct udevice *dev, const char *id); int clk_prepare_enable(struct clk *clk); From patchwork Sun Oct 27 15:54:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185065 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="n3btIOVf"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N4c0492z9sPK for ; Mon, 28 Oct 2019 03:06:07 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id AA2CDC21DB5; Sun, 27 Oct 2019 16:01:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A45DAC21ECF; Sun, 27 Oct 2019 15:56:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8A5E6C21DCA; Sun, 27 Oct 2019 15:56:12 +0000 (UTC) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by lists.denx.de (Postfix) with ESMTPS id 083ECC21DCA for ; Sun, 27 Oct 2019 15:55:34 +0000 (UTC) Received: by mail-io1-f66.google.com with SMTP id z19so7772970ior.0 for ; Sun, 27 Oct 2019 08:55:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aA7HMFT+IhHyAXESBN8n5JBxsRJYS1wlAmp7CBBQOIk=; b=n3btIOVf2YQt/1pgCiJnxeZqoyWBIQI24LS/J8TFeyFDixzFIURr3vbNXitpTj48ye 2Of3gvyE4VpSghcUdKbX7/d5+cdbzdWc5XZTcjX/OLlDEd398gifkcffnO3GzQPxNVr/ bTmXTt7iFwcLPBWLzjk7QT7YD/DDXH7yJxlPU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aA7HMFT+IhHyAXESBN8n5JBxsRJYS1wlAmp7CBBQOIk=; b=LFMbkTgz8LXi4Yms33y8onsj4NL0kRQkHpORpds9OIrwwQuItDv3RRRtBk7mUh1bOX LmzS20qIAMJiGzqIed5cZloscsKDinsRmtaUGdl8uipUGLRQk6lJT+44IsfcMvUCLiuX 8A/wUXZv6MxkONJ431UfaQBpVrnOqXpIjexQOwdERbTSgx60zlk5eqbKTnGu7fcLR3mr Yd/vYj8f0/tjQUaodYef30/MCodgGlKivkBBwp++bJ/9fQ/mps/jFWjtcqqQRaCW7pcL yAqBix3c7/QpstscEvL1NrRvZZEN5LXIBRPKBp//Y4wXdyz19T0Ey0sRT19yNs20C1Nm ceEw== X-Gm-Message-State: APjAAAUlpRqxntr8kDO4FpPGm94cHxg8gcWWbouNTl1qNNPWNDaffx3L YQXa+1EDzpFVZ97EvBbjOCxrZvJqjlmGtg== X-Google-Smtp-Source: APXvYqxLk4+wcrhjfnD32BOUpXcPqVNdkEc1egcK3+9jX/Jg3L/7F1XPtLwd3dNJrsHgNG0lvvnbfQ== X-Received: by 2002:a05:6638:20a:: with SMTP id e10mr13874249jaq.27.1572191732819; Sun, 27 Oct 2019 08:55:32 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:32 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:08 -0600 Message-Id: <20191027155410.187957-28-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini Subject: [U-Boot] [PATCH 28/30] ufs: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Also drop asm.io Signed-off-by: Simon Glass --- drivers/ufs/cdns-platform.c | 1 + drivers/ufs/ufs.c | 2 +- drivers/ufs/ufs.h | 5 ++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/ufs/cdns-platform.c b/drivers/ufs/cdns-platform.c index c80f4253e4..341fd217c7 100644 --- a/drivers/ufs/cdns-platform.c +++ b/drivers/ufs/cdns-platform.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "ufs.h" diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index 23306863d5..89a32d38cd 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -16,7 +16,7 @@ #include #include #include - +#include #include #include "ufs.h" diff --git a/drivers/ufs/ufs.h b/drivers/ufs/ufs.h index e0bde93776..069888fdd9 100644 --- a/drivers/ufs/ufs.h +++ b/drivers/ufs/ufs.h @@ -2,11 +2,10 @@ #ifndef __UFS_H #define __UFS_H -#include -#include - #include "unipro.h" +struct udevice; + #define UFS_CDB_SIZE 16 #define UPIU_TRANSACTION_UIC_CMD 0x1F #define UIC_CMD_SIZE (sizeof(u32) * 4) From patchwork Sun Oct 27 15:54:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185069 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Z4OrxIMA"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N7B46S1z9sPK for ; Mon, 28 Oct 2019 03:08:22 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 4101FC21DA1; Sun, 27 Oct 2019 16:01:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0BF8AC21EDC; Sun, 27 Oct 2019 15:56:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 80302C21E5B; Sun, 27 Oct 2019 15:56:14 +0000 (UTC) Received: from mail-il1-f196.google.com (mail-il1-f196.google.com [209.85.166.196]) by lists.denx.de (Postfix) with ESMTPS id E46C7C21E36 for ; Sun, 27 Oct 2019 15:55:35 +0000 (UTC) Received: by mail-il1-f196.google.com with SMTP id y5so5867990ilb.5 for ; Sun, 27 Oct 2019 08:55:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5OB40e4V2omxBBLur0y8zAqGWJl11VZLIpLetCIYUNs=; b=Z4OrxIMAqAqT7H++H4fgORYqcCPL6vi7Hz+9Os1UpbJmpAohsPIphNQsk5rGVRkM4/ VHQFhxcPUN4m2nTD1aUXglLsY0ivkxq88t4Sh7paiGillg0KRMQ3rchRC30WPbP89Vjc 2uISFYviMpxuYq70/MNRzUt9QG29J5sZxGENU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5OB40e4V2omxBBLur0y8zAqGWJl11VZLIpLetCIYUNs=; b=FzhNlFSSmo7fvId130Yhhmq/QDFU2q1ajhaKIBY9Ur2uSlhxObKRslSIrwjibSOUYS fx4vlyn+QEFROGHlwgJJBKG3HuesZ7IcEIhzOTHQ5XwDY6erL+4RjdHhwSUgYXchCZv1 3DNMvUN2KyLrr6sd2EbNKUoaRJvn21FWaR99x0TEU9l6IKO3JerHyScaLNs7jbmZD6/E emNjNJ9YgI0tmOeJQvgJ88atGFPvO5nsM8k3Z3X29Mzm/0mY4YYuDOhwgPEXD75kDT01 HCtjyQ35dDY/Yi3F57qaV7TIAcFQwc2VcQr6MBjLvee9c7BLhatjZkTQaQbPyn5kH8Tt F+JA== X-Gm-Message-State: APjAAAVeWFdms64iZZ5MOtwMMo6n1fdW2H2tTFNwKxnXBDLSQRKVRvCR SQ0siS06Wz9yusupRZ5UFkU6pGbv2ixRwQ== X-Google-Smtp-Source: APXvYqyNzOcrmIrBH99sT/GNXMjWBW8rFmUAh5ojB/keZ3FwwHPlrSGTihjjZJJMWY4nmNMQBL34ig== X-Received: by 2002:a92:1907:: with SMTP id 7mr16066477ilz.72.1572191734722; Sun, 27 Oct 2019 08:55:34 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:34 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:09 -0600 Message-Id: <20191027155410.187957-29-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Marek Vasut , Tom Rini , Remy Bohmer , Sven Schwermer , Michal Suchanek Subject: [U-Boot] [PATCH 29/30] usb: Drop dm.h header file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This header file should not be included in other header files. Remove it and use a forward declaration instead. Also move the inline function out into a C file. We should not include C code in headers. Signed-off-by: Simon Glass --- drivers/usb/musb-new/musb_uboot.c | 37 +++++++++++++++++++++++++ drivers/usb/musb-new/pic32.c | 1 + drivers/usb/musb-new/usb-compat.h | 45 +++++++------------------------ 3 files changed, 47 insertions(+), 36 deletions(-) diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index 9eb593402e..98df080e50 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -1,5 +1,6 @@ #include #include +#include #include #include #include @@ -449,3 +450,39 @@ struct musb *musb_register(struct musb_hdrc_platform_data *plat, void *bdata, return *musbp; } + +#if CONFIG_IS_ENABLED(DM_USB) +struct usb_device *usb_dev_get_parent(struct usb_device *udev) +{ + struct udevice *parent = udev->dev->parent; + + /* + * When called from usb-uclass.c: usb_scan_device() udev->dev points + * to the parent udevice, not the actual udevice belonging to the + * udev as the device is not instantiated yet. + * + * If dev is an usb-bus, then we are called from usb_scan_device() for + * an usb-device plugged directly into the root port, return NULL. + */ + if (device_get_uclass_id(udev->dev) == UCLASS_USB) + return NULL; + + /* + * If these 2 are not the same we are being called from + * usb_scan_device() and udev itself is the parent. + */ + if (dev_get_parent_priv(udev->dev) != udev) + return udev; + + /* We are being called normally, use the parent pointer */ + if (device_get_uclass_id(parent) == UCLASS_USB_HUB) + return dev_get_parent_priv(parent); + + return NULL; +} +#else +struct usb_device *usb_dev_get_parent(struct usb_device *udev) +{ + return udev->parent; +} +#endif diff --git a/drivers/usb/musb-new/pic32.c b/drivers/usb/musb-new/pic32.c index 3a19900e21..b41b7ee154 100644 --- a/drivers/usb/musb-new/pic32.c +++ b/drivers/usb/musb-new/pic32.c @@ -10,6 +10,7 @@ */ #include +#include #include #include "linux-compat.h" #include "musb_core.h" diff --git a/drivers/usb/musb-new/usb-compat.h b/drivers/usb/musb-new/usb-compat.h index f2c18ad3a2..1c66c4fe36 100644 --- a/drivers/usb/musb-new/usb-compat.h +++ b/drivers/usb/musb-new/usb-compat.h @@ -1,9 +1,10 @@ #ifndef __USB_COMPAT_H__ #define __USB_COMPAT_H__ -#include #include "usb.h" +struct udevice; + struct usb_hcd { void *hcd_priv; }; @@ -67,40 +68,12 @@ static inline int usb_hcd_unmap_urb_for_dma(struct usb_hcd *hcd, return 0; } -#if CONFIG_IS_ENABLED(DM_USB) -static inline struct usb_device *usb_dev_get_parent(struct usb_device *udev) -{ - struct udevice *parent = udev->dev->parent; - - /* - * When called from usb-uclass.c: usb_scan_device() udev->dev points - * to the parent udevice, not the actual udevice belonging to the - * udev as the device is not instantiated yet. - * - * If dev is an usb-bus, then we are called from usb_scan_device() for - * an usb-device plugged directly into the root port, return NULL. - */ - if (device_get_uclass_id(udev->dev) == UCLASS_USB) - return NULL; - - /* - * If these 2 are not the same we are being called from - * usb_scan_device() and udev itself is the parent. - */ - if (dev_get_parent_priv(udev->dev) != udev) - return udev; - - /* We are being called normally, use the parent pointer */ - if (device_get_uclass_id(parent) == UCLASS_USB_HUB) - return dev_get_parent_priv(parent); - - return NULL; -} -#else -static inline struct usb_device *usb_dev_get_parent(struct usb_device *dev) -{ - return dev->parent; -} -#endif +/** + * usb_dev_get_parent() - Get the parent of a USB device + * + * @udev: USB struct containing information about the device + * @return associated device for which udev == dev_get_parent_priv(dev) + */ +struct usb_device *usb_dev_get_parent(struct usb_device *udev); #endif /* __USB_COMPAT_H__ */ From patchwork Sun Oct 27 15:54:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1185060 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="SlWOjHGJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 471N312VFSz9sPK for ; Mon, 28 Oct 2019 03:04:45 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 1AAC1C21DDC; Sun, 27 Oct 2019 16:02:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A8ADCC21EE7; Sun, 27 Oct 2019 15:56:20 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B8D45C21E36; Sun, 27 Oct 2019 15:56:16 +0000 (UTC) Received: from mail-io1-f65.google.com (mail-io1-f65.google.com [209.85.166.65]) by lists.denx.de (Postfix) with ESMTPS id CA236C21DB6 for ; Sun, 27 Oct 2019 15:55:37 +0000 (UTC) Received: by mail-io1-f65.google.com with SMTP id s17so606400iol.12 for ; Sun, 27 Oct 2019 08:55:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OCks10XKDMVKF0tNkiSa6/s/fSGbCL/u2UdMwDfC4Go=; b=SlWOjHGJVQ/bRM3xTs2a8E8ed5Ke2iYbOyNuWyEC0IgKe/hUPsFOv4XWCudS1Sk8By YmoMSNSpAfOOiS3t1IKOUV+8BkTrgUKvLHvCytKW3bCbmIsL7dw5krHX1yLuDYsT/7+r bp5kejdjbw9TousT5lkY6V/TUHn7ZKTbhz51E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OCks10XKDMVKF0tNkiSa6/s/fSGbCL/u2UdMwDfC4Go=; b=XUtKPeAIGf7HexvvrbKBVCdsFOiTohAPsHYzwcj4ML212zNYTsoh+M20nB7oOEmXMG OVh7B48yfW52FriwsmgO9Z8FgP5wTvZi+cRBth76Esc6N74JyU9AWdkcBOSJ3/FFhoyt 7tls6x8Zo8IuJjufa4roUNng8znuPEN6Co2NiDOmVSoLWkGjNhmeqryKaZiUsmE/398+ 10cfq4as1hlSPdqux7DZRCrE/mkpHWVUBgj+gPYgYzirKyrKM+2cerOvcujDmmySN3R+ 2NDV23tzAdDAvIRiGDuqzbVYc6q0r0Ox9uBMCSiOQCmtE1Fh8UtrcuzZ7smyohuoNXal 3lgQ== X-Gm-Message-State: APjAAAU2LnxSIIC37gyJl1GN6ZRzw26eRd4MHt2wM41di4GIh0lvWnYW 1rXyY68WQu6uMkeaekTJtiNiXMlkuW2x4A== X-Google-Smtp-Source: APXvYqyLIEMl+WWj1CFONcqOwQT47Rv/1LY/OIS6zG6mHdmFluDipLMEbG3+zhmohL/ZOS/gJo8+ew== X-Received: by 2002:a02:c7d2:: with SMTP id s18mr7418205jao.88.1572191736650; Sun, 27 Oct 2019 08:55:36 -0700 (PDT) Received: from kiwi.bld.corp.google.com ([2620:15c:183:0:8223:87c:a681:66aa]) by smtp.gmail.com with ESMTPSA id n3sm1215070ilm.8.2019.10.27.08.55.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 08:55:36 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 27 Oct 2019 09:54:10 -0600 Message-Id: <20191027155410.187957-30-sjg@chromium.org> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog In-Reply-To: <20191027155410.187957-1-sjg@chromium.org> References: <20191027155410.187957-1-sjg@chromium.org> MIME-Version: 1.0 Cc: Tom Rini , Pavel Herrmann Subject: [U-Boot] [PATCH 30/30] dm: core: Guard against including dm.h in header files X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Header files generally should not include header files just for a struct, since forward declarations work just as well and reduce overhead. Add a warning for dm.h being included, since this has crept into U-Boot. Signed-off-by: Simon Glass dm: Avoid including dm.h in header files At present a small number of header files include the dm.h header file. The intent with driver model is for C files that use it to define dm.h themselves. This helps indicate that driver model is supported and also reduces the amount of code pointlessly included and relying on header guards. Ultimately (combined with the reduction in size of common.h) this should speed up U-Boot compilation. This series removes all uses of dm.h in header files and adds a warning to avert more such activity. END --- include/dm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/dm.h b/include/dm.h index 2e1afda440..a1b84169e6 100644 --- a/include/dm.h +++ b/include/dm.h @@ -3,6 +3,10 @@ * Copyright (c) 2013 Google, Inc */ +#ifdef _DM_H_ +#warning "Suspect dm.h is included from a header file - please fix" +#endif + #ifndef _DM_H_ #define _DM_H_