diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-01 21:40:42 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-01 21:40:42 +0300 |
| commit | d4ea2bd1bb502c54380cc44a4130660494679bb8 (patch) | |
| tree | 7d14962a86c24026ce2eee8f9e67db610db23fd8 /arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi | |
| parent | eaa1b01fe709d6a236a9cec74813e0400601fd23 (diff) | |
| parent | e81fdba0208666b65bafeaba814874b4d6e5edde (diff) | |
| download | linux-d4ea2bd1bb502c54380cc44a4130660494679bb8.tar.xz | |
Merge tag 'asoc-fix-v6.8-rc2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.8
This pull request adds Richard Fitzgerald's series with extensive fixes
for the CS35L56, he said:
These patches fix various things that were undocumented, unknown or
uncertain when the original driver code was written. And also a few
things that were just bugs.
Diffstat (limited to 'arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi index 44cc4ff1d0df..d12fb44aeb14 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi @@ -116,7 +116,7 @@ tpm_tis: tpm@1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_tpm>; - compatible = "tcg,tpm_tis-spi"; + compatible = "infineon,slb9670", "tcg,tpm_tis-spi"; reg = <1>; spi-max-frequency = <20000000>; interrupt-parent = <&gpio5>; |