Skip to content

Commit b719ae0

Browse files
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
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
2 parents 3e71e12 + 3bf3c97 commit b719ae0

39 files changed

+14
-65
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,6 @@
178178
phy-mode = "rgmii";
179179
pinctrl-0 = <&pinctrl_rgmii1 &pinctrl_rgmii1_mdio_1>;
180180

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
/* DAC */
4747
format = "i2s";
4848
mclk-fs = <256>;
49-
frame-inversion = <1>;
49+
frame-inversion;
5050
cpu {
5151
sound-dai = <&sti_uni_player2>;
5252
};

arch/arm/configs/am200epdkit_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ CONFIG_SLAB=y
1111
CONFIG_MODULES=y
1212
CONFIG_MODULE_UNLOAD=y
1313
# CONFIG_BLK_DEV_BSG is not set
14-
# CONFIG_IOSCHED_DEADLINE is not set
15-
# CONFIG_IOSCHED_CFQ is not set
1614
CONFIG_ARCH_PXA=y
1715
CONFIG_ARCH_GUMSTIX=y
1816
CONFIG_PCCARD=y

arch/arm/configs/axm55xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ CONFIG_EMBEDDED=y
2525
CONFIG_PROFILING=y
2626
CONFIG_MODULES=y
2727
CONFIG_MODULE_UNLOAD=y
28-
# CONFIG_IOSCHED_DEADLINE is not set
2928
CONFIG_ARCH_AXXIA=y
3029
CONFIG_GPIO_PCA953X=y
3130
CONFIG_ARM_LPAE=y

arch/arm/configs/clps711x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ CONFIG_EMBEDDED=y
77
CONFIG_SLOB=y
88
CONFIG_JUMP_LABEL=y
99
CONFIG_PARTITION_ADVANCED=y
10-
# CONFIG_IOSCHED_CFQ is not set
1110
CONFIG_ARCH_CLPS711X=y
1211
CONFIG_ARCH_AUTCPU12=y
1312
CONFIG_ARCH_CDB89712=y

arch/arm/configs/cns3420vb_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ CONFIG_MODULE_UNLOAD=y
1717
CONFIG_MODULE_FORCE_UNLOAD=y
1818
CONFIG_MODVERSIONS=y
1919
# CONFIG_BLK_DEV_BSG is not set
20-
CONFIG_IOSCHED_CFQ=m
20+
CONFIG_IOSCHED_BFQ=m
2121
CONFIG_ARCH_MULTI_V6=y
2222
#CONFIG_ARCH_MULTI_V7 is not set
2323
CONFIG_ARCH_CNS3XXX=y

arch/arm/configs/colibri_pxa300_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
4343
CONFIG_USB_MON=y
4444
CONFIG_USB_STORAGE=y
4545
CONFIG_MMC=y
46-
# CONFIG_MMC_BLOCK_BOUNCE is not set
4746
CONFIG_MMC_PXA=y
4847
CONFIG_EXT3_FS=y
4948
CONFIG_NFS_FS=y

arch/arm/configs/collie_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ CONFIG_EXPERT=y
77
# CONFIG_BASE_FULL is not set
88
# CONFIG_EPOLL is not set
99
CONFIG_SLOB=y
10-
# CONFIG_IOSCHED_DEADLINE is not set
11-
# CONFIG_IOSCHED_CFQ is not set
1210
CONFIG_ARCH_SA1100=y
1311
CONFIG_SA1100_COLLIE=y
1412
CONFIG_PCCARD=y

arch/arm/configs/davinci_all_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ CONFIG_MODULE_UNLOAD=y
1515
CONFIG_MODULE_FORCE_UNLOAD=y
1616
CONFIG_MODVERSIONS=y
1717
CONFIG_PARTITION_ADVANCED=y
18-
# CONFIG_IOSCHED_DEADLINE is not set
19-
# CONFIG_IOSCHED_CFQ is not set
2018
CONFIG_ARCH_MULTIPLATFORM=y
2119
CONFIG_ARCH_MULTI_V7=n
2220
CONFIG_ARCH_MULTI_V5=y

arch/arm/configs/efm32_defconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ CONFIG_EMBEDDED=y
1212
# CONFIG_VM_EVENT_COUNTERS is not set
1313
# CONFIG_SLUB_DEBUG is not set
1414
# CONFIG_BLK_DEV_BSG is not set
15-
# CONFIG_IOSCHED_DEADLINE is not set
16-
# CONFIG_IOSCHED_CFQ is not set
1715
# CONFIG_MMU is not set
1816
CONFIG_ARM_SINGLE_ARMV7M=y
1917
CONFIG_ARCH_EFM32=y

0 commit comments

Comments
 (0)