---

yaml --- r: 323006 b: refs/heads/master c: 3549517 h: refs/heads/master v: v3
git-mirror · Sep 18, 2012 · c362327 · c362327
1 parent 9190ffd
commit c362327
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 31 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 652f5b5e8019d33deef29b198cbcc0f982a8a316
+refs/heads/master: 35495173e1df621dff0e9a244accbe32cd28a98f
diff --git a/trunk/arch/arm/boot/dts/at91sam9260.dtsi b/trunk/arch/arm/boot/dts/at91sam9260.dtsi
@@ -104,7 +104,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioB: gpio@fffff600 {
@@ -114,7 +113,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioC: gpio@fffff800 {
@@ -124,7 +122,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			dbgu: serial@fffff200 {

diff --git a/trunk/arch/arm/boot/dts/at91sam9263.dtsi b/trunk/arch/arm/boot/dts/at91sam9263.dtsi
@@ -95,7 +95,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioB: gpio@fffff400 {
@@ -105,7 +104,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioC: gpio@fffff600 {
@@ -115,7 +113,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioD: gpio@fffff800 {
@@ -125,7 +122,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioE: gpio@fffffa00 {
@@ -135,7 +131,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			dbgu: serial@ffffee00 {

diff --git a/trunk/arch/arm/boot/dts/at91sam9g45.dtsi b/trunk/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -113,7 +113,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioB: gpio@fffff400 {
@@ -123,7 +122,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioC: gpio@fffff600 {
@@ -133,7 +131,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioD: gpio@fffff800 {
@@ -143,7 +140,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioE: gpio@fffffa00 {
@@ -153,7 +149,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			dbgu: serial@ffffee00 {

diff --git a/trunk/arch/arm/boot/dts/at91sam9n12.dtsi b/trunk/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -107,7 +107,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioB: gpio@fffff600 {
@@ -117,7 +116,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioC: gpio@fffff800 {
@@ -127,7 +125,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioD: gpio@fffffa00 {
@@ -137,7 +134,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			dbgu: serial@fffff200 {

diff --git a/trunk/arch/arm/boot/dts/at91sam9x5.dtsi b/trunk/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -115,7 +115,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioB: gpio@fffff600 {
@@ -125,7 +124,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioC: gpio@fffff800 {
@@ -135,7 +133,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			pioD: gpio@fffffa00 {
@@ -145,7 +142,6 @@
 				#gpio-cells = <2>;
 				gpio-controller;
 				interrupt-controller;
-				#interrupt-cells = <2>;
 			};
 
 			dbgu: serial@fffff200 {

diff --git a/trunk/arch/arm/mach-imx/mach-armadillo5x0.c b/trunk/arch/arm/mach-imx/mach-armadillo5x0.c
@@ -526,7 +526,8 @@ static void __init armadillo5x0_init(void)
 	imx31_add_mxc_nand(&armadillo5x0_nand_board_info);
 
 	/* set NAND page size to 2k if not configured via boot mode pins */
-	__raw_writel(__raw_readl(MXC_CCM_RCSR) | (1 << 30), MXC_CCM_RCSR);
+	__raw_writel(__raw_readl(mx3_ccm_base + MXC_CCM_RCSR) |
+					(1 << 30), mx3_ccm_base + MXC_CCM_RCSR);
 
 	/* RTC */
 	/* Get RTC IRQ and register the chip */

diff --git a/trunk/arch/arm/mach-shmobile/board-kzm9g.c b/trunk/arch/arm/mach-shmobile/board-kzm9g.c
@@ -346,11 +346,11 @@ static struct resource sh_mmcif_resources[] = {
 		.flags	= IORESOURCE_MEM,
 	},
 	[1] = {
-		.start	= gic_spi(140),
+		.start	= gic_spi(141),
 		.flags	= IORESOURCE_IRQ,
 	},
 	[2] = {
-		.start	= gic_spi(141),
+		.start	= gic_spi(140),
 		.flags	= IORESOURCE_IRQ,
 	},
 };

diff --git a/trunk/arch/arm/plat-samsung/clock.c b/trunk/arch/arm/plat-samsung/clock.c
@@ -144,7 +144,6 @@ long clk_round_rate(struct clk *clk, unsigned long rate)
 
 int clk_set_rate(struct clk *clk, unsigned long rate)
 {
-	unsigned long flags;
 	int ret;
 
 	if (IS_ERR(clk))
@@ -160,9 +159,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate)
 	if (clk->ops == NULL || clk->ops->set_rate == NULL)
 		return -EINVAL;
 
-	spin_lock_irqsave(&clocks_lock, flags);
+	spin_lock(&clocks_lock);
 	ret = (clk->ops->set_rate)(clk, rate);
-	spin_unlock_irqrestore(&clocks_lock, flags);
+	spin_unlock(&clocks_lock);
 
 	return ret;
 }
@@ -174,18 +173,17 @@ struct clk *clk_get_parent(struct clk *clk)
 
 int clk_set_parent(struct clk *clk, struct clk *parent)
 {
-	unsigned long flags;
 	int ret = 0;
 
 	if (IS_ERR(clk))
 		return -EINVAL;
 
-	spin_lock_irqsave(&clocks_lock, flags);
+	spin_lock(&clocks_lock);
 
 	if (clk->ops && clk->ops->set_parent)
 		ret = (clk->ops->set_parent)(clk, parent);
 
-	spin_unlock_irqrestore(&clocks_lock, flags);
+	spin_unlock(&clocks_lock);
 
 	return ret;
 }