Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable (79a94c35) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-mx25/clock.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -72,7 +72,7 @@ unsigned long get_rate_arm(struct clk *clk)
	unsigned long rate = get_rate_mpll();		unsigned long rate = get_rate_mpll();

	if (cctl & (1 << 14))		if (cctl & (1 << 14))
	rate = (rate * 3) >> 1;		rate = (rate * 3) >> 2;

	return rate / ((cctl >> 30) + 1);		return rate / ((cctl >> 30) + 1);
	}		}
	@@ -99,7 +99,7 @@ static unsigned long get_rate_per(int per)
	if (readl(CRM_BASE + 0x64) & (1 << per))		if (readl(CRM_BASE + 0x64) & (1 << per))
	fref = get_rate_upll();		fref = get_rate_upll();
	else		else
	fref = get_rate_ipg(NULL);		fref = get_rate_ahb(NULL);

	return fref / (val + 1);		return fref / (val + 1);
	}		}
	@@ -261,7 +261,7 @@ DEFINE_CLOCK(esdhc2_clk, 1, CCM_CGCR1, 14, get_rate_esdhc2, NULL,
	DEFINE_CLOCK(audmux_clk, 0, CCM_CGCR1, 0, NULL, NULL, NULL);		DEFINE_CLOCK(audmux_clk, 0, CCM_CGCR1, 0, NULL, NULL, NULL);
	DEFINE_CLOCK(csi_clk, 0, CCM_CGCR1, 4, get_rate_csi, NULL, &csi_per_clk);		DEFINE_CLOCK(csi_clk, 0, CCM_CGCR1, 4, get_rate_csi, NULL, &csi_per_clk);
	DEFINE_CLOCK(can1_clk, 0, CCM_CGCR1, 2, get_rate_ipg, NULL, NULL);		DEFINE_CLOCK(can1_clk, 0, CCM_CGCR1, 2, get_rate_ipg, NULL, NULL);
	DEFINE_CLOCK(can2_clk, 0, CCM_CGCR1, 3, get_rate_ipg, NULL, NULL);		DEFINE_CLOCK(can2_clk, 1, CCM_CGCR1, 3, get_rate_ipg, NULL, NULL);

	#define _REGISTER_CLOCK(d, n, c) \		#define _REGISTER_CLOCK(d, n, c) \
	{ \		{ \

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -49,7 +49,6 @@ extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
	#define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata)		#define imx25_add_spi_imx1(pdata) imx25_add_spi_imx(1, pdata)
	#define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata)		#define imx25_add_spi_imx2(pdata) imx25_add_spi_imx(2, pdata)

	#define imx25_add_esdhc0(pdata) \		extern const struct imx_esdhc_imx_data imx25_esdhc_data[] __initconst;
	imx_add_esdhc(0, MX25_ESDHC1_BASE_ADDR, SZ_16K, MX25_INT_MMC_SDHC1, pdata)		#define imx25_add_esdhc(id, pdata) \
	#define imx25_add_esdhc1(pdata) \		imx_add_esdhc(&imx25_esdhc_data[id], pdata)
	imx_add_esdhc(1, MX25_ESDHC2_BASE_ADDR, SZ_16K, MX25_INT_MMC_SDHC2, pdata)

+33 −1

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,38 @@ static struct imx_fb_videomode eukrea_mximxsd_modes[] = {
	},		},
	.bpp = 16,		.bpp = 16,
	.pcr = 0xCAD08B80,		.pcr = 0xCAD08B80,
			}, {
			.mode = {
			.name = "DVI-VGA",
			.refresh = 60,
			.xres = 640,
			.yres = 480,
			.pixclock = 32000,
			.hsync_len = 7,
			.left_margin = 100,
			.right_margin = 100,
			.vsync_len = 7,
			.upper_margin = 7,
			.lower_margin = 100,
			},
			.pcr = 0xFA208B80,
			.bpp = 16,
			}, {
			.mode = {
			.name = "DVI-SVGA",
			.refresh = 60,
			.xres = 800,
			.yres = 600,
			.pixclock = 25000,
			.hsync_len = 7,
			.left_margin = 75,
			.right_margin = 75,
			.vsync_len = 7,
			.upper_margin = 7,
			.lower_margin = 75,
			},
			.pcr = 0xFA208B80,
			.bpp = 16,
	},		},
	};		};

	@@ -245,7 +277,7 @@ void __init eukrea_mbimxsd25_baseboard_init(void)
	imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);		imx25_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);

	imx25_add_flexcan1(NULL);		imx25_add_flexcan1(NULL);
	imx25_add_esdhc0(NULL);		imx25_add_esdhc(0, NULL);

	gpio_request(GPIO_LED1, "LED1");		gpio_request(GPIO_LED1, "LED1");
	gpio_direction_output(GPIO_LED1, 1);		gpio_direction_output(GPIO_LED1, 1);

