Unverified Commit ebdd054f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-fixes-5.17' of...

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/20220129115442.13474-1-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f8d1fc05 442b0c08
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -2571,6 +2571,7 @@ N: rockchip
ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES
M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
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
@@ -15291,6 +15292,7 @@ PIN CONTROLLER - SAMSUNG
M:	Tomasz Figa <tomasz.figa@gmail.com>
M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
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
@@ -17090,6 +17092,7 @@ SAMSUNG SOC CLOCK DRIVERS
M:	Sylwester Nawrocki <s.nawrocki@samsung.com>
M:	Tomasz Figa <tomasz.figa@gmail.com>
M:	Chanwoo Choi <cw00.choi@samsung.com>
R:	Alim Akhtar <alim.akhtar@samsung.com>
L:	linux-samsung-soc@vger.kernel.org
S:	Supported
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
+1 −1
Original line number Diff line number Diff line
@@ -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