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

Commit 2cb85a7b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for-merge-window-v2

parents d7dde8c1 d9ba5737

arch/arm/boot/dts/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -107,6 +107,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap3-evm.dtb \

	omap3-evm.dtb \

	omap3-tobi.dtb \

	omap3-tobi.dtb \

	omap4-panda.dtb \

	omap4-panda.dtb \

	omap4-panda-a4.dtb \

	omap4-panda-es.dtb \

	omap4-panda-es.dtb \

	omap4-var-som.dtb \

	omap4-var-som.dtb \

	omap4-sdp.dtb \

	omap4-sdp.dtb \

arch/arm/boot/dts/omap2420-h4.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,6 @@ 




	memory {

	memory {

		device_type = "memory";

		device_type = "memory";

		reg = <0x80000000 0x84000000>; /* 64 MB */

		reg = <0x80000000 0x4000000>; /* 64 MB */

	};

	};

};
 
};

arch/arm/mach-omap2/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -26,6 +26,8 @@ config SOC_HAS_OMAP2_SDRC 




config SOC_HAS_REALTIME_COUNTER

config SOC_HAS_REALTIME_COUNTER

	bool "Real time free running counter"

	bool "Real time free running counter"

	depends on SOC_OMAP5

	default y





config ARCH_OMAP2

config ARCH_OMAP2

	bool "TI OMAP2"

	bool "TI OMAP2"
@@ -79,7 +81,6 @@ config SOC_OMAP5 
	select ARM_GIC

	select ARM_GIC

	select CPU_V7

	select CPU_V7

	select HAVE_SMP

	select HAVE_SMP

	select SOC_HAS_REALTIME_COUNTER

	select COMMON_CLK

	select COMMON_CLK





comment "OMAP Core Type"

comment "OMAP Core Type"

arch/arm/mach-omap2/board-3430sdp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -157,6 +157,7 @@ static struct omap_dss_device sdp3430_lcd_device = { 




static struct tfp410_platform_data dvi_panel = {

static struct tfp410_platform_data dvi_panel = {

	.power_down_gpio	= -1,

	.power_down_gpio	= -1,

	.i2c_bus_num		= -1,

};

};





static struct omap_dss_device sdp3430_dvi_device = {

static struct omap_dss_device sdp3430_dvi_device = {

arch/arm/mach-omap2/board-am3517evm.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -208,6 +208,7 @@ static struct omap_dss_device am3517_evm_tv_device = { 




static struct tfp410_platform_data dvi_panel = {

static struct tfp410_platform_data dvi_panel = {

	.power_down_gpio	= -1,

	.power_down_gpio	= -1,

	.i2c_bus_num		= -1,

};

};





static struct omap_dss_device am3517_evm_dvi_device = {

static struct omap_dss_device am3517_evm_dvi_device = {