All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names
@ 2013-03-19 17:38 Guennadi Liakhovetski
  2013-03-21 12:23 ` Laurent Pinchart
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Guennadi Liakhovetski @ 2013-03-19 17:38 UTC (permalink / raw)
  To: linux-sh

Fix several device-tree bindings, that haven't been updated for newest
versions of respective drivers, and device names and pin numbers, left over
from non-DT and old pinctrl versions.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---

Applies on top of my previous patches from yesterday and today. In 
principle it would be better to first fix bugs and then move device tree 
nodes around, but the bugs are there also in the original version, so, 
doesn't really matter in which order we do fixing and transforming. Unless 
we want to merge fixes into original patches, that introduced the bugs.

 arch/arm/boot/dts/sh73a0.dtsi                  |   12 +++++-----
 arch/arm/mach-shmobile/board-kzm9g-reference.c |   27 +++++++++++------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index c89be38..3e4d383 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -109,36 +109,36 @@
 	};
 
 	sdhi0: sdhi@0xee100000 {
-		compatible = "renesas,shmobile-sdhi";
+		compatible = "renesas,r8a7740-sdhi";
 		reg = <0xee100000 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 83 4
 				0 84 4
 				0 85 4>;
-		toshiba,mmc-has-idle-wait;
+		cap-sd-highspeed;
 		status = "disabled";
 	};
 
 	/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
 	sdhi1: sdhi@0xee120000 {
-		compatible = "renesas,shmobile-sdhi";
+		compatible = "renesas,r8a7740-sdhi";
 		reg = <0xee120000 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 88 4
 				0 89 4>;
 		toshiba,mmc-wrprotect-disable;
-		toshiba,mmc-has-idle-wait;
+		cap-sd-highspeed;
 		status = "disabled";
 	};
 
 	sdhi2: sdhi@0xee140000 {
-		compatible = "renesas,shmobile-sdhi";
+		compatible = "renesas,r8a7740-sdhi";
 		reg = <0xee140000 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 104 4
 				0 105 4>;
 		toshiba,mmc-wrprotect-disable;
-		toshiba,mmc-has-idle-wait;
+		cap-sd-highspeed;
 		status = "disabled";
 	};
 };
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index b21e03f..100672c 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -81,16 +81,16 @@ static unsigned long pin_pullup_conf[] = {
 };
 
 static const struct pinctrl_map kzm_pinctrl_map[] = {
-	PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("e6826000.i2c", "pfc-sh73a0",
 				  "i2c3_1", "i2c3"),
 	/* MMCIF */
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
 				  "mmc0_data8_0", "mmc0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
 				  "mmc0_ctrl_0", "mmc0"),
-	PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
+	PIN_MAP_CONFIGS_PIN_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
 				    "PORT279", pin_pullup_conf),
-	PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
+	PIN_MAP_CONFIGS_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
 				      "mmc0_data8_0", pin_pullup_conf),
 	/* SCIFA4 */
 	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
@@ -98,18 +98,18 @@ static const struct pinctrl_map kzm_pinctrl_map[] = {
 	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
 				  "scifa4_ctrl", "scifa4"),
 	/* SDHI0 */
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
 				  "sdhi0_data4", "sdhi0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
 				  "sdhi0_ctrl", "sdhi0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
 				  "sdhi0_cd", "sdhi0"),
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
 				  "sdhi0_wp", "sdhi0"),
 	/* SDHI2 */
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0",
 				  "sdhi2_data4", "sdhi2"),
-	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0",
+	PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0",
 				  "sdhi2_ctrl", "sdhi2"),
 };
 
@@ -124,10 +124,9 @@ static void __init kzm_init(void)
 
 	/* enable SD */
 	gpio_request(GPIO_FN_SDHI0_VCCQ_MC0_ON,	NULL);
-	gpio_request_one(GPIO_PORT15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
+	gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
 
-	gpio_request(GPIO_FN_SDHICLK2,		NULL);
-	gpio_request_one(GPIO_PORT14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
+	gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
 
 #ifdef CONFIG_CACHE_L2X0
 	/* Early BRESP enable, Shared attribute override enable, 64K*8way */
-- 
1.7.2.5


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names
  2013-03-19 17:38 [PATCH] ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names Guennadi Liakhovetski
@ 2013-03-21 12:23 ` Laurent Pinchart
  2013-03-21 13:25 ` Simon Horman
  2013-05-22 12:49   ` Simon Horman
  2 siblings, 0 replies; 9+ messages in thread
