leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Arnd Bergmann
2020-12-09 00:05:29 +01:00
parent 4569830224 7995fb896b
commit b4e217d0b3
4 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/devicetree/bindings/arm/samsung/samsung-boards.yaml
View File

@@ -14,6 +14,19 @@ properties:
const: '/'
compatible:
oneOf:
- description: S3C2416 based boards
items:
- enum:
- samsung,smdk2416 # Samsung SMDK2416
- const: samsung,s3c2416
- description: S3C6410 based boards
items:
- enum:
- friendlyarm,mini6410 # FriendlyARM Mini6410
- samsung,smdk6410 # Samsung SMDK6410
- const: samsung,s3c6410
- description: S5PV210 based boards
items:
- enum:

7
arch/arm/boot/dts/exynos3250-artik5-eval.dts
View File

@@ -42,12 +42,9 @@
status = "okay";
cs-gpios = <&gpx3 4 GPIO_ACTIVE_LOW>, <0>;
assigned-clocks = <&cmu CLK_MOUT_MPLL>, <&cmu CLK_DIV_MPLL_PRE>,
<&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>,
assigned-clocks = <&cmu CLK_MOUT_SPI0>, <&cmu CLK_DIV_SPI0>,
<&cmu CLK_DIV_SPI0_PRE>, <&cmu CLK_SCLK_SPI0>;
assigned-clock-parents = <&cmu CLK_FOUT_MPLL>, /* for: CLK_MOUT_MPLL */
<&cmu CLK_MOUT_MPLL>, /* for: CLK_DIV_MPLL_PRE */
<&cmu CLK_DIV_MPLL_PRE>, /* for: CLK_MOUT_SPI0 */
assigned-clock-parents = <&cmu CLK_DIV_MPLL_PRE>, /* for: CLK_MOUT_SPI0 */
<&cmu CLK_MOUT_SPI0>, /* for: CLK_DIV_SPI0 */
<&cmu CLK_DIV_SPI0>, /* for: CLK_DIV_SPI0_PRE */
<&cmu CLK_DIV_SPI0_PRE>; /* for: CLK_SCLK_SPI0 */

2
arch/arm/boot/dts/s3c2416-smdk2416.dts
View File

@@ -10,7 +10,7 @@
/ {
model = "SMDK2416";
compatible = "samsung,s3c2416";
compatible = "samsung,smdk2416", "samsung,s3c2416";
memory@30000000 {
device_type = "memory";

2
arch/arm/boot/dts/s3c6410-smdk6410.dts
View File

@@ -17,7 +17,7 @@
/ {
model = "Samsung SMDK6410 board based on S3C6410";
compatible = "samsung,mini6410", "samsung,s3c6410";
compatible = "samsung,smdk6410", "samsung,s3c6410";
memory@50000000 {
device_type = "memory";