merge linus head to drm-mm branch (23bfc1a3) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/mach-integrator/impd1.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ static void impd1_setvco(struct clk *clk, struct icst525_vco vco)
		}
		writel(0, impd1->base + IMPD1_LOCK);

		#if DEBUG
		#ifdef DEBUG
		vco.v = val & 0x1ff;
		vco.r = (val >> 9) & 0x7f;
		vco.s = (val >> 16) & 7;
		@@ -427,17 +427,18 @@ static int impd1_probe(struct lm_device *dev)
		return ret;
		}

		static int impd1_remove_one(struct device dev, void data)
		{
		device_unregister(dev);
		return 0;
		}

		static void impd1_remove(struct lm_device *dev)
		{
		struct impd1_module *impd1 = lm_get_drvdata(dev);
		struct list_head l, n;
		int i;

		list_for_each_safe(l, n, &dev->dev.children) {
		struct device *d = list_to_dev(l);

		device_unregister(d);
		}
		device_for_each_child(&dev->dev, NULL, impd1_remove_one);

		for (i = 0; i < ARRAY_SIZE(impd1->vcos); i++)
		clk_unregister(&impd1->vcos[i]);

arch/arm/mach-pxa/generic.c

+20 −0

Original line number	Diff line number	Diff line
		@@ -250,6 +250,25 @@ void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
		i2c_device.dev.platform_data = info;
		}

		static struct resource i2s_resources[] = {
		{
		.start = 0x40400000,
		.end = 0x40400083,
		.flags = IORESOURCE_MEM,
		}, {
		.start = IRQ_I2S,
		.end = IRQ_I2S,
		.flags = IORESOURCE_IRQ,
		},
		};

		static struct platform_device i2s_device = {
		.name = "pxa2xx-i2s",
		.id = -1,
		.resource = i2c_resources,
		.num_resources = ARRAY_SIZE(i2s_resources),
		};

		static struct platform_device *devices[] __initdata = {
		&pxamci_device,
		&udc_device,
		@@ -258,6 +277,7 @@ static struct platform_device *devices[] __initdata = {
		&btuart_device,
		&stuart_device,
		&i2c_device,
		&i2s_device,
		};

		static int __init pxa_init(void)

arch/arm/mach-s3c2410/mach-bast.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -307,9 +307,9 @@ static void bast_nand_select(struct s3c2410_nand_set *set, int slot)
		}

		static struct s3c2410_platform_nand bast_nand_info = {
		.tacls = 40,
		.twrph0 = 80,
		.twrph1 = 80,
		.tacls = 30,
		.twrph0 = 60,
		.twrph1 = 60,
		.nr_sets = ARRAY_SIZE(bast_nand_sets),
		.sets = bast_nand_sets,
		.select_chip = bast_nand_select,

arch/i386/kernel/cpu/cpufreq/powernow-k8.c

+19 −11

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

		#define PFX "powernow-k8: "
		#define BFX PFX "BIOS error: "
		#define VERSION "version 1.50.3"
		#define VERSION "version 1.50.4"
		#include "powernow-k8.h"

		/* serialize freq changes */
		@@ -111,8 +111,8 @@ static int query_current_values_with_pending_wait(struct powernow_k8_data *data)
		u32 i = 0;

		do {
		if (i++ > 0x1000000) {
		printk(KERN_ERR PFX "detected change pending stuck\n");
		if (i++ > 10000) {
		dprintk("detected change pending stuck\n");
		return 1;
		}
		rdmsr(MSR_FIDVID_STATUS, lo, hi);
		@@ -159,6 +159,7 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid)
		{
		u32 lo;
		u32 savevid = data->currvid;
		u32 i = 0;

		if ((fid & INVALID_FID_MASK) \|\| (data->currvid & INVALID_VID_MASK)) {
		printk(KERN_ERR PFX "internal error - overflow on fid write\n");
		@@ -170,10 +171,13 @@ static int write_new_fid(struct powernow_k8_data *data, u32 fid)
		dprintk("writing fid 0x%x, lo 0x%x, hi 0x%x\n",
		fid, lo, data->plllock * PLL_LOCK_CONVERSION);

		do {
		wrmsr(MSR_FIDVID_CTL, lo, data->plllock * PLL_LOCK_CONVERSION);

		if (query_current_values_with_pending_wait(data))
		if (i++ > 100) {
		printk(KERN_ERR PFX "internal error - pending bit very stuck - no further pstate changes possible\n");
		return 1;
		}
		} while (query_current_values_with_pending_wait(data));

		count_off_irt(data);

		@@ -197,6 +201,7 @@ static int write_new_vid(struct powernow_k8_data *data, u32 vid)
		{
		u32 lo;
		u32 savefid = data->currfid;
		int i = 0;

		if ((data->currfid & INVALID_FID_MASK) \|\| (vid & INVALID_VID_MASK)) {
		printk(KERN_ERR PFX "internal error - overflow on vid write\n");
		@@ -208,10 +213,13 @@ static int write_new_vid(struct powernow_k8_data *data, u32 vid)
		dprintk("writing vid 0x%x, lo 0x%x, hi 0x%x\n",
		vid, lo, STOP_GRANT_5NS);

		do {
		wrmsr(MSR_FIDVID_CTL, lo, STOP_GRANT_5NS);

		if (query_current_values_with_pending_wait(data))
		if (i++ > 100) {
		printk(KERN_ERR PFX "internal error - pending bit very stuck - no further pstate changes possible\n");
		return 1;
		}
		} while (query_current_values_with_pending_wait(data));

		if (savefid != data->currfid) {
		printk(KERN_ERR PFX "fid changed on vid trans, old 0x%x new 0x%x\n",

arch/ppc64/kernel/iSeries_htab.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va,
		}

		if (slot < 0) { /* MSB set means secondary group */
		vflags \|= HPTE_V_VALID;
		vflags \|= HPTE_V_SECONDARY;
		secondary = 1;
		slot &= 0x7fffffffffffffff;
		}