Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc (b719ae07) · Commits · 戴 / test

Pull ARM SoC fixes from Olof Johansson: "A handful of fixes that have come in since the merge window: - Fix of PCI interrupt map on arm64 fast model (SW emulator) - Fixlet for sound on ST platforms and a small cleanup of deprecated DT properties - A stack buffer overflow fix for moxtet - Fuse driver build fix for Tegra194 - A few config updates to turn on new drivers merged this cycle" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: bus: moxtet: fix potential stack buffer overflow soc/tegra: fuse: Fix build with Tegra194 configuration ARM: dts: sti: fixup sound frame-inversion for stihxxx-b2120.dtsi ARM: dts: sti: Remove deprecated snps PHY properties for stih410-b2260 arm64: defconfig: Enable DRM_SUN6I_DSI arm64: defconfig: Enable CONFIG_SUN8I_THERMAL ARM: sunxi: Enable CONFIG_SUN8I_THERMAL arm64: defconfig: Set bcm2835-dma as built-in ARM: configs: Cleanup old Kconfig options ARM: npcm: Bring back GPIOLIB support arm64: dts: fast models: Fix FVP PCI interrupt-map property

arch/arm/boot/dts/stih410-b2260.dts

+0 −3

Original line number	Diff line number	Diff line
		@@ -178,9 +178,6 @@
		phy-mode = "rgmii";
		pinctrl-0 = <&pinctrl_rgmii1 &pinctrl_rgmii1_mdio_1>;

		snps,phy-bus-name = "stmmac";
		snps,phy-bus-id = <0>;
		snps,phy-addr = <0>;
		snps,reset-gpio = <&pio0 7 0>;
		snps,reset-active-low;
		snps,reset-delays-us = <0 10000 1000000>;

arch/arm/boot/dts/stihxxx-b2120.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@
		/* DAC */
		format = "i2s";
		mclk-fs = <256>;
		frame-inversion = <1>;
		frame-inversion;
		cpu {
		sound-dai = <&sti_uni_player2>;
		};

arch/arm/configs/am200epdkit_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -11,8 +11,6 @@ CONFIG_SLAB=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		# CONFIG_BLK_DEV_BSG is not set
		# CONFIG_IOSCHED_DEADLINE is not set
		# CONFIG_IOSCHED_CFQ is not set
		CONFIG_ARCH_PXA=y
		CONFIG_ARCH_GUMSTIX=y
		CONFIG_PCCARD=y

arch/arm/configs/axm55xx_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ CONFIG_EMBEDDED=y
		CONFIG_PROFILING=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		# CONFIG_IOSCHED_DEADLINE is not set
		CONFIG_ARCH_AXXIA=y
		CONFIG_GPIO_PCA953X=y
		CONFIG_ARM_LPAE=y

arch/arm/configs/clps711x_defconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ CONFIG_EMBEDDED=y
		CONFIG_SLOB=y
		CONFIG_JUMP_LABEL=y
		CONFIG_PARTITION_ADVANCED=y
		# CONFIG_IOSCHED_CFQ is not set
		CONFIG_ARCH_CLPS711X=y
		CONFIG_ARCH_AUTCPU12=y
		CONFIG_ARCH_CDB89712=y

Admin message