diff --git a/MAINTAINERS b/MAINTAINERS index 806bd2d80d15..11ae51e4805e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3550,14 +3550,12 @@ N: s5pv210 ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT M: Łukasz Stelmach 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 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 M: Jacek Anaszewski M: Sylwester Nawrocki 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: Andrzej Hajda 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 -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 -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 -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 -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 -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 M: Artur Świgoń -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 -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 -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 M: Andrzej Hajda -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 -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 M: Andrzej Hajda -L: linux-media@vger.kernel.org S: Supported F: drivers/media/i2c/s5k5baf.c SAMSUNG S5KJN1 CAMERA DRIVER M: Vladimir Zapolskiy -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 M: Vladimir Zapolskiy -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 -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 R: Tudor Ambarus -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 M: Krzysztof Kozlowski -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 R: Peter Griffin -L: linux-scsi@vger.kernel.org L: linux-samsung-soc@vger.kernel.org S: Maintained F: drivers/ufs/host/ufs-exynos* diff --git a/arch/arm/mach-s3c/map-base.h b/arch/arm/mach-s3c/map-base.h index 463a995b399b..beb58e6f12e1 100644 --- a/arch/arm/mach-s3c/map-base.h +++ b/arch/arm/mach-s3c/map-base.h @@ -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)) diff --git a/include/linux/serial_s3c.h b/include/linux/serial_s3c.h index 102aa33d956c..f54cb6e23f85 100644 --- a/include/linux/serial_s3c.h +++ b/include/linux/serial_s3c.h @@ -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 @@ -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 */