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

arch/arm/common/clkdev.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -62,9 +62,8 @@ static struct clk clk_find(const char dev_id, const char *con_id)
		return clk;
		}

		struct clk clk_get(struct device dev, const char *con_id)
		struct clk clk_get_sys(const char dev_id, const char *con_id)
		{
		const char *dev_id = dev ? dev_name(dev) : NULL;
		struct clk *clk;

		mutex_lock(&clocks_mutex);
		@@ -75,6 +74,14 @@ struct clk clk_get(struct device dev, const char *con_id)

		return clk ? clk : ERR_PTR(-ENOENT);
		}
		EXPORT_SYMBOL(clk_get_sys);

		struct clk clk_get(struct device dev, const char *con_id)
		{
		const char *dev_id = dev ? dev_name(dev) : NULL;

		return clk_get_sys(dev_id, con_id);
		}
		EXPORT_SYMBOL(clk_get);

		void clk_put(struct clk *clk)

+0 −36

Original line number	Diff line number	Diff line
		@@ -29,7 +29,6 @@
		#include <linux/string.h>

		#include <asm/errno.h>
		#include <mach/imxfb.h>
		#include <mach/hardware.h>
		#include <mach/imx-regs.h>

		@@ -245,43 +244,8 @@ void __init imx_set_mmc_info(struct imxmmc_platform_data *info)
		imx_mmc_device.dev.platform_data = info;
		}

		static struct imx_fb_platform_data imx_fb_info;

		void __init set_imx_fb_info(struct imx_fb_platform_data *hard_imx_fb_info)
		{
		memcpy(&imx_fb_info,hard_imx_fb_info,sizeof(struct imx_fb_platform_data));
		}

		static struct resource imxfb_resources[] = {
		[0] = {
		.start = 0x00205000,
		.end = 0x002050FF,
		.flags = IORESOURCE_MEM,
		},
		[1] = {
		.start = LCDC_INT,
		.end = LCDC_INT,
		.flags = IORESOURCE_IRQ,
		},
		};

		static u64 fb_dma_mask = ~(u64)0;

		static struct platform_device imxfb_device = {
		.name = "imx-fb",
		.id = 0,
		.dev = {
		.platform_data = &imx_fb_info,
		.dma_mask = &fb_dma_mask,
		.coherent_dma_mask = 0xffffffff,
		},
		.num_resources = ARRAY_SIZE(imxfb_resources),
		.resource = imxfb_resources,
		};

		static struct platform_device *devices[] __initdata = {
		&imx_mmc_device,
		&imxfb_device,
		};

		static struct map_desc imx_io_desc[] __initdata = {

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@

		# Object file lists.

		obj-y := system.o generic.o devices.o serial.o
		obj-y := generic.o devices.o serial.o

		obj-$(CONFIG_MACH_MX21) += clock_imx21.o

+0 −2

Original line number	Diff line number	Diff line
		@@ -229,7 +229,6 @@ struct platform_device mxc_nand_device = {
		.resource = mxc_nand_resources,
		};

		#ifdef CONFIG_FB_IMX
		/*
		* lcdc:
		* - i.MX1: the basic controller
		@@ -259,7 +258,6 @@ struct platform_device mxc_fb_device = {
		.coherent_dma_mask = 0xFFFFFFFF,
		},
		};
		#endif

		#ifdef CONFIG_MACH_MX27
		static struct resource mxc_fec_resources[] = {

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		#

		# Common support
		obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o
		obj-y := irq.o clock.o gpio.o time.o devices.o cpu.o system.o

		obj-$(CONFIG_ARCH_MX1) += iomux-mx1-mx2.o dma-mx1-mx2.o
		obj-$(CONFIG_ARCH_MX2) += iomux-mx1-mx2.o dma-mx1-mx2.o