Skip to contentSkip to conversation

ATMEL/PIO: Enable new feature of PIO on Atmel device

PATCH Superseded Bo Shen 2 participants 5 messages May 16, 2012 – May 21, 2012

Subsystems (3)
Arm (32-bit) GPIO Arm/Microchip (AT91) SoC support

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Bo Shen

author
#0 lore raw

PATCH v2 1/1 ATMEL/PIO: Enable new feature of PIO on Atmel device

v2:
Remove legacy interface.

v1:
Enable new PIO feature supported by Atmel SoC. Using CPU_HAS_PIO3 micro to enable PIO new feature.

Signed-off-by Bo Shen <[email protected]>
---
 arch/arm/include/asm/arch-at91/at91_pio.h |   78 ++++++++++--------
 drivers/gpio/at91_gpio.c                  |  125 ++++++++++++++++++++++++++++-
 2 files changed, 167 insertions(+), 36 deletions(-)
arch/arm/include/asm/arch-at91/at91_pio.h +44 -34
index 416cabf..0ec2dca 100644
@@ -66,14 +66,50 @@ typedef struct at91_port {
 	u32	puer;		/* 0x64 Pull-up Enable Register */
 	u32	pusr;		/* 0x68 Pad Pull-up Status Register */
 	u32	reserved4;
+#if defined(CPU_HAS_PIO3)
+	u32	abcdsr1;	/* 0x70 Peripheral ABCD Select Register 1 */
+	u32	abcdsr2;	/* 0x74 Peripheral ABCD Select Register 2 */
+	u32	reserved5[2];
+	u32	ifscdr;		/* 0x80 Input Filter SCLK Disable Register */
+	u32	ifscer;		/* 0x84 Input Filter SCLK Enable Register */
+	u32	ifscsr;		/* 0x88 Input Filter SCLK Status Register */
+	u32	scdr;		/* 0x8C SCLK Divider Debouncing Register */
+	u32	ppddr;		/* 0x90 Pad Pull-down Disable Register */
+	u32	ppder;		/* 0x94 Pad Pull-down Enable Register */
+	u32	ppdsr;		/* 0x98 Pad Pull-down Status Register */
+	u32	reserved6;	/*  */
+#else
 	u32	asr;		/* 0x70 Select A Register */
 	u32	bsr;		/* 0x74 Select B Register */
 	u32	absr;		/* 0x78 AB Select Status Register */
 	u32	reserved5[9];	/*  */
+#endif
 	u32	ower;		/* 0xA0 Output Write Enable Register */
 	u32	owdr;		/* 0xA4 Output Write Disable Register */
-	u32	owsr;		/* OxA8 utput Write Status Register */
+	u32	owsr;		/* OxA8 Output Write Status Register */
+#if defined(CPU_HAS_PIO3)
+	u32	reserved7;	/*  */
+	u32	aimer;		/* 0xB0 Additional INT Modes Enable Register */
+	u32	aimdr;		/* 0xB4 Additional INT Modes Disable Register */
+	u32	aimmr;		/* 0xB8 Additional INT Modes Mask Register */
+	u32	reserved8;	/* */
+	u32	esr;		/* 0xC0 Edge Select Register */
+	u32	lsr;		/* 0xC4 Level Select Register */
+	u32	elsr;		/* 0xC8 Edge/Level Status Register */
+	u32	reserved9;	/* 0xCC */
+	u32	fellsr;		/* 0xD0 Falling /Low Level Select Register */
+	u32	rehlsr;		/* 0xD4 Rising /High Level Select Register */
+	u32	frlhsr;		/* 0xD8 Fall/Rise - Low/High Status Register */
+	u32	reserved10;	/* */
+	u32	locksr;		/* 0xE0 Lock Status */
+	u32	wpmr;		/* 0xE4 Write Protect Mode Register */
+	u32	wpsr;		/* 0xE8 Write Protect Status Register */
+	u32	reserved11[5];	/* */
+	u32	schmitt;	/* 0x100 Schmitt Trigger Register */
+	u32	reserved12[63];
+#else
 	u32	reserved6[85];
+#endif
 } at91_port_t;
 
 typedef union at91_pio {

@@ -94,6 +130,13 @@ typedef union at91_pio {
 #ifdef CONFIG_AT91_GPIO
 int at91_set_a_periph(unsigned port, unsigned pin, int use_pullup);
 int at91_set_b_periph(unsigned port, unsigned pin, int use_pullup);
+#if defined(CPU_HAS_PIO3)
+int at91_set_c_periph(unsigned port, unsigned pin, int use_pullup);
+int at91_set_d_periph(unsigned port, unsigned pin, int use_pullup);
+int at91_set_pio_debounce(unsigned port, unsigned pin, int is_on, int div);
+int at91_set_pio_pulldown(unsigned port, unsigned pin, int is_on);
+int at91_set_pio_disable_schmitt_trig(unsigned port, unsigned pin);
+#endif
 int at91_set_pio_input(unsigned port, unsigned pin, int use_pullup);
 int at91_set_pio_multi_drive(unsigned port, unsigned pin, int is_on);
 int at91_set_pio_output(unsigned port, unsigned pin, int value);

@@ -111,37 +154,4 @@ int at91_get_pio_value(unsigned port, unsigned pin);
 #define	AT91_PIO_PORTD		0x3
 #define	AT91_PIO_PORTE		0x4
 
-#ifdef CONFIG_AT91_LEGACY
-
-#define PIO_PER		0x00	/* Enable Register */
-#define PIO_PDR		0x04	/* Disable Register */
-#define PIO_PSR		0x08	/* Status Register */
-#define PIO_OER		0x10	/* Output Enable Register */
-#define PIO_ODR		0x14	/* Output Disable Register */
-#define PIO_OSR		0x18	/* Output Status Register */
-#define PIO_IFER	0x20	/* Glitch Input Filter Enable */
-#define PIO_IFDR	0x24	/* Glitch Input Filter Disable */
-#define PIO_IFSR	0x28	/* Glitch Input Filter Status */
-#define PIO_SODR	0x30	/* Set Output Data Register */
-#define PIO_CODR	0x34	/* Clear Output Data Register */
-#define PIO_ODSR	0x38	/* Output Data Status Register */
-#define PIO_PDSR	0x3c	/* Pin Data Status Register */
-#define PIO_IER		0x40	/* Interrupt Enable Register */
-#define PIO_IDR		0x44	/* Interrupt Disable Register */
-#define PIO_IMR		0x48	/* Interrupt Mask Register */
-#define PIO_ISR		0x4c	/* Interrupt Status Register */
-#define PIO_MDER	0x50	/* Multi-driver Enable Register */
-#define PIO_MDDR	0x54	/* Multi-driver Disable Register */
-#define PIO_MDSR	0x58	/* Multi-driver Status Register */
-#define PIO_PUDR	0x60	/* Pull-up Disable Register */
-#define PIO_PUER	0x64	/* Pull-up Enable Register */
-#define PIO_PUSR	0x68	/* Pull-up Status Register */
-#define PIO_ASR		0x70	/* Peripheral A Select Register */
-#define PIO_BSR		0x74	/* Peripheral B Select Register */
-#define PIO_ABSR	0x78	/* AB Status Register */
-#define PIO_OWER	0xa0	/* Output Write Enable Register */
-#define PIO_OWDR	0xa4	/* Output Write Disable Register */
-#define PIO_OWSR	0xa8	/* Output Write Status Register */
-#endif
-
 #endif
drivers/gpio/at91_gpio.c +123 -2

155 lines not on this page · raw message

Signature · 1 line
1.7.10
#1 lore raw

PATCH v2 1/1 ATMEL/PIO: Enable new feature of PIO on Atmel device

Dear Bo Shen,

Quoted 6 lines · Bo Shen

v2:
Remove legacy interface.

v1:
Enable new PIO feature supported by Atmel SoC. Using CPU_HAS_PIO3 micro to enable PIO new feature.

these go behind the '---' line. All before the '---' will be the git commit message. The git commit message should not contain the history!

Please read http://www.denx.de/wiki/U-Boot/Patches for that.

arch/arm/include/asm/arch-at91/at91_pio.h

Quoted 10 lines
Signed-off-by Bo Shen <[email protected]>
---
 arch/arm/include/asm/arch-at91/at91_pio.h |   78 ++++++++++--------
 drivers/gpio/at91_gpio.c                  |  125 ++++++++++++++++++++++++++++-
 2 files changed, 167 insertions(+), 36 deletions(-)
arch/arm/include/asm/arch-at91/at91_pio.h +0 -0
index 416cabf..0ec2dca 100644

<snip new interface>

new interface looks good so far, but seems there are no users currently (will there new at91 devices coming soon?)

Quoted 23 lines
arch/arm/include/asm/arch-at91/at91_pio.h +0 -23
-#ifdef CONFIG_AT91_LEGACY
-
-#define PIO_PER		0x00	/* Enable Register */
-#define PIO_PDR		0x04	/* Disable Register */
-#define PIO_PSR		0x08	/* Status Register */
-#define PIO_OER		0x10	/* Output Enable Register */
-#define PIO_ODR		0x14	/* Output Disable Register */
-#define PIO_OSR		0x18	/* Output Status Register */
-#define PIO_IFER	0x20	/* Glitch Input Filter Enable */
-#define PIO_IFDR	0x24	/* Glitch Input Filter Disable */
-#define PIO_IFSR	0x28	/* Glitch Input Filter Status */
-#define PIO_SODR	0x30	/* Set Output Data Register */
-#define PIO_CODR	0x34	/* Clear Output Data Register */
-#define PIO_ODSR	0x38	/* Output Data Status Register */
-#define PIO_PDSR	0x3c	/* Pin Data Status Register */
-#define PIO_IER		0x40	/* Interrupt Enable Register */
-#define PIO_IDR		0x44	/* Interrupt Disable Register */
-#define PIO_IMR		0x48	/* Interrupt Mask Register */
-#define PIO_ISR		0x4c	/* Interrupt Status Register */
-#define PIO_MDER	0x50	/* Multi-driver Enable Register */
-#define PIO_MDDR	0x54	/* Multi-driver Disable Register */
-#define PIO_MDSR	0x58	/* Multi-driver Status Register */
-#define PIO_PUDR	0x60	/* Pull-up Disable Register */

arch/arm/include/asm/arch-at91/at91_pio.h int at91_get_pio_value(unsigned port, unsigned pin); · line 146

Quoted 10 lines
arch/arm/include/asm/arch-at91/at91_pio.h +0 -10
-#define PIO_PUER	0x64	/* Pull-up Enable Register */
-#define PIO_PUSR	0x68	/* Pull-up Status Register */
-#define PIO_ASR		0x70	/* Peripheral A Select Register */
-#define PIO_BSR		0x74	/* Peripheral B Select Register */
-#define PIO_ABSR	0x78	/* AB Status Register */
-#define PIO_OWER	0xa0	/* Output Write Enable Register */
-#define PIO_OWDR	0xa4	/* Output Write Disable Register */
-#define PIO_OWSR	0xa8	/* Output Write Status Register */
-#endif
-

I think this should be done in a separate patch (series). There are a lot of CONFIG_AT91_LEGACY left somewhere in the code. Please read doc/README.at91-soc; I think step 4 is reached so step 5 should follow.

For this patch I think it would be best to not touch these definitions at all.
A second patch (series) fulfilling step 5 in doc/README.at91-soc would be great ;)

best regards

Andreas Bie?mann

author
#2 lore raw

PATCH v2 1/1 ATMEL/PIO: Enable new feature of PIO on Atmel device

Quoted 6 lines · Andreas Bie?mann

Dear Bo Shen,

Quoted 3 lines · Bo Shen

v2:
Remove legacy interface.

Quoted 7 lines
Quoted 3 lines

v1:
Enable new PIO feature supported by Atmel SoC. Using CPU_HAS_PIO3 micro to enable PIO new feature.

these go behind the '---' line. All before the '---' will be the git commit message. The git commit message should not contain the history!

Please read http://www.denx.de/wiki/U-Boot/Patches for that.

OK. Thanks

Quoted 7 lines
Quoted 7 lines
Signed-off-by Bo Shen<[email protected]>
---
  arch/arm/include/asm/arch-at91/at91_pio.h |   78 ++++++++++--------
  drivers/gpio/at91_gpio.c                  |  125 ++++++++++++++++++++++++++++-
  2 files changed, 167 insertions(+), 36 deletions(-)
Quoted 8 lines

arch/arm/include/asm/arch-at91/at91_pio.h

Quoted 4 lines
arch/arm/include/asm/arch-at91/at91_pio.h +0 -0
index 416cabf..0ec2dca 100644

<snip new interface>

new interface looks good so far, but seems there are no users currently (will there new at91 devices coming soon?)

Yes. I plan to submit new at91 devices at following days.

Quoted 29 lines
Quoted 29 lines
arch/arm/include/asm/arch-at91/at91_pio.h +0 -28
-#ifdef CONFIG_AT91_LEGACY
-
-#define PIO_PER		0x00	/* Enable Register */
-#define PIO_PDR		0x04	/* Disable Register */
-#define PIO_PSR		0x08	/* Status Register */
-#define PIO_OER		0x10	/* Output Enable Register */
-#define PIO_ODR		0x14	/* Output Disable Register */
-#define PIO_OSR		0x18	/* Output Status Register */
-#define PIO_IFER	0x20	/* Glitch Input Filter Enable */
-#define PIO_IFDR	0x24	/* Glitch Input Filter Disable */
-#define PIO_IFSR	0x28	/* Glitch Input Filter Status */
-#define PIO_SODR	0x30	/* Set Output Data Register */
-#define PIO_CODR	0x34	/* Clear Output Data Register */
-#define PIO_ODSR	0x38	/* Output Data Status Register */
-#define PIO_PDSR	0x3c	/* Pin Data Status Register */
-#define PIO_IER		0x40	/* Interrupt Enable Register */
-#define PIO_IDR		0x44	/* Interrupt Disable Register */
-#define PIO_IMR		0x48	/* Interrupt Mask Register */
-#define PIO_ISR		0x4c	/* Interrupt Status Register */
-#define PIO_MDER	0x50	/* Multi-driver Enable Register */
-#define PIO_MDDR	0x54	/* Multi-driver Disable Register */
-#define PIO_MDSR	0x58	/* Multi-driver Status Register */
-#define PIO_PUDR	0x60	/* Pull-up Disable Register */
-#define PIO_PUER	0x64	/* Pull-up Enable Register */
-#define PIO_PUSR	0x68	/* Pull-up Status Register */
-#define PIO_ASR		0x70	/* Peripheral A Select Register */
-#define PIO_BSR		0x74	/* Peripheral B Select Register */
-#define PIO_ABSR	0x78	/* AB Status Register */
Quoted 8 lines

arch/arm/include/asm/arch-at91/at91_pio.h int at91_get_pio_value(unsigned port, unsigned pin); · line 146

Quoted 5 lines
arch/arm/include/asm/arch-at91/at91_pio.h +0 -5
-#define PIO_OWER	0xa0	/* Output Write Enable Register */
-#define PIO_OWDR	0xa4	/* Output Write Disable Register */
-#define PIO_OWSR	0xa8	/* Output Write Status Register */
-#endif
-

I think this should be done in a separate patch (series). There are a lot of CONFIG_AT91_LEGACY left somewhere in the code. Please read doc/README.at91-soc; I think step 4 is reached so step 5 should follow.

Would this be dealt one by one, while not a series?

Quoted 9 lines

For this patch I think it would be best to not touch these definitions at all.
A second patch (series) fulfilling step 5 in doc/README.at91-soc would be great ;)

best regards

Andreas Bie?mann

#3 lore raw

PATCH v2 1/1 ATMEL/PIO: Enable new feature of PIO on Atmel device

Dear Bo Shen,

Quoted 4 lines · Bo Shen
Quoted 3 lines · Andreas Bie?mann

Dear Bo Shen,

On 16.05.2012 04:16, Bo Shen wrote:

<snip>

Quoted 2 lines
Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +0 -2
-#ifdef CONFIG_AT91_LEGACY
-

<snip remove of legacy interface>

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

-

I think this should be done in a separate patch (series). There are a lot of CONFIG_AT91_LEGACY left somewhere in the code. Please read doc/README.at91-soc; I think step 4 is reached so step 5 should follow.

Would this be dealt one by one, while not a series?

Well it must not be a series of patches send at once. This can also be done step by step e.g. by first cleaning up atmel_pio and doing other parts later (I think this should/could be documented in the doc/README.at91-soc). This should be carefully considered because you may break some boards.
Beware! I do not really know if my statement 'step 4 of doc/README.at91-soc is reached' is correct, so this needs to be proven. If you have proven that removing legacy interface of atmel_pio is ok, I would like to see another patch for that task (this patch is 'Enable new feature ..' not 'remove legacy interface ..').

Some additional words on this part of the patch. I think (and this is my personal view) we should not expand legacy interfaces at all, instead we should try to remove them sooner rather than later. Additionally I think (again my personal view) it is not your responsibility to clean this up _now_ because you touch this file. In my opinion it is ok to just add the new interface and leave the old one as is.

Maybe someone else (Albert?) can comment on this?

best regards

Andreas Bie?mann

author
#4 lore raw

PATCH v2 1/1 ATMEL/PIO: Enable new feature of PIO on Atmel device

Hi Andreas,

Quoted 22 lines · Andreas Bie?mann

Dear Bo Shen,

Quoted 4 lines · Bo Shen
Quoted 3 lines · Andreas Bie?mann

Dear Bo Shen,

On 16.05.2012 04:16, Bo Shen wrote:

<snip>

Quoted 2 lines
Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +0 -2
-#ifdef CONFIG_AT91_LEGACY
-

<snip remove of legacy interface>

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

-

I think this should be done in a separate patch (series). There are a lot of CONFIG_AT91_LEGACY left somewhere in the code. Please read doc/README.at91-soc; I think step 4 is reached so step 5 should follow.

Would this be dealt one by one, while not a series?

Quoted 10 lines

Well it must not be a series of patches send at once. This can also be done step by step e.g. by first cleaning up atmel_pio and doing other parts later (I think this should/could be documented in the doc/README.at91-soc). This should be carefully considered because you may break some boards.
Beware! I do not really know if my statement 'step 4 of doc/README.at91-soc is reached' is correct, so this needs to be proven. If you have proven that removing legacy interface of atmel_pio is ok, I would like to see another patch for that task (this patch is 'Enable new feature ..' not 'remove legacy interface ..').

I will take this suggestion. Just add the new feature and do not touch with the legacy interface. The version 3 has been sent out.

Quoted 13 lines

Some additional words on this part of the patch. I think (and this is my personal view) we should not expand legacy interfaces at all, instead we should try to remove them sooner rather than later. Additionally I think (again my personal view) it is not your responsibility to clean this up _now_ because you touch this file. In my opinion it is ok to just add the new interface and leave the old one as is.

Maybe someone else (Albert?) can comment on this?

best regards

Andreas Bie?mann