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

Commit 1b6c3521 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

Omap fixes that were considered too intrusive or not critical for the -rc cycle

By Artem Bityutskiy (1) and others
via Tony Lindgren
* tag 'omap-fixes-non-critical-for-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: igep0020: Specify the VPLL2 regulator unconditionally
  ARM: OMAP2+: INTC: fix Kconfig option for TI81XX
  ARM: OMAP2+: remove incorrect irq_chip ack field
  ARM: OMAP4: Adding ID for OMAP4460 ES1.1
  ARM: OMAP4: panda: add statics to remove warnings
  ARM: OMAP2+: Incorrect Register Offsets in OMAP Mailbox
  ARM: OMAP: fix trivial warnings for dspbridge
  ARM: OMAP4: hsmmc: check for null pointer
  ARM: OMAP1: fix compilation issue in board-sx1.c
parents b6d35979 b2f44dc2

arch/arm/mach-omap1/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -132,6 +132,7 @@ config MACH_OMAP_PALMTT 




config MACH_SX1

config MACH_SX1

	bool "Siemens SX1"

	bool "Siemens SX1"

	select I2C

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

	help

	help

	  Support for the Siemens SX1 phone. To boot the kernel,

	  Support for the Siemens SX1 phone. To boot the kernel,

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

+0 −44
Original line number Original line Diff line number Diff line
@@ -489,50 +489,6 @@ static struct platform_device omap_vwlan_device = { 
	},

	},

};

};





static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int irq = 0;

	struct platform_device *pdev = container_of(dev,

				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;



	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0) {

		irq = twl6030_mmc_card_detect_config();

		if (irq < 0) {

			pr_err("Failed configuring MMC1 card detect\n");

			return irq;

		}

		pdata->slots[0].card_detect_irq = irq;

		pdata->slots[0].card_detect = twl6030_mmc_card_detect;

	}

	return 0;

}



static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)

{

	struct omap_mmc_platform_data *pdata;



	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */

	if (!dev) {

		pr_err("Failed %s\n", __func__);

		return;

	}

	pdata = dev->platform_data;

	pdata->init =	omap4_twl6030_hsmmc_late_init;

}



static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)

{

	struct omap2_hsmmc_info *c;



	omap_hsmmc_init(controllers);

	for (c = controllers; c->mmc; c++)

		omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);



	return 0;

}



static struct regulator_init_data sdp4430_vaux1 = {

static struct regulator_init_data sdp4430_vaux1 = {

	.constraints = {

	.constraints = {

		.min_uV			= 1000000,

		.min_uV			= 1000000,

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -540,7 +540,10 @@ static void __init igep_i2c_init(void) 
{

{

	int ret;

	int ret;





	omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_USB, 0);

	omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_USB,

			      TWL_COMMON_REGULATOR_VPLL2);

	igep_twldata.vpll2->constraints.apply_uV = true;

	igep_twldata.vpll2->constraints.name = "VDVI";





	if (machine_is_igep0020()) {

	if (machine_is_igep0020()) {

		/*

		/*
@@ -554,10 +557,7 @@ static void __init igep_i2c_init(void) 




		igep_twldata.keypad	= &igep2_keypad_pdata;

		igep_twldata.keypad	= &igep2_keypad_pdata;

		/* Get common pmic data */

		/* Get common pmic data */

		omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_AUDIO,

		omap3_pmic_get_config(&igep_twldata, TWL_COMMON_PDATA_AUDIO, 0);

				      TWL_COMMON_REGULATOR_VPLL2);

		igep_twldata.vpll2->constraints.apply_uV = true;

		igep_twldata.vpll2->constraints.name = "VDVI";

	}

	}





	omap3_pmic_init("twl4030", &igep_twldata);

	omap3_pmic_init("twl4030", &igep_twldata);

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

+4 −53
Original line number Original line Diff line number Diff line
@@ -231,60 +231,11 @@ static struct platform_device omap_vwlan_device = { 
	},

	},

};

};





struct wl12xx_platform_data omap_panda_wlan_data  __initdata = {

static struct wl12xx_platform_data omap_panda_wlan_data  __initdata = {

