diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-12-20 17:36:04 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-12-20 17:36:04 +0100 |
| commit | 1e9a328e4b35af22c23ce9357c2c2a77159e74bb (patch) | |
| tree | d04364bc2f892e1db6a4ec0edaccfbb782acd243 /arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | |
| parent | ALSA: usb-audio: Fix the missing ctl name suffix at parsing SU (diff) | |
| parent | Merge remote-tracking branches 'asoc/fix/rt5663', 'asoc/fix/tlv320aic31xx' an... (diff) | |
| download | linux-1e9a328e4b35af22c23ce9357c2c2a77159e74bb.tar.xz linux-1e9a328e4b35af22c23ce9357c2c2a77159e74bb.zip | |
Merge tag 'asoc-fix-v4.15-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v4.15
This is a fairly large set of fixes, they've been delayed partly as more
and more keep coming in. Most of them are very small driver specific
fixes, the biggest individual thing is the revert of the rcar IOMMU
support - it was causing problems and there wasn't the confidence that
it could be resolved sensibly. There's also a relatively large change
in the Freescale SSI controller which resolves some issues with the
AC'97 mode, these aren't that large in the grand scheme of things and
reflect some fairly thorough review and testing.
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi index ead895a4e9a5..1fb8b9d6cb4e 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -753,12 +753,12 @@ &uart_B { clocks = <&xtal>, <&clkc CLKID_UART1>, <&xtal>; - clock-names = "xtal", "core", "baud"; + clock-names = "xtal", "pclk", "baud"; }; &uart_C { clocks = <&xtal>, <&clkc CLKID_UART2>, <&xtal>; - clock-names = "xtal", "core", "baud"; + clock-names = "xtal", "pclk", "baud"; }; &vpu { |