mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 04:34:03 +02:00
Samsung mach/soc changes for v7.3
Two minor cleanups:
1. Replace __ASSEMBLY__ with __ASSEMBLER__ in headers to have
consistency with what compilers define.
2. Drop redundant mailing lists from Samsung MAINTAINERS entries (less
code).
-----BEGIN PGP SIGNATURE-----
iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmp0Qv8QHGtyemtAa2Vy
bmVsLm9yZwAKCRDBN2bmhouD1x7wEACCF42NRjTz4mOnM3NcjdEeewSgw29wL0/C
eYSgc+iyE1filSBRe7nyHQn0+bAXmahnBAbChMHWjBYzXyuKKtPyRJDqIfouDgQK
L3VKRQQ03JLF4YuxcAfA2EZqDh1HIxaFs0PEq1vk2kfyk+0VmVvgg/nZAmheCUgz
yeL5CnxRRX3YRfOXEs1KXTht26rimLfDEmG/Krr8f6c3MxQ6DNrbryDXv8Dnc3AM
oANFEDhCDwfB2o7PvMXhbkmoQsE3qTJRgTDktsQ+QS1MvKsas3hjAB9XmD0zy1jk
nTzV9FK3rX0mZn68KzEf1guQ6PQ5VhD096zgZcgeBzMhsh646e2Pd5UPoQ0GIabf
musAZuRH9DjctycwfN48Wrbg7oG5zbNNuILgWQ42B3+Ful2rHkIOu3SejTXYsqXe
aDSGWOPaKKDJJNRc177b/Xj8Gklk57mOySAS6EEOci+vKXVP9LvnoWXLak0p/wxx
777OE8VuD+s8LYy1IeDPUMLO/jH6DgF9Cfup73NVmYTN6yzRBzf3agmlAl42M0eL
YHHCIJZOaVDinoZPGEACuxsZA5vkPyYBx0DtkOkmvfE6MjPuKL2mxPvujoIsHyDe
dPkxy1rXHF7ncvuEvVYGwLJJzYEygF2vEkX/K3QnbmIvdbJ/p/cCph0DHuIUu0Gc
iSRZsfjGpQ==
=JuRt
-----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmp6MdEACgkQmmx57+YA
GNmCZg//YM3svxqpc7txzO7i8uoGtNNdmo8Pgh4pPYHj8NAVWv4lropo44OrbmT6
Bb6A0ccjyDNWG6ZL5YIj+PXzH/LwEyquaJwp53bnFy+NxbmOw/RxGYkxE+pfiHQX
M53yPDn23NzXV0z++ZpxQmr9JRF3yoO3Isbb0khlI2RQFgtNN/k4KAyx4eq1C26r
atA5OcySgat9msKgcnoThS5wuCf9Ii0iELW1dSw4xqELEkjwZ/VgF8QCW4KXGC8C
BDvuVQgPedjfd3St05WWAp5Kd/xYYR+Ml1HN5rHrsVng9sw7vqTxYyaOHi9kBZ3s
qdTvZAnZiJwzLtGWlOSbeCoTc86+mifNbqTl15mOu1eyZ3803hpA7v3I5oahs5Mm
pNGm71naS9lVPHOyzDaSAl3BpdV40/0HN1NIdd6xdJJCKa4P8KLtPncwUy5pM4yO
/cK/42RHDur6hfNrVInz4Opq3FRteIneXDHMcqKhUcPFvQ5hZTQTJ+Azf6y9C1zZ
ANtgOh1TWRdc/lLaEiaspMpXUhk6y3mVxAgEghZG6F5u7py3ADI0JYlTpyZUSdEP
TILIoi68GWBLG1dKOLAg3tULLebWk5h9hC3tPt8drqQGo0iRV3FLQAxBpJI86fBV
TFKR9CTojudMmsuZav7I9xXWSTAUDcV+34f73Ha7M5lJ/VTuzkI=
=RX5R
-----END PGP SIGNATURE-----
Merge tag 'samsung-soc-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/arm
Samsung mach/soc changes for v7.3
Two minor cleanups:
1. Replace __ASSEMBLY__ with __ASSEMBLER__ in headers to have
consistency with what compilers define.
2. Drop redundant mailing lists from Samsung MAINTAINERS entries (less
code).
* tag 'samsung-soc-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
MAINTAINERS: Drop redundant lists from various Samsung entries
ARM: s3c: Replace __ASSEMBLY__ with __ASSEMBLER__ in header files
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
acf1efa948
21
MAINTAINERS
21
MAINTAINERS
|
|
@ -3550,14 +3550,12 @@ N: s5pv210
|
|||
ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
|
||||
M: Łukasz Stelmach <l.stelmach@samsung.com>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/media/platform/samsung/s5p-g2d/
|
||||
|
||||
ARM/SAMSUNG S5P SERIES HDMI CEC SUBSYSTEM SUPPORT
|
||||
M: Marek Szyprowski <m.szyprowski@samsung.com>
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml
|
||||
F: drivers/media/cec/platform/s5p/
|
||||
|
|
@ -3567,7 +3565,6 @@ M: Andrzej Pietrasiewicz <andrzejtp2010@gmail.com>
|
|||
M: Jacek Anaszewski <jacek.anaszewski@gmail.com>
|
||||
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/media/samsung,s5pv210-jpeg.yaml
|
||||
F: drivers/media/platform/samsung/s5p-jpeg/
|
||||
|
|
@ -3576,7 +3573,6 @@ ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
|
|||
M: Marek Szyprowski <m.szyprowski@samsung.com>
|
||||
M: Andrzej Hajda <andrzej.hajda@intel.com>
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/media/samsung,s5p-mfc.yaml
|
||||
F: drivers/media/platform/samsung/s5p-mfc/
|
||||
|
|
@ -5650,7 +5646,6 @@ F: drivers/media/pci/bt8xx/bttv*
|
|||
|
||||
BUS FREQUENCY DRIVER FOR SAMSUNG EXYNOS
|
||||
M: Chanwoo Choi <cw00.choi@samsung.com>
|
||||
L: linux-pm@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Maintained
|
||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git
|
||||
|
|
@ -16041,7 +16036,6 @@ F: drivers/power/supply/max77976_charger.c
|
|||
|
||||
MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
|
||||
M: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
L: linux-pm@vger.kernel.org
|
||||
S: Maintained
|
||||
B: mailto:linux-samsung-soc@vger.kernel.org
|
||||
F: Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
|
||||
|
|
@ -20738,7 +20732,6 @@ F: drivers/pci/controller/dwc/*rcar*
|
|||
|
||||
PCI DRIVER FOR SAMSUNG EXYNOS
|
||||
M: Jingoo Han <jingoohan1@gmail.com>
|
||||
L: linux-pci@vger.kernel.org
|
||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Maintained
|
||||
|
|
@ -23996,7 +23989,6 @@ F: include/dt-bindings/clock/exynos850.h
|
|||
|
||||
SAMSUNG EXYNOS ACPM MAILBOX PROTOCOL
|
||||
M: Tudor Ambarus <tudor.ambarus@linaro.org>
|
||||
L: linux-kernel@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Supported
|
||||
F: Documentation/devicetree/bindings/firmware/google,gs101-acpm-ipc.yaml
|
||||
|
|
@ -24006,7 +23998,6 @@ F: include/linux/firmware/samsung/exynos-acpm-protocol.h
|
|||
|
||||
SAMSUNG EXYNOS MAILBOX DRIVER
|
||||
M: Tudor Ambarus <tudor.ambarus@linaro.org>
|
||||
L: linux-kernel@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Supported
|
||||
F: Documentation/devicetree/bindings/mailbox/google,gs101-mbox.yaml
|
||||
|
|
@ -24036,7 +24027,6 @@ F: drivers/platform/x86/samsung-galaxybook.c
|
|||
SAMSUNG INTERCONNECT DRIVERS
|
||||
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
|
||||
M: Artur Świgoń <a.swigon@samsung.com>
|
||||
L: linux-pm@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Supported
|
||||
F: drivers/interconnect/samsung/
|
||||
|
|
@ -24049,7 +24039,6 @@ F: drivers/platform/x86/samsung-laptop.c
|
|||
|
||||
SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS
|
||||
M: André Draszik <andre.draszik@linaro.org>
|
||||
L: linux-kernel@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Maintained
|
||||
B: mailto:linux-samsung-soc@vger.kernel.org
|
||||
|
|
@ -24068,7 +24057,6 @@ F: include/linux/mfd/samsung/
|
|||
|
||||
SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
|
||||
M: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
|
||||
L: linux-media@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/media/platform/samsung/s3c-camif/
|
||||
|
|
@ -24083,14 +24071,12 @@ F: drivers/nfc/s3fwrn5
|
|||
SAMSUNG S5C73M3 CAMERA DRIVER
|
||||
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
|
||||
M: Andrzej Hajda <andrzej.hajda@intel.com>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Supported
|
||||
F: Documentation/devicetree/bindings/media/samsung,s5c73m3.yaml
|
||||
F: drivers/media/i2c/s5c73m3/*
|
||||
|
||||
SAMSUNG S5K3M5 CAMERA DRIVER
|
||||
M: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
T: git git://linuxtv.org/media_tree.git
|
||||
F: Documentation/devicetree/bindings/media/i2c/samsung,s5k3m5.yaml
|
||||
|
|
@ -24099,13 +24085,11 @@ F: drivers/media/i2c/s5k3m5.c
|
|||
SAMSUNG S5K5BAF CAMERA DRIVER
|
||||
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
|
||||
M: Andrzej Hajda <andrzej.hajda@intel.com>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Supported
|
||||
F: drivers/media/i2c/s5k5baf.c
|
||||
|
||||
SAMSUNG S5KJN1 CAMERA DRIVER
|
||||
M: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
T: git git://linuxtv.org/media_tree.git
|
||||
F: Documentation/devicetree/bindings/media/i2c/samsung,s5kjn1.yaml
|
||||
|
|
@ -24114,7 +24098,6 @@ F: drivers/media/i2c/s5kjn1.c
|
|||
SAMSUNG S5P Security SubSystem (SSS) DRIVER
|
||||
M: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
M: Vladimir Zapolskiy <vz@mleia.com>
|
||||
L: linux-crypto@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/crypto/samsung-slimsss.yaml
|
||||
|
|
@ -24123,7 +24106,6 @@ F: drivers/crypto/s5p-sss.c
|
|||
|
||||
SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
|
||||
M: Sylwester Nawrocki <s.nawrocki@samsung.com>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Supported
|
||||
Q: https://patchwork.linuxtv.org/project/linux-media/list/
|
||||
F: Documentation/devicetree/bindings/media/samsung,exynos4210-csis.yaml
|
||||
|
|
@ -24153,7 +24135,6 @@ F: include/linux/clk/samsung.h
|
|||
SAMSUNG SPI DRIVERS
|
||||
M: Andi Shyti <andi.shyti@kernel.org>
|
||||
R: Tudor Ambarus <tudor.ambarus@linaro.org>
|
||||
L: linux-spi@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/spi/samsung,spi*.yaml
|
||||
|
|
@ -24169,7 +24150,6 @@ F: drivers/net/ethernet/samsung/sxgbe/
|
|||
SAMSUNG THERMAL DRIVER
|
||||
M: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
|
||||
M: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
L: linux-pm@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Maintained
|
||||
F: Documentation/devicetree/bindings/thermal/samsung,exynos-thermal.yaml
|
||||
|
|
@ -27742,7 +27722,6 @@ F: drivers/ufs/host/*dwc*
|
|||
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER EXYNOS HOOKS
|
||||
M: Alim Akhtar <alim.akhtar@samsung.com>
|
||||
R: Peter Griffin <peter.griffin@linaro.org>
|
||||
L: linux-scsi@vger.kernel.org
|
||||
L: linux-samsung-soc@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/ufs/host/ufs-exynos*
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
#define S3C_ADDR_BASE 0xF6000000
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#ifndef __ASSEMBLER__
|
||||
#define S3C_ADDR(x) ((void __iomem __force *)S3C_ADDR_BASE + (x))
|
||||
#else
|
||||
#define S3C_ADDR(x) (S3C_ADDR_BASE + (x))
|
||||
|
|
|
|||
|
|
@ -269,7 +269,7 @@
|
|||
#define APPLE_S5L_UTRSTAT_RXTO BIT(9)
|
||||
#define APPLE_S5L_UTRSTAT_ALL_FLAGS GENMASK(9, 3)
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
#ifndef __ASSEMBLER__
|
||||
|
||||
#include <linux/serial_core.h>
|
||||
|
||||
|
|
@ -294,7 +294,7 @@ struct s3c2410_uartcfg {
|
|||
unsigned long ufcon; /* value of ufcon for port */
|
||||
};
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
#endif /* __ASSEMBLER__ */
|
||||
|
||||
#endif /* __ASM_ARM_REGS_SERIAL_H */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user