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

Commit b0189cd0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'next/devel2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (47 commits)
  OMAP: Add debugfs node to show the summary of all clocks
  OMAP2+: hwmod: Follow the recommended PRCM module enable sequence
  OMAP2+: clock: allow per-SoC clock init code to prevent clockdomain calls from clock code
  OMAP2+: clockdomain: Add per clkdm lock to prevent concurrent state programming
  OMAP2+: PM: idle clkdms only if already in idle
  OMAP2+: clockdomain: add clkdm_in_hwsup()
  OMAP2+: clockdomain: Add 2 APIs to control clockdomain from hwmod framework
  OMAP: clockdomain: Remove redundant call to pwrdm_wait_transition()
  OMAP4: hwmod: Introduce the module control in hwmod control
  OMAP4: cm: Add two new APIs for modulemode control
  OMAP4: hwmod data: Add modulemode entry in omap_hwmod structure
  OMAP4: hwmod data: Add PRM context register offset
  OMAP4: prm: Remove deprecated functions
  OMAP4: prm: Replace warm reset API with the offset based version
  OMAP4: hwmod: Replace RSTCTRL absolute address with offset macros
  OMAP: hwmod: Wait the idle status to be disabled
  OMAP4: hwmod: Replace CLKCTRL absolute address with offset macros
  OMAP2+: hwmod: Init clkdm field at boot time
  OMAP4: hwmod data: Add clock domain attribute
  OMAP4: clock data: Add missing divider selection for auxclks
  ...
parents 69f1d1a6 bc574e19

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

+55 −0
Original line number Diff line number Diff line
@@ -345,11 +345,40 @@ static struct platform_device sdp4430_lcd_device = { 
	.id		= -1,

};



static struct regulator_consumer_supply sdp4430_vbat_supply[] = {

	REGULATOR_SUPPLY("vddvibl", "twl6040-vibra"),

	REGULATOR_SUPPLY("vddvibr", "twl6040-vibra"),

};



static struct regulator_init_data sdp4430_vbat_data = {

	.constraints = {

		.always_on	= 1,

	},

	.num_consumer_supplies	= ARRAY_SIZE(sdp4430_vbat_supply),

	.consumer_supplies	= sdp4430_vbat_supply,

};



static struct fixed_voltage_config sdp4430_vbat_pdata = {

	.supply_name	= "VBAT",

	.microvolts	= 3750000,

	.init_data	= &sdp4430_vbat_data,

	.gpio		= -EINVAL,

};



static struct platform_device sdp4430_vbat = {

	.name		= "reg-fixed-voltage",

	.id		= -1,

	.dev = {

		.platform_data = &sdp4430_vbat_pdata,

	},

};



static struct platform_device *sdp4430_devices[] __initdata = {

	&sdp4430_lcd_device,

	&sdp4430_gpio_keys_device,

	&sdp4430_leds_gpio,

	&sdp4430_leds_pwm,

	&sdp4430_vbat,

};



static struct omap_lcd_config sdp4430_lcd_config __initdata = {
@@ -505,7 +534,33 @@ static struct regulator_init_data sdp4430_vusim = { 
	},

};



static struct twl4030_codec_data twl6040_codec = {

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

	.hs_left_step	= 0x0f,

	.hs_right_step	= 0x0f,

	.hf_left_step	= 0x1d,

	.hf_right_step	= 0x1d,

};



static struct twl4030_vibra_data twl6040_vibra = {

	.vibldrv_res = 8,

	.vibrdrv_res = 3,

	.viblmotor_res = 10,

	.vibrmotor_res = 10,

	.vddvibl_uV = 0,	/* fixed volt supply - VBAT */

	.vddvibr_uV = 0,	/* fixed volt supply - VBAT */

};



static struct twl4030_audio_data twl6040_audio = {

	.codec		= &twl6040_codec,

	.vibra		= &twl6040_vibra,

	.audpwron_gpio	= 127,

	.naudint_irq	= OMAP44XX_IRQ_SYS_2N,

	.irq_base	= TWL6040_CODEC_IRQ_BASE,

};



static struct twl4030_platform_data sdp4430_twldata = {

	.audio		= &twl6040_audio,

	/* Regulators */

	.vusim		= &sdp4430_vusim,

