aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <[email protected]>2022-02-08 09:52:04 +0100
committerArnd Bergmann <[email protected]>2022-02-08 09:52:05 +0100
commitebdd054ffa14ece5764365846f90fea3703c935f (patch)
tree56ccafd9899210d39e03a47facde0db74962beb5
parentf8d1fc05e2881fe3e466b212af7a2b67c2d88f8d (diff)
parent442b0c08db7e35980bed6af091877f4dda72ffca (diff)
Merge tag 'samsung-fixes-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes
Samsung fixes for v5.17 1. Typo in CONFIG_EXYNOS_USI description. 2. Add Alim Akhtar as a reviewer for Samsung Exynos platform. * tag 'samsung-fixes-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: soc: samsung: Fix typo in CONFIG_EXYNOS_USI description MAINTAINERS: add reviewer entry for Samsung/Exynos platform Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
-rw-r--r--MAINTAINERS3
-rw-r--r--drivers/soc/samsung/Kconfig2
2 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 7158c29c6cbd..6dbbc16a807a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2571,6 +2571,7 @@ N: rockchip
ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
M: Krzysztof Kozlowski <[email protected]>
+R: Alim Akhtar <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained
@@ -15291,6 +15292,7 @@ PIN CONTROLLER - SAMSUNG
M: Tomasz Figa <[email protected]>
M: Krzysztof Kozlowski <[email protected]>
M: Sylwester Nawrocki <[email protected]>
+R: Alim Akhtar <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained
@@ -17090,6 +17092,7 @@ SAMSUNG SOC CLOCK DRIVERS
M: Sylwester Nawrocki <[email protected]>
M: Tomasz Figa <[email protected]>
M: Chanwoo Choi <[email protected]>
+R: Alim Akhtar <[email protected]>
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
diff --git a/drivers/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig
index a9f8b224322e..02e319508cc6 100644
--- a/drivers/soc/samsung/Kconfig
+++ b/drivers/soc/samsung/Kconfig
@@ -31,7 +31,7 @@ config EXYNOS_USI
help
Enable support for USI block. USI (Universal Serial Interface) is an
IP-core found in modern Samsung Exynos SoCs, like Exynos850 and
- ExynosAutoV0. USI block can be configured to provide one of the
+ ExynosAutoV9. USI block can be configured to provide one of the
following serial protocols: UART, SPI or High Speed I2C.
This driver allows one to configure USI for desired protocol, which