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

Commit b6d17c1a authored by Russell King's avatar Russell King
Browse files

Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6

parents 1fd31707 14f0f512

arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata = { 
 * Add platform devices present on this baseboard and init

 * them from CPU side as far as required to use them later on

 */

void __init eukrea_mbimxsd_baseboard_init(void)

void __init eukrea_mbimxsd25_baseboard_init(void)

{

	if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads,

			ARRAY_SIZE(eukrea_mbimxsd_pads)))

arch/arm/mach-mx25/mach-cpuimx25.c

+2 −2
Original line number Diff line number Diff line
@@ -147,8 +147,8 @@ static void __init eukrea_cpuimx25_init(void) 
	if (!otg_mode_host)

		mxc_register_device(&otg_udc_device, &otg_device_pdata);



#ifdef CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD

	eukrea_mbimxsd_baseboard_init();

#ifdef CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD

	eukrea_mbimxsd25_baseboard_init();

#endif

}

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

+55 −22
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ static unsigned long get_rate_arm(void) 


	aad = &clk_consumer[(pdr0 >> 16) & 0xf];

	if (aad->sel)

		fref = fref * 2 / 3;

		fref = fref * 3 / 4;



	return fref / aad->arm;

}
@@ -164,7 +164,7 @@ static unsigned long get_rate_ahb(struct clk *clk) 
{

	unsigned long pdr0 = __raw_readl(CCM_BASE + CCM_PDR0);

	struct arm_ahb_div *aad;

	unsigned long fref = get_rate_mpll();

	unsigned long fref = get_rate_arm();



	aad = &clk_consumer[(pdr0 >> 16) & 0xf];
@@ -176,16 +176,11 @@ static unsigned long get_rate_ipg(struct clk *clk) 
	return get_rate_ahb(NULL) >> 1;

}



static unsigned long get_3_3_div(unsigned long in)

{

	return (((in >> 3) & 0x7) + 1) * ((in & 0x7) + 1);

}



static unsigned long get_rate_uart(struct clk *clk)

{

	unsigned long pdr3 = __raw_readl(CCM_BASE + CCM_PDR3);

	unsigned long pdr4 = __raw_readl(CCM_BASE + CCM_PDR4);

	unsigned long div = get_3_3_div(pdr4 >> 10);

	unsigned long div = ((pdr4 >> 10) & 0x3f) + 1;



	if (pdr3 & (1 << 14))

		return get_rate_arm() / div;
@@ -216,7 +211,7 @@ static unsigned long get_rate_sdhc(struct clk *clk) 
		break;

	}



	return rate / get_3_3_div(div);

	return rate / (div + 1);

}



static unsigned long get_rate_mshc(struct clk *clk)
@@ -270,7 +265,7 @@ static unsigned long get_rate_csi(struct clk *clk) 
	else

		rate = get_rate_ppll();



	return rate / get_3_3_div((pdr2 >> 16) & 0x3f);

	return rate / (((pdr2 >> 16) & 0x3f) + 1);

}



static unsigned long get_rate_otg(struct clk *clk)
@@ -283,25 +278,51 @@ static unsigned long get_rate_otg(struct clk *clk) 
	else

		rate = get_rate_ppll();



	return rate / get_3_3_div((pdr4 >> 22) & 0x3f);

	return rate / (((pdr4 >> 22) & 0x3f) + 1);

}



static unsigned long get_rate_ipg_per(struct clk *clk)

{

	unsigned long pdr0 = __raw_readl(CCM_BASE + CCM_PDR0);

	unsigned long pdr4 = __raw_readl(CCM_BASE + CCM_PDR4);

	unsigned long div1, div2;

	unsigned long div;



	if (pdr0 & (1 << 26)) {

		div1 = (pdr4 >> 19) & 0x7;

		div2 = (pdr4 >> 16) & 0x7;

		return get_rate_arm() / ((div1 + 1) * (div2 + 1));

		div = (pdr4 >> 16) & 0x3f;

		return get_rate_arm() / (div + 1);

	} else {

		div1 = (pdr0 >> 12) & 0x7;

		return get_rate_ahb(NULL) / div1;

		div = (pdr0 >> 12) & 0x7;

		return get_rate_ahb(NULL) / (div + 1);

	}

}