	/* PANDA ref clock is 38.4 MHz */

	/* PANDA ref clock is 38.4 MHz */

	.board_ref_clock = 2,

	.board_ref_clock = 2,

};

};





static int omap4_twl6030_hsmmc_late_init(struct device *dev)

{

	int irq = 0;

	struct platform_device *pdev = container_of(dev,

				struct platform_device, dev);

	struct omap_mmc_platform_data *pdata = dev->platform_data;



	if (!pdata) {

		dev_err(dev, "%s: NULL platform data\n", __func__);

		return -EINVAL;

	}

	/* Setting MMC1 Card detect Irq */

	if (pdev->id == 0) {

		irq = twl6030_mmc_card_detect_config();

		if (irq < 0) {

			dev_err(dev, "%s: Error card detect config(%d)\n",

				__func__, irq);

			return irq;

		}

		pdata->slots[0].card_detect = twl6030_mmc_card_detect;

	}

	return 0;

}



static __init void omap4_twl6030_hsmmc_set_late_init(struct device *dev)

{

	struct omap_mmc_platform_data *pdata;



	/* dev can be null if CONFIG_MMC_OMAP_HS is not set */

	if (!dev) {

		pr_err("Failed omap4_twl6030_hsmmc_set_late_init\n");

		return;

	}

	pdata = dev->platform_data;



	pdata->init =	omap4_twl6030_hsmmc_late_init;

}



static int __init omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers)

{

	struct omap2_hsmmc_info *c;



	omap_hsmmc_init(controllers);

	for (c = controllers; c->mmc; c++)

		omap4_twl6030_hsmmc_set_late_init(&c->pdev->dev);



	return 0;

}



static struct twl6040_codec_data twl6040_codec = {

static struct twl6040_codec_data twl6040_codec = {

	/* single-step ramp for headset and handsfree */

	/* single-step ramp for headset and handsfree */

	.hs_left_step	= 0x0f,

	.hs_left_step	= 0x0f,
@@ -438,7 +389,7 @@ static struct panel_dvi_platform_data omap4_dvi_panel = { 
	.i2c_bus_num = 3,

	.i2c_bus_num = 3,

};

};





struct omap_dss_device omap4_panda_dvi_device = {

static struct omap_dss_device omap4_panda_dvi_device = {

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.type			= OMAP_DISPLAY_TYPE_DPI,

	.name			= "dvi",

	.name			= "dvi",

	.driver_name		= "dvi",

	.driver_name		= "dvi",
@@ -448,7 +399,7 @@ struct omap_dss_device omap4_panda_dvi_device = { 
	.channel		= OMAP_DSS_CHANNEL_LCD2,

	.channel		= OMAP_DSS_CHANNEL_LCD2,

};

};





int __init omap4_panda_dvi_init(void)

static int __init omap4_panda_dvi_init(void)

{

{

	int r;

	int r;
@@ -509,7 +460,7 @@ static struct omap_dss_board_info omap4_panda_dss_data = { 
	.default_device	= &omap4_panda_dvi_device,

	.default_device	= &omap4_panda_dvi_device,

};

};





void __init omap4_panda_display_init(void)

static void __init omap4_panda_display_init(void)

{

{

	int r;

	int r;

arch/arm/mach-omap2/common.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ 
#ifndef __ASSEMBLER__

#ifndef __ASSEMBLER__





#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/i2c/twl.h>

#include <plat/common.h>

#include <plat/common.h>

#include <asm/proc-fns.h>

#include <asm/proc-fns.h>
@@ -254,6 +255,8 @@ static inline u32 omap4_mpuss_read_prev_context_state(void) 
struct omap_sdrc_params;

struct omap_sdrc_params;

extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

				      struct omap_sdrc_params *sdrc_cs1);

				      struct omap_sdrc_params *sdrc_cs1);

struct omap2_hsmmc_info;

extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers);





#endif /* __ASSEMBLER__ */

#endif /* __ASSEMBLER__ */

#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */
 
#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */