Commit a1c19328 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 47ca5060 6e73bd23

Documentation/process/maintainer-handbooks.rst

+1 −0
Original line number Diff line number Diff line
@@ -17,5 +17,6 @@ Contents: 


   maintainer-netdev

   maintainer-soc

   maintainer-soc-clean-dts

   maintainer-tip

   maintainer-kvm-x86

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0



==============================================

SoC Platforms with DTS Compliance Requirements

==============================================



Overview

--------



SoC platforms or subarchitectures should follow all the rules from

Documentation/process/maintainer-soc.rst.  This document referenced in

MAINTAINERS impose additional requirements listed below.



Strict DTS DT Schema and dtc Compliance

---------------------------------------



No changes to the SoC platform Devicetree sources (DTS files) should introduce

new ``make dtbs_check W=1`` warnings.  Warnings in a new board DTS, which are

results of issues in an included DTSI file, are considered existing, not new

warnings.  The platform maintainers have automation in place which should point

out any new warnings.



If a commit introducing new warnings gets accepted somehow, the resulting

issues shall be fixed in reasonable time (e.g. within one release) or the

commit reverted.

Documentation/process/maintainer-soc.rst

+2 −2
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ with the dt-bindings that describe the ABI. Please read the section 
more information on the validation of devicetrees.



For new platforms, or additions to existing ones, ``make dtbs_check`` should not

add any new warnings.  For RISC-V, as it has the advantage of being a newer

architecture, ``make dtbs_check W=1`` is required to not add any new warnings.

add any new warnings.  For RISC-V and Samsung SoC, ``make dtbs_check W=1`` is

required to not add any new warnings.

If in any doubt about a devicetree change, reach out to the devicetree

maintainers.

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -1570,9 +1570,10 @@ M: Olof Johansson <olof@lixom.net> 
M:	soc@kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

P:	Documentation/process/maintainer-soc.rst

C:	irc://irc.libera.chat/armlinux

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git

F:	Documentation/process/maintainer-soc.rst

F:	Documentation/process/maintainer-soc*.rst

F:	arch/arm/boot/dts/Makefile

F:	arch/arm64/boot/dts/Makefile








@@ -2641,6 +2642,7 @@ R:	Alim Akhtar <alim.akhtar@samsung.com>







L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained









P:	Documentation/process/maintainer-soc-clean-dts.rst









Q:	https://patchwork.kernel.org/project/linux-samsung-soc/list/









B:	mailto:linux-samsung-soc@vger.kernel.org









C:	irc://irc.libera.chat/linux-exynos








@@ -15603,6 +15605,7 @@ W:	http://www.muru.com/linux/omap/







W:	http://linux.omap.com/









Q:	http://patchwork.kernel.org/project/linux-omap/list/









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git









F:	Documentation/devicetree/bindings/arm/ti/omap.yaml









F:	arch/arm/configs/omap2plus_defconfig









F:	arch/arm/mach-omap2/









F:	drivers/bus/ti-sysc.c
































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



+2
−0






























Original line number
Diff line number
Diff line







@@ -9,6 +9,8 @@







#define __ASM_ARM_HARDWARE_L2X0_H



















#include <linux/errno.h>









#include <linux/init.h>









#include <linux/types.h>



















#define L2X0_CACHE_ID			0x000









#define L2X0_CACHE_TYPE			0x004