Commit 5ac40fdd authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-dt64-6.10' of...

Merge tag 'samsung-dt64-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt

Samsung DTS ARM64 changes for v6.10

1. Add FIFO depth to each SPI node so we can avoid matching this through
   DTS alias.  Difference SPI instances on given SoC have different FIFO
   depths.
2. Exynos850: add clock controllers providing clocks to CPUs.
3. Google GS101: few cleanups and add missing serial engine (USI)
   interface nodes.

* tag 'samsung-dt64-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: gs101: define all PERIC USI nodes
  arm64: dts: exynos: gs101: join lines close to 80 chars
  arm64: dts: exynos: gs101: move pinctrl-* properties after clocks
  arm64: dts: exynos: gs101: move serial_0 pinctrl-0/names to dtsi
  arm64: dts: exynos: gs101: reorder pinctrl-* properties
  arm64: dts: exynos850: Add CPU clocks
  arm64: dts: exynosautov9: specify the SPI FIFO depth
  arm64: dts: exynos5433: specify the SPI FIFO depth

Link: https://lore.kernel.org/r/20240425071856.9235-2-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 3a2fb1a9 a45c3a9b
...@@ -1468,6 +1468,7 @@ spi_0: spi@14d20000 { ...@@ -1468,6 +1468,7 @@ spi_0: spi@14d20000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi0_bus>; pinctrl-0 = <&spi0_bus>;
num-cs = <1>; num-cs = <1>;
fifo-depth = <256>;
status = "disabled"; status = "disabled";
}; };
...@@ -1487,6 +1488,7 @@ spi_1: spi@14d30000 { ...@@ -1487,6 +1488,7 @@ spi_1: spi@14d30000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi1_bus>; pinctrl-0 = <&spi1_bus>;
num-cs = <1>; num-cs = <1>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -1506,6 +1508,7 @@ spi_2: spi@14d40000 { ...@@ -1506,6 +1508,7 @@ spi_2: spi@14d40000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_bus>; pinctrl-0 = <&spi2_bus>;
num-cs = <1>; num-cs = <1>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -1525,6 +1528,7 @@ spi_3: spi@14d50000 { ...@@ -1525,6 +1528,7 @@ spi_3: spi@14d50000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi3_bus>; pinctrl-0 = <&spi3_bus>;
num-cs = <1>; num-cs = <1>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -1544,6 +1548,7 @@ spi_4: spi@14d00000 { ...@@ -1544,6 +1548,7 @@ spi_4: spi@14d00000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi4_bus>; pinctrl-0 = <&spi4_bus>;
num-cs = <1>; num-cs = <1>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -93,6 +93,8 @@ cpu0: cpu@0 { ...@@ -93,6 +93,8 @@ cpu0: cpu@0 {
compatible = "arm,cortex-a55"; compatible = "arm,cortex-a55";
reg = <0x0>; reg = <0x0>;
enable-method = "psci"; enable-method = "psci";
clocks = <&cmu_cpucl0 CLK_CLUSTER0_SCLK>;
clock-names = "cluster0_clk";
}; };
cpu1: cpu@1 { cpu1: cpu@1 {
device_type = "cpu"; device_type = "cpu";
...@@ -117,6 +119,8 @@ cpu4: cpu@100 { ...@@ -117,6 +119,8 @@ cpu4: cpu@100 {
compatible = "arm,cortex-a55"; compatible = "arm,cortex-a55";
reg = <0x100>; reg = <0x100>;
enable-method = "psci"; enable-method = "psci";
clocks = <&cmu_cpucl1 CLK_CLUSTER1_SCLK>;
clock-names = "cluster1_clk";
}; };
cpu5: cpu@101 { cpu5: cpu@101 {
device_type = "cpu"; device_type = "cpu";
...@@ -254,6 +258,28 @@ cmu_peri: clock-controller@10030000 { ...@@ -254,6 +258,28 @@ cmu_peri: clock-controller@10030000 {
"dout_peri_uart", "dout_peri_ip"; "dout_peri_uart", "dout_peri_ip";
}; };
cmu_cpucl1: clock-controller@10800000 {
compatible = "samsung,exynos850-cmu-cpucl1";
reg = <0x10800000 0x8000>;
#clock-cells = <1>;
clocks = <&oscclk>, <&cmu_top CLK_DOUT_CPUCL1_SWITCH>,
<&cmu_top CLK_DOUT_CPUCL1_DBG>;
clock-names = "oscclk", "dout_cpucl1_switch",
"dout_cpucl1_dbg";
};
cmu_cpucl0: clock-controller@10900000 {
compatible = "samsung,exynos850-cmu-cpucl0";
reg = <0x10900000 0x8000>;
#clock-cells = <1>;
clocks = <&oscclk>, <&cmu_top CLK_DOUT_CPUCL0_SWITCH>,
<&cmu_top CLK_DOUT_CPUCL0_DBG>;
clock-names = "oscclk", "dout_cpucl0_switch",
"dout_cpucl0_dbg";
};
cmu_g3d: clock-controller@11400000 { cmu_g3d: clock-controller@11400000 {
compatible = "samsung,exynos850-cmu-g3d"; compatible = "samsung,exynos850-cmu-g3d";
reg = <0x11400000 0x8000>; reg = <0x11400000 0x8000>;
......
...@@ -435,6 +435,7 @@ spi_0: spi@10300000 { ...@@ -435,6 +435,7 @@ spi_0: spi@10300000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <256>;
status = "disabled"; status = "disabled";
}; };
...@@ -526,6 +527,7 @@ spi_1: spi@10320000 { ...@@ -526,6 +527,7 @@ spi_1: spi@10320000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <256>;
status = "disabled"; status = "disabled";
}; };
...@@ -617,6 +619,7 @@ spi_2: spi@10340000 { ...@@ -617,6 +619,7 @@ spi_2: spi@10340000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -708,6 +711,7 @@ spi_3: spi@10360000 { ...@@ -708,6 +711,7 @@ spi_3: spi@10360000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -799,6 +803,7 @@ spi_4: spi@10380000 { ...@@ -799,6 +803,7 @@ spi_4: spi@10380000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -890,6 +895,7 @@ spi_5: spi@103a0000 { ...@@ -890,6 +895,7 @@ spi_5: spi@103a0000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -981,6 +987,7 @@ spi_6: spi@10900000 { ...@@ -981,6 +987,7 @@ spi_6: spi@10900000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <256>;
status = "disabled"; status = "disabled";
}; };
...@@ -1072,6 +1079,7 @@ spi_7: spi@10920000 { ...@@ -1072,6 +1079,7 @@ spi_7: spi@10920000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -1163,6 +1171,7 @@ spi_8: spi@10940000 { ...@@ -1163,6 +1171,7 @@ spi_8: spi@10940000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -1254,6 +1263,7 @@ spi_9: spi@10960000 { ...@@ -1254,6 +1263,7 @@ spi_9: spi@10960000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -1345,6 +1355,7 @@ spi_10: spi@10980000 { ...@@ -1345,6 +1355,7 @@ spi_10: spi@10980000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
...@@ -1434,6 +1445,7 @@ spi_11: spi@109a0000 { ...@@ -1434,6 +1445,7 @@ spi_11: spi@109a0000 {
num-cs = <1>; num-cs = <1>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
fifo-depth = <64>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -29,8 +29,8 @@ chosen { ...@@ -29,8 +29,8 @@ chosen {
gpio-keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&key_voldown>, <&key_volup>, <&key_power>; pinctrl-0 = <&key_voldown>, <&key_volup>, <&key_power>;
pinctrl-names = "default";
button-vol-down { button-vol-down {
label = "KEY_VOLUMEDOWN"; label = "KEY_VOLUMEDOWN";
...@@ -103,8 +103,6 @@ key_power: key-power-pins { ...@@ -103,8 +103,6 @@ key_power: key-power-pins {
}; };
&serial_0 { &serial_0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_bus>;
status = "okay"; status = "okay";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment