Merge tag 'amlogic-dt64' of... (80e7f21d) · Commits · 戴 / test

Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt arm64: dts: Amlogic updates for v5.7 - sound, bluetooth, thermal updates - A1: add secure power domain nodes - misc. cleanups * tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: arm64: dts: meson: add thermal zones to meson gx devices arm64: dts: meson: khadas-vim3: move model to g12b-khadas-vim3 dtsi arm64: dts: meson-g12b: fix N2/VIM3 audio card model names arm64: dts: meson-gxbb-vega-s95: fix bluetooth node arm64: dts: meson-gxl-s905x-p212: add bluetooth nodes arm64: dts: meson-gxbb-odroid-c2: add rc-odroid ir keymap arm64: dts: meson: fix gxm-khadas-vim2 wifi arm64: dts: meson: sei510: fix sound card codec node arm64: dts: meson: s400: fix sound card codec nodes arm64: dts: meson: add pdm reset line arm64: dts: g12-common: add parkmode_disable_ss_quirk on DWC3 controller arm64: dts: amlogic: add rc-videostrong-kii-pro keymap arm64: dts: meson: a1: add secure power domain controller Link: https://lore.kernel.org/r/7hlfo0ugnj.fsf@baylibre.com Signed-off-by:

Arnd Bergmann <arnd@arndb.de>

arch/arm64/boot/dts/amlogic/meson-a1.dtsi

+6 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,12 @@

		sm: secure-monitor {
		compatible = "amlogic,meson-gxbb-sm";

		pwrc: power-controller {
		compatible = "amlogic,meson-a1-pwrc";
		#power-domain-cells = <1>;
		status = "okay";
		};
		};

		soc {

arch/arm64/boot/dts/amlogic/meson-axg-s400.dts

+3 −3

Original line number	Diff line number	Diff line
		@@ -313,15 +313,15 @@
		dai-tdm-slot-rx-mask-1 = <1 1>;
		mclk-fs = <256>;

		codec@0 {
		codec-0 {
		sound-dai = <&lineout>;
		};

		codec@1 {
		codec-1 {
		sound-dai = <&speaker_amp1>;
		};

		codec@2 {
		codec-2 {
		sound-dai = <&linein>;
		};

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -2220,6 +2220,7 @@
		dr_mode = "host";
		snps,dis_u2_susphy_quirk;
		snps,quirk-frame-length-adjustment;
		snps,parkmode-disable-ss-quirk;
		};
		};

arch/arm64/boot/dts/amlogic/meson-g12.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@
		<&clkc_audio AUD_CLKID_PDM_DCLK>,
		<&clkc_audio AUD_CLKID_PDM_SYSCLK>;
		clock-names = "pclk", "dclk", "sysclk";
		resets = <&clkc_audio AUD_RESET_PDM>;
		status = "disabled";
		};

arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts

+1 −1

Original line number	Diff line number	Diff line
		@@ -269,7 +269,7 @@
		dai-tdm-slot-tx-mask-3 = <1 1>;
		mclk-fs = <256>;

		codec@0 {
		codec {
		sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>;
		};
		};

Admin message