static unsigned long get_rate_hsp(struct clk *clk)

{

	unsigned long hsp_podf = (__raw_readl(CCM_BASE + CCM_PDR0) >> 20) & 0x03;

	unsigned long fref = get_rate_mpll();



	if (fref > 400 * 1000 * 1000) {

		switch (hsp_podf) {

		case 0:

			return fref >> 2;

		case 1:

			return fref >> 3;

		case 2:

			return fref / 3;

		}

	} else {

		switch (hsp_podf) {

		case 0:

		case 2:

			return fref / 3;

		case 1:

			return fref / 6;

		}

	}



	return 0;

}



static int clk_cgr_enable(struct clk *clk)

{

	u32 reg;
@@ -359,7 +380,7 @@ DEFINE_CLOCK(i2c1_clk, 0, CCM_CGR1, 10, get_rate_ipg_per, NULL); 
DEFINE_CLOCK(i2c2_clk,   1, CCM_CGR1, 12, get_rate_ipg_per, NULL);

DEFINE_CLOCK(i2c3_clk,   2, CCM_CGR1, 14, get_rate_ipg_per, NULL);

DEFINE_CLOCK(iomuxc_clk, 0, CCM_CGR1, 16, NULL, NULL);

DEFINE_CLOCK(ipu_clk,    0, CCM_CGR1, 18, get_rate_ahb, NULL);

DEFINE_CLOCK(ipu_clk,    0, CCM_CGR1, 18, get_rate_hsp, NULL);

DEFINE_CLOCK(kpp_clk,    0, CCM_CGR1, 20, get_rate_ipg, NULL);

DEFINE_CLOCK(mlb_clk,    0, CCM_CGR1, 22, get_rate_ahb, NULL);

DEFINE_CLOCK(mshc_clk,   0, CCM_CGR1, 24, get_rate_mshc, NULL);
@@ -485,10 +506,10 @@ static struct clk_lookup lookups[] = { 


int __init mx35_clocks_init()

{

	unsigned int ll = 0;

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



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

	ll = (3 << 16);

	cgr2 |= 3 << 16;

#endif



	clkdev_add_table(lookups, ARRAY_SIZE(lookups));
@@ -499,8 +520,20 @@ 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((3 << 26) | ll, CCM_BASE + CCM_CGR2);

	__raw_writel(0, CCM_BASE + CCM_CGR3);



	/*

	 * Check if we came up in internal boot mode. If yes, we need some

	 * extra clocks turned on, otherwise the MX35 boot ROM code will

	 * hang after a watchdog reset.

	 */

	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);



	mxc_timer_init(&gpt_clk,

			MX35_IO_ADDRESS(MX35_GPT1_BASE_ADDR), MX35_INT_GPT);

arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c

+1 −1
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata = { 
 * Add platform devices present on this baseboard and init

 * them from CPU side as far as required to use them later on

 */

void __init eukrea_mbimxsd_baseboard_init(void)

void __init eukrea_mbimxsd35_baseboard_init(void)

{

	if (mxc_iomux_v3_setup_multiple_pads(eukrea_mbimxsd_pads,

			ARRAY_SIZE(eukrea_mbimxsd_pads)))

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

+2 −2
Original line number Diff line number Diff line
@@ -201,8 +201,8 @@ static void __init mxc_board_init(void) 
	if (!otg_mode_host)

		mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata);



#ifdef CONFIG_MACH_EUKREA_MBIMXSD_BASEBOARD

	eukrea_mbimxsd_baseboard_init();

#ifdef CONFIG_MACH_EUKREA_MBIMXSD35_BASEBOARD

	eukrea_mbimxsd35_baseboard_init();

#endif

}