From patchwork Sun Dec 12 20:01:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sander Vanheule X-Patchwork-Id: 1567034 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=NABkwG+4; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=svanheule.net header.i=@svanheule.net header.a=rsa-sha256 header.s=mail1707 header.b=F2H6RtAY; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JBwcc34B0z9s3q for ; Mon, 13 Dec 2021 07:05:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vZ3m8zDZxxD5a0ULm8TD+Ydvi2C7arweOTdALsZuKfY=; b=NABkwG+4wuJsnc jwuslBIk8tNqnoB9YBNBQXsPUtexuX68014DwZvmc20uHkfRwh97zz3m967OkbUc4sYjM1XohlNjb ABOfq+qX4+fw+DTGHq4xXH1rN/yvofMwFuz4KijJ+OjvZkEtDqtAgqken6fg3GuoJCpxX0q9/kGJ1 Z0eeuDQr5t9LUguxLSjILyg4Z1/fb6AfHptP+z3Syuo/J0hBIc4bspwraVtIp0v3/DlJJh6O1mJj2 xqzLpStRC8w5f+5cjcEBEuRX//0Avf4a3dKigTJCXyYLzUXzMRmlouEmgafPfHE12RdoLVCJ5oOVT ASGKBm3BlDlXjUK1smkA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwV4h-0077TI-PZ; Sun, 12 Dec 2021 20:04:00 +0000 Received: from polaris.svanheule.net ([2a00:c98:2060:a004:1::200]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mwV2v-0076qU-L7 for openwrt-devel@lists.openwrt.org; Sun, 12 Dec 2021 20:02:11 +0000 Received: from terra.local.svanheule.net (unknown [IPv6:2a02:a03f:eafe:c901:9d78:c664:81ab:1c5b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sander@svanheule.net) by polaris.svanheule.net (Postfix) with ESMTPSA id E8E0128010D; Sun, 12 Dec 2021 21:02:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svanheule.net; s=mail1707; t=1639339326; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5xlm4+sHAvMF1sG+qGOhdWk+iTFTrVI6BlmG3QBoqxc=; b=F2H6RtAY87KQvIYk0bIM0vsMLpng0yUyoW91A+Shi0vOHKN/IPOUdyPPGcyIi4hHR/ewBa 1sixJwynQ6Da2O9PkYj/x2dwO8HH/e+4DnQiYiQxf11h0rIfgaVrV3lYGiMrCnlHERnjKw OwRInjAWRuFZzelroGlrowIcLUU1EijLkfVA17zmKwslpGMXFAmlYmRXhtIOa9LB4DaRcE DCbS+r9AkZVoByRFr+OpN4XXJ9DO+Bsdku2sJPFOkRo8ZDOpNpNOK6W3hi30Sq5z1EGRGS kVlvIUKdvTjlr+UaXrxfj8hmrmv296kxWBHqdpTKAbE3qTjVWhr1ZAkhS6Uk8A== From: Sander Vanheule To: openwrt-devel@lists.openwrt.org Cc: INAGAKI Hiroshi , Birger Koblitz , John Crispin , Sebastian Gottschall , =?utf-8?q?Bj=C3=B8rn_Mork?= , Sander Vanheule Subject: [PATCH v2 06/14] realtek: update mach-rtl83xx.h includes Date: Sun, 12 Dec 2021 21:01:28 +0100 Message-Id: X-Mailer: git-send-email 2.33.1 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211212_120209_868883_878BC58B X-CRM114-Status: UNSURE ( 8.54 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.5 (--) X-Spam-Report: =?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?= =?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?= =?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?= =?unknown-8bit?q?ginal?= =?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?= =?unknown-8bit?q?bel?= =?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?= =?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_preview=3A__Include_the_mach-rtl83xx=2Eh_header_fr?= =?unknown-8bit?q?om_the_root_MIPS_asm_include?= =?unknown-8bit?q?_directory=2E_This_will_allow_custom_build_options_to_be_dr?= =?unknown-8bit?q?opped_once_ioremap=2Eh?= =?unknown-8bit?q?_is_no_longer_required=2E_Co-developed-by=3A_INAGAKI_Hirosh?= =?unknown-8bit?q?i_=3Cmusashino=2Eopen=40gmail=2Ecom=3E?= =?unknown-8bit?q?_Signed-off-by=3A_INAGAKI_Hiroshi_=3Cmusashino=2Eopen=40gma?= =?unknown-8bit?q?il=2Ecom=3E_Signed-off-by=3A?= =?unknown-8bit?b?IFNhbmRlciBWYW5oZXVsZSA8c2FuZGVyQHN2YW5oZXVsZS5uZXQ+IFRl?= =?unknown-8bit?b?c3RlZC1ieTogQmrDuHJuIE1vcmsgPGJqb3IgWy4uLl0g?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_Content_analysis_details=3A___=28-2=2E5_points=2C_5=2E0_re?= =?unknown-8bit?q?quired=29?= =?unknown-8bit?q?_?= =?unknown-8bit?q?_pts_rule_name______________description?= =?unknown-8bit?q?_----_----------------------_------------------------------?= =?unknown-8bit?q?--------------------?= =?unknown-8bit?q?_-2=2E3_RCVD=5FIN=5FDNSWL=5FMED______RBL=3A_Sender_listed_a?= =?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?= =?unknown-8bit?q?_medium_trust?= =?unknown-8bit?b?IFsyYTAwOmM5ODoyMDYwOmEwMDQ6MTowOjA6MjAwIGxpc3RlZCBpbl0=?= =?unknown-8bit?b?IFtsaXN0LmRuc3dsLm9yZ10=?= =?unknown-8bit?q?_-0=2E0_SPF=5FPASS_______________SPF=3A_sender_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E0_SPF=5FHELO=5FPASS__________SPF=3A_HELO_matches_SPF_?= =?unknown-8bit?q?record?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_author=27s_domain?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?= =?unknown-8bit?q?alid_DKIM_or_DK_signature?= =?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?= =?unknown-8bit?q?gnature=2C_not_necessarily?= =?unknown-8bit?q?_valid?= =?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?= =?unknown-8bit?q?_or_DK_signature_from?= =?unknown-8bit?q?_envelope-from_domain?= X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Include the mach-rtl83xx.h header from the root MIPS asm include directory. This will allow custom build options to be dropped once ioremap.h is no longer required. Co-developed-by: INAGAKI Hiroshi Signed-off-by: INAGAKI Hiroshi Signed-off-by: Sander Vanheule Tested-by: Bjørn Mork --- target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c | 2 +- target/linux/realtek/files-5.10/arch/mips/rtl838x/setup.c | 2 +- .../realtek/files-5.10/drivers/clocksource/timer-rtl9300.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c b/target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c index 3390c043347e..aea53c545159 100644 --- a/target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c +++ b/target/linux/realtek/files-5.10/arch/mips/rtl838x/prom.c @@ -19,7 +19,7 @@ #include #include -#include +#include extern char arcs_cmdline[]; extern const char __appended_dtb; diff --git a/target/linux/realtek/files-5.10/arch/mips/rtl838x/setup.c b/target/linux/realtek/files-5.10/arch/mips/rtl838x/setup.c index df29b76bbf0f..eed24ef50f59 100644 --- a/target/linux/realtek/files-5.10/arch/mips/rtl838x/setup.c +++ b/target/linux/realtek/files-5.10/arch/mips/rtl838x/setup.c @@ -24,7 +24,7 @@ #include #include -#include "mach-rtl83xx.h" +#include "asm/mach-rtl838x/mach-rtl83xx.h" extern struct rtl83xx_soc_info soc_info; diff --git a/target/linux/realtek/files-5.10/drivers/clocksource/timer-rtl9300.c b/target/linux/realtek/files-5.10/drivers/clocksource/timer-rtl9300.c index 9ab1733fe38c..f749cce64758 100644 --- a/target/linux/realtek/files-5.10/drivers/clocksource/timer-rtl9300.c +++ b/target/linux/realtek/files-5.10/drivers/clocksource/timer-rtl9300.c @@ -9,7 +9,7 @@ #include #include "timer-of.h" -#include +#include /* * Timer registers