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

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

Merge branch 'ux500-fixes-20120301' of... 

Merge branch 'ux500-fixes-20120301' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/fixes-non-critical

* 'ux500-fixes-20120301' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: solve some Kconfig mess
  ARM: ux500: delete TPS6105X selection
  ARM: ux500: select CPU_FREQ_TABLE where needed
  ARM: ux500: select L2X0 cache on ux500
  ARM: ux500: add board autoselection
  ARM: ux500: U8500 depends on MMU
  ARM: ux500: included linux/gpio.h twice
  ARM: ux500: fix around AB8500 GPIO macro name
  ARM: ux500: set ARCH_NR_GPIO to 355 on U8500 platforms
  ARM: ux500: Add audio-regulators
  ARM: ux500: Add DMA-channels for MSP
  ARM: ux500: Add placeholder for clk_set_parent
parents 04496e37 5017f1cd

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -901,6 +901,7 @@ config ARCH_U300 


config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	depends on MMU

	select CPU_V7

	select ARM_AMBA

	select GENERIC_CLOCKEVENTS
@@ -1577,7 +1578,7 @@ config LOCAL_TIMERS 
config ARCH_NR_GPIO

	int

	default 1024 if ARCH_SHMOBILE || ARCH_TEGRA

	default 350 if ARCH_U8500

	default 355 if ARCH_U8500

	default 0

	help

	  Maximum number of GPIOs in the system.

arch/arm/mach-ux500/Kconfig

+26 −18
Original line number Diff line number Diff line
@@ -8,47 +8,55 @@ config UX500_SOC_COMMON 
	select ARM_ERRATA_753970

	select ARM_ERRATA_754322

	select ARM_ERRATA_764369



menu "Ux500 SoC"

	select CACHE_L2X0



config UX500_SOC_DB5500

	bool "DB5500"

	bool

	select MFD_DB5500_PRCMU



config UX500_SOC_DB8500

	bool "DB8500"

	bool

	select MFD_DB8500_PRCMU

	select REGULATOR_DB8500_PRCMU



endmenu

	select CPU_FREQ_TABLE if CPU_FREQ



menu "Ux500 target platform (boards)"



config MACH_U8500

	bool "U8500 Development platform"

	depends on UX500_SOC_DB8500

	select TPS6105X

config MACH_MOP500

	bool "U8500 Development platform, MOP500 versions"

	select UX500_SOC_DB8500

	select I2C

	select I2C_NOMADIK

	help

	  Include support for the mop500 development platform.

	  Include support for the MOP500 development platform.



config MACH_HREFV60

       bool "U85000 Development platform, HREFv60 version"

       depends on UX500_SOC_DB8500

	bool "U8500 Development platform, HREFv60 version"

	select MACH_MOP500

	help

	  Include support for the HREFv60 new development platform.

	  Includes HREFv70, v71 etc.



config MACH_SNOWBALL

	bool "U8500 Snowball platform"

	depends on UX500_SOC_DB8500

	select MACH_U8500

	select MACH_MOP500

	help

	  Include support for the snowball development platform.



config MACH_U5500

	bool "U5500 Development platform"

	depends on UX500_SOC_DB5500

	select UX500_SOC_DB5500

	help

	  Include support for the U5500 development platform.



config UX500_AUTO_PLATFORM

	def_bool y

	depends on !MACH_U5500

	select MACH_MOP500

	help

	  At least one platform needs to be selected in order to build

	  a working kernel. If everything else is disabled, this

	  automatically enables MACH_MOP500.

endmenu



config UX500_DEBUG_UART

arch/arm/mach-ux500/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ obj-y := clock.o cpu.o devices.o devices-common.o \ 
obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o

obj-$(CONFIG_UX500_SOC_DB5500)	+= cpu-db5500.o dma-db5500.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o

obj-$(CONFIG_MACH_U8500)	+= board-mop500.o board-mop500-sdi.o \

obj-$(CONFIG_MACH_MOP500)	+= board-mop500.o board-mop500-sdi.o \

				board-mop500-regulators.o \

				board-mop500-uib.o board-mop500-stuib.o \

				board-mop500-u8500uib.o \

arch/arm/mach-ux500/board-mop500-regulators.c

+28 −0
Original line number Diff line number Diff line
@@ -74,6 +74,26 @@ static struct regulator_consumer_supply ab8500_vtvout_consumers[] = { 
	REGULATOR_SUPPLY("vddadc", "ab8500-gpadc.0"),

};



static struct regulator_consumer_supply ab8500_vaud_consumers[] = {

	/* AB8500 audio-codec main supply */

	REGULATOR_SUPPLY("vaud", "ab8500-codec.0"),

};



static struct regulator_consumer_supply ab8500_vamic1_consumers[] = {

	/* AB8500 audio-codec Mic1 supply */

	REGULATOR_SUPPLY("vamic1", "ab8500-codec.0"),

};



static struct regulator_consumer_supply ab8500_vamic2_consumers[] = {

	/* AB8500 audio-codec Mic2 supply */

	REGULATOR_SUPPLY("vamic2", "ab8500-codec.0"),

};



static struct regulator_consumer_supply ab8500_vdmic_consumers[] = {

	/* AB8500 audio-codec DMic supply */

	REGULATOR_SUPPLY("vdmic", "ab8500-codec.0"),

};



static struct regulator_consumer_supply ab8500_vintcore_consumers[] = {

	/* SoC core supply, no device */

	REGULATOR_SUPPLY("v-intcore", NULL),
@@ -323,6 +343,8 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { 
			.name = "V-AUD",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

		.num_consumer_supplies = ARRAY_SIZE(ab8500_vaud_consumers),

		.consumer_supplies = ab8500_vaud_consumers,

	},

	/* supply for v-anamic1 VAMic1-LDO */

	[AB8500_LDO_ANAMIC1] = {
@@ -330,6 +352,8 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { 
			.name = "V-AMIC1",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

		.num_consumer_supplies = ARRAY_SIZE(ab8500_vamic1_consumers),

		.consumer_supplies = ab8500_vamic1_consumers,

	},

	/* supply for v-amic2, VAMIC2 LDO, reuse constants for AMIC1 */

	[AB8500_LDO_ANAMIC2] = {
@@ -337,6 +361,8 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { 
			.name = "V-AMIC2",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

		.num_consumer_supplies = ARRAY_SIZE(ab8500_vamic2_consumers),

		.consumer_supplies = ab8500_vamic2_consumers,

	},

	/* supply for v-dmic, VDMIC LDO */

	[AB8500_LDO_DMIC] = {
@@ -344,6 +370,8 @@ struct regulator_init_data ab8500_regulators[AB8500_NUM_REGULATORS] = { 
			.name = "V-DMIC",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

		},

		.num_consumer_supplies = ARRAY_SIZE(ab8500_vdmic_consumers),

		.consumer_supplies = ab8500_vdmic_consumers,

	},

	/* supply for v-intcore12, VINTCORE12 LDO */

	[AB8500_LDO_INTCORE] = {

arch/arm/mach-ux500/board-mop500-u8500uib.c

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/i2c.h>

#include <linux/gpio.h>

#include <linux/interrupt.h>

#include <linux/mfd/tc3589x.h>

#include <linux/input/matrix_keypad.h>