Commit 604a16b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: plat-orion: make gpiochip label unique
  enable uncompress log on cpuimx35sd
  cpuimx35: fix touchscreen support
  cpuimx35sd: fix Kconfig
  clock-imx35: fix reboot in internal boot mode
  dma: MX3_IPU fix depends
  imx_v4_v5_defconfig: update default configuration
  cpuimx25sd: fix Kconfig
  arm/imx: fix cpufreq section mismatch
  ARM:imx:fix pwm period value
  ARM: OMAP: hwmod data: fix iva and mailbox hwmods for OMAP 3
parents c63c4edc 00ca4e4c

arch/arm/configs/imx_v4_v5_defconfig

+7 −5
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ CONFIG_ARCH_MXC=y 
CONFIG_ARCH_IMX_V4_V5=y

CONFIG_ARCH_MX1ADS=y

CONFIG_MACH_SCB9328=y

CONFIG_MACH_APF9328=y

CONFIG_MACH_MX21ADS=y

CONFIG_MACH_MX25_3DS=y

CONFIG_MACH_EUKREA_CPUIMX25=y

CONFIG_MACH_EUKREA_CPUIMX25SD=y

CONFIG_MACH_MX27ADS=y

CONFIG_MACH_PCM038=y

CONFIG_MACH_CPUIMX27=y
@@ -72,17 +73,16 @@ CONFIG_MTD_CFI_GEOMETRY=y 
CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_PHYSMAP=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_MXC=y

CONFIG_MTD_UBI=y

CONFIG_MISC_DEVICES=y

CONFIG_EEPROM_AT24=y

CONFIG_EEPROM_AT25=y

CONFIG_NETDEVICES=y

CONFIG_NET_ETHERNET=y

CONFIG_SMC91X=y

CONFIG_DM9000=y

CONFIG_SMC91X=y

CONFIG_SMC911X=y

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set

CONFIG_SMSC_PHY=y

# CONFIG_INPUT_MOUSEDEV is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_KEYBOARD is not set
@@ -100,6 +100,7 @@ CONFIG_I2C_CHARDEV=y 
CONFIG_I2C_IMX=y

CONFIG_SPI=y

CONFIG_SPI_IMX=y

CONFIG_SPI_SPIDEV=y

CONFIG_W1=y

CONFIG_W1_MASTER_MXC=y

CONFIG_W1_SLAVE_THERM=y
@@ -139,6 +140,7 @@ CONFIG_MMC=y 
CONFIG_MMC_MXC=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_MC13783=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

arch/arm/mach-imx/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ config MACH_MX25_3DS 
	select IMX_HAVE_PLATFORM_MXC_NAND

	select IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX



config MACH_EUKREA_CPUIMX25

config MACH_EUKREA_CPUIMX25SD

	bool "Support Eukrea CPUIMX25 Platform"

	select SOC_IMX25

	select IMX_HAVE_PLATFORM_FLEXCAN
@@ -148,7 +148,7 @@ config MACH_EUKREA_CPUIMX25 


choice

	prompt "Baseboard"

	depends on MACH_EUKREA_CPUIMX25

	depends on MACH_EUKREA_CPUIMX25SD

	default MACH_EUKREA_MBIMXSD25_BASEBOARD



config MACH_EUKREA_MBIMXSD25_BASEBOARD
@@ -542,7 +542,7 @@ config MACH_MX35_3DS 
	  Include support for MX35PDK platform. This includes specific

	  configurations for the board and its peripherals.



config MACH_EUKREA_CPUIMX35

config MACH_EUKREA_CPUIMX35SD

	bool "Support Eukrea CPUIMX35 Platform"

	select SOC_IMX35

	select IMX_HAVE_PLATFORM_FLEXCAN
@@ -560,7 +560,7 @@ config MACH_EUKREA_CPUIMX35 


choice

	prompt "Baseboard"

	depends on MACH_EUKREA_CPUIMX35

	depends on MACH_EUKREA_CPUIMX35SD

	default MACH_EUKREA_MBIMXSD35_BASEBOARD



config MACH_EUKREA_MBIMXSD35_BASEBOARD

arch/arm/mach-imx/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o 


# i.MX25 based machines

obj-$(CONFIG_MACH_MX25_3DS) += mach-mx25_3ds.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX25) += mach-eukrea_cpuimx25.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX25SD) += mach-eukrea_cpuimx25.o

obj-$(CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD) += eukrea_mbimxsd25-baseboard.o



# i.MX27 based machines
@@ -57,7 +57,7 @@ obj-$(CONFIG_MACH_BUG) += mach-bug.o 
# i.MX35 based machines

obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o

obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX35) += mach-cpuimx35.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX35SD) += mach-cpuimx35.o

obj-$(CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD) += eukrea_mbimxsd35-baseboard.o

obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o

arch/arm/mach-imx/clock-imx35.c

+10 −10
Original line number Diff line number Diff line
@@ -507,7 +507,7 @@ static struct clk_lookup lookups[] = { 


int __init mx35_clocks_init()

{

	unsigned int cgr2 = 3 << 26, cgr3 = 0;

	unsigned int cgr2 = 3 << 26;



#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)

	cgr2 |= 3 << 16;
@@ -521,6 +521,12 @@ int __init mx35_clocks_init() 
	__raw_writel((3 << 18), CCM_BASE + CCM_CGR0);

	__raw_writel((3 << 2) | (3 << 4) | (3 << 6) | (3 << 8) | (3 << 16),

			CCM_BASE + CCM_CGR1);

	__raw_writel(cgr2, CCM_BASE + CCM_CGR2);

	__raw_writel(0, CCM_BASE + CCM_CGR3);



	clk_enable(&iim_clk);

	imx_print_silicon_rev("i.MX35", mx35_revision());

	clk_disable(&iim_clk);



	/*

	 * Check if we came up in internal boot mode. If yes, we need some
@@ -529,16 +535,10 @@ int __init mx35_clocks_init() 
	 */

	if (!(__raw_readl(CCM_BASE + CCM_RCSR) & (3 << 10))) {

		/* Additionally turn on UART1, SCC, and IIM clocks */

		cgr2 |= 3 << 16 | 3 << 4;

		cgr3 |= 3 << 2;

	}



	__raw_writel(cgr2, CCM_BASE + CCM_CGR2);

	__raw_writel(cgr3, CCM_BASE + CCM_CGR3);



		clk_enable(&iim_clk);

	imx_print_silicon_rev("i.MX35", mx35_revision());

	clk_disable(&iim_clk);

		clk_enable(&uart1_clk);

		clk_enable(&scc_clk);

	}



#ifdef CONFIG_MXC_USE_EPIT

	epit_timer_init(&epit1_clk,

arch/arm/mach-imx/mach-cpuimx35.c

+7 −1
Original line number Diff line number Diff line
@@ -53,12 +53,18 @@ static const struct imxi2c_platform_data 
	.bitrate =		100000,

};



#define TSC2007_IRQGPIO		IMX_GPIO_NR(3, 2)

static int tsc2007_get_pendown_state(void)

{

	return !gpio_get_value(TSC2007_IRQGPIO);

}



static struct tsc2007_platform_data tsc2007_info = {

	.model			= 2007,

	.x_plate_ohms		= 180,

	.get_pendown_state = tsc2007_get_pendown_state,

};



#define TSC2007_IRQGPIO		IMX_GPIO_NR(3, 2)

static struct i2c_board_info eukrea_cpuimx35_i2c_devices[] = {

	{

		I2C_BOARD_INFO("pcf8563", 0x51),

CRA Git | Maintained and supported by SUSTech CRA and CCSE