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

Commit a8e1ceb7 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/boards' into HEAD 

Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c
parents 8b1a13b0 e6ca4ae8

arch/arm/Kconfig.debug

+14 −0
Original line number Diff line number Diff line
@@ -224,6 +224,20 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  on i.MX6Q UART4.



	config DEBUG_MMP_UART2

		bool "Kernel low-level debugging message via MMP UART2"

		depends on ARCH_MMP

		help

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

		  on MMP UART2.



	config DEBUG_MMP_UART3

		bool "Kernel low-level debugging message via MMP UART3"

		depends on ARCH_MMP

		help

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

		  on MMP UART3.



	config DEBUG_MSM_UART1

		bool "Kernel low-level debugging messages via MSM UART1"

		depends on ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50

arch/arm/boot/dts/exynos4210-origen.dts

+13 −5
Original line number Diff line number Diff line
@@ -62,35 +62,43 @@ 


		up {

			label = "Up";

			gpios = <&gpx2 0 0 0 2>;

			gpios = <&gpx2 0 0 0x10000 2>;

			linux,code = <103>;

		};



		down {

			label = "Down";

			gpios = <&gpx2 1 0 0 2>;

			gpios = <&gpx2 1 0 0x10000 2>;

			linux,code = <108>;

		};



		back {

			label = "Back";

			gpios = <&gpx1 7 0 0 2>;

			gpios = <&gpx1 7 0 0x10000 2>;

			linux,code = <158>;

		};



		home {

			label = "Home";

			gpios = <&gpx1 6 0 0 2>;

			gpios = <&gpx1 6 0 0x10000 2>;

			linux,code = <102>;

		};



		menu {

			label = "Menu";

			gpios = <&gpx1 5 0 0 2>;

			gpios = <&gpx1 5 0 0x10000 2>;

			linux,code = <139>;

		};

	};



	leds {

		compatible = "gpio-leds";

		status {

			gpios = <&gpx1 3 0 0x10000 2>;

			linux,default-trigger = "heartbeat";

		};

	};



	keypad@100A0000 {

		status = "disabled";

	};

arch/arm/configs/armadillo800eva_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=8 
CONFIG_SERIAL_SH_SCI_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

CONFIG_I2C_GPIO=y

CONFIG_I2C_SH_MOBILE=y

# CONFIG_HWMON is not set

CONFIG_MEDIA_SUPPORT=y
@@ -120,6 +121,8 @@ CONFIG_USB_ETH=m 
CONFIG_MMC=y

CONFIG_MMC_SDHI=y

CONFIG_MMC_SH_MMCIF=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_S35390A=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_UIO=y

arch/arm/configs/marzen_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y 
# CONFIG_HW_RANDOM is not set

CONFIG_GPIO_SYSFS=y

# CONFIG_HWMON is not set

CONFIG_THERMAL=y

CONFIG_RCAR_THERMAL=y

CONFIG_SSB=y

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

arch/arm/configs/mmp2_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ CONFIG_PREEMPT=y 
CONFIG_AEABI=y

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS2,38400 mem=128M user_debug=255"

CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfsroot/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS2,38400 mem=128M user_debug=255 earlyprintk"

CONFIG_VFP=y

CONFIG_NET=y

CONFIG_PACKET=y
@@ -90,6 +90,9 @@ CONFIG_DEBUG_INFO=y 
# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_DYNAMIC_DEBUG is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_LL=y

CONFIG_DEBUG_MMP_UART3=y

CONFIG_EARLY_PRINTK=y

CONFIG_DEBUG_ERRORS=y

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_CCITT=y