Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'samsung-dt-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Samsung DTS ARM changes for v5.11, part three

1. S3C bindings and DTS cleanup,
2. Correct the clock rates for SPI0 in Artik 5 which is a fix for recently
introduced Ethernet on SPI on Artik 5 board.

* tag 'samsung-dt-5.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: exynos: Reduce assigned-clocks entries for SPI0 on Artik5 board
ARM: dts: s3c6410: correct SMDK6410 board compatible
ARM: dts: s3c24xx: add SMDK2416 board compatible
dt-bindings: arm: samsung: document S3C6410-based boards binding
dt-bindings: arm: samsung: document SMDK2416 board binding

Link: https://lore.kernel.org/r/20201207074528.4475-2-krzk@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+17 -7
+13
Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml
··· 14 14 const: '/' 15 15 compatible: 16 16 oneOf: 17 + - description: S3C2416 based boards 18 + items: 19 + - enum: 20 + - samsung,smdk2416 # Samsung SMDK2416 21 + - const: samsung,s3c2416 22 + 23 + - description: S3C6410 based boards 24 + items: 25 + - enum: 26 + - friendlyarm,mini6410 # FriendlyARM Mini6410 27 + - samsung,smdk6410 # Samsung SMDK6410 28 + - const: samsung,s3c6410 29 + 17 30 - description: S5PV210 based boards 18 31 items: 19 32 - enum:
+2 -5
arch/arm/boot/dts/exynos3250-artik5-eval.dts
··· 42 42 status = "okay"; 43 43 cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>; 44 44 45 - assigned-clocks = <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>, 46 - <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, 45 + assigned-clocks = <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>, 47 46 <&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>; 48 - assigned-clock-parents = <&cmu CLK_FOUT_MPLL>, /* for: CLK_MOUT_MPLL */ 49 - <&cmu CLK_MOUT_MPLL>, /* for: CLK_DIV_MPLL_PRE */ 50 - <&cmu CLK_DIV_MPLL_PRE>, /* for: CLK_MOUT_SPI0 */ 47 + assigned-clock-parents = <&cmu CLK_DIV_MPLL_PRE>, /* for: CLK_MOUT_SPI0 */ 51 48 <&cmu CLK_MOUT_SPI0>, /* for: CLK_DIV_SPI0 */ 52 49 <&cmu CLK_DIV_SPI0>, /* for: CLK_DIV_SPI0_PRE */ 53 50 <&cmu CLK_DIV_SPI0_PRE>; /* for: CLK_SCLK_SPI0 */
+1 -1
arch/arm/boot/dts/s3c2416-smdk2416.dts
··· 10 10 11 11 / { 12 12 model = "SMDK2416"; 13 - compatible = "samsung,s3c2416"; 13 + compatible = "samsung,smdk2416", "samsung,s3c2416"; 14 14 15 15 memory@30000000 { 16 16 device_type = "memory";
+1 -1
arch/arm/boot/dts/s3c6410-smdk6410.dts
··· 17 17 18 18 / { 19 19 model = "Samsung SMDK6410 board based on S3C6410"; 20 - compatible = "samsung,mini6410", "samsung,s3c6410"; 20 + compatible = "samsung,smdk6410", "samsung,s3c6410"; 21 21 22 22 memory@50000000 { 23 23 device_type = "memory";