	.vaux1		= &sdp4430_vaux1,

arch/arm/mach-omap2/board-rx51-peripherals.c

+3 −3
Original line number Diff line number Diff line
@@ -864,11 +864,11 @@ static struct twl4030_power_data rx51_t2scripts_data __initdata = { 
	.resource_config = twl4030_rconfig,

};



struct twl4030_codec_vibra_data rx51_vibra_data __initdata = {

struct twl4030_vibra_data rx51_vibra_data __initdata = {

	.coexist	= 0,

};



struct twl4030_codec_data rx51_codec_data __initdata = {

struct twl4030_audio_data rx51_audio_data __initdata = {

	.audio_mclk	= 26000000,

	.vibra		= &rx51_vibra_data,

};
@@ -878,7 +878,7 @@ static struct twl4030_platform_data rx51_twldata __initdata = { 
	.gpio			= &rx51_gpio_data,

	.keypad			= &rx51_kp_data,

	.power			= &rx51_t2scripts_data,

	.codec			= &rx51_codec_data,

	.audio			= &rx51_audio_data,



	.vaux1			= &rx51_vaux1,

	.vaux2			= &rx51_vaux2,

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

+5 −5
Original line number Diff line number Diff line
@@ -274,12 +274,12 @@ static int __init omap_i2c_init(void) 
			TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2);



	if (machine_is_omap_zoom2()) {

		struct twl4030_codec_audio_data *audio_data;

		audio_data = zoom_twldata.codec->audio;

		struct twl4030_codec_data *codec_data;

		codec_data = zoom_twldata.audio->codec;



		audio_data->ramp_delay_value = 3;	/* 161 ms */

		audio_data->hs_extmute = 1;

		audio_data->set_hs_extmute = zoom2_set_hs_extmute;

		codec_data->ramp_delay_value = 3;	/* 161 ms */

		codec_data->hs_extmute = 1;

		codec_data->set_hs_extmute = zoom2_set_hs_extmute;

	}

	omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata);

	omap_register_i2c_bus(2, 400, NULL, 0);

arch/arm/mach-omap2/clock.c

+24 −3
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ 


u8 cpu_mask;



/*

 * clkdm_control: if true, then when a clock is enabled in the

 * hardware, its clockdomain will first be enabled; and when a clock

 * is disabled in the hardware, its clockdomain will be disabled

 * afterwards.

 */

static bool clkdm_control = true;



/*

 * OMAP2+ specific clock functions

 */
@@ -99,6 +107,19 @@ void omap2_init_clk_clkdm(struct clk *clk) 
	}

}



/**

 * omap2_clk_disable_clkdm_control - disable clkdm control on clk enable/disable

 *

 * Prevent the OMAP clock code from calling into the clockdomain code

 * when a hardware clock in that clockdomain is enabled or disabled.

 * Intended to be called at init time from omap*_clk_init().  No

 * return value.

 */

void __init omap2_clk_disable_clkdm_control(void)

{

	clkdm_control = false;

}



/**

 * omap2_clk_dflt_find_companion - find companion clock to @clk

 * @clk: struct clk * to find the companion clock of
@@ -268,7 +289,7 @@ void omap2_clk_disable(struct clk *clk) 
		clk->ops->disable(clk);

	}



	if (clk->clkdm)

	if (clkdm_control && clk->clkdm)

		clkdm_clk_disable(clk->clkdm, clk);



	if (clk->parent)
@@ -308,7 +329,7 @@ int omap2_clk_enable(struct clk *clk) 
		}

	}



	if (clk->clkdm) {

	if (clkdm_control && clk->clkdm) {

		ret = clkdm_clk_enable(clk->clkdm, clk);

		if (ret) {

			WARN(1, "clock: %s: could not enable clockdomain %s: "
@@ -330,7 +351,7 @@ int omap2_clk_enable(struct clk *clk) 
	return 0;



oce_err3:

	if (clk->clkdm)

	if (clkdm_control && clk->clkdm)

		clkdm_clk_disable(clk->clkdm, clk);

oce_err2:

	if (clk->parent)

arch/arm/mach-omap2/clock.h

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 
#ifndef __ARCH_ARM_MACH_OMAP2_CLOCK_H

#define __ARCH_ARM_MACH_OMAP2_CLOCK_H



#include <linux/kernel.h>



#include <plat/clock.h>



/* CM_CLKSEL2_PLL.CORE_CLK_SRC bits (2XXX) */
@@ -72,6 +74,7 @@ void omap2_clk_disable_unused(struct clk *clk); 
#endif



void omap2_init_clk_clkdm(struct clk *clk);

void __init omap2_clk_disable_clkdm_control(void);



/* clkt_clksel.c public functions */

u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate,