[v2,06/14] realtek: update mach-rtl83xx.h includes

Message ID	e07f1fc8a072b56ad84f164fa071902d510705b0.1639339223.git.sander@svanheule.net
State	Changes Requested
Headers	show Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> sender: sander@svanheule.net) by polaris.svanheule.net (Postfix) with ESMTPSA id E8E0128010D; Sun, 12 Dec 2021 21:02:05 +0100 (CET) From: Sander Vanheule <sander@svanheule.net> To: openwrt-devel@lists.openwrt.org Cc: INAGAKI Hiroshi <musashino.open@gmail.com>, Birger Koblitz <mail@birger-koblitz.de>, John Crispin <john@phrozen.org>, Sebastian Gottschall <s.gottschall@dd-wrt.com>, =?utf-8?q?Bj=C3=B8rn_Mork?= <bjorn@mork.no>, Sander Vanheule <sander@svanheule.net> Subject: [PATCH v2 06/14] realtek: update mach-rtl83xx.h includes Date: Sun, 12 Dec 2021 21:01:28 +0100 Message-Id: <e07f1fc8a072b56ad84f164fa071902d510705b0.1639339223.git.sander@svanheule.net> In-Reply-To: <cover.1639339223.git.sander@svanheule.net> References: <cover.1639339223.git.sander@svanheule.net> MIME-Version: 1.0 Precedence: list Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org
Series	Switch realtek target to upstream platform \| expand [v2,00/14] Switch realtek target to upstream platform [v2,01/14] realtek: add missing gpio0 pinctrl properties [v2,02/14] realtek: add sys-led disable pinctrl for rtl930x [v2,03/14] realtek: remove hardcoded sys-led configurations [v2,04/14] realtek: use fixed-clock as CPU clock [v2,05/14] realtek: include io.h in mach-rtl83xx.h [v2,06/14] realtek: update mach-rtl83xx.h includes [v2,07/14] realtek: backport upstream platform [v2,08/14] realtek: add board file for MACH_REALTEK_RTL [v2,09/14] realtek: use correct compatible for rtl930x SoCs [v2,10/14] realtek: update driver platform dependencies [v2,11/14] realtek: switch target to upstream platform [v2,12/14] realtek: drop downstream platform [v2,13/14] realtek: modernise devicetree console setup [v2,14/14] realtek: initialise mulithreading on supported SoCs

Message ID

e07f1fc8a072b56ad84f164fa071902d510705b0.1639339223.git.sander@svanheule.net

State

Changes Requested

Headers

From: Sander Vanheule <sander@svanheule.net>
To: openwrt-devel@lists.openwrt.org
Cc: INAGAKI Hiroshi <musashino.open@gmail.com>,
 Birger Koblitz <mail@birger-koblitz.de>, John Crispin <john@phrozen.org>,
 Sebastian Gottschall <s.gottschall@dd-wrt.com>,
 =?utf-8?q?Bj=C3=B8rn_Mork?= <bjorn@mork.no>,
 Sander Vanheule <sander@svanheule.net>
Subject: [PATCH v2 06/14] realtek: update mach-rtl83xx.h includes
Date: Sun, 12 Dec 2021 21:01:28 +0100
Message-Id: 
 <e07f1fc8a072b56ad84f164fa071902d510705b0.1639339223.git.sander@svanheule.net>
In-Reply-To: <cover.1639339223.git.sander@svanheule.net>
References: <cover.1639339223.git.sander@svanheule.net>
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org>
Errors-To: 
 openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org

Series

Switch realtek target to upstream platform | expand

Commit Message

Sander Vanheule Dec. 12, 2021, 8:01 p.m. UTC

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 <musashino.open@gmail.com>
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Signed-off-by: Sander Vanheule <sander@svanheule.net>
Tested-by: Bjørn Mork <bjorn@mork.no>
---
 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 <asm/page.h>
 #include <asm/cpu.h>
 
-#include <mach-rtl83xx.h>
+#include <asm/mach-rtl838x/mach-rtl83xx.h>
 
 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 <asm/prom.h>
 #include <asm/smp-ops.h>
 
-#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 <linux/sched_clock.h>
 #include "timer-of.h"
 
-#include <mach-rtl83xx.h>
+#include <asm/mach-rtl838x/mach-rtl83xx.h>
 
 /* 
  * Timer registers

[v2,06/14] realtek: update mach-rtl83xx.h includes

Commit Message

Patch