linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: Add TS-7800 revisions 6-9
@ 2011-03-05  4:39 Michael Spang
  2011-03-05  4:39 ` [PATCH 2/2] ARM: Enable TS-78XX features in unknown revisions Michael Spang
  2011-03-05  4:59 ` [PATCH 1/2] ARM: Add TS-7800 revisions 6-9 Nicolas Pitre
  0 siblings, 2 replies; 5+ messages in thread
From: Michael Spang @ 2011-03-05  4:39 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Lennert Buytenhek, Russell King, linux-arm-kernel, linux-kernel,
	Michael Spang

The RTC, NAND, and RNG devices are not enabled on current TS-7800s.
The manufacturer is at revision 9 (at least), and they do support
these devices. We'll assume revisions 6 through 8 do as well.

Signed-off-by: Michael Spang <mspang@csclub.uwaterloo.ca>
---
 arch/arm/mach-orion5x/ts78xx-fpga.h  |    4 ++++
 arch/arm/mach-orion5x/ts78xx-setup.c |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-orion5x/ts78xx-fpga.h b/arch/arm/mach-orion5x/ts78xx-fpga.h
index 37b3d48..791f754 100644
--- a/arch/arm/mach-orion5x/ts78xx-fpga.h
+++ b/arch/arm/mach-orion5x/ts78xx-fpga.h
@@ -11,6 +11,10 @@ enum fpga_ids {
 	TS7800_REV_3	= FPGAID(0x00b480, 0x03),
 	TS7800_REV_4	= FPGAID(0x00b480, 0x04),
 	TS7800_REV_5	= FPGAID(0x00b480, 0x05),
+	TS7800_REV_6	= FPGAID(0x00b480, 0x06),
+	TS7800_REV_7	= FPGAID(0x00b480, 0x07),
+	TS7800_REV_8	= FPGAID(0x00b480, 0x08),
+	TS7800_REV_9	= FPGAID(0x00b480, 0x09),
 
 	/* Unaffordable & Expensive */
 	UAE_DUMMY	= FPGAID(0xffffff, 0x01),
diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index c1c1cd0..7bed418 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -334,6 +334,10 @@ static void ts78xx_fpga_supports(void)
 	case TS7800_REV_3:
 	case TS7800_REV_4:
 	case TS7800_REV_5:
+	case TS7800_REV_6:
+	case TS7800_REV_7:
+	case TS7800_REV_8:
+	case TS7800_REV_9:
 		ts78xx_fpga.supports.ts_rtc.present = 1;
 		ts78xx_fpga.supports.ts_nand.present = 1;
 		ts78xx_fpga.supports.ts_rng.present = 1;
-- 
1.7.2.3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/2] ARM: Enable TS-78XX features in unknown revisions
  2011-03-05  4:39 [PATCH 1/2] ARM: Add TS-7800 revisions 6-9 Michael Spang
@ 2011-03-05  4:39 ` Michael Spang
  2011-03-05  4:50   ` [PATCH v2 " Michael Spang
  2011-03-05 12:30   ` [PATCH " Sergei Shtylyov
  2011-03-05  4:59 ` [PATCH 1/2] ARM: Add TS-7800 revisions 6-9 Nicolas Pitre
  1 sibling, 2 replies; 5+ messages in thread
From: Michael Spang @ 2011-03-05  4:39 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Lennert Buytenhek, Russell King, linux-arm-kernel, linux-kernel,
	Michael Spang

When the manufacturer increases the revision number the platform
devices for the RTC, NAND, and RNG disappear. We should assume
new revisions have these devices instead of assuming they do not.

Signed-off-by: Michael Spang <mspang@csclub.uwaterloo.ca>
---
 arch/arm/mach-orion5x/ts78xx-setup.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 7bed418..13d1fc5 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -343,9 +343,11 @@ static void ts78xx_fpga_supports(void)
 		ts78xx_fpga.supports.ts_rng.present = 1;
 		break;
 	default:
-		ts78xx_fpga.supports.ts_rtc.present = 0;
-		ts78xx_fpga.supports.ts_nand.present = 0;
-		ts78xx_fpga.supports.ts_rng.present = 0;
+		printk(KERN_WARN "Unrecognized TS-78XX FPGA ID 0x%02x",
+		       ts78xx_fpga.id);
+		ts78xx_fpga.supports.ts_rtc.present = 1;
+		ts78xx_fpga.supports.ts_nand.present = 1;
+		ts78xx_fpga.supports.ts_rng.present = 1;
 	}
 }
 
-- 
1.7.2.3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH v2 2/2] ARM: Enable TS-78XX features in unknown revisions
  2011-03-05  4:39 ` [PATCH 2/2] ARM: Enable TS-78XX features in unknown revisions Michael Spang
@ 2011-03-05  4:50   ` Michael Spang
  2011-03-05 12:30   ` [PATCH " Sergei Shtylyov
  1 sibling, 0 replies; 5+ messages in thread
From: Michael Spang @ 2011-03-05  4:50 UTC (permalink / raw)
  To: Nicolas Pitre
  Cc: Lennert Buytenhek, Russell King, linux-arm-kernel, linux-kernel,
	Michael Spang

When the manufacturer increases the revision number the platform
devices for the RTC, NAND, and RNG disappear. We should assume
new revisions have these devices instead of assuming they do not.

Signed-off-by: Michael Spang <mspang@csclub.uwaterloo.ca>
---
 arch/arm/mach-orion5x/ts78xx-setup.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Misspelled KERN_WARNING. Oops. This one is tested.

diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
index 7bed418..3f8013a 100644
--- a/arch/arm/mach-orion5x/ts78xx-setup.c
+++ b/arch/arm/mach-orion5x/ts78xx-setup.c
@@ -343,9 +343,11 @@ static void ts78xx_fpga_supports(void)
 		ts78xx_fpga.supports.ts_rng.present = 1;
 		break;
 	default:
-		ts78xx_fpga.supports.ts_rtc.present = 0;
-		ts78xx_fpga.supports.ts_nand.present = 0;
-		ts78xx_fpga.supports.ts_rng.present = 0;
+		printk(KERN_WARNING "Unrecognized TS-78XX FPGA ID 0x%02x",
+		       ts78xx_fpga.id);
+		ts78xx_fpga.supports.ts_rtc.present = 1;
+		ts78xx_fpga.supports.ts_nand.present = 1;
+		ts78xx_fpga.supports.ts_rng.present = 1;
 	}
 }
 
-- 
1.7.2.3


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 1/2] ARM: Add TS-7800 revisions 6-9
  2011-03-05  4:39 [PATCH 1/2] ARM: Add TS-7800 revisions 6-9 Michael Spang
  2011-03-05  4:39 ` [PATCH 2/2] ARM: Enable TS-78XX features in unknown revisions Michael Spang
@ 2011-03-05  4:59 ` Nicolas Pitre
  1 sibling, 0 replies; 5+ messages in thread
From: Nicolas Pitre @ 2011-03-05  4:59 UTC (permalink / raw)
  To: Michael Spang
  Cc: Lennert Buytenhek, Russell King, linux-arm-kernel, linux-kernel

On Fri, 4 Mar 2011, Michael Spang wrote:

> The RTC, NAND, and RNG devices are not enabled on current TS-7800s.
> The manufacturer is at revision 9 (at least), and they do support
> these devices. We'll assume revisions 6 through 8 do as well.
> 
> Signed-off-by: Michael Spang <mspang@csclub.uwaterloo.ca>

Alexander Clouter <alex@digriz.org.uk> did send the exact same patch on 
February 16 already.


Nicolas

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH 2/2] ARM: Enable TS-78XX features in unknown revisions
  2011-03-05  4:39 ` [PATCH 2/2] ARM: Enable TS-78XX features in unknown revisions Michael Spang
  2011-03-05  4:50   ` [PATCH v2 " Michael Spang
@ 2011-03-05 12:30   ` Sergei Shtylyov
  1 sibling, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2011-03-05 12:30 UTC (permalink / raw)
  To: Michael Spang
  Cc: Nicolas Pitre, Russell King, Lennert Buytenhek, linux-arm-kernel,
	linux-kernel

Hello.

On 05-03-2011 7:39, Michael Spang wrote:

> When the manufacturer increases the revision number the platform
> devices for the RTC, NAND, and RNG disappear. We should assume
> new revisions have these devices instead of assuming they do not.

> Signed-off-by: Michael Spang<mspang@csclub.uwaterloo.ca>
> ---
>   arch/arm/mach-orion5x/ts78xx-setup.c |    8 +++++---
>   1 files changed, 5 insertions(+), 3 deletions(-)

> diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c
> index 7bed418..13d1fc5 100644
> --- a/arch/arm/mach-orion5x/ts78xx-setup.c
> +++ b/arch/arm/mach-orion5x/ts78xx-setup.c
> @@ -343,9 +343,11 @@ static void ts78xx_fpga_supports(void)
>   		ts78xx_fpga.supports.ts_rng.present = 1;
>   		break;
>   	default:
> -		ts78xx_fpga.supports.ts_rtc.present = 0;
> -		ts78xx_fpga.supports.ts_nand.present = 0;
> -		ts78xx_fpga.supports.ts_rng.present = 0;
> +		printk(KERN_WARN "Unrecognized TS-78XX FPGA ID 0x%02x",

    Use pr_warning() or pr_warn().

WBR, Sergei

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-03-05 12:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-05  4:39 [PATCH 1/2] ARM: Add TS-7800 revisions 6-9 Michael Spang
2011-03-05  4:39 ` [PATCH 2/2] ARM: Enable TS-78XX features in unknown revisions Michael Spang
2011-03-05  4:50   ` [PATCH v2 " Michael Spang
2011-03-05 12:30   ` [PATCH " Sergei Shtylyov
2011-03-05  4:59 ` [PATCH 1/2] ARM: Add TS-7800 revisions 6-9 Nicolas Pitre

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).