Skip to content

Commit a1c1932

Browse files
torvaldstorvalds
committed
Merge tag 'soc-arm-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC cleanups from Arnd Bergmann: "These are all minor cleanups for platform specific code in arch/arm/ and some of the associated drivers. The majority of these are work done by Rob Herring to improve the way devicetreee header files are handled" * tag 'soc-arm-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (49 commits) ARM: davinci: Drop unused includes ARM: s5pv210: Explicitly include correct DT includes ARM: dove: Drop unused includes ARM: mvebu: Explicitly include correct DT includes Documentation/process: maintainer-soc: document dtbs_check requirement for Samsung MAINTAINER: samsung: document dtbs_check requirement for Samsung Documentation/process: maintainer-soc: add clean platforms profile MAINTAINERS: soc: reference maintainer profile ARM: nspire: Remove unused header file mmio.h ARM: nspire: Use syscon-reboot to handle restart soc: fsl: Explicitly include correct DT includes soc: xilinx: Explicitly include correct DT includes soc: sunxi: Explicitly include correct DT includes soc: rockchip: Explicitly include correct DT includes soc: mediatek: Explicitly include correct DT includes soc: aspeed: Explicitly include correct DT includes firmware: Explicitly include correct DT includes bus: Explicitly include correct DT includes ARM: spear: Explicitly include correct DT includes ARM: mvebu: Explicitly include correct DT includes ...
2 parents 47ca506 + 6e73bd2 commit a1c1932

File tree

93 files changed

+137
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+137
-336
lines changed

‎Documentation/process/maintainer-handbooks.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@ Contents:
1717

1818
maintainer-netdev
1919
maintainer-soc
20+
maintainer-soc-clean-dts
2021
maintainer-tip
2122
maintainer-kvm-x86

‎Documentation/process/maintainer-soc-clean-dts.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
3+
==============================================
4+
SoC Platforms with DTS Compliance Requirements
5+
==============================================
6+
7+
Overview
8+
--------
9+
10+
SoC platforms or subarchitectures should follow all the rules from
11+
Documentation/process/maintainer-soc.rst. This document referenced in
12+
MAINTAINERS impose additional requirements listed below.
13+
14+
Strict DTS DT Schema and dtc Compliance
15+
---------------------------------------
16+
17+
No changes to the SoC platform Devicetree sources (DTS files) should introduce
18+
new ``make dtbs_check W=1`` warnings. Warnings in a new board DTS, which are
19+
results of issues in an included DTSI file, are considered existing, not new
20+
warnings. The platform maintainers have automation in place which should point
21+
out any new warnings.
22+
23+
If a commit introducing new warnings gets accepted somehow, the resulting
24+
issues shall be fixed in reasonable time (e.g. within one release) or the
25+
commit reverted.

‎Documentation/process/maintainer-soc.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ with the dt-bindings that describe the ABI. Please read the section
133133
more information on the validation of devicetrees.
134134

135135
For new platforms, or additions to existing ones, ``make dtbs_check`` should not
136-
add any new warnings. For RISC-V, as it has the advantage of being a newer
137-
architecture, ``make dtbs_check W=1`` is required to not add any new warnings.
136+
add any new warnings. For RISC-V and Samsung SoC, ``make dtbs_check W=1`` is
137+
required to not add any new warnings.
138138
If in any doubt about a devicetree change, reach out to the devicetree
139139
maintainers.
140140

‎MAINTAINERS

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1570,9 +1570,10 @@ M: Olof Johansson <olof@lixom.net>
15701570
M: soc@kernel.org
15711571
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
15721572
S: Maintained
1573+
P: Documentation/process/maintainer-soc.rst
15731574
C: irc://irc.libera.chat/armlinux
15741575
T: git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
1575-
F: Documentation/process/maintainer-soc.rst
1576+
F: Documentation/process/maintainer-soc*.rst
15761577
F: arch/arm/boot/dts/Makefile
15771578
F: arch/arm64/boot/dts/Makefile
15781579

@@ -2641,6 +2642,7 @@ R: Alim Akhtar <alim.akhtar@samsung.com>
26412642
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
26422643
L: linux-samsung-soc@vger.kernel.org
26432644
S: Maintained
2645+
P: Documentation/process/maintainer-soc-clean-dts.rst
26442646
Q: https://patchwork.kernel.org/project/linux-samsung-soc/list/
26452647
B: mailto:linux-samsung-soc@vger.kernel.org
26462648
C: irc://irc.libera.chat/linux-exynos
@@ -15603,6 +15605,7 @@ W: http://www.muru.com/linux/omap/
1560315605
W: http://linux.omap.com/
1560415606
Q: http://patchwork.kernel.org/project/linux-omap/list/
1560515607
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
15608+
F: Documentation/devicetree/bindings/arm/ti/omap.yaml
1560615609
F: arch/arm/configs/omap2plus_defconfig
1560715610
F: arch/arm/mach-omap2/
1560815611
F: drivers/bus/ti-sysc.c

‎arch/arm/include/asm/hardware/cache-l2x0.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
#define __ASM_ARM_HARDWARE_L2X0_H
1010

1111
#include <linux/errno.h>
12+
#include <linux/init.h>
13+
#include <linux/types.h>
1214

1315
#define L2X0_CACHE_ID 0x000
1416
#define L2X0_CACHE_TYPE 0x004

‎arch/arm/mach-alpine/alpine_machine.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
* Copyright (C) 2015 Annapurna Labs Ltd.
66
*/
77

8-
#include <linux/of_platform.h>
9-
108
#include <asm/mach/arch.h>
119

1210
static const char * const al_match[] __initconst = {

‎arch/arm/mach-at91/pm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/of.h>
1313
#include <linux/of_fdt.h>
1414
#include <linux/of_platform.h>
15+
#include <linux/platform_device.h>
1516
#include <linux/parser.h>
1617
#include <linux/suspend.h>
1718

‎arch/arm/mach-at91/samv7.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@
55
* Copyright (C) 2013 Atmel,
66
* 2016 Andras Szemzo <szemzo.andras@gmail.com>
77
*/
8-
#include <linux/of.h>
9-
#include <linux/of_platform.h>
10-
#include <linux/of_address.h>
11-
#include <linux/slab.h>
128
#include <asm/mach/arch.h>
13-
#include <asm/mach/map.h>
14-
#include <asm/system_misc.h>
15-
#include "generic.h"
169

1710
static const char *const samv7_dt_board_compat[] __initconst = {
1811
"atmel,samv7",

‎arch/arm/mach-bcm/bcm_5301x.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*
66
* Licensed under the GNU/GPL. See COPYING for details.
77
*/
8-
#include <linux/of_platform.h>
9-
#include <asm/hardware/cache-l2x0.h>
108

119
#include <asm/mach/arch.h>
1210
#include <asm/siginfo.h>

‎arch/arm/mach-bcm/board_bcm23550.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// SPDX-License-Identifier: GPL-2.0-only
22
// Copyright (C) 2016 Broadcom
33

4-
#include <linux/of_platform.h>
5-
64
#include <asm/mach/arch.h>
75

86
static const char * const bcm23550_dt_compat[] = {

0 commit comments

Comments
 (0)