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

Commit a06347d0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-fixes-non-critical-for-v3.6' of... 

Merge tag 'omap-fixes-non-critical-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

From Tony Lindgren <tony@atomide.com>:

This branch contains fixes that were too intrusive or not
critical enough for the 3.5 -rc cycle. The biggest changes are
fixes for the am35xx clock and hwmod data, and the removal of dead
code for the 730 and 850 headers.

* tag 'omap-fixes-non-critical-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

: (25 commits)
  ARM: OMAP2+: fix CONFIG_CPU_IDLE dependency on CONFIG_PM
  ARM: OMAP: remove unused cpu detection macros
  ARM: OMAP: fix typos related to OMAP330
  ARM: OMAP7XX:  Remove omap730.h and omap850.h
  ARM: OMAP2+: fix naming collision of variable nr_irqs
  ARM: OMAP: omap2plus_defconfig: Enable EXT4 support
  ARM: OMAP depends on MMU
  arm: omap3: am35x: Set proper powerdomain states
  ARM: OMAP AM35x: clockdomain data: Fix clockdomain dependencies
  ARM: OMAP AM35x: EMAC/MDIO integration: Add Davinci EMAC/MDIO hwmod support
  ARM: OMAP: AM35xx: fix UART4 softreset
  ARM: OMAP AM35xx: clock and hwmod data: fix UART4 data
  ARM: OMAP AM35xx: clock and hwmod data: fix AM35xx HSOTGUSB hwmod
  ARM: OMAP: Fix dts files w/ status property: "disable" -> "disabled"
  ARM: OMAP: beagle: Set USB Host Port 1 to OMAP_USBHS_PORT_MODE_UNUSED
  ARM: OMAP2: twl-common: Fix compiler warning
  ARM: OMAP: fix the ads7846 init code
  mfd: twl: remove pdata->irq_base/_end, no more users
  ARM: OMAP2+: TWL: remove usage of pdata->irq_base/_end
  ARM: OMAP2+: OPP: Fix to ensure check of right oppdef after bad one
  ...

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6887a413 f6f1f12f

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -936,6 +936,7 @@ config ARCH_DAVINCI 


config ARCH_OMAP

	bool "TI OMAP"

	depends on MMU

	select HAVE_CLK

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_HAS_CPUFREQ

arch/arm/boot/dts/omap3-beagle.dts

+2 −2
Original line number Diff line number Diff line
@@ -61,9 +61,9 @@ 
};



&mmc2 {

	status = "disable";

	status = "disabled";

};



&mmc3 {

	status = "disable";

	status = "disabled";

};

arch/arm/boot/dts/omap4-panda.dts

+3 −3
Original line number Diff line number Diff line
@@ -74,15 +74,15 @@ 
};



&mmc2 {

	status = "disable";

	status = "disabled";

};



&mmc3 {

	status = "disable";

	status = "disabled";

};



&mmc4 {

	status = "disable";

	status = "disabled";

};



&mmc5 {

arch/arm/boot/dts/omap4-sdp.dts

+2 −2
Original line number Diff line number Diff line
@@ -147,11 +147,11 @@ 
};



&mmc3 {

	status = "disable";

	status = "disabled";

};



&mmc4 {

	status = "disable";

	status = "disabled";

};



&mmc5 {

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ CONFIG_RTC_DRV_TWL4030=y 
CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_EXT4_FS=y

CONFIG_QUOTA=y

CONFIG_QFMT_V2=y

CONFIG_MSDOS_FS=y