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

Merge tag 'samsung-soc-5.18' of... 

Merge tag 'samsung-soc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung mach/soc changes for v5.18

1. Fix hang of secondary CPU bring-up on some of Exynos5420-based
   devices (Secure Monitor Call SMC_CMD_CPU1BOOT should be skipped for
   all Exynos5 devices).
2. Extend Universal Serial Interface DT schema to precisely describe
   children nodes.

* tag 'samsung-soc-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  dt-bindings: soc: samsung: usi: refer to dtschema for children
  ARM: exynos: only do SMC_CMD_CPU1BOOT call on Exynos4

Link: https://lore.kernel.org/r/20220226220116.13452-3-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 28f74201 e465ea5c

Documentation/devicetree/bindings/soc/samsung/exynos-usi.yaml

+10 −10
Original line number Diff line number Diff line
@@ -17,13 +17,6 @@ description: | 
  child nodes, each representing a serial sub-node device. The mode setting

  selects which particular function will be used.



  Refer to next bindings documentation for information on protocol subnodes that

  can exist under USI node:



  [1] Documentation/devicetree/bindings/serial/samsung_uart.yaml

  [2] Documentation/devicetree/bindings/i2c/i2c-exynos5.txt

  [3] Documentation/devicetree/bindings/spi/spi-samsung.txt



properties:

  $nodename:

    pattern: "^usi@[0-9a-f]+$"
@@ -71,10 +64,17 @@ properties: 
      This property is optional.



patternProperties:

  # All other properties should be child nodes

  "^(serial|spi|i2c)@[0-9a-f]+$":

  "^i2c@[0-9a-f]+$":

    $ref: /schemas/i2c/i2c-exynos5.yaml

    description: Child node describing underlying I2C



  "^serial@[0-9a-f]+$":

    $ref: /schemas/serial/samsung_uart.yaml

    description: Child node describing underlying UART/serial



  "^spi@[0-9a-f]+$":

    type: object

    description: Child node describing underlying USI serial protocol

    description: Child node describing underlying SPI



required:

  - compatible

arch/arm/mach-exynos/firmware.c

+3 −1
Original line number Diff line number Diff line
@@ -60,8 +60,10 @@ static int exynos_cpu_boot(int cpu) 
	/*

	 * Exynos3250 doesn't need to send smc command for secondary CPU boot

	 * because Exynos3250 removes WFE in secure mode.

	 *

	 * On Exynos5 devices the call is ignored by trustzone firmware.

	 */

	if (soc_is_exynos3250())

	if (!soc_is_exynos4210() && !soc_is_exynos4412())

		return 0;



	/*