From: Laurent Pinchart @ 2013-03-21 12:23 UTC (permalink / raw)
  To: linux-sh

Hi Guennadi,

Thanks for the patch.

On Tuesday 19 March 2013 18:38:50 Guennadi Liakhovetski wrote:
> Fix several device-tree bindings, that haven't been updated for newest
> versions of respective drivers, and device names and pin numbers, left over
> from non-DT and old pinctrl versions.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
> 
> Applies on top of my previous patches from yesterday and today. In
> principle it would be better to first fix bugs and then move device tree
> nodes around, but the bugs are there also in the original version, so,
> doesn't really matter in which order we do fixing and transforming. Unless
> we want to merge fixes into original patches, that introduced the bugs.

I prefer merging the fixes in the original patches when they haven't reached 
mainline yet, but I can live with both.

>  arch/arm/boot/dts/sh73a0.dtsi                  |   12 +++++-----
>  arch/arm/mach-shmobile/board-kzm9g-reference.c |   27 ++++++++++-----------
>  2 files changed, 19 insertions(+), 20 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
> index c89be38..3e4d383 100644
> --- a/arch/arm/boot/dts/sh73a0.dtsi
> +++ b/arch/arm/boot/dts/sh73a0.dtsi
> @@ -109,36 +109,36 @@
>  	};
> 
>  	sdhi0: sdhi@0xee100000 {
> -		compatible = "renesas,shmobile-sdhi";
> +		compatible = "renesas,r8a7740-sdhi";
>  		reg = <0xee100000 0x100>;
>  		interrupt-parent = <&gic>;
>  		interrupts = <0 83 4
>  				0 84 4
>  				0 85 4>;
> -		toshiba,mmc-has-idle-wait;
> +		cap-sd-highspeed;
>  		status = "disabled";
>  	};
> 
>  	/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
>  	sdhi1: sdhi@0xee120000 {
> -		compatible = "renesas,shmobile-sdhi";
> +		compatible = "renesas,r8a7740-sdhi";
>  		reg = <0xee120000 0x100>;
>  		interrupt-parent = <&gic>;
>  		interrupts = <0 88 4
>  				0 89 4>;
>  		toshiba,mmc-wrprotect-disable;
> -		toshiba,mmc-has-idle-wait;
> +		cap-sd-highspeed;
>  		status = "disabled";
>  	};
> 
>  	sdhi2: sdhi@0xee140000 {
> -		compatible = "renesas,shmobile-sdhi";
> +		compatible = "renesas,r8a7740-sdhi";
>  		reg = <0xee140000 0x100>;
>  		interrupt-parent = <&gic>;
>  		interrupts = <0 104 4
>  				0 105 4>;
>  		toshiba,mmc-wrprotect-disable;
> -		toshiba,mmc-has-idle-wait;
> +		cap-sd-highspeed;
>  		status = "disabled";
>  	};
>  };
> diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> b/arch/arm/mach-shmobile/board-kzm9g-reference.c index b21e03f..100672c
> 100644
> --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> @@ -81,16 +81,16 @@ static unsigned long pin_pullup_conf[] = {
>  };
> 
>  static const struct pinctrl_map kzm_pinctrl_map[] = {
> -	PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("e6826000.i2c", "pfc-sh73a0",
>  				  "i2c3_1", "i2c3"),
>  	/* MMCIF */
> -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
>  				  "mmc0_data8_0", "mmc0"),
> -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
>  				  "mmc0_ctrl_0", "mmc0"),
> -	PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
> +	PIN_MAP_CONFIGS_PIN_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
>  				    "PORT279", pin_pullup_conf),
> -	PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
> +	PIN_MAP_CONFIGS_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
>  				      "mmc0_data8_0", pin_pullup_conf),
>  	/* SCIFA4 */
>  	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
> @@ -98,18 +98,18 @@ static const struct pinctrl_map kzm_pinctrl_map[] = {
>  	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
>  				  "scifa4_ctrl", "scifa4"),
>  	/* SDHI0 */
> -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
>  				  "sdhi0_data4", "sdhi0"),
> -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
>  				  "sdhi0_ctrl", "sdhi0"),
> -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
>  				  "sdhi0_cd", "sdhi0"),
> -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
>  				  "sdhi0_wp", "sdhi0"),
>  	/* SDHI2 */
> -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0",
>  				  "sdhi2_data4", "sdhi2"),
> -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0",
> +	PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0",
>  				  "sdhi2_ctrl", "sdhi2"),
>  };
> 
> @@ -124,10 +124,9 @@ static void __init kzm_init(void)
> 
>  	/* enable SD */
>  	gpio_request(GPIO_FN_SDHI0_VCCQ_MC0_ON,	NULL);
> -	gpio_request_one(GPIO_PORT15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> +	gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> 
> -	gpio_request(GPIO_FN_SDHICLK2,		NULL);
> -	gpio_request_one(GPIO_PORT14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> +	gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> 
>  #ifdef CONFIG_CACHE_L2X0
>  	/* Early BRESP enable, Shared attribute override enable, 64K*8way */

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names
  2013-03-19 17:38 [PATCH] ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names Guennadi Liakhovetski
  2013-03-21 12:23 ` Laurent Pinchart
@ 2013-03-21 13:25 ` Simon Horman
  2013-05-22 12:49   ` Simon Horman
  2 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-03-21 13:25 UTC (permalink / raw)
  To: linux-sh

On Thu, Mar 21, 2013 at 01:23:44PM +0100, Laurent Pinchart wrote:
> Hi Guennadi,
> 
> Thanks for the patch.
> 
> On Tuesday 19 March 2013 18:38:50 Guennadi Liakhovetski wrote:
> > Fix several device-tree bindings, that haven't been updated for newest
> > versions of respective drivers, and device names and pin numbers, left over
> > from non-DT and old pinctrl versions.
> > 
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> 
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Thanks, applied to the boards branch.

> > ---
> > 
> > Applies on top of my previous patches from yesterday and today. In
> > principle it would be better to first fix bugs and then move device tree
> > nodes around, but the bugs are there also in the original version, so,
> > doesn't really matter in which order we do fixing and transforming. Unless
> > we want to merge fixes into original patches, that introduced the bugs.
> 
> I prefer merging the fixes in the original patches when they haven't reached 
> mainline yet, but I can live with both.
> 
> >  arch/arm/boot/dts/sh73a0.dtsi                  |   12 +++++-----
> >  arch/arm/mach-shmobile/board-kzm9g-reference.c |   27 ++++++++++-----------
> >  2 files changed, 19 insertions(+), 20 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
> > index c89be38..3e4d383 100644
> > --- a/arch/arm/boot/dts/sh73a0.dtsi
> > +++ b/arch/arm/boot/dts/sh73a0.dtsi
> > @@ -109,36 +109,36 @@
> >  	};
> > 
> >  	sdhi0: sdhi@0xee100000 {
> > -		compatible = "renesas,shmobile-sdhi";
> > +		compatible = "renesas,r8a7740-sdhi";
> >  		reg = <0xee100000 0x100>;
> >  		interrupt-parent = <&gic>;
> >  		interrupts = <0 83 4
> >  				0 84 4
> >  				0 85 4>;
> > -		toshiba,mmc-has-idle-wait;
> > +		cap-sd-highspeed;
> >  		status = "disabled";
> >  	};
> > 
> >  	/* SDHI1 and SDHI2 have no CD pins, no need for CD IRQ */
> >  	sdhi1: sdhi@0xee120000 {
> > -		compatible = "renesas,shmobile-sdhi";
> > +		compatible = "renesas,r8a7740-sdhi";
> >  		reg = <0xee120000 0x100>;
> >  		interrupt-parent = <&gic>;
> >  		interrupts = <0 88 4
> >  				0 89 4>;
> >  		toshiba,mmc-wrprotect-disable;
> > -		toshiba,mmc-has-idle-wait;
> > +		cap-sd-highspeed;
> >  		status = "disabled";
> >  	};
> > 
> >  	sdhi2: sdhi@0xee140000 {
> > -		compatible = "renesas,shmobile-sdhi";
> > +		compatible = "renesas,r8a7740-sdhi";
> >  		reg = <0xee140000 0x100>;
> >  		interrupt-parent = <&gic>;
> >  		interrupts = <0 104 4
> >  				0 105 4>;
> >  		toshiba,mmc-wrprotect-disable;
> > -		toshiba,mmc-has-idle-wait;
> > +		cap-sd-highspeed;
> >  		status = "disabled";
> >  	};
> >  };
> > diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > b/arch/arm/mach-shmobile/board-kzm9g-reference.c index b21e03f..100672c
> > 100644
> > --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> > @@ -81,16 +81,16 @@ static unsigned long pin_pullup_conf[] = {
> >  };
> > 
> >  static const struct pinctrl_map kzm_pinctrl_map[] = {
> > -	PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("e6826000.i2c", "pfc-sh73a0",
> >  				  "i2c3_1", "i2c3"),
> >  	/* MMCIF */
> > -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
> >  				  "mmc0_data8_0", "mmc0"),
> > -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
> >  				  "mmc0_ctrl_0", "mmc0"),
> > -	PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
> > +	PIN_MAP_CONFIGS_PIN_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
> >  				    "PORT279", pin_pullup_conf),
> > -	PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
> > +	PIN_MAP_CONFIGS_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
> >  				      "mmc0_data8_0", pin_pullup_conf),
> >  	/* SCIFA4 */
> >  	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
> > @@ -98,18 +98,18 @@ static const struct pinctrl_map kzm_pinctrl_map[] = {
> >  	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
> >  				  "scifa4_ctrl", "scifa4"),
> >  	/* SDHI0 */
> > -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
> >  				  "sdhi0_data4", "sdhi0"),
> > -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
> >  				  "sdhi0_ctrl", "sdhi0"),
> > -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
> >  				  "sdhi0_cd", "sdhi0"),
> > -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
> >  				  "sdhi0_wp", "sdhi0"),
> >  	/* SDHI2 */
> > -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0",
> >  				  "sdhi2_data4", "sdhi2"),
> > -	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-sh73a0",
> > +	PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0",
> >  				  "sdhi2_ctrl", "sdhi2"),
> >  };
> > 
> > @@ -124,10 +124,9 @@ static void __init kzm_init(void)
> > 
> >  	/* enable SD */
> >  	gpio_request(GPIO_FN_SDHI0_VCCQ_MC0_ON,	NULL);
> > -	gpio_request_one(GPIO_PORT15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> > +	gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> > 
> > -	gpio_request(GPIO_FN_SDHICLK2,		NULL);
> > -	gpio_request_one(GPIO_PORT14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> > +	gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
> > 
> >  #ifdef CONFIG_CACHE_L2X0
> >  	/* Early BRESP enable, Shared attribute override enable, 64K*8way */
> 
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] ARM: shmobile: kzm9g-reference: Update CMT clocksource rating to 80
@ 2013-05-22 12:49   ` Simon Horman
  0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-05-22 12:49 UTC (permalink / raw)
  To: linux-arm-kernel

Update the CMT clocksource rating from 100 to 10.

This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1
introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp:
Avoid dummy clockevent being preferred over real").

The patch noted above reduces the rating of dummy clockevent from 400 to 100.
This patch reduces the rating of CMT so that it is once again less than that
of the dummy clockevent.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

I also plan to reduce the rating of the STI clocksource to less than 100.
However, as I am not aware of any problems relating to STI in v3.10-rc
my plan is to update STI in the v3.11 timeframe.
---
 arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index fdf3894..9696f36 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -252,7 +252,7 @@ static struct sh_timer_config cmt10_platform_data = {
 	.name = "CMT10",
 	.channel_offset = 0x10,
 	.timer_bit = 0,
-	.clockevent_rating = 125,
+	.clockevent_rating = 80,
 	.clocksource_rating = 125,
 };
 
-- 
1.8.2.1


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [PATCH] ARM: shmobile: kzm9g-reference: Update CMT clocksource rating to 80
@ 2013-05-22 12:49   ` Simon Horman
  0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-05-22 12:49 UTC (permalink / raw)
  To: linux-arm-kernel

Update the CMT clocksource rating from 100 to 10.

This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1
introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp:
Avoid dummy clockevent being preferred over real").

The patch noted above reduces the rating of dummy clockevent from 400 to 100.
This patch reduces the rating of CMT so that it is once again less than that
of the dummy clockevent.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

I also plan to reduce the rating of the STI clocksource to less than 100.
However, as I am not aware of any problems relating to STI in v3.10-rc
my plan is to update STI in the v3.11 timeframe.
---
 arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index fdf3894..9696f36 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -252,7 +252,7 @@ static struct sh_timer_config cmt10_platform_data = {
 	.name = "CMT10",
 	.channel_offset = 0x10,
 	.timer_bit = 0,
-	.clockevent_rating = 125,
+	.clockevent_rating = 80,
 	.clocksource_rating = 125,
 };
 
-- 
1.8.2.1

^ permalink raw reply related	[flat|nested] 9+ messages in thread
* Re: [PATCH] ARM: shmobile: kzm9g-reference: Update CMT clocksource rating to 80
  2013-05-22 12:49   ` Simon Horman
@ 2013-05-22 13:43     ` Sergei Shtylyov
  -1 siblings, 0 replies; 9+ messages in thread
From: Sergei Shtylyov @ 2013-05-22 13:43 UTC (permalink / raw)
  To: linux-arm-kernel

Hello.

On 22-05-2013 16:49, Simon Horman wrote:

> Update the CMT clocksource rating from 100 to 10.

    s/100/125/ and s/10/80/, apparently.

> This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1
> introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp:
> Avoid dummy clockevent being preferred over real").

> The patch noted above reduces the rating of dummy clockevent from 400 to 100.

    400 seems very high rating for a dummy clockevent...

> This patch reduces the rating of CMT so that it is once again less than that
> of the dummy clockevent.

> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

> ---

> I also plan to reduce the rating of the STI clocksource to less than 100.
> However, as I am not aware of any problems relating to STI in v3.10-rc
> my plan is to update STI in the v3.11 timeframe.
> ---
>   arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

> diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
> index fdf3894..9696f36 100644
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@ -252,7 +252,7 @@ static struct sh_timer_config cmt10_platform_data = {
>   	.name = "CMT10",
>   	.channel_offset = 0x10,
>   	.timer_bit = 0,
> -	.clockevent_rating = 125,
> +	.clockevent_rating = 80,
>   	.clocksource_rating = 125,
>   };

WBR, Sergei



^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] ARM: shmobile: kzm9g-reference: Update CMT clocksource rating to 80
@ 2013-05-22 13:43     ` Sergei Shtylyov
  0 siblings, 0 replies; 9+ messages in thread
From: Sergei Shtylyov @ 2013-05-22 13:43 UTC (permalink / raw)
  To: linux-arm-kernel

Hello.

On 22-05-2013 16:49, Simon Horman wrote:

> Update the CMT clocksource rating from 100 to 10.

    s/100/125/ and s/10/80/, apparently.

> This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1
> introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp:
> Avoid dummy clockevent being preferred over real").

> The patch noted above reduces the rating of dummy clockevent from 400 to 100.

    400 seems very high rating for a dummy clockevent...

> This patch reduces the rating of CMT so that it is once again less than that
> of the dummy clockevent.

> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

> ---

> I also plan to reduce the rating of the STI clocksource to less than 100.
> However, as I am not aware of any problems relating to STI in v3.10-rc
> my plan is to update STI in the v3.11 timeframe.
> ---
>   arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

> diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
> index fdf3894..9696f36 100644
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@ -252,7 +252,7 @@ static struct sh_timer_config cmt10_platform_data = {
>   	.name = "CMT10",
>   	.channel_offset = 0x10,
>   	.timer_bit = 0,
> -	.clockevent_rating = 125,
> +	.clockevent_rating = 80,
>   	.clocksource_rating = 125,
>   };

WBR, Sergei

^ permalink raw reply	[flat|nested] 9+ messages in thread
* Re: [PATCH] ARM: shmobile: kzm9g-reference: Update CMT clocksource rating to 80
  2013-05-22 13:43     ` Sergei Shtylyov
@ 2013-05-22 13:56       ` Simon Horman
  -1 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-05-22 13:56 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, May 22, 2013 at 05:43:51PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 22-05-2013 16:49, Simon Horman wrote:
> 
> >Update the CMT clocksource rating from 100 to 10.
> 
>    s/100/125/ and s/10/80/, apparently.

Thanks, I don't know what I was thinking.

> 
> >This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1
> >introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp:
> >Avoid dummy clockevent being preferred over real").
> 
> >The patch noted above reduces the rating of dummy clockevent from 400 to 100.
> 
>    400 seems very high rating for a dummy clockevent...
> 
> >This patch reduces the rating of CMT so that it is once again less than that
> >of the dummy clockevent.
> 
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> >---
> 
> >I also plan to reduce the rating of the STI clocksource to less than 100.
> >However, as I am not aware of any problems relating to STI in v3.10-rc
> >my plan is to update STI in the v3.11 timeframe.
> >---
> >  arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> >diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
> >index fdf3894..9696f36 100644
> >--- a/arch/arm/mach-shmobile/setup-sh73a0.c
> >+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> >@@ -252,7 +252,7 @@ static struct sh_timer_config cmt10_platform_data = {
> >  	.name = "CMT10",
> >  	.channel_offset = 0x10,
> >  	.timer_bit = 0,
> >-	.clockevent_rating = 125,
> >+	.clockevent_rating = 80,
> >  	.clocksource_rating = 125,
> >  };
> 
> WBR, Sergei
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread
* [PATCH] ARM: shmobile: kzm9g-reference: Update CMT clocksource rating to 80
@ 2013-05-22 13:56       ` Simon Horman
  0 siblings, 0 replies; 9+ messages in thread
From: Simon Horman @ 2013-05-22 13:56 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, May 22, 2013 at 05:43:51PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 22-05-2013 16:49, Simon Horman wrote:
> 
> >Update the CMT clocksource rating from 100 to 10.
> 
>    s/100/125/ and s/10/80/, apparently.

Thanks, I don't know what I was thinking.

> 
> >This resolves a boot-failure regression for kzm9g-reference in v3.10-rc1
> >introduced by f7db706b132f11c79ae1d74b2382e0926cf31644 ("ARM: 7674/1: smp:
> >Avoid dummy clockevent being preferred over real").
> 
> >The patch noted above reduces the rating of dummy clockevent from 400 to 100.
> 
>    400 seems very high rating for a dummy clockevent...
> 
> >This patch reduces the rating of CMT so that it is once again less than that
> >of the dummy clockevent.
> 
> >Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> >---
> 
> >I also plan to reduce the rating of the STI clocksource to less than 100.
> >However, as I am not aware of any problems relating to STI in v3.10-rc
> >my plan is to update STI in the v3.11 timeframe.
> >---
> >  arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> >diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
> >index fdf3894..9696f36 100644
> >--- a/arch/arm/mach-shmobile/setup-sh73a0.c
> >+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> >@@ -252,7 +252,7 @@ static struct sh_timer_config cmt10_platform_data = {
> >  	.name = "CMT10",
> >  	.channel_offset = 0x10,
> >  	.timer_bit = 0,
> >-	.clockevent_rating = 125,
> >+	.clockevent_rating = 80,
> >  	.clocksource_rating = 125,
> >  };
> 
> WBR, Sergei
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

^ permalink raw reply	[flat|nested] 9+ messages in thread
end of thread, other threads:[~2013-05-22 13:56 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-19 17:38 [PATCH] ARM: shmobile: kzm9g-reference: fix device-tree bindings and device names Guennadi Liakhovetski
2013-03-21 12:23 ` Laurent Pinchart
2013-03-21 13:25 ` Simon Horman
2013-05-22 12:49 ` [PATCH] ARM: shmobile: kzm9g-reference: Update CMT clocksource rating to 80 Simon Horman
2013-05-22 12:49   ` Simon Horman
2013-05-22 13:43   ` Sergei Shtylyov
2013-05-22 13:43     ` Sergei Shtylyov
2013-05-22 13:56     ` Simon Horman
2013-05-22 13:56       ` Simon Horman

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.