+4 −10

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,6 @@
	#include <mach/mxc_nand.h>		#include <mach/mxc_nand.h>
	#include <mach/imxfb.h>		#include <mach/imxfb.h>
	#include <mach/mxc_ehci.h>		#include <mach/mxc_ehci.h>
	#include <mach/ulpi.h>
	#include <mach/iomux-mx25.h>		#include <mach/iomux-mx25.h>

	#include "devices-imx25.h"		#include "devices-imx25.h"
	@@ -134,18 +133,13 @@ static void __init eukrea_cpuimx25_init(void)
	ARRAY_SIZE(eukrea_cpuimx25_i2c_devices));		ARRAY_SIZE(eukrea_cpuimx25_i2c_devices));
	imx25_add_imx_i2c0(&eukrea_cpuimx25_i2c0_data);		imx25_add_imx_i2c0(&eukrea_cpuimx25_i2c0_data);

	#if defined(CONFIG_USB_ULPI)		if (otg_mode_host)
	if (otg_mode_host) {
	otg_pdata.otg = otg_ulpi_create(&mxc_ulpi_access_ops,
	ULPI_OTG_DRVVBUS \| ULPI_OTG_DRVVBUS_EXT);

	mxc_register_device(&mxc_otg, &otg_pdata);		mxc_register_device(&mxc_otg, &otg_pdata);
	}		else
	mxc_register_device(&mxc_usbh2, &usbh2_pdata);
	#endif
	if (!otg_mode_host)
	mxc_register_device(&otg_udc_device, &otg_device_pdata);		mxc_register_device(&otg_udc_device, &otg_device_pdata);

			mxc_register_device(&mxc_usbh2, &usbh2_pdata);

	#ifdef CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD		#ifdef CONFIG_MACH_EUKREA_MBIMXSD25_BASEBOARD
	eukrea_mbimxsd25_baseboard_init();		eukrea_mbimxsd25_baseboard_init();
	#endif		#endif

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -46,9 +46,6 @@ extern const struct imx_spi_imx_data imx35_cspi_data[] __initconst;
	#define imx35_add_spi_imx0(pdata) imx35_add_cspi(0, pdata)		#define imx35_add_spi_imx0(pdata) imx35_add_cspi(0, pdata)
	#define imx35_add_spi_imx1(pdata) imx35_add_cspi(1, pdata)		#define imx35_add_spi_imx1(pdata) imx35_add_cspi(1, pdata)

	#define imx35_add_esdhc0(pdata) \		extern const struct imx_esdhc_imx_data imx35_esdhc_data[] __initconst;
	imx_add_esdhc(0, MX35_ESDHC1_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC1, pdata)		#define imx35_add_esdhc(id, pdata) \
	#define imx35_add_esdhc1(pdata) \		imx_add_esdhc(&imx35_esdhc_data[id], pdata)
	imx_add_esdhc(1, MX35_ESDHC2_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC2, pdata)
	#define imx35_add_esdhc2(pdata) \
	imx_add_esdhc(2, MX35_ESDHC3_BASE_ADDR, SZ_16K, MX35_INT_MMC_SDHC3, pdata)