tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds b719ae07 3e71e121

+14 -65
-3
arch/arm/boot/dts/stih410-b2260.dts
··· 178 178 phy-mode = "rgmii"; 179 179 pinctrl-0 = <&pinctrl_rgmii1 &pinctrl_rgmii1_mdio_1>; 180 180 181 - snps,phy-bus-name = "stmmac"; 182 - snps,phy-bus-id = <0>; 183 - snps,phy-addr = <0>; 184 181 snps,reset-gpio = <&pio0 7 0>; 185 182 snps,reset-active-low; 186 183 snps,reset-delays-us = <0 10000 1000000>;
+1 -1
arch/arm/boot/dts/stihxxx-b2120.dtsi
··· 46 46 /* DAC */ 47 47 format = "i2s"; 48 48 mclk-fs = <256>; 49 - frame-inversion = <1>; 49 + frame-inversion; 50 50 cpu { 51 51 sound-dai = <&sti_uni_player2>; 52 52 };
-2
arch/arm/configs/am200epdkit_defconfig
··· 11 11 CONFIG_MODULES=y 12 12 CONFIG_MODULE_UNLOAD=y 13 13 # CONFIG_BLK_DEV_BSG is not set 14 - # CONFIG_IOSCHED_DEADLINE is not set 15 - # CONFIG_IOSCHED_CFQ is not set 16 14 CONFIG_ARCH_PXA=y 17 15 CONFIG_ARCH_GUMSTIX=y 18 16 CONFIG_PCCARD=y
-1
arch/arm/configs/axm55xx_defconfig
··· 25 25 CONFIG_PROFILING=y 26 26 CONFIG_MODULES=y 27 27 CONFIG_MODULE_UNLOAD=y 28 - # CONFIG_IOSCHED_DEADLINE is not set 29 28 CONFIG_ARCH_AXXIA=y 30 29 CONFIG_GPIO_PCA953X=y 31 30 CONFIG_ARM_LPAE=y
-1
arch/arm/configs/clps711x_defconfig
··· 7 7 CONFIG_SLOB=y 8 8 CONFIG_JUMP_LABEL=y 9 9 CONFIG_PARTITION_ADVANCED=y 10 - # CONFIG_IOSCHED_CFQ is not set 11 10 CONFIG_ARCH_CLPS711X=y 12 11 CONFIG_ARCH_AUTCPU12=y 13 12 CONFIG_ARCH_CDB89712=y
+1 -1
arch/arm/configs/cns3420vb_defconfig
··· 17 17 CONFIG_MODULE_FORCE_UNLOAD=y 18 18 CONFIG_MODVERSIONS=y 19 19 # CONFIG_BLK_DEV_BSG is not set 20 - CONFIG_IOSCHED_CFQ=m 20 + CONFIG_IOSCHED_BFQ=m 21 21 CONFIG_ARCH_MULTI_V6=y 22 22 #CONFIG_ARCH_MULTI_V7 is not set 23 23 CONFIG_ARCH_CNS3XXX=y
-1
arch/arm/configs/colibri_pxa300_defconfig
··· 43 43 CONFIG_USB_MON=y 44 44 CONFIG_USB_STORAGE=y 45 45 CONFIG_MMC=y 46 - # CONFIG_MMC_BLOCK_BOUNCE is not set 47 46 CONFIG_MMC_PXA=y 48 47 CONFIG_EXT3_FS=y 49 48 CONFIG_NFS_FS=y
-2
arch/arm/configs/collie_defconfig
··· 7 7 # CONFIG_BASE_FULL is not set 8 8 # CONFIG_EPOLL is not set 9 9 CONFIG_SLOB=y 10 - # CONFIG_IOSCHED_DEADLINE is not set 11 - # CONFIG_IOSCHED_CFQ is not set 12 10 CONFIG_ARCH_SA1100=y 13 11 CONFIG_SA1100_COLLIE=y 14 12 CONFIG_PCCARD=y
-2
arch/arm/configs/davinci_all_defconfig
··· 15 15 CONFIG_MODULE_FORCE_UNLOAD=y 16 16 CONFIG_MODVERSIONS=y 17 17 CONFIG_PARTITION_ADVANCED=y 18 - # CONFIG_IOSCHED_DEADLINE is not set 19 - # CONFIG_IOSCHED_CFQ is not set 20 18 CONFIG_ARCH_MULTIPLATFORM=y 21 19 CONFIG_ARCH_MULTI_V7=n 22 20 CONFIG_ARCH_MULTI_V5=y
-2
arch/arm/configs/efm32_defconfig
··· 12 12 # CONFIG_VM_EVENT_COUNTERS is not set 13 13 # CONFIG_SLUB_DEBUG is not set 14 14 # CONFIG_BLK_DEV_BSG is not set 15 - # CONFIG_IOSCHED_DEADLINE is not set 16 - # CONFIG_IOSCHED_CFQ is not set 17 15 # CONFIG_MMU is not set 18 16 CONFIG_ARM_SINGLE_ARMV7M=y 19 17 CONFIG_ARCH_EFM32=y
-1
arch/arm/configs/ep93xx_defconfig
··· 11 11 CONFIG_MODULE_FORCE_UNLOAD=y 12 12 # CONFIG_BLK_DEV_BSG is not set 13 13 CONFIG_PARTITION_ADVANCED=y 14 - # CONFIG_IOSCHED_CFQ is not set 15 14 CONFIG_ARCH_EP93XX=y 16 15 CONFIG_CRUNCH=y 17 16 CONFIG_MACH_ADSSPHERE=y
-2
arch/arm/configs/eseries_pxa_defconfig
··· 9 9 CONFIG_MODULE_UNLOAD=y 10 10 CONFIG_MODULE_FORCE_UNLOAD=y 11 11 # CONFIG_BLK_DEV_BSG is not set 12 - # CONFIG_IOSCHED_DEADLINE is not set 13 - # CONFIG_IOSCHED_CFQ is not set 14 12 CONFIG_ARCH_PXA=y 15 13 CONFIG_ARCH_PXA_ESERIES=y 16 14 # CONFIG_ARM_THUMB is not set
-1
arch/arm/configs/ezx_defconfig
··· 14 14 CONFIG_MODULE_FORCE_UNLOAD=y 15 15 CONFIG_MODVERSIONS=y 16 16 # CONFIG_BLK_DEV_BSG is not set 17 - # CONFIG_IOSCHED_CFQ is not set 18 17 CONFIG_ARCH_PXA=y 19 18 CONFIG_PXA_EZX=y 20 19 CONFIG_NO_HZ=y
-2
arch/arm/configs/h3600_defconfig
··· 5 5 CONFIG_BLK_DEV_INITRD=y 6 6 CONFIG_MODULES=y 7 7 # CONFIG_BLK_DEV_BSG is not set 8 - # CONFIG_IOSCHED_DEADLINE is not set 9 - # CONFIG_IOSCHED_CFQ is not set 10 8 CONFIG_ARCH_SA1100=y 11 9 CONFIG_SA1100_H3600=y 12 10 CONFIG_PCCARD=y
-1
arch/arm/configs/h5000_defconfig
··· 10 10 CONFIG_MODULE_UNLOAD=y 11 11 CONFIG_MODULE_FORCE_UNLOAD=y 12 12 # CONFIG_BLK_DEV_BSG is not set 13 - # CONFIG_IOSCHED_CFQ is not set 14 13 CONFIG_ARCH_PXA=y 15 14 CONFIG_MACH_H5000=y 16 15 CONFIG_AEABI=y
-1
arch/arm/configs/imote2_defconfig
··· 13 13 CONFIG_MODULE_FORCE_UNLOAD=y 14 14 CONFIG_MODVERSIONS=y 15 15 # CONFIG_BLK_DEV_BSG is not set 16 - # CONFIG_IOSCHED_CFQ is not set 17 16 CONFIG_ARCH_PXA=y 18 17 CONFIG_MACH_INTELMOTE2=y 19 18 CONFIG_NO_HZ=y
-2
arch/arm/configs/imx_v4_v5_defconfig
··· 32 32 CONFIG_MODULES=y 33 33 CONFIG_MODULE_UNLOAD=y 34 34 # CONFIG_BLK_DEV_BSG is not set 35 - # CONFIG_IOSCHED_DEADLINE is not set 36 - # CONFIG_IOSCHED_CFQ is not set 37 35 CONFIG_NET=y 38 36 CONFIG_PACKET=y 39 37 CONFIG_UNIX=y
-4
arch/arm/configs/lpc18xx_defconfig
··· 1 - CONFIG_CROSS_COMPILE="arm-linux-gnueabihf-" 2 1 CONFIG_HIGH_RES_TIMERS=y 3 2 CONFIG_PREEMPT=y 4 3 CONFIG_BLK_DEV_INITRD=y ··· 27 28 CONFIG_ZBOOT_ROM_TEXT=0x0 28 29 CONFIG_ZBOOT_ROM_BSS=0x0 29 30 CONFIG_ARM_APPENDED_DTB=y 30 - # CONFIG_LBDAF is not set 31 31 # CONFIG_BLK_DEV_BSG is not set 32 - # CONFIG_IOSCHED_DEADLINE is not set 33 - # CONFIG_IOSCHED_CFQ is not set 34 32 CONFIG_BINFMT_FLAT=y 35 33 CONFIG_BINFMT_ZFLAT=y 36 34 CONFIG_BINFMT_SHARED_FLAT=y
-2
arch/arm/configs/magician_defconfig
··· 9 9 CONFIG_MODULES=y 10 10 CONFIG_MODULE_UNLOAD=y 11 11 # CONFIG_BLK_DEV_BSG is not set 12 - # CONFIG_IOSCHED_DEADLINE is not set 13 - # CONFIG_IOSCHED_CFQ is not set 14 12 CONFIG_ARCH_PXA=y 15 13 CONFIG_MACH_H4700=y 16 14 CONFIG_MACH_MAGICIAN=y
-1
arch/arm/configs/moxart_defconfig
··· 15 15 # CONFIG_SLUB_DEBUG is not set 16 16 # CONFIG_COMPAT_BRK is not set 17 17 # CONFIG_BLK_DEV_BSG is not set 18 - # CONFIG_IOSCHED_DEADLINE is not set 19 18 CONFIG_ARCH_MULTI_V4=y 20 19 # CONFIG_ARCH_MULTI_V7 is not set 21 20 CONFIG_ARCH_MOXART=y
-2
arch/arm/configs/mxs_defconfig
··· 25 25 CONFIG_MODULE_FORCE_UNLOAD=y 26 26 CONFIG_MODVERSIONS=y 27 27 CONFIG_BLK_DEV_INTEGRITY=y 28 - # CONFIG_IOSCHED_DEADLINE is not set 29 - # CONFIG_IOSCHED_CFQ is not set 30 28 CONFIG_NET=y 31 29 CONFIG_PACKET=y 32 30 CONFIG_UNIX=y
-2
arch/arm/configs/omap1_defconfig
··· 18 18 CONFIG_MODULE_UNLOAD=y 19 19 CONFIG_MODULE_FORCE_UNLOAD=y 20 20 # CONFIG_BLK_DEV_BSG is not set 21 - # CONFIG_IOSCHED_DEADLINE is not set 22 - # CONFIG_IOSCHED_CFQ is not set 23 21 CONFIG_ARCH_OMAP=y 24 22 CONFIG_ARCH_OMAP1=y 25 23 CONFIG_OMAP_RESET_CLOCKS=y
-2
arch/arm/configs/palmz72_defconfig
··· 7 7 CONFIG_MODULES=y 8 8 CONFIG_MODULE_UNLOAD=y 9 9 # CONFIG_BLK_DEV_BSG is not set 10 - # CONFIG_IOSCHED_DEADLINE is not set 11 - # CONFIG_IOSCHED_CFQ is not set 12 10 CONFIG_ARCH_PXA=y 13 11 CONFIG_ARCH_PXA_PALM=y 14 12 # CONFIG_MACH_PALMTX is not set
-2
arch/arm/configs/pcm027_defconfig
··· 13 13 CONFIG_MODULE_UNLOAD=y 14 14 CONFIG_MODULE_FORCE_UNLOAD=y 15 15 # CONFIG_BLK_DEV_BSG is not set 16 - # CONFIG_IOSCHED_DEADLINE is not set 17 - # CONFIG_IOSCHED_CFQ is not set 18 16 CONFIG_ARCH_PXA=y 19 17 CONFIG_MACH_PCM027=y 20 18 CONFIG_MACH_PCM990_BASEBOARD=y
-2
arch/arm/configs/pleb_defconfig
··· 6 6 # CONFIG_HOTPLUG is not set 7 7 # CONFIG_SHMEM is not set 8 8 CONFIG_MODULES=y 9 - # CONFIG_IOSCHED_DEADLINE is not set 10 - # CONFIG_IOSCHED_CFQ is not set 11 9 CONFIG_ARCH_SA1100=y 12 10 CONFIG_SA1100_PLEB=y 13 11 CONFIG_ZBOOT_ROM_TEXT=0x0
-1
arch/arm/configs/realview_defconfig
··· 8 8 CONFIG_MODULES=y 9 9 CONFIG_MODULE_UNLOAD=y 10 10 # CONFIG_BLK_DEV_BSG is not set 11 - # CONFIG_IOSCHED_CFQ is not set 12 11 CONFIG_ARCH_MULTI_V6=y 13 12 CONFIG_ARCH_REALVIEW=y 14 13 CONFIG_MACH_REALVIEW_EB=y
-3
arch/arm/configs/sama5_defconfig
··· 14 14 CONFIG_MODULE_UNLOAD=y 15 15 CONFIG_MODULE_FORCE_UNLOAD=y 16 16 # CONFIG_BLK_DEV_BSG is not set 17 - # CONFIG_IOSCHED_DEADLINE is not set 18 - # CONFIG_IOSCHED_CFQ is not set 19 17 CONFIG_ARCH_AT91=y 20 18 CONFIG_SOC_SAMA5D2=y 21 19 CONFIG_SOC_SAMA5D3=y ··· 180 182 CONFIG_USB_ATMEL_USBA=y 181 183 CONFIG_USB_G_SERIAL=y 182 184 CONFIG_MMC=y 183 - # CONFIG_MMC_BLOCK_BOUNCE is not set 184 185 CONFIG_MMC_SDHCI=y 185 186 CONFIG_MMC_SDHCI_PLTFM=y 186 187 CONFIG_MMC_SDHCI_OF_AT91=y
-2
arch/arm/configs/stm32_defconfig
··· 14 14 # CONFIG_VM_EVENT_COUNTERS is not set 15 15 # CONFIG_SLUB_DEBUG is not set 16 16 # CONFIG_BLK_DEV_BSG is not set 17 - # CONFIG_IOSCHED_DEADLINE is not set 18 - # CONFIG_IOSCHED_CFQ is not set 19 17 # CONFIG_MMU is not set 20 18 CONFIG_ARCH_STM32=y 21 19 CONFIG_CPU_V7M_NUM_IRQ=240
+1
arch/arm/configs/sunxi_defconfig
··· 85 85 CONFIG_AXP20X_POWER=y 86 86 CONFIG_THERMAL=y 87 87 CONFIG_CPU_THERMAL=y 88 + CONFIG_SUN8I_THERMAL=y 88 89 CONFIG_WATCHDOG=y 89 90 CONFIG_SUNXI_WATCHDOG=y 90 91 CONFIG_MFD_AC100=y
-2
arch/arm/configs/u300_defconfig
··· 11 11 CONFIG_MODULE_UNLOAD=y 12 12 # CONFIG_BLK_DEV_BSG is not set 13 13 CONFIG_PARTITION_ADVANCED=y 14 - # CONFIG_IOSCHED_CFQ is not set 15 14 # CONFIG_ARCH_MULTI_V7 is not set 16 15 CONFIG_ARCH_U300=y 17 16 CONFIG_MACH_U300_SPIDUMMY=y ··· 45 46 CONFIG_BACKLIGHT_CLASS_DEVICE=y 46 47 # CONFIG_USB_SUPPORT is not set 47 48 CONFIG_MMC=y 48 - # CONFIG_MMC_BLOCK_BOUNCE is not set 49 49 CONFIG_MMC_ARMMMCI=y 50 50 CONFIG_RTC_CLASS=y 51 51 # CONFIG_RTC_HCTOSYS is not set
-2
arch/arm/configs/vexpress_defconfig
··· 15 15 CONFIG_MODULES=y 16 16 CONFIG_MODULE_UNLOAD=y 17 17 # CONFIG_BLK_DEV_BSG is not set 18 - # CONFIG_IOSCHED_DEADLINE is not set 19 - # CONFIG_IOSCHED_CFQ is not set 20 18 CONFIG_ARCH_VEXPRESS=y 21 19 CONFIG_ARCH_VEXPRESS_DCSCB=y 22 20 CONFIG_ARCH_VEXPRESS_TC2_PM=y
-1
arch/arm/configs/viper_defconfig
··· 9 9 CONFIG_MODULES=y 10 10 CONFIG_MODULE_UNLOAD=y 11 11 # CONFIG_BLK_DEV_BSG is not set 12 - # CONFIG_IOSCHED_CFQ is not set 13 12 CONFIG_ARCH_PXA=y 14 13 CONFIG_ARCH_VIPER=y 15 14 CONFIG_IWMMXT=y
-2
arch/arm/configs/zeus_defconfig
··· 4 4 CONFIG_MODULES=y 5 5 CONFIG_MODULE_UNLOAD=y 6 6 # CONFIG_BLK_DEV_BSG is not set 7 - # CONFIG_IOSCHED_CFQ is not set 8 7 CONFIG_ARCH_PXA=y 9 8 CONFIG_MACH_ARCOM_ZEUS=y 10 9 CONFIG_PCCARD=m ··· 136 137 CONFIG_USB_G_SERIAL=m 137 138 CONFIG_USB_G_PRINTER=m 138 139 CONFIG_MMC=y 139 - # CONFIG_MMC_BLOCK_BOUNCE is not set 140 140 CONFIG_MMC_PXA=y 141 141 CONFIG_NEW_LEDS=y 142 142 CONFIG_LEDS_CLASS=m
-1
arch/arm/configs/zx_defconfig
··· 16 16 CONFIG_PERF_EVENTS=y 17 17 CONFIG_SLAB=y 18 18 # CONFIG_BLK_DEV_BSG is not set 19 - # CONFIG_IOSCHED_CFQ is not set 20 19 CONFIG_ARCH_ZX=y 21 20 CONFIG_SOC_ZX296702=y 22 21 # CONFIG_SWP_EMULATE is not set
+1 -1
arch/arm/mach-npcm/Kconfig
··· 11 11 depends on ARCH_MULTI_V7 12 12 select PINCTRL_NPCM7XX 13 13 select NPCM7XX_TIMER 14 - select ARCH_REQUIRE_GPIOLIB 14 + select GPIOLIB 15 15 select CACHE_L2X0 16 16 select ARM_GIC 17 17 select HAVE_ARM_TWD if SMP
+4 -4
arch/arm64/boot/dts/arm/fvp-base-revc.dts
··· 161 161 bus-range = <0x0 0x1>; 162 162 reg = <0x0 0x40000000 0x0 0x10000000>; 163 163 ranges = <0x2000000 0x0 0x50000000 0x0 0x50000000 0x0 0x10000000>; 164 - interrupt-map = <0 0 0 1 &gic GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, 165 - <0 0 0 2 &gic GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, 166 - <0 0 0 3 &gic GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, 167 - <0 0 0 4 &gic GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; 164 + interrupt-map = <0 0 0 1 &gic 0 0 GIC_SPI 168 IRQ_TYPE_LEVEL_HIGH>, 165 + <0 0 0 2 &gic 0 0 GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>, 166 + <0 0 0 3 &gic 0 0 GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>, 167 + <0 0 0 4 &gic 0 0 GIC_SPI 171 IRQ_TYPE_LEVEL_HIGH>; 168 168 interrupt-map-mask = <0x0 0x0 0x0 0x7>; 169 169 msi-map = <0x0 &its 0x0 0x10000>; 170 170 iommu-map = <0x0 &smmu 0x0 0x10000>;
+3 -1
arch/arm64/configs/defconfig
··· 452 452 CONFIG_CPU_THERMAL=y 453 453 CONFIG_THERMAL_EMULATION=y 454 454 CONFIG_QORIQ_THERMAL=m 455 + CONFIG_SUN8I_THERMAL=y 455 456 CONFIG_ROCKCHIP_THERMAL=m 456 457 CONFIG_RCAR_THERMAL=y 457 458 CONFIG_RCAR_GEN3_THERMAL=y ··· 548 547 CONFIG_ROCKCHIP_INNO_HDMI=y 549 548 CONFIG_DRM_RCAR_DU=m 550 549 CONFIG_DRM_SUN4I=m 550 + CONFIG_DRM_SUN6I_DSI=m 551 551 CONFIG_DRM_SUN8I_DW_HDMI=m 552 552 CONFIG_DRM_SUN8I_MIXER=m 553 553 CONFIG_DRM_MSM=m ··· 683 681 CONFIG_RTC_DRV_IMX_SC=m 684 682 CONFIG_RTC_DRV_XGENE=y 685 683 CONFIG_DMADEVICES=y 686 - CONFIG_DMA_BCM2835=m 684 + CONFIG_DMA_BCM2835=y 687 685 CONFIG_DMA_SUN6I=m 688 686 CONFIG_FSL_EDMA=y 689 687 CONFIG_IMX_SDMA=y
+1 -1
drivers/bus/moxtet.c
··· 465 465 { 466 466 struct moxtet *moxtet = file->private_data; 467 467 u8 bin[TURRIS_MOX_MAX_MODULES]; 468 - u8 hex[sizeof(buf) * 2 + 1]; 468 + u8 hex[sizeof(bin) * 2 + 1]; 469 469 int ret, n; 470 470 471 471 ret = moxtet_spi_read(moxtet, bin);
+2 -1
drivers/soc/tegra/fuse/fuse-tegra30.c
··· 36 36 defined(CONFIG_ARCH_TEGRA_124_SOC) || \ 37 37 defined(CONFIG_ARCH_TEGRA_132_SOC) || \ 38 38 defined(CONFIG_ARCH_TEGRA_210_SOC) || \ 39 - defined(CONFIG_ARCH_TEGRA_186_SOC) 39 + defined(CONFIG_ARCH_TEGRA_186_SOC) || \ 40 + defined(CONFIG_ARCH_TEGRA_194_SOC) 40 41 static u32 tegra30_fuse_read_early(struct tegra_fuse *fuse, unsigned int offset) 41 42 { 42 43 if (WARN_ON(!fuse->base))