Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9663398a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Olof Johansson:
 "This is our first set of fixes from arm-soc for 3.11.
   - A handful of build and warning fixes from Arnd
   - A collection of OMAP fixes
   - defconfig updates to make the default configs more useful for real
     use (and testing) out of the box on hardware

  And a couple of other small fixes.  Some of these have been recently
  applied but it's normally how we deal with fixes, with less bake time
  in -next needed"

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (32 commits)
  arm: multi_v7_defconfig: Tweaks for omap and sunxi
  arm: multi_v7_defconfig: add i.MX options and NFS root
  ARM: omap2: add select of TI_PRIV_EDMA
  ARM: exynos: select PM_GENERIC_DOMAINS only when used
  ARM: ixp4xx: avoid circular header dependency
  ARM: OMAP: omap_common_late_init may be unused
  ARM: sti: move DEBUG_STI_UART into alphabetical order
  ARM: OMAP: build mach-omap code only if needed
  ARM: zynq: use DT_MACHINE_START
  ARM: omap5: omap5 has SCU and TWD
  ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
  ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
  ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
  ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
  ARM: OMAP2+: devices: remove duplicated include from devices.c
  ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
  ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
  ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
  ARM: OMAP2+: Remove obsolete Makefile line
  ARM: OMAP5: Enable Cortex A15 errata 798181
  ...
parents bfd65dd9 d4e1c7ef

arch/arm/Kconfig.debug

+10 −10
Original line number Diff line number Diff line
@@ -510,6 +510,16 @@ choice 
		  Say Y here if you want the debug print routines to direct

		  their output to the uart1 port on SiRFmarco devices.



	config DEBUG_STI_UART

		depends on ARCH_STI

		bool "Use StiH415/416 ASC for low-level debug"

		help

		  Say Y here if you want kernel low-level debugging support

		  on StiH415/416 based platforms like B2000, B2020.

		  It support UART2 and SBC_UART1.



		  If unsure, say N.



	config DEBUG_U300_UART

		bool "Kernel low-level debugging messages via U300 UART0"

		depends on ARCH_U300
@@ -564,16 +574,6 @@ choice 
		  This option selects UART0 on VIA/Wondermedia System-on-a-chip

		  devices, including VT8500, WM8505, WM8650 and WM8850.



	config DEBUG_STI_UART

		depends on ARCH_STI

		bool "Use StiH415/416 ASC for low-level debug"

		help

		  Say Y here if you want kernel low-level debugging support

		  on StiH415/416 based platforms like B2000, B2020.

		  It support UART2 and SBC_UART1.



		  If unsure, say N.



	config DEBUG_LL_UART_NONE

		bool "No low-level debugging UART"

		depends on !ARCH_MULTIPLATFORM

arch/arm/boot/dts/tegra20-seaboard.dts

+1 −0
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ 
			regulator-name = "vdd_vbus_wup1";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio 24 0>; /* PD0 */

		};

	};

arch/arm/boot/dts/tegra20-trimslice.dts

+1 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ 
			regulator-name = "usb1_vbus";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&gpio 170 0>; /* PV2 */

		};

	};

arch/arm/boot/dts/tegra20-whistler.dts

+2 −0
Original line number Diff line number Diff line
@@ -586,6 +586,7 @@ 
			regulator-name = "vbus1";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&tca6416 0 0>; /* GPIO_PMU0 */

		};
@@ -595,6 +596,7 @@ 
			regulator-name = "vbus3";

			regulator-min-microvolt = <5000000>;

			regulator-max-microvolt = <5000000>;

			enable-active-high;

			gpio = <&tca6416 1 0>; /* GPIO_PMU1 */

		};

	};

arch/arm/configs/multi_v7_defconfig

+106 −27
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_IRQ_DOMAIN_DEBUG=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_ARCH_MVEBU=y

CONFIG_MACH_ARMADA_370=y

CONFIG_ARCH_SIRF=y

CONFIG_MACH_ARMADA_XP=y

CONFIG_ARCH_BCM=y

CONFIG_GPIO_PCA953X=y

CONFIG_ARCH_HIGHBANK=y

CONFIG_ARCH_KEYSTONE=y

CONFIG_ARCH_MXC=y

CONFIG_MACH_IMX51_DT=y

CONFIG_SOC_IMX53=y

CONFIG_SOC_IMX6Q=y

CONFIG_SOC_IMX6SL=y

CONFIG_SOC_VF610=y

CONFIG_ARCH_OMAP3=y

CONFIG_ARCH_OMAP4=y

CONFIG_SOC_OMAP5=y

CONFIG_SOC_AM33XX=y

CONFIG_SOC_AM43XX=y

CONFIG_ARCH_ROCKCHIP=y

CONFIG_ARCH_SOCFPGA=y

CONFIG_ARCH_SUNXI=y

CONFIG_ARCH_WM8850=y

# CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA is not set

CONFIG_ARCH_ZYNQ=y

CONFIG_ARM_ERRATA_754322=y

CONFIG_PLAT_SPEAR=y

CONFIG_ARCH_SPEAR13XX=y

CONFIG_MACH_SPEAR1310=y

CONFIG_MACH_SPEAR1340=y

CONFIG_ARCH_STI=y

CONFIG_ARCH_SUNXI=y

CONFIG_ARCH_SIRF=y

CONFIG_ARCH_TEGRA=y

CONFIG_ARCH_TEGRA_2x_SOC=y

CONFIG_ARCH_TEGRA_3x_SOC=y

