[PATCH] [rfc] ARM: mach-shmobile: mackerel: Add zboot support

[PATCH] [rfc] ARM: mach-shmobile: mackerel: Add zboot support

[Simon Horman]

When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small
boot loader and may be burned to rom or flash.

This patch assumes that head-mackerel.txt will be the same as head-ap4evb.txt.
I am waiting for verification of this.

This patch depends on
* ARM: 6515/1: Add zboot support for SuperH Mobile ARM
  (merged into the devel branch of Russel King's linux-2.6-arm tree)
* ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM
  (merged into the devel branch of Russel King's linux-2.6-arm tree)
* MACH_MACKEREL (3211) being present in arch/arm/tools/mach-types

Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 .../mach-shmobile/include/mach/head-mackerel.txt   |   87 ++++++++++++++++++++
 arch/arm/mach-shmobile/include/mach/zboot.h        |    3 +
 2 files changed, 90 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-shmobile/include/mach/head-mackerel.txt

diff --git a/arch/arm/mach-shmobile/include/mach/head-mackerel.txt b/arch/arm/mach-shmobile/include/mach/head-mackerel.txt
new file mode 100644
index 0000000..e3ebfa7
--- /dev/null
+++ b/arch/arm/mach-shmobile/include/mach/head-mackerel.txt
@@ -0,0 +1,87 @@
+LIST "partner-jet-setup.txt"
+LIST "(C) Copyright 2010 Renesas Solutions Corp"
+LIST "Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>"
+
+LIST "RWT Setting"
+EW 0xE6020004, 0xA500
+EW 0xE6030004, 0xA500
+
+DD 0x01001000, 0x01001000
+
+LIST "GPIO Setting"
+EB 0xE6051013, 0xA2
+
+LIST "CPG"
+ED 0xE6150080, 0x00000180
+ED 0xE61500C0, 0x00000002
+
+WAIT 1, 0xFE40009C
+
+LIST "FRQCR"
+ED 0xE6150000, 0x2D1305C3
+ED 0xE61500E0, 0x9E40358E
+ED 0xE6150004, 0x80331050
+
+WAIT 1, 0xFE40009C
+
+ED 0xE61500E4, 0x00002000
+
+WAIT 1, 0xFE40009C
+
+LIST "PLL"
+ED 0xE6150028, 0x00004000
+
+WAIT 1, 0xFE40009C
+
+ED 0xE615002C, 0x93000040
+
+WAIT 1, 0xFE40009C
+
+LIST "BSC"
+ED 0xFEC10000, 0x00E0001B
+
+LIST "SBSC1"
+ED 0xFE400354, 0x01AD8000
+ED 0xFE400354, 0x01AD8001
+
+WAIT 5, 0xFE40009C
+
+ED 0xFE400008, 0xBCC90151
+ED 0xFE400040, 0x41774113
+ED 0xFE400044, 0x2712E229
+ED 0xFE400048, 0x20C18505
+ED 0xFE40004C, 0x00110209
+ED 0xFE400010, 0x00000087
+
+WAIT 10, 0xFE40009C
+
+ED 0xFE400084, 0x0000003F
+EB 0xFE500000, 0x00
+
+WAIT 5, 0xFE40009C
+
+ED 0xFE400084, 0x0000FF0A
+EB 0xFE500000, 0x00
+
+WAIT 1, 0xFE40009C
+
+ED 0xFE400084, 0x00002201
+EB 0xFE500000, 0x00
+ED 0xFE400084, 0x00000302
+EB 0xFE500000, 0x00
+EB 0xFE5C0000, 0x00
+ED 0xFE400008, 0xBCC90159
+ED 0xFE40008C, 0x88800004
+ED 0xFE400094, 0x00000004
+ED 0xFE400028, 0xA55A0032
+ED 0xFE40002C, 0xA55A000C
+ED 0xFE400020, 0xA55A2048
+ED 0xFE400008, 0xBCC90959
+
+LIST "Change CPGA setting"
+ED 0xE61500E0, 0x9E40352E
+ED 0xE6150004, 0x80331050
+
+WAIT 1, 0xFE40009C
+
+ED 0xE6150354, 0x00000002
diff --git a/arch/arm/mach-shmobile/include/mach/zboot.h b/arch/arm/mach-shmobile/include/mach/zboot.h
index 3ad86b7..994b891 100644
--- a/arch/arm/mach-shmobile/include/mach/zboot.h
+++ b/arch/arm/mach-shmobile/include/mach/zboot.h
@@ -13,6 +13,9 @@
 #ifdef CONFIG_MACH_AP4EVB
 #define MACH_TYPE	MACH_TYPE_AP4EVB
 #include "mach/head-ap4evb.txt"
+#elif CONFIG_MACH_MACKEREL
+#define MACH_TYPE	MACH_TYPE_MACKEREL
+#include "mach/head-ap4evb.txt"
 #else
 #error "unsupported board."
 #endif
-- 
1.7.2.3

[PATCH] [rfc] ARM: mach-shmobile: mackerel: Add zboot support

[Simon Horman]

When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small
boot loader and may be burned to rom or flash.

This patch assumes that head-mackerel.txt will be the same as head-ap4evb.txt.
I am waiting for verification of this.

This patch depends on
* ARM: 6515/1: Add zboot support for SuperH Mobile ARM
  (merged into the devel branch of Russel King's linux-2.6-arm tree)
* ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM
  (merged into the devel branch of Russel King's linux-2.6-arm tree)
* MACH_MACKEREL (3211) being present in arch/arm/tools/mach-types

Cc: Magnus Damm <magnus.damm@gmail.com>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 .../mach-shmobile/include/mach/head-mackerel.txt   |   87 ++++++++++++++++++++
 arch/arm/mach-shmobile/include/mach/zboot.h        |    3 +
 2 files changed, 90 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-shmobile/include/mach/head-mackerel.txt

diff --git a/arch/arm/mach-shmobile/include/mach/head-mackerel.txt b/arch/arm/mach-shmobile/include/mach/head-mackerel.txt
new file mode 100644
index 0000000..e3ebfa7
--- /dev/null
+++ b/arch/arm/mach-shmobile/include/mach/head-mackerel.txt
@@ -0,0 +1,87 @@
+LIST "partner-jet-setup.txt"
+LIST "(C) Copyright 2010 Renesas Solutions Corp"
+LIST "Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>"
+
+LIST "RWT Setting"
+EW 0xE6020004, 0xA500
+EW 0xE6030004, 0xA500
+
+DD 0x01001000, 0x01001000
+
+LIST "GPIO Setting"
+EB 0xE6051013, 0xA2
+
+LIST "CPG"
+ED 0xE6150080, 0x00000180
+ED 0xE61500C0, 0x00000002
+
+WAIT 1, 0xFE40009C
+
+LIST "FRQCR"
+ED 0xE6150000, 0x2D1305C3
+ED 0xE61500E0, 0x9E40358E
+ED 0xE6150004, 0x80331050
+
+WAIT 1, 0xFE40009C
+
+ED 0xE61500E4, 0x00002000
+
+WAIT 1, 0xFE40009C
+
+LIST "PLL"
+ED 0xE6150028, 0x00004000
+
+WAIT 1, 0xFE40009C
+
+ED 0xE615002C, 0x93000040
+
+WAIT 1, 0xFE40009C
+
+LIST "BSC"
+ED 0xFEC10000, 0x00E0001B
+
+LIST "SBSC1"
+ED 0xFE400354, 0x01AD8000
+ED 0xFE400354, 0x01AD8001
+
+WAIT 5, 0xFE40009C
+
+ED 0xFE400008, 0xBCC90151
+ED 0xFE400040, 0x41774113
+ED 0xFE400044, 0x2712E229
+ED 0xFE400048, 0x20C18505
+ED 0xFE40004C, 0x00110209
+ED 0xFE400010, 0x00000087
+
+WAIT 10, 0xFE40009C
+
+ED 0xFE400084, 0x0000003F
+EB 0xFE500000, 0x00
+
+WAIT 5, 0xFE40009C
+
+ED 0xFE400084, 0x0000FF0A
+EB 0xFE500000, 0x00
+
+WAIT 1, 0xFE40009C
+
+ED 0xFE400084, 0x00002201
+EB 0xFE500000, 0x00
+ED 0xFE400084, 0x00000302
+EB 0xFE500000, 0x00
+EB 0xFE5C0000, 0x00
+ED 0xFE400008, 0xBCC90159
+ED 0xFE40008C, 0x88800004
+ED 0xFE400094, 0x00000004
+ED 0xFE400028, 0xA55A0032
+ED 0xFE40002C, 0xA55A000C
+ED 0xFE400020, 0xA55A2048
+ED 0xFE400008, 0xBCC90959
+
+LIST "Change CPGA setting"
+ED 0xE61500E0, 0x9E40352E
+ED 0xE6150004, 0x80331050
+
+WAIT 1, 0xFE40009C
+
+ED 0xE6150354, 0x00000002
diff --git a/arch/arm/mach-shmobile/include/mach/zboot.h b/arch/arm/mach-shmobile/include/mach/zboot.h
index 3ad86b7..994b891 100644
--- a/arch/arm/mach-shmobile/include/mach/zboot.h
+++ b/arch/arm/mach-shmobile/include/mach/zboot.h
@@ -13,6 +13,9 @@
 #ifdef CONFIG_MACH_AP4EVB
 #define MACH_TYPE	MACH_TYPE_AP4EVB
 #include "mach/head-ap4evb.txt"
+#elif CONFIG_MACH_MACKEREL
+#define MACH_TYPE	MACH_TYPE_MACKEREL
+#include "mach/head-ap4evb.txt"
 #else
 #error "unsupported board."
 #endif
-- 
1.7.2.3

[PATCH] [rfc] ARM: mach-shmobile: mackerel: clarify shdi/mmcif switch settings

[Simon Horman]

* Pins 2 and 4 of switch 33 are documented as don't care on the PCB,
  my testing seems to confirm this.

* I have been unable to do anything sensible with S1 set to on.
  Am I missing something with regards to MMC1?

* Clarify which driver is needed for each switch setting.

* Should the AP4 board code be updated to allow the
  SHDI driver to access SHDI1 as the mackerel code does?

Signed-off-by: Simon Horman <horms@verge.net.au>
---
 arch/arm/mach-shmobile/board-mackerel.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 42f7c0d..b190248 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -167,9 +167,8 @@
  *	SW1	|	SW33
  *		| bit1 | bit2 | bit3 | bit4
  * -------------+------+------+------+-------
- * MMC0	  OFF	|  OFF |  ON  |  ON  |  X
- * MMC1	  ON	|  OFF |  ON  |  X   | ON
- * SDHI1  OFF	|  ON  |   X  |  OFF | ON
+ * MMC0   OFF	|  OFF |   X  |  ON  |  X       (Use MMCIF)
+ * SDHI1  OFF	|  ON  |   X  |  OFF |  X       (Use MFD_SH_MOBILE_SDHI)
  *
  */
 
-- 
1.7.2.3

Re: [PATCH] [rfc] ARM: mach-shmobile: mackerel: clarify shdi/mmcif

[Yusuke Goda]

Hi Simon-san

(2011/01/08 7:26), Simon Horman wrote:
> * Pins 2 and 4 of switch 33 are documented as don't care on the PCB,
>   my testing seems to confirm this.
I approve of your patch.
Pins 2 and 4 of switch 33 dont' care in mackerel.
There was a mistake in the Users Manual.
I asked a designer to revise Users Manual.
Thank you for your indication.

> * I have been unable to do anything sensible with S1 set to on.
>   Am I missing something with regards to MMC1?
SW1 ON : Can not use MCP(NOR, NAND) and Ether
Therefore, u-boot does not start.

> * Clarify which driver is needed for each switch setting.
> 
> * Should the AP4 board code be updated to allow the
>   SHDI driver to access SHDI1 as the mackerel code does?
In AP4, pins 2 and 4 of switch 33 should care.

Thanks,
Goda

> Signed-off-by: Simon Horman <horms@verge.net.au>
> ---
>  arch/arm/mach-shmobile/board-mackerel.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
> index 42f7c0d..b190248 100644
> --- a/arch/arm/mach-shmobile/board-mackerel.c
> +++ b/arch/arm/mach-shmobile/board-mackerel.c
> @@ -167,9 +167,8 @@
>   *	SW1	|	SW33
>   *		| bit1 | bit2 | bit3 | bit4
>   * -------------+------+------+------+-------
> - * MMC0	  OFF	|  OFF |  ON  |  ON  |  X
> - * MMC1	  ON	|  OFF |  ON  |  X   | ON
> - * SDHI1  OFF	|  ON  |   X  |  OFF | ON
> + * MMC0   OFF	|  OFF |   X  |  ON  |  X       (Use MMCIF)
> + * SDHI1  OFF	|  ON  |   X  |  OFF |  X       (Use MFD_SH_MOBILE_SDHI)
>   *
>   */
>  

Re: [PATCH] [rfc] ARM: mach-shmobile: mackerel: clarify shdi/mmcif

[Simon Horman]

Hi Goda-san,

On Tue, Jan 11, 2011 at 04:30:38PM +0900, Yusuke Goda wrote:
> Hi Simon-san
> 
> (2011/01/08 7:26), Simon Horman wrote:
> > * Pins 2 and 4 of switch 33 are documented as don't care on the PCB,
> >   my testing seems to confirm this.
> I approve of your patch.

Great. Can I take that to mean that Paul can merge this change?

> Pins 2 and 4 of switch 33 dont' care in mackerel.
> There was a mistake in the Users Manual.
> I asked a designer to revise Users Manual.
> Thank you for your indication.
> 
> > * I have been unable to do anything sensible with S1 set to on.
> >   Am I missing something with regards to MMC1?
> SW1 ON : Can not use MCP(NOR, NAND) and Ether
> Therefore, u-boot does not start.
> 
> > * Clarify which driver is needed for each switch setting.
> > 
> > * Should the AP4 board code be updated to allow the
> >   SHDI driver to access SHDI1 as the mackerel code does?
> In AP4, pins 2 and 4 of switch 33 should care.
> 
> Thanks,
> Goda
> 
> > Signed-off-by: Simon Horman <horms@verge.net.au>
> > ---
> >  arch/arm/mach-shmobile/board-mackerel.c |    5 ++---
> >  1 files changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
> > index 42f7c0d..b190248 100644
> > --- a/arch/arm/mach-shmobile/board-mackerel.c
> > +++ b/arch/arm/mach-shmobile/board-mackerel.c
> > @@ -167,9 +167,8 @@
> >   *	SW1	|	SW33
> >   *		| bit1 | bit2 | bit3 | bit4
> >   * -------------+------+------+------+-------
> > - * MMC0	  OFF	|  OFF |  ON  |  ON  |  X
> > - * MMC1	  ON	|  OFF |  ON  |  X   | ON
> > - * SDHI1  OFF	|  ON  |   X  |  OFF | ON
> > + * MMC0   OFF	|  OFF |   X  |  ON  |  X       (Use MMCIF)
> > + * SDHI1  OFF	|  ON  |   X  |  OFF |  X       (Use MFD_SH_MOBILE_SDHI)
> >   *
> >   */
> >  
> 
> 
> --
> 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
> 

Re: [PATCH] [rfc] ARM: mach-shmobile: mackerel: clarify shdi/mmcif switch settings

[Paul Mundt]

On Wed, Jan 19, 2011 at 09:47:54AM +0900, Yusuke Goda wrote:
> (2011/01/19 9:32), Simon Horman wrote:
> > On Tue, Jan 11, 2011 at 04:30:38PM +0900, Yusuke Goda wrote:
> >> (2011/01/08 7:26), Simon Horman wrote:
> >>> * Pins 2 and 4 of switch 33 are documented as don't care on the PCB,
> >>>   my testing seems to confirm this.
> >> I approve of your patch.
> > 
> > Great. Can I take that to mean that Paul can merge this change?
> Yes!
> I think so.
> 
Ok, I'll queue it up then, thanks.

Re: [PATCH] [rfc] ARM: mach-shmobile: mackerel: clarify shdi/mmcif

[Yusuke Goda]

Hi Simon-san

(2011/01/19 9:32), Simon Horman wrote:
> Hi Goda-san,
> 
> On Tue, Jan 11, 2011 at 04:30:38PM +0900, Yusuke Goda wrote:
>> Hi Simon-san
>>
>> (2011/01/08 7:26), Simon Horman wrote:
>>> * Pins 2 and 4 of switch 33 are documented as don't care on the PCB,
>>>   my testing seems to confirm this.
>> I approve of your patch.
> 
> Great. Can I take that to mean that Paul can merge this change?
Yes!
I think so.

Thanks,
Goda
> 
>> Pins 2 and 4 of switch 33 dont' care in mackerel.
>> There was a mistake in the Users Manual.
>> I asked a designer to revise Users Manual.
>> Thank you for your indication.
>>
>>> * I have been unable to do anything sensible with S1 set to on.
>>>   Am I missing something with regards to MMC1?
>> SW1 ON : Can not use MCP(NOR, NAND) and Ether
>> Therefore, u-boot does not start.
>>
>>> * Clarify which driver is needed for each switch setting.
>>>
>>> * Should the AP4 board code be updated to allow the
>>>   SHDI driver to access SHDI1 as the mackerel code does?
>> In AP4, pins 2 and 4 of switch 33 should care.
>>
>> Thanks,
>> Goda
>>
>>> Signed-off-by: Simon Horman <horms@verge.net.au>
>>> ---
>>>  arch/arm/mach-shmobile/board-mackerel.c |    5 ++---
>>>  1 files changed, 2 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
>>> index 42f7c0d..b190248 100644
>>> --- a/arch/arm/mach-shmobile/board-mackerel.c
>>> +++ b/arch/arm/mach-shmobile/board-mackerel.c
>>> @@ -167,9 +167,8 @@
>>>   *	SW1	|	SW33
>>>   *		| bit1 | bit2 | bit3 | bit4
>>>   * -------------+------+------+------+-------
>>> - * MMC0	  OFF	|  OFF |  ON  |  ON  |  X
>>> - * MMC1	  ON	|  OFF |  ON  |  X   | ON
>>> - * SDHI1  OFF	|  ON  |   X  |  OFF | ON
>>> + * MMC0   OFF	|  OFF |   X  |  ON  |  X       (Use MMCIF)
>>> + * SDHI1  OFF	|  ON  |   X  |  OFF |  X       (Use MFD_SH_MOBILE_SDHI)
>>>   *
>>>   */
>>>  
>>
>>
>> --
>> 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
>>
> --
> 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
> 
> 

Re: [PATCH] [rfc] ARM: mach-shmobile: mackerel: clarify shdi/mmcif

[Simon Horman]

On Wed, Jan 19, 2011 at 09:46:31AM +0900, Paul Mundt wrote:
> On Wed, Jan 19, 2011 at 09:47:54AM +0900, Yusuke Goda wrote:
> > (2011/01/19 9:32), Simon Horman wrote:
> > > On Tue, Jan 11, 2011 at 04:30:38PM +0900, Yusuke Goda wrote:
> > >> (2011/01/08 7:26), Simon Horman wrote:
> > >>> * Pins 2 and 4 of switch 33 are documented as don't care on the PCB,
> > >>>   my testing seems to confirm this.
> > >> I approve of your patch.
> > > 
> > > Great. Can I take that to mean that Paul can merge this change?
> > Yes!
> > I think so.
> > 
> Ok, I'll queue it up then, thanks.

Thanks.