diff options
| author | Tom Rini <[email protected]> | 2025-01-26 16:17:48 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-01-26 16:19:33 -0600 |
| commit | d8a7100d658eb201fa0e955667fdff298db31945 (patch) | |
| tree | 90447acc915dafdd9227d24f748b5f1a3976b9d3 /dts/upstream/src/arm64/amd | |
| parent | 2348dd8e41ea7912f2ecf35684bbe6386281fb57 (diff) | |
| parent | 844493d7e99cb795f3e28130ee09ba7a6441162f (diff) | |
Subtree merge tag 'v6.13-dts' of dts repo [1] into dts/upstream
[1] https://git.kernel.org/pub/scm/linux/kernel/git/devicetree/devicetree-rebasing.git
[rockchip fixes from Jonas Karlman via IRC]
Diffstat (limited to 'dts/upstream/src/arm64/amd')
| -rw-r--r-- | dts/upstream/src/arm64/amd/amd-overdrive-rev-b0.dts | 1 | ||||
| -rw-r--r-- | dts/upstream/src/arm64/amd/amd-overdrive-rev-b1.dts | 1 | ||||
| -rw-r--r-- | dts/upstream/src/arm64/amd/amd-seattle-soc.dtsi | 8 |
3 files changed, 4 insertions, 6 deletions
diff --git a/dts/upstream/src/arm64/amd/amd-overdrive-rev-b0.dts b/dts/upstream/src/arm64/amd/amd-overdrive-rev-b0.dts index 1a65f1ec183..7c82d90e940 100644 --- a/dts/upstream/src/arm64/amd/amd-overdrive-rev-b0.dts +++ b/dts/upstream/src/arm64/amd/amd-overdrive-rev-b0.dts @@ -27,7 +27,6 @@ &ccp0 { status = "okay"; - amd,zlib-support = <1>; }; /** diff --git a/dts/upstream/src/arm64/amd/amd-overdrive-rev-b1.dts b/dts/upstream/src/arm64/amd/amd-overdrive-rev-b1.dts index 52f8d36295a..58e2b0a6f84 100644 --- a/dts/upstream/src/arm64/amd/amd-overdrive-rev-b1.dts +++ b/dts/upstream/src/arm64/amd/amd-overdrive-rev-b1.dts @@ -27,7 +27,6 @@ &ccp0 { status = "okay"; - amd,zlib-support = <1>; }; /** diff --git a/dts/upstream/src/arm64/amd/amd-seattle-soc.dtsi b/dts/upstream/src/arm64/amd/amd-seattle-soc.dtsi index 690020589d4..d3d931eb767 100644 --- a/dts/upstream/src/arm64/amd/amd-seattle-soc.dtsi +++ b/dts/upstream/src/arm64/amd/amd-seattle-soc.dtsi @@ -123,8 +123,8 @@ reg = <0 0xe1020000 0 0x1000>; spi-controller; interrupts = <0 330 4>; - clocks = <&uartspiclk_100mhz>; - clock-names = "apb_pclk"; + clocks = <&uartspiclk_100mhz>, <&uartspiclk_100mhz>; + clock-names = "sspclk", "apb_pclk"; }; spi1: spi@e1030000 { @@ -133,8 +133,8 @@ reg = <0 0xe1030000 0 0x1000>; spi-controller; interrupts = <0 329 4>; - clocks = <&uartspiclk_100mhz>; - clock-names = "apb_pclk"; + clocks = <&uartspiclk_100mhz>, <&uartspiclk_100mhz>; + clock-names = "sspclk", "apb_pclk"; num-cs = <1>; #address-cells = <1>; #size-cells = <0>; |