CONFIG_ARCH_TEGRA_114_SOC=y

CONFIG_TEGRA_PCI=y

CONFIG_TEGRA_EMC_SCALING_ENABLE=y

CONFIG_ARCH_U8500=y

CONFIG_MACH_SNOWBALL=y

CONFIG_MACH_UX500_DT=y

CONFIG_ARCH_VEXPRESS=y

CONFIG_ARCH_VEXPRESS_CA9X4=y

CONFIG_ARCH_VIRT=y

CONFIG_ARCH_WM8850=y

CONFIG_ARCH_ZYNQ=y

CONFIG_SMP=y

CONFIG_ARM_ARCH_TIMER=y

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_HIGHPTE=y

CONFIG_ARM_APPENDED_DTB=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_NET=y

CONFIG_UNIX=y

CONFIG_INET=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

CONFIG_BLK_DEV_SD=y

CONFIG_ATA=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_SATA_HIGHBANK=y

CONFIG_SATA_MV=y

CONFIG_SATA_AHCI_PLATFORM=y

CONFIG_NETDEVICES=y

CONFIG_SUN4I_EMAC=y

CONFIG_NET_CALXEDA_XGMAC=y

CONFIG_SMSC911X=y

CONFIG_STMMAC_ETH=y

CONFIG_SERIO_AMBAKMI=y

CONFIG_MDIO_SUN4I=y

CONFIG_KEYBOARD_SPEAR=y

CONFIG_SERIO_AMBAKMI=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_DW=y

CONFIG_KEYBOARD_SPEAR=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_SIRFSOC=y

CONFIG_SERIAL_SIRFSOC_CONSOLE=y

CONFIG_SERIAL_TEGRA=y

CONFIG_SERIAL_IMX=y

CONFIG_SERIAL_IMX_CONSOLE=y

CONFIG_SERIAL_VT8500=y

CONFIG_SERIAL_VT8500_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_OMAP=y

CONFIG_SERIAL_OMAP_CONSOLE=y

CONFIG_SERIAL_XILINX_PS_UART=y

CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y

CONFIG_IPMI_HANDLER=y

CONFIG_IPMI_SI=y

CONFIG_I2C=y

CONFIG_SERIAL_FSL_LPUART=y

CONFIG_SERIAL_FSL_LPUART_CONSOLE=y

CONFIG_I2C_DESIGNWARE_PLATFORM=y

CONFIG_I2C_SIRF=y

CONFIG_I2C_TEGRA=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_SPI_SIRF=y

CONFIG_GPIO_PL061=y

CONFIG_FB=y

CONFIG_SPI_TEGRA114=y

CONFIG_SPI_TEGRA20_SLINK=y

CONFIG_PINCTRL_SINGLE=y

CONFIG_GPIO_GENERIC_PLATFORM=y

CONFIG_GPIO_TWL4030=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_AB8500=y

CONFIG_REGULATOR_TPS51632=y

CONFIG_REGULATOR_TPS62360=y

CONFIG_REGULATOR_TWL4030=y

CONFIG_REGULATOR_VEXPRESS=y

CONFIG_DRM=y

CONFIG_TEGRA_HOST1X=y

CONFIG_DRM_TEGRA=y

CONFIG_FB_ARMCLCD=y

CONFIG_FB_WM8505=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FB_SIMPLE=y

CONFIG_USB=y

CONFIG_USB_XHCI_HCD=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_MXC=y

CONFIG_USB_EHCI_TEGRA=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_ISP1760_HCD=y

CONFIG_USB_STORAGE=y

CONFIG_AB8500_USB=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_OMAP_USB2=y

CONFIG_OMAP_USB3=y

CONFIG_SAMSUNG_USB2PHY=y

CONFIG_SAMSUNG_USB3PHY=y

CONFIG_USB_GPIO_VBUS=y

CONFIG_USB_ISP1301=y

CONFIG_USB_MXS_PHY=y

CONFIG_MMC=y

CONFIG_MMC_ARMMMCI=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_TEGRA=y

CONFIG_MMC_SDHCI_SPEAR=y

CONFIG_MMC_WMT=y

CONFIG_MMC_OMAP=y

CONFIG_MMC_OMAP_HS=y

CONFIG_EDAC=y

CONFIG_EDAC_MM_EDAC=y

CONFIG_EDAC_HIGHBANK_MC=y

CONFIG_EDAC_HIGHBANK_L2=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_TWL4030=y

CONFIG_RTC_DRV_PL031=y

CONFIG_RTC_DRV_VT8500=y

CONFIG_PWM=y

CONFIG_PWM_VT8500=y

CONFIG_RTC_DRV_TEGRA=y

CONFIG_DMADEVICES=y

CONFIG_PL330_DMA=y

CONFIG_SIRF_DMA=y

CONFIG_DW_DMAC=y

CONFIG_TEGRA20_APB_DMA=y

CONFIG_STE_DMA40=y

CONFIG_SIRF_DMA=y

CONFIG_TI_EDMA=y

CONFIG_PL330_DMA=y

CONFIG_IMX_SDMA=y

CONFIG_IMX_DMA=y

CONFIG_MXS_DMA=y

CONFIG_DMA_OMAP=y

CONFIG_PWM=y

CONFIG_PWM_VT8500=y

CONFIG_EXT4_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_ROOT_NFS=y

CONFIG_PRINTK_TIME=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOCKUP_DETECTOR=y