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

Commit 62c9072b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (24 commits)
  ASoC: omap: McBSP: fix build breakage on OMAP1
  OMAP: hwmod: fix the i2c-reset timeout during bootup
  I2C: OMAP2+: add correct functionality flags to all omap2plus i2c dev_attr
  I2C: OMAP2+: Tag all OMAP2+ hwmod defintions with I2C IP revision
  I2C: OMAP1/OMAP2+: create omap I2C functionality flags for each cpu_... test
  I2C: OMAP2+:  Introduce I2C IP versioning constants
  I2C: OMAP2+: increase omap_i2c_dev_attr flags from u8 to u32
  I2C: OMAP2+: Set hwmod flags to only allow 16-bit accesses to i2c
  OMAP4: hwmod data: Change DSS main_clk scheme
  OMAP4: powerdomain data: Remove unsupported MPU powerdomain state
  OMAP4: clock data: Keep GPMC clocks always enabled and hardware managed
  OMAP4: powerdomain data: Fix core mem states and missing cefuse flag
  OMAP2+: PM: Initialise sleep_switch to a non-valid value
  OMAP4: hwmod data: Modify DSS opt clocks
  OMAP4: iommu: fix clock name
  omap: iovmm: s/sg_dma_len(sg)/sg->length/
  omap: iommu: fix pte programming
  arm: omap3: cm-t35: fix slow path warning
  arm: omap3: cm-t35: minor comments fixes
  omap: ZOOM: QUART: Request reset GPIO
  ...
parents 4b30b6f2 c2fda222

arch/arm/mach-omap2/board-cm-t35.c

+7 −11
Original line number Diff line number Diff line 
/*

 * board-cm-t35.c (CompuLab CM-T35 module)

 *

 * Copyright (C) 2009 CompuLab, Ltd.

 * Author: Mike Rapoport <mike@compulab.co.il>

 * Copyright (C) 2009-2011 CompuLab, Ltd.

 * Authors: Mike Rapoport <mike@compulab.co.il>

 *	    Igor Grinberg <grinberg@compulab.co.il>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -13,11 +14,6 @@ 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

 * 02110-1301 USA

 *

 */



#include <linux/kernel.h>
@@ -149,12 +145,12 @@ static struct mtd_partition cm_t35_nand_partitions[] = { 
	},

	{

		.name           = "linux",

		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x280000 */

		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x2A0000 */

		.size           = 32 * NAND_BLOCK_SIZE,

	},

	{

		.name           = "rootfs",

		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x680000 */

		.offset         = MTDPART_OFS_APPEND,	/* Offset = 0x6A0000 */

		.size           = MTDPART_SIZ_FULL,

	},

};
@@ -433,9 +429,9 @@ static int cm_t35_twl_gpio_setup(struct device *dev, unsigned gpio, 
	if (gpio_request_one(wlan_rst, GPIOF_OUT_INIT_HIGH, "WLAN RST") == 0) {

		gpio_export(wlan_rst, 0);

		udelay(10);

		gpio_set_value(wlan_rst, 0);

		gpio_set_value_cansleep(wlan_rst, 0);

		udelay(10);

		gpio_set_value(wlan_rst, 1);

		gpio_set_value_cansleep(wlan_rst, 1);

	} else {

		pr_err("CM-T35: could not obtain gpio for WiFi reset\n");

	}

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

+0 −1
Original line number Diff line number Diff line
@@ -519,7 +519,6 @@ static void __init overo_init(void) 
	usb_musb_init(NULL);

	usbhs_init(&usbhs_bdata);

	overo_spi_init();

	overo_ads7846_init();

	overo_init_smsc911x();

	overo_display_init();

	overo_init_led();

arch/arm/mach-omap2/board-zoom-debugboard.c

+9 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define ZOOM_SMSC911X_GPIO	158

#define ZOOM_QUADUART_CS	3

#define ZOOM_QUADUART_GPIO	102

#define ZOOM_QUADUART_RST_GPIO	152

#define QUART_CLK		1843200

#define DEBUG_BASE		0x08000000

#define ZOOM_ETHR_START	DEBUG_BASE
@@ -67,6 +68,14 @@ static inline void __init zoom_init_quaduart(void) 
	unsigned long cs_mem_base;

	int quart_gpio = 0;



	if (gpio_request_one(ZOOM_QUADUART_RST_GPIO,

				GPIOF_OUT_INIT_LOW,

				"TL16CP754C GPIO") < 0) {

		pr_err("Failed to request GPIO%d for TL16CP754C\n",

			ZOOM_QUADUART_RST_GPIO);

		return;

	}



	quart_cs = ZOOM_QUADUART_CS;



	if (gpmc_cs_request(quart_cs, SZ_1M, &cs_mem_base) < 0) {

arch/arm/mach-omap2/clock.c

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ int __init omap2_clk_switch_mpurate_at_boot(const char *mpurate_ck_name) 
	if (IS_ERR_VALUE(r)) {

		WARN(1, "clock: %s: unable to set MPU rate to %d: %d\n",

		     mpurate_ck->name, mpurate, r);

		clk_put(mpurate_ck);

		return -EINVAL;

	}

arch/arm/mach-omap2/clock44xx_data.c

+5 −4
Original line number Diff line number Diff line
@@ -1639,6 +1639,7 @@ static struct clk gpmc_ick = { 
	.ops		= &clkops_omap2_dflt,

	.enable_reg	= OMAP4430_CM_L3_2_GPMC_CLKCTRL,

	.enable_bit	= OMAP4430_MODULEMODE_HWCTRL,

	.flags		= ENABLE_ON_INIT,

	.clkdm_name	= "l3_2_clkdm",

	.parent		= &l3_div_ck,

	.recalc		= &followparent_recalc,
@@ -3068,10 +3069,10 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK(NULL,	"dmic_sync_mux_ck",		&dmic_sync_mux_ck,	CK_443X),

	CLK(NULL,	"dmic_fck",			&dmic_fck,	CK_443X),

	CLK(NULL,	"dsp_fck",			&dsp_fck,	CK_443X),

	CLK("omapdss_dss",	"sys_clk",			&dss_sys_clk,	CK_443X),

	CLK("omapdss_dss",	"tv_clk",			&dss_tv_clk,	CK_443X),

	CLK("omapdss_dss",	"video_clk",			&dss_48mhz_clk,	CK_443X),

	CLK("omapdss_dss",	"fck",				&dss_dss_clk,	CK_443X),

	CLK(NULL,	"dss_sys_clk",			&dss_sys_clk,	CK_443X),

	CLK(NULL,	"dss_tv_clk",			&dss_tv_clk,	CK_443X),

	CLK(NULL,	"dss_48mhz_clk",		&dss_48mhz_clk,	CK_443X),

	CLK(NULL,	"dss_dss_clk",			&dss_dss_clk,	CK_443X),

	CLK("omapdss_dss",	"ick",				&dss_fck,	CK_443X),

	CLK(NULL,	"efuse_ctrl_cust_fck",		&efuse_ctrl_cust_fck,	CK_443X),

	CLK(NULL,	"emif1_fck",			&emif1_fck,	CK_443X),