Commit 1bfecd93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Pull "ARM: board specific updates" from Arnd Bergmann/Olof Johansson:
 "These changes are all specific to one board only.  We're trying to
  keep the number of board files low, but generally board level updates
  are ok on platforms that are working on moving towards DT based
  probing, which will eventually lead to removing them.

  The board-ams-delta.c board file gets a conflict between the removal
  of ams_delta_config and the addition of a lot of other data.  The
  Kconfig file has two changes in the same line, and in exynos, the
  power domain cleanup conflicts with the addition of the image sensor
  device.

  Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
  [olof: Amended a fix for a mismerge to board-omap4panda.c]
  Signed-off-by: default avatarOlof Johansson <olof@lixom.net&gt;">

Fixed up some fairly trivial conflicts manually.

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (82 commits)
  i.MX35-PDK: Add Camera support
  ARM : mx35: 3ds-board: add framebuffer device
  pxa/hx4700: Remove pcmcia platform_device structure
  ARM: pxa/hx4700: Reduce sleep mode battery discharge by 35%
  ARM: pxa/hx4700: Remove unwanted request for GPIO105
  ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board
  ARM: EXYNOS: Register JPEG on nuri
  ARM: EXYNOS: Register JPEG on universal_c210
  ARM: S5PV210: Enable JPEG on SMDKV210
  ARM: S5PV210: Add JPEG board definition
  ARM: EXYNOS: Enable JPEG on Origen
  ARM: EXYNOS: Enable JPEG on SMDKV310
  ARM: EXYNOS: Add __init attribute to universal_camera_init()
  ARM: EXYNOS: Add __init attribute to nuri_camera_init()
  ARM: S5PV210: Enable FIMC on SMDKC110
  ARM: S5PV210: Enable FIMC on SMDKV210
  ARM: S5PV210: Enable MFC on SMDKC110
  ARM: S5PV210: Enable MFC on SMDKV210
  ARM: EXYNOS: Enable G2D on SMDKV310
  ARM: tegra: update defconfig
  ...
parents 281b0539 a754a87c

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1583,6 +1583,7 @@ config ARCH_NR_GPIO 
	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 355 if ARCH_U8500

	default 264 if MACH_H4700

	default 0

	help

	  Maximum number of GPIOs in the system.

arch/arm/boot/dts/kirkwood-dreamplug.dts

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"



/ {

	model = "Globalscale Technologies Dreamplug";

	compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};



	serial@f1012000 {

		compatible = "ns16550a";

		reg = <0xf1012000 0xff>;

		reg-shift = <2>;

		interrupts = <33>;

		clock-frequency = <200000000>;

	};

};

arch/arm/boot/dts/kirkwood.dtsi

0 → 100644
+6 −0
Original line number Diff line number Diff line 
/include/ "skeleton.dtsi"



/ {

	compatible = "marvell,kirkwood";

};

arch/arm/boot/dts/tegra-paz00.dts

+26 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ 


	i2c@7000d000 {

		clock-frequency = <400000>;



		adt7461@4c {

			compatible = "adi,adt7461";

			reg = <0x4c>;

		};

	};



	serial@70006000 {
@@ -74,4 +79,25 @@ 
	sdhci@c8000600 {

		support-8bit;

	};



	gpio-keys {

		compatible = "gpio-keys";



		power {

			label = "Power";

			gpios = <&gpio 79 1>; /* gpio PJ7, active low */

			linux,code = <116>; /* KEY_POWER */

			gpio-key,wakeup;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		wifi {

			label = "wifi-led";

			gpios = <&gpio 24 0>;

			linux,default-trigger = "rfkill0";

		};

	};

};

arch/arm/configs/tegra_defconfig

+22 −11
Original line number Diff line number Diff line
@@ -11,11 +11,14 @@ CONFIG_RT_GROUP_SCHED=y 
CONFIG_BLK_DEV_INITRD=y

# CONFIG_ELF_CORE is not set

CONFIG_EMBEDDED=y

CONFIG_PERF_EVENTS=y

CONFIG_SLAB=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

CONFIG_EFI_PARTITION=y

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_IOSCHED_CFQ is not set

CONFIG_ARCH_TEGRA=y
@@ -27,18 +30,20 @@ CONFIG_MACH_PAZ00=y 
CONFIG_MACH_TRIMSLICE=y

CONFIG_MACH_WARIO=y

CONFIG_MACH_VENTANA=y

CONFIG_TEGRA_DEBUG_UARTD=y

CONFIG_ARM_ERRATA_742230=y

CONFIG_TEGRA_EMC_SCALING_ENABLE=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_PREEMPT=y

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

CONFIG_HIGHMEM=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_AUTO_ZRELADDR=y

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPU_IDLE=y

CONFIG_VFP=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -68,7 +73,6 @@ CONFIG_IPV6_MULTIPLE_TABLES=y 
# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_PROC_DEVICETREE=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_MISC_DEVICES=y

CONFIG_AD525X_DPOT=y

CONFIG_AD525X_DPOT_I2C=y

CONFIG_ICS932S401=y
@@ -76,6 +80,7 @@ CONFIG_APDS9802ALS=y 
CONFIG_ISL29003=y

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_BLK_DEV_SR=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_NETDEVICES=y

CONFIG_DUMMY=y
@@ -85,8 +90,7 @@ CONFIG_USB_USBNET=y 
CONFIG_USB_NET_SMSC75XX=y

CONFIG_USB_NET_SMSC95XX=y

# CONFIG_WLAN is not set

# CONFIG_INPUT is not set

# CONFIG_SERIO is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_VT is not set

# CONFIG_LEGACY_PTYS is not set

# CONFIG_DEVKMEM is not set
@@ -96,13 +100,15 @@ CONFIG_SERIAL_OF_PLATFORM=y 
# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_I2C_COMPAT is not set

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_TEGRA=y

CONFIG_SPI=y

CONFIG_SPI_TEGRA=y

CONFIG_SENSORS_LM90=y

CONFIG_MFD_TPS6586X=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_VIRTUAL_CONSUMER=y

CONFIG_REGULATOR_GPIO=y

CONFIG_REGULATOR_TPS6586X=y

CONFIG_SOUND=y

CONFIG_SND=y
@@ -116,11 +122,13 @@ CONFIG_SND_SOC=y 
CONFIG_SND_SOC_TEGRA=y

CONFIG_SND_SOC_TEGRA_WM8903=y

CONFIG_SND_SOC_TEGRA_TRIMSLICE=y

CONFIG_SND_SOC_TEGRA_ALC5632=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_TEGRA=y

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_BLOCK_MINORS=16

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_TEGRA=y
@@ -130,6 +138,11 @@ CONFIG_STAGING=y 
CONFIG_IIO=y

CONFIG_SENSORS_ISL29018=y

CONFIG_SENSORS_AK8975=y

CONFIG_MFD_NVEC=y

CONFIG_KEYBOARD_NVEC=y

CONFIG_SERIO_NVEC_PS2=y

CONFIG_TEGRA_IOMMU_GART=y

CONFIG_TEGRA_IOMMU_SMMU=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT2_FS_POSIX_ACL=y
@@ -138,13 +151,12 @@ CONFIG_EXT3_FS=y 
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

CONFIG_EXT4_FS=y

# CONFIG_DNOTIFY is not set

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_EFI_PARTITION=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_PRINTK_TIME=y
@@ -162,9 +174,8 @@ CONFIG_DEBUG_SG=y 
CONFIG_DEBUG_LL=y

CONFIG_EARLY_PRINTK=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_ARC4=y

CONFIG_CRYPTO_TWOFISH=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_DEV_TEGRA_AES=y

CONFIG_CRC_CCITT=y
 
CONFIG_CRC16=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE