Skip to content Skip to conversation

OMAP3: Various: Update serial platdata to update reg_offset to 0

PATCH Superseded Adam Ford 5 participants 8 messages Feb 29, 2016

Share & tools

Adam Ford

author

2016-02-29 11:53 UTC #0 lore raw

PATCH v2 1/1 OMAP3: Various: Update serial platdata to update reg_offset to 0

V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1.

With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property" reg_offset is added to the struct ns16550_platdata to be
dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless.

I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods and Alexander Graf.

Signed-off-by Adam Ford <[email protected]>

---
 board/isee/igep00x0/igep00x0.c      | 7 ++++---
 board/logicpd/omap3som/omap3logic.c | 7 ++++---
 board/logicpd/zoom1/zoom1.c         | 7 ++++---
 board/overo/overo.c                 | 7 ++++---
 board/quipos/cairo/cairo.c          | 7 ++++---
 board/ti/beagle/beagle.c            | 7 ++++---
 board/timll/devkit8000/devkit8000.c | 7 ++++---
 7 files changed, 28 insertions(+), 21 deletions(-)

board/isee/igep00x0/igep00x0.c +4 -3

index e2fce50..63489e5 100644
@@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = {
 #endif
 
 static const struct ns16550_platdata igep_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
 };
 
 U_BOOT_DEVICE(igep_uart) = {

board/logicpd/omap3som/omap3logic.c +4 -3

index 668f684..0e72a5a 100644
@@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR;
  */
 
 static const struct ns16550_platdata omap3logic_serial = {
-	OMAP34XX_UART1,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
 };
 
 U_BOOT_DEVICE(omap3logic_uart) = {

board/logicpd/zoom1/zoom1.c +4 -3

index 4040114..3d34919 100644
@@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = {
 };
 
 static const struct ns16550_platdata zoom1_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
 };
 
 U_BOOT_DEVICE(zoom1_uart) = {

board/overo/overo.c +4 -3

index a38b959..3da80e9 100644
@@ -68,9 +68,10 @@ static struct {
 } expansion_config = {0x0};
 
 static const struct ns16550_platdata overo_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
 };
 
 U_BOOT_DEVICE(overo_uart) = {

board/quipos/cairo/cairo.c +4 -3

index 21793e8..15d68c1 100644
@@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
 #endif
 
 static const struct ns16550_platdata cairo_serial = {
-	OMAP34XX_UART2,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
 };
 
 U_BOOT_DEVICE(cairo_uart) = {

board/ti/beagle/beagle.c +4 -3

index ff317ef..a5f2af7 100644
@@ -73,9 +73,10 @@ static struct {
 } expansion_config;
 
 static const struct ns16550_platdata beagle_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
 };
 
 U_BOOT_DEVICE(beagle_uart) = {

board/timll/devkit8000/devkit8000.c +4 -3

index 1a447c7..fb8e357 100644
@@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
 };
 
 static const struct ns16550_platdata devkit8000_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
 };
 
 U_BOOT_DEVICE(devkit8000_uart) = {

Signature · 1 line

1.9.1

Heiko Schocher

2016-02-29 12:29 UTC #1 lore raw

PATCH v2 1/1 OMAP3: Various: Update serial platdata to update reg_offset to 0

Hello Adam,

Am 29.02.2016 um 12:53 schrieb Adam Ford:

Quoted 15 lines

V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1.
With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property" reg_offset is added to the struct ns16550_platdata to be
dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless.
I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods and Alexander Graf.
Signed-off-by Adam Ford <[email protected]>

Quoted 9 lines

---
  board/isee/igep00x0/igep00x0.c      | 7 ++++---
  board/logicpd/omap3som/omap3logic.c | 7 ++++---
  board/logicpd/zoom1/zoom1.c         | 7 ++++---
  board/overo/overo.c                 | 7 ++++---
  board/quipos/cairo/cairo.c          | 7 ++++---
  board/ti/beagle/beagle.c            | 7 ++++---
  board/timll/devkit8000/devkit8000.c | 7 ++++---
  7 files changed, 28 insertions(+), 21 deletions(-)

What has changed exactly in v2 ?

Beside of this:

Reviewed-by Heiko Schocher <[email protected]>

Thanks!

bye,
Heiko

Quoted 128 lines

board/isee/igep00x0/igep00x0.c +4 -3

index e2fce50..63489e5 100644
@@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = {
  #endif
 
  static const struct ns16550_platdata igep_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(igep_uart) = {

board/logicpd/omap3som/omap3logic.c +4 -3

index 668f684..0e72a5a 100644
@@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR;
   */
 
  static const struct ns16550_platdata omap3logic_serial = {
-	OMAP34XX_UART1,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(omap3logic_uart) = {

board/logicpd/zoom1/zoom1.c +4 -3

index 4040114..3d34919 100644
@@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = {
  };
 
  static const struct ns16550_platdata zoom1_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(zoom1_uart) = {

board/overo/overo.c +4 -3

index a38b959..3da80e9 100644
@@ -68,9 +68,10 @@ static struct {
  } expansion_config = {0x0};
 
  static const struct ns16550_platdata overo_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(overo_uart) = {

board/quipos/cairo/cairo.c +4 -3

index 21793e8..15d68c1 100644
@@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
  #endif
 
  static const struct ns16550_platdata cairo_serial = {
-	OMAP34XX_UART2,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(cairo_uart) = {

board/ti/beagle/beagle.c +4 -3

index ff317ef..a5f2af7 100644
@@ -73,9 +73,10 @@ static struct {
  } expansion_config;
 
  static const struct ns16550_platdata beagle_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(beagle_uart) = {

board/timll/devkit8000/devkit8000.c +4 -3

index 1a447c7..fb8e357 100644
@@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
  };
 
  static const struct ns16550_platdata devkit8000_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(devkit8000_uart) = {

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Adam Ford

author

2016-02-29 12:51 UTC #2 lore raw

PATCH v2 1/1 OMAP3: Various: Update serial platdata to update reg_offset to 0

V1 I changed all the platform data to explicitly name the entries instead of just using a table of numbers. This would hopefully address future proofing against the header changing order. I copy-pasted the table from my board to a series of boards and then later realized I had accidentally changed the UART number which would have broken a few boards.

V2, Fixes that issue because igep, overo, beagle and devkit8000 used UART3 instead of UART1, so it was a correction on my part. The change from V1 was kept, but the correct UART was referenced.

Quoted 179 lines · Heiko Schocher

Hello Adam,

Am 29.02.2016 um 12:53 schrieb Adam Ford:

Quoted 19 lines

V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1.
With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property"
reg_offset is added to the struct ns16550_platdata to be
dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken
as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless.
I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods
and Alexander Graf.
Signed-off-by Adam Ford <[email protected]>

Quoted 9 lines

---
  board/isee/igep00x0/igep00x0.c      | 7 ++++---
  board/logicpd/omap3som/omap3logic.c | 7 ++++---
  board/logicpd/zoom1/zoom1.c         | 7 ++++---
  board/overo/overo.c                 | 7 ++++---
  board/quipos/cairo/cairo.c          | 7 ++++---
  board/ti/beagle/beagle.c            | 7 ++++---
  board/timll/devkit8000/devkit8000.c | 7 ++++---
  7 files changed, 28 insertions(+), 21 deletions(-)

What has changed exactly in v2 ?

Beside of this:

Reviewed-by Heiko Schocher <[email protected]>

Thanks!

bye,
Heiko

Quoted 122 lines

board/isee/igep00x0/igep00x0.c +4 -3

index e2fce50..63489e5 100644
@@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = {
  #endif
 
  static const struct ns16550_platdata igep_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(igep_uart) = {

board/logicpd/omap3som/omap3logic.c +4 -3

index 668f684..0e72a5a 100644
@@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR;
   */
 
  static const struct ns16550_platdata omap3logic_serial = {
-       OMAP34XX_UART1,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(omap3logic_uart) = {

board/logicpd/zoom1/zoom1.c +4 -3

index 4040114..3d34919 100644
@@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = {
  };
 
  static const struct ns16550_platdata zoom1_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(zoom1_uart) = {

board/overo/overo.c +4 -3

index a38b959..3da80e9 100644
@@ -68,9 +68,10 @@ static struct {
  } expansion_config = {0x0};
 
  static const struct ns16550_platdata overo_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(overo_uart) = {

board/quipos/cairo/cairo.c +4 -3

index 21793e8..15d68c1 100644
@@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings
 *timings)
  #endif
 
  static const struct ns16550_platdata cairo_serial = {
-       OMAP34XX_UART2,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };

  U_BOOT_DEVICE(cairo_uart) = {

board/ti/beagle/beagle.c +4 -3

index ff317ef..a5f2af7 100644
@@ -73,9 +73,10 @@ static struct {
  } expansion_config;
 
  static const struct ns16550_platdata beagle_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(beagle_uart) = {

board/timll/devkit8000/devkit8000.c +0 -0

index 1a447c7..fb8e357 100644
@@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
  };
 
  static const struct ns16550_platdata devkit8000_serial = {

board/timll/devkit8000/devkit8000.c static u32 gpmc_net_config[GPMC_MAX_REG] = { · line 55

Quoted 10 lines

board/timll/devkit8000/devkit8000.c +4 -3

-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(devkit8000_uart) = {

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Heiko Schocher

2016-02-29 13:28 UTC #3 lore raw

PATCH v2 1/1 OMAP3: Various: Update serial platdata to update reg_offset to 0

Hello Adam,

Am 29.02.2016 um 13:51 schrieb Adam Ford:

Quoted 10 lines

V1 I changed all the platform data to explicitly name the entries instead of just using a table of numbers. This would hopefully address future proofing against the header changing order. I copy-pasted the table from my board to a series of boards and then later realized I had accidentally changed the UART number which would have broken a few boards.
V2, Fixes that issue because igep, overo, beagle and devkit8000 used UART3 instead of UART1, so it was a correction on my part. The change from V1 was kept, but the correct UART was referenced.

Please add this information below the "---" in your next version, thanks!

Maybe you want to try "u-boot:tools/patman/patman", which helps a lot

bye,
Heiko

Quoted 182 lines · Heiko Schocher

Quoted 179 lines

Hello Adam,

Am 29.02.2016 um 12:53 schrieb Adam Ford:

Quoted 19 lines

V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1.
With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property"
reg_offset is added to the struct ns16550_platdata to be
dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken
as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless.
I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods
and Alexander Graf.
Signed-off-by Adam Ford <[email protected]>

Quoted 9 lines

---
   board/isee/igep00x0/igep00x0.c      | 7 ++++---
   board/logicpd/omap3som/omap3logic.c | 7 ++++---
   board/logicpd/zoom1/zoom1.c         | 7 ++++---
   board/overo/overo.c                 | 7 ++++---
   board/quipos/cairo/cairo.c          | 7 ++++---
   board/ti/beagle/beagle.c            | 7 ++++---
   board/timll/devkit8000/devkit8000.c | 7 ++++---
   7 files changed, 28 insertions(+), 21 deletions(-)

What has changed exactly in v2 ?

Beside of this:

Reviewed-by Heiko Schocher <[email protected]>

Thanks!

bye,
Heiko

Quoted 122 lines

board/isee/igep00x0/igep00x0.c +4 -3

index e2fce50..63489e5 100644
@@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = {
   #endif
 
   static const struct ns16550_platdata igep_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
   };
 
   U_BOOT_DEVICE(igep_uart) = {

board/logicpd/omap3som/omap3logic.c +4 -3

index 668f684..0e72a5a 100644
@@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR;
    */
 
   static const struct ns16550_platdata omap3logic_serial = {
-       OMAP34XX_UART1,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
   };
 
   U_BOOT_DEVICE(omap3logic_uart) = {

board/logicpd/zoom1/zoom1.c +4 -3

index 4040114..3d34919 100644
@@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = {
   };
 
   static const struct ns16550_platdata zoom1_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
   };
 
   U_BOOT_DEVICE(zoom1_uart) = {

board/overo/overo.c +4 -3

index a38b959..3da80e9 100644
@@ -68,9 +68,10 @@ static struct {
   } expansion_config = {0x0};
 
   static const struct ns16550_platdata overo_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
   };
 
   U_BOOT_DEVICE(overo_uart) = {

board/quipos/cairo/cairo.c +4 -3

index 21793e8..15d68c1 100644
@@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings
 *timings)
   #endif
 
   static const struct ns16550_platdata cairo_serial = {
-       OMAP34XX_UART2,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
   };

   U_BOOT_DEVICE(cairo_uart) = {

board/ti/beagle/beagle.c +4 -3

index ff317ef..a5f2af7 100644
@@ -73,9 +73,10 @@ static struct {
   } expansion_config;
 
   static const struct ns16550_platdata beagle_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
   };
 
   U_BOOT_DEVICE(beagle_uart) = {

board/timll/devkit8000/devkit8000.c +0 -0

index 1a447c7..fb8e357 100644
@@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
   };
 
   static const struct ns16550_platdata devkit8000_serial = {

board/timll/devkit8000/devkit8000.c static u32 gpmc_net_config[GPMC_MAX_REG] = { · line 55

Quoted 10 lines

board/timll/devkit8000/devkit8000.c +4 -3

-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
   };
 
   U_BOOT_DEVICE(devkit8000_uart) = {

--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Alexander Graf

2016-02-29 13:04 UTC #4 lore raw

PATCH v2 1/1 OMAP3: Various: Update serial platdata to update reg_offset to 0

In reply to Adam Ford

Quoted 30 lines · Adam Ford

V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1.
With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property" reg_offset is added to the struct ns16550_platdata to be
dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless.
I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods and Alexander Graf.
Signed-off-by Adam Ford <[email protected]>
---
  board/isee/igep00x0/igep00x0.c      | 7 ++++---
  board/logicpd/omap3som/omap3logic.c | 7 ++++---
  board/logicpd/zoom1/zoom1.c         | 7 ++++---
  board/overo/overo.c                 | 7 ++++---
  board/quipos/cairo/cairo.c          | 7 ++++---
  board/ti/beagle/beagle.c            | 7 ++++---
  board/timll/devkit8000/devkit8000.c | 7 ++++---
  7 files changed, 28 insertions(+), 21 deletions(-)
board/isee/igep00x0/igep00x0.c +0 -0
index e2fce50..63489e5 100644

board/isee/igep00x0/igep00x0.c static const u32 gpmc_lan_config[] = { · line 37

Quoted 7 lines

board/isee/igep00x0/igep00x0.c +1 -3

@@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = {
  #endif
 
  static const struct ns16550_platdata igep_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,

This looks wrong

board/isee/igep00x0/igep00x0.c static const u32 gpmc_lan_config[] = { · line 38

Quoted 1 line

board/isee/igep00x0/igep00x0.c +1 -0
+	.reg_offset = 0,

I'd say just leave reg_offset out in all the structs. It gets initialized to 0 by default.

Quoted 28 lines

board/isee/igep00x0/igep00x0.c +2 -0

+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(igep_uart) = {

board/logicpd/omap3som/omap3logic.c +4 -3

index 668f684..0e72a5a 100644
@@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR;
   */
 
  static const struct ns16550_platdata omap3logic_serial = {
-	OMAP34XX_UART1,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(omap3logic_uart) = {

board/logicpd/zoom1/zoom1.c +0 -0

index 4040114..3d34919 100644

board/logicpd/zoom1/zoom1.c static const u32 gpmc_lab_enet[] = { · line 47

Quoted 7 lines

board/logicpd/zoom1/zoom1.c +1 -3

@@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = {
  };
 
  static const struct ns16550_platdata zoom1_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,

looks wrong too

Quoted 29 lines

board/logicpd/zoom1/zoom1.c +3 -0

+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(zoom1_uart) = {

board/overo/overo.c +4 -3

index a38b959..3da80e9 100644
@@ -68,9 +68,10 @@ static struct {
  } expansion_config = {0x0};
 
  static const struct ns16550_platdata overo_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(overo_uart) = {

board/quipos/cairo/cairo.c +0 -0

index 21793e8..15d68c1 100644

board/quipos/cairo/cairo.c void get_board_mem_timings(struct board_sdrc_timings *timings) · line 94

Quoted 7 lines

board/quipos/cairo/cairo.c +1 -3

@@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
  #endif
 
  static const struct ns16550_platdata cairo_serial = {
-	OMAP34XX_UART2,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART1,

wrong?

Given the number of typos, maybe try and create a coccinelle script instead? :)

Alex

Quoted 42 lines

board/quipos/cairo/cairo.c +3 -0

+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(cairo_uart) = {

board/ti/beagle/beagle.c +4 -3

index ff317ef..a5f2af7 100644
@@ -73,9 +73,10 @@ static struct {
  } expansion_config;
 
  static const struct ns16550_platdata beagle_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(beagle_uart) = {

board/timll/devkit8000/devkit8000.c +4 -3

index 1a447c7..fb8e357 100644
@@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
  };
 
  static const struct ns16550_platdata devkit8000_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_offset = 0,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK
  };
 
  U_BOOT_DEVICE(devkit8000_uart) = {

Adam Ford

author

2016-02-29 21:31 UTC #5 lore raw

PATCH v2 1/1 OMAP3: Various: Update serial platdata to update reg_offset to 0

I won't be able to fix it tonight, but I'll try to look at this tomorrow. Sorry, I was in a hurry this morning. Does anyone have an opinion on whether or not I should I also remove the 'const' part of the declaration? I wonder how much longer we'll be using this mechanism before the device trees take over. It seems like only a handful of omap boards use it.

adam

Quoted 175 lines · Alexander Graf

Quoted 35 lines · Adam Ford
V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1.
With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property"
reg_offset is added to the struct ns16550_platdata to be
dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken
as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless.
I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods
and Alexander Graf.
Signed-off-by Adam Ford <[email protected]>
---
  board/isee/igep00x0/igep00x0.c      | 7 ++++---
  board/logicpd/omap3som/omap3logic.c | 7 ++++---
  board/logicpd/zoom1/zoom1.c         | 7 ++++---
  board/overo/overo.c                 | 7 ++++---
  board/quipos/cairo/cairo.c          | 7 ++++---
  board/ti/beagle/beagle.c            | 7 ++++---
  board/timll/devkit8000/devkit8000.c | 7 ++++---
  7 files changed, 28 insertions(+), 21 deletions(-)
board/isee/igep00x0/igep00x0.c +0 -0
index e2fce50..63489e5 100644
board/isee/igep00x0/igep00x0.c static const u32 gpmc_lan_config[] = { · line 36
Quoted 6 lines
board/isee/igep00x0/igep00x0.c +1 -3
@@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = {
  #endif
    static const struct ns16550_platdata igep_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
This looks wrong
board/isee/igep00x0/igep00x0.c static const u32 gpmc_lan_config[] = { · line 37
Quoted 1 line
board/isee/igep00x0/igep00x0.c +1 -0
+       .reg_offset = 0,
I'd say just leave reg_offset out in all the structs. It gets initialized to 0 by default.
Quoted 26 lines
board/isee/igep00x0/igep00x0.c +2 -0
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(igep_uart) = {
board/logicpd/omap3som/omap3logic.c +4 -3
index 668f684..0e72a5a 100644
@@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR;
   */
    static const struct ns16550_platdata omap3logic_serial = {
-       OMAP34XX_UART1,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(omap3logic_uart) = {
board/logicpd/zoom1/zoom1.c +0 -0
index 4040114..3d34919 100644
board/logicpd/zoom1/zoom1.c static const u32 gpmc_lab_enet[] = { · line 46
Quoted 6 lines
board/logicpd/zoom1/zoom1.c +1 -3
@@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = {
  };
    static const struct ns16550_platdata zoom1_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
looks wrong too
Quoted 26 lines
board/logicpd/zoom1/zoom1.c +3 -0
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(zoom1_uart) = {
board/overo/overo.c +4 -3
index a38b959..3da80e9 100644
@@ -68,9 +68,10 @@ static struct {
  } expansion_config = {0x0};
    static const struct ns16550_platdata overo_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(overo_uart) = {
board/quipos/cairo/cairo.c +0 -0
index 21793e8..15d68c1 100644
board/quipos/cairo/cairo.c void get_board_mem_timings(struct board_sdrc_timings · line 94
Quoted 7 lines
board/quipos/cairo/cairo.c +1 -3
@@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings
 *timings)
  #endif
    static const struct ns16550_platdata cairo_serial = {
-       OMAP34XX_UART2,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
wrong?
Given the number of typos, maybe try and create a coccinelle script instead? :)
Alex
Quoted 38 lines
board/quipos/cairo/cairo.c +3 -0
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(cairo_uart) = {
board/ti/beagle/beagle.c +4 -3
index ff317ef..a5f2af7 100644
@@ -73,9 +73,10 @@ static struct {
  } expansion_config;
    static const struct ns16550_platdata beagle_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(beagle_uart) = {
board/timll/devkit8000/devkit8000.c +4 -3
index 1a447c7..fb8e357 100644
@@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
  };
    static const struct ns16550_platdata devkit8000_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(devkit8000_uart) = {

Derald D. Woods

2016-02-29 21:47 UTC #6 lore raw

PATCH v2 1/1 OMAP3: Various: Update serial platdata to update reg_offset to 0

Quoted 7 lines · Adam Ford

I won't be able to fix it tonight, but I'll try to look at this tomorrow. Sorry, I was in a hurry this morning. Does anyone have an opinion on whether or not I should I also remove the 'const' part of the declaration? I wonder how much longer we'll be using this mechanism before the device trees take over. It seems like only a handful of omap boards use it.

The commit was reverted this morning. There is no need for a patch now. U-Boot 'master' has been updated.

- Derald

Quoted 178 lines

adam
Quoted 175 lines · Alexander Graf
Quoted 35 lines · Adam Ford
V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1.
With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property"
reg_offset is added to the struct ns16550_platdata to be
dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken
as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless.
I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods
and Alexander Graf.
Signed-off-by Adam Ford <[email protected]>
---
  board/isee/igep00x0/igep00x0.c      | 7 ++++---
  board/logicpd/omap3som/omap3logic.c | 7 ++++---
  board/logicpd/zoom1/zoom1.c         | 7 ++++---
  board/overo/overo.c                 | 7 ++++---
  board/quipos/cairo/cairo.c          | 7 ++++---
  board/ti/beagle/beagle.c            | 7 ++++---
  board/timll/devkit8000/devkit8000.c | 7 ++++---
  7 files changed, 28 insertions(+), 21 deletions(-)
board/isee/igep00x0/igep00x0.c +0 -0
index e2fce50..63489e5 100644
board/isee/igep00x0/igep00x0.c static const u32 gpmc_lan_config[] = { · line 36
Quoted 6 lines
board/isee/igep00x0/igep00x0.c +1 -3
@@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = {
  #endif
    static const struct ns16550_platdata igep_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
This looks wrong
board/isee/igep00x0/igep00x0.c static const u32 gpmc_lan_config[] = { · line 37
Quoted 1 line
board/isee/igep00x0/igep00x0.c +1 -0
+       .reg_offset = 0,
I'd say just leave reg_offset out in all the structs. It gets initialized to 0 by default.
Quoted 26 lines
board/isee/igep00x0/igep00x0.c +2 -0
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(igep_uart) = {
board/logicpd/omap3som/omap3logic.c +4 -3
index 668f684..0e72a5a 100644
@@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR;
   */
    static const struct ns16550_platdata omap3logic_serial = {
-       OMAP34XX_UART1,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(omap3logic_uart) = {
board/logicpd/zoom1/zoom1.c +0 -0
index 4040114..3d34919 100644
board/logicpd/zoom1/zoom1.c static const u32 gpmc_lab_enet[] = { · line 46
Quoted 6 lines
board/logicpd/zoom1/zoom1.c +1 -3
@@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = {
  };
    static const struct ns16550_platdata zoom1_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
looks wrong too
Quoted 26 lines
board/logicpd/zoom1/zoom1.c +3 -0
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(zoom1_uart) = {
board/overo/overo.c +4 -3
index a38b959..3da80e9 100644
@@ -68,9 +68,10 @@ static struct {
  } expansion_config = {0x0};
    static const struct ns16550_platdata overo_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(overo_uart) = {
board/quipos/cairo/cairo.c +0 -0
index 21793e8..15d68c1 100644
board/quipos/cairo/cairo.c void get_board_mem_timings(struct board_sdrc_timings · line 94
Quoted 7 lines
board/quipos/cairo/cairo.c +1 -3
@@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings
 *timings)
  #endif
    static const struct ns16550_platdata cairo_serial = {
-       OMAP34XX_UART2,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
wrong?
Given the number of typos, maybe try and create a coccinelle script instead? :)
Alex
Quoted 38 lines
board/quipos/cairo/cairo.c +3 -0
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(cairo_uart) = {
board/ti/beagle/beagle.c +4 -3
index ff317ef..a5f2af7 100644
@@ -73,9 +73,10 @@ static struct {
  } expansion_config;
    static const struct ns16550_platdata beagle_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(beagle_uart) = {
board/timll/devkit8000/devkit8000.c +4 -3
index 1a447c7..fb8e357 100644
@@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
  };
    static const struct ns16550_platdata devkit8000_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(devkit8000_uart) = {

Tom Rini

2016-02-29 21:49 UTC #7 lore raw

PATCH v2 1/1 OMAP3: Various: Update serial platdata to update reg_offset to 0

In reply to Adam Ford

Quoted 6 lines · Adam Ford

I won't be able to fix it tonight, but I'll try to look at this tomorrow. Sorry, I was in a hurry this morning. Does anyone have an opinion on whether or not I should I also remove the 'const' part of the declaration? I wonder how much longer we'll be using this mechanism before the device trees take over. It seems like only a handful of omap boards use it.

So, for the moment, no rush. I reverted the dm commit for this release.

Quoted 183 lines

adam
Quoted 165 lines · Alexander Graf
Quoted 35 lines · Adam Ford
V2: I hastily copy-pasted the boards without looking at the UART number. This addresses 3 boards that use UART3 and not UART1.
With commit: d9a3bec682f9 "dm: ns16550: Add support for reg-offset property"
reg_offset is added to the struct ns16550_platdata to be
dt compatible with Linux kernel driver. A variety of OMAP3 boards are broken
as the serial platdata is missing offsets. By explicitly naming the entry, this should also help 'future-proof' if more entries get added but are not needed for OMAP3. Tested on the Logic PD Torpedo + Wireless.
I only changed a handful of devices that used the same syntax as the Logic board. Appologies if I missed one or stepped on toes. Thanks to Derald Woods
and Alexander Graf.
Signed-off-by Adam Ford <[email protected]>
---
  board/isee/igep00x0/igep00x0.c      | 7 ++++---
  board/logicpd/omap3som/omap3logic.c | 7 ++++---
  board/logicpd/zoom1/zoom1.c         | 7 ++++---
  board/overo/overo.c                 | 7 ++++---
  board/quipos/cairo/cairo.c          | 7 ++++---
  board/ti/beagle/beagle.c            | 7 ++++---
  board/timll/devkit8000/devkit8000.c | 7 ++++---
  7 files changed, 28 insertions(+), 21 deletions(-)
board/isee/igep00x0/igep00x0.c +0 -0
index e2fce50..63489e5 100644
board/isee/igep00x0/igep00x0.c static const u32 gpmc_lan_config[] = { · line 36
Quoted 6 lines
board/isee/igep00x0/igep00x0.c +1 -3
@@ -34,9 +34,10 @@ static const u32 gpmc_lan_config[] = {
  #endif
    static const struct ns16550_platdata igep_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
This looks wrong
board/isee/igep00x0/igep00x0.c static const u32 gpmc_lan_config[] = { · line 37
Quoted 1 line
board/isee/igep00x0/igep00x0.c +1 -0
+       .reg_offset = 0,
I'd say just leave reg_offset out in all the structs. It gets initialized to 0 by default.
Quoted 26 lines
board/isee/igep00x0/igep00x0.c +2 -0
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(igep_uart) = {
board/logicpd/omap3som/omap3logic.c +4 -3
index 668f684..0e72a5a 100644
@@ -47,9 +47,10 @@ DECLARE_GLOBAL_DATA_PTR;
   */
    static const struct ns16550_platdata omap3logic_serial = {
-       OMAP34XX_UART1,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(omap3logic_uart) = {
board/logicpd/zoom1/zoom1.c +0 -0
index 4040114..3d34919 100644
board/logicpd/zoom1/zoom1.c static const u32 gpmc_lab_enet[] = { · line 46
Quoted 6 lines
board/logicpd/zoom1/zoom1.c +1 -3
@@ -44,9 +44,10 @@ static const u32 gpmc_lab_enet[] = {
  };
    static const struct ns16550_platdata zoom1_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
looks wrong too
Quoted 26 lines
board/logicpd/zoom1/zoom1.c +3 -0
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(zoom1_uart) = {
board/overo/overo.c +4 -3
index a38b959..3da80e9 100644
@@ -68,9 +68,10 @@ static struct {
  } expansion_config = {0x0};
    static const struct ns16550_platdata overo_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(overo_uart) = {
board/quipos/cairo/cairo.c +0 -0
index 21793e8..15d68c1 100644
board/quipos/cairo/cairo.c void get_board_mem_timings(struct board_sdrc_timings · line 94
Quoted 7 lines
board/quipos/cairo/cairo.c +1 -3
@@ -91,9 +91,10 @@ void get_board_mem_timings(struct board_sdrc_timings
 *timings)
  #endif
    static const struct ns16550_platdata cairo_serial = {
-       OMAP34XX_UART2,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART1,
wrong?
Given the number of typos, maybe try and create a coccinelle script instead? :)
Alex
Quoted 30 lines
board/quipos/cairo/cairo.c +3 -0
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(cairo_uart) = {
board/ti/beagle/beagle.c +4 -3
index ff317ef..a5f2af7 100644
@@ -73,9 +73,10 @@ static struct {
  } expansion_config;
    static const struct ns16550_platdata beagle_serial = {
-       OMAP34XX_UART3,
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(beagle_uart) = {
board/timll/devkit8000/devkit8000.c +0 -1
index 1a447c7..fb8e357 100644
@@ -46,9 +46,10 @@ static u32 gpmc_net_config[GPMC_MAX_REG] = {
  };
    static const struct ns16550_platdata devkit8000_serial = {
-       OMAP34XX_UART3,
Quoted 10 lines
board/timll/devkit8000/devkit8000.c static u32 gpmc_net_config[GPMC_MAX_REG] = { · line 55
Quoted 8 lines
board/timll/devkit8000/devkit8000.c +4 -2
-       2,
-       V_NS16550_CLK
+       .base = OMAP34XX_UART3,
+       .reg_offset = 0,
+       .reg_shift = 2,
+       .clock = V_NS16550_CLK
  };
    U_BOOT_DEVICE(devkit8000_uart) = {
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160229/5e762ba8/attachment.sig>