arm: socfpga: arria10: Added miscellaneous drivers for Arria10

PATCH New Chee Tien Fong 4 participants 7 messages Dec 6, 2016 – Dec 7, 2016

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/socfpga architecture

lore

Share & tools

lore

Chee Tien Fong

author

2016-12-06 08:09 UTC #0 lore raw

PATCH 7/10 arm: socfpga: arria10: Added miscellaneous drivers for Arria10

From: Tien Fong Chee <[email protected]>

The drivers is restructured such common functions, gen5 functions, and arria10 functions are moved to misc.c, misc_gen5 and misc_arria10 respectively.

Signed-off-by Tien Fong Chee <[email protected]>

Cc Marek Vasut <[email protected]>

Cc Dinh Nguyen <[email protected]>

Cc Chin Liang See <[email protected]>

Cc Tien Fong <[email protected]>

---
 arch/arm/mach-socfpga/Makefile            |    4 +-
 arch/arm/mach-socfpga/include/mach/misc.h |   25 ++
 arch/arm/mach-socfpga/misc.c              |  429 +---------------------------
 arch/arm/mach-socfpga/misc_arria10.c      |  111 ++++++++
 arch/arm/mach-socfpga/misc_gen5.c         |  363 ++++++++++++++++++++++++
 5 files changed, 517 insertions(+), 415 deletions(-)
 create mode 100644 arch/arm/mach-socfpga/include/mach/misc.h
 create mode 100644 arch/arm/mach-socfpga/misc_arria10.c
 create mode 100644 arch/arm/mach-socfpga/misc_gen5.c

arch/arm/mach-socfpga/Makefile +2 -2

index b8fcf6e..f8b529e 100644
@@ -9,9 +9,9 @@
 
 obj-y	+= misc.o timer.o reset_manager.o system_manager.o clock_manager.o \
 	   fpga_manager.o board.o
-obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += reset_manager_arria10.o
+obj-$(CONFIG_TARGET_SOCFPGA_ARRIA10) += reset_manager_arria10.o misc_arria10.o
 obj-$(CONFIG_TARGET_SOCFPGA_GEN5) += scan_manager.o wrap_pll_config.o \
-				reset_manager_gen5.o
+				reset_manager_gen5.o misc_gen5.o
 
 ifdef CONFIG_SPL_BUILD
 obj-y += spl.o

arch/arm/mach-socfpga/include/mach/misc.h new file +25 -0

new file mode 100644
index 0000000..1bf1783
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2016, Intel Corporation
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
+#ifndef _MISC_H_
+#define	_MISC_H_
+
+extern void dwmac_deassert_reset(const unsigned int of_reset_id,
+				 const u32 phymode);
+
+struct bsel{
+	const char	*mode;
+	const char	*name;
+};
+
+extern struct bsel bsel_str[];
+
+#ifdef CONFIG_FPGA
+extern void socfpga_fpga_add(void);
+#else
+inline void socfpga_fpga_add(void) {}
+#endif
+#endif /* _MISC_H_ */

arch/arm/mach-socfpga/misc.c +16 ~~-413~~

474 lines not on this page · raw message

arch/arm/mach-socfpga/misc_arria10.c new file +111 -0

111 lines not on this page · raw message

arch/arm/mach-socfpga/misc_gen5.c new file +363 -0

363 lines not on this page · raw message

Signature · 1 line

1.7.7.4

dinguyen

maintainer

2016-12-06 22:26 UTC #1 lore raw

PATCH 7/10 arm: socfpga: arria10: Added miscellaneous drivers for Arria10

Quoted 11 lines · Chee Tien Fong

From: Tien Fong Chee <[email protected]>
The drivers is restructured such common functions, gen5 functions, and arria10 functions are moved to misc.c, misc_gen5 and misc_arria10 respectively.
Signed-off-by Tien Fong Chee <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Tien Fong <[email protected]>

Quoted 11 lines

---
 arch/arm/mach-socfpga/Makefile            |    4 +-
 arch/arm/mach-socfpga/include/mach/misc.h |   25 ++
 arch/arm/mach-socfpga/misc.c              |  429 +---------------------------
 arch/arm/mach-socfpga/misc_arria10.c      |  111 ++++++++
 arch/arm/mach-socfpga/misc_gen5.c         |  363 ++++++++++++++++++++++++
 5 files changed, 517 insertions(+), 415 deletions(-)
 create mode 100644 arch/arm/mach-socfpga/include/mach/misc.h
 create mode 100644 arch/arm/mach-socfpga/misc_arria10.c
 create mode 100644 arch/arm/mach-socfpga/misc_gen5.c

The previous patches in this series applied to Marek's 01-arria10 branch, but this patch does not apply at all:

error: patch failed: arch/arm/mach-socfpga/misc.c:361
error: arch/arm/mach-socfpga/misc.c: patch does not apply

Also, on the next revision, please add -C to git format-patch.

Dinh

Marek Vasut

2016-12-06 23:41 UTC #2 lore raw

PATCH 7/10 arm: socfpga: arria10: Added miscellaneous drivers for Arria10

Quoted 25 lines · dinguyen

Quoted 11 lines · Chee Tien Fong
From: Tien Fong Chee <[email protected]>
The drivers is restructured such common functions, gen5 functions, and arria10 functions are moved to misc.c, misc_gen5 and misc_arria10 respectively.
Signed-off-by Tien Fong Chee <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Tien Fong <[email protected]>
Quoted 11 lines
---
 arch/arm/mach-socfpga/Makefile            |    4 +-
 arch/arm/mach-socfpga/include/mach/misc.h |   25 ++
 arch/arm/mach-socfpga/misc.c              |  429 +---------------------------
 arch/arm/mach-socfpga/misc_arria10.c      |  111 ++++++++
 arch/arm/mach-socfpga/misc_gen5.c         |  363 ++++++++++++++++++++++++
 5 files changed, 517 insertions(+), 415 deletions(-)
 create mode 100644 arch/arm/mach-socfpga/include/mach/misc.h
 create mode 100644 arch/arm/mach-socfpga/misc_arria10.c
 create mode 100644 arch/arm/mach-socfpga/misc_gen5.c

Quoted 7 lines

The previous patches in this series applied to Marek's 01-arria10 branch, but this patch does not apply at all:
error: patch failed: arch/arm/mach-socfpga/misc.c:361
error: arch/arm/mach-socfpga/misc.c: patch does not apply
Also, on the next revision, please add -C to git format-patch.

I was tempted to discard that arria 10 patchset from the tree, I've been trying to keep it kinda in sync, but it's probably broken. If you plan to submit A10, just start on u-boot/master and -- if we all agree -- I'll discard the 01-arria10 branch. The current situation is chaos.

Signature · 2 lines

Best regards,
Marek Vasut

Dinh Nguyen

maintainer

2016-12-07 15:05 UTC #3 lore raw

PATCH 7/10 arm: socfpga: arria10: Added miscellaneous drivers for Arria10

Quoted 6 lines · Marek Vasut

Quoted 6 lines
The previous patches in this series applied to Marek's 01-arria10 branch, but this patch does not apply at all:
error: patch failed: arch/arm/mach-socfpga/misc.c:361
error: arch/arm/mach-socfpga/misc.c: patch does not apply

Quoted 8 lines

Quoted 1 line
Also, on the next revision, please add -C to git format-patch.
I was tempted to discard that arria 10 patchset from the tree, I've been trying to keep it kinda in sync, but it's probably broken. If you plan to submit A10, just start on u-boot/master and -- if we all agree -- I'll discard the 01-arria10 branch. The current situation is chaos.

I agree that it is a bit chaotic. I'll let you make the decision, since I have not been actively sending patches for A10. That is Tien Fong's and Chin Liang's job now.

BTW, really appreciate the work to keep the 01-arria10 branch alive for all this time.

Dinh

Marek Vasut

2016-12-07 15:12 UTC #4 lore raw

PATCH 7/10 arm: socfpga: arria10: Added miscellaneous drivers for Arria10

Quoted 18 lines · Dinh Nguyen

Quoted 6 lines · Marek Vasut
Quoted 6 lines
The previous patches in this series applied to Marek's 01-arria10 branch, but this patch does not apply at all:
error: patch failed: arch/arm/mach-socfpga/misc.c:361
error: arch/arm/mach-socfpga/misc.c: patch does not apply
Quoted 8 lines
Quoted 1 line
Also, on the next revision, please add -C to git format-patch.
I was tempted to discard that arria 10 patchset from the tree, I've been trying to keep it kinda in sync, but it's probably broken. If you plan to submit A10, just start on u-boot/master and -- if we all agree -- I'll discard the 01-arria10 branch. The current situation is chaos.

Quoted 3 lines

I agree that it is a bit chaotic. I'll let you make the decision, since I have not been actively sending patches for A10. That is Tien Fong's and Chin Liang's job now.

Yeah :-)

Quoted 2 lines

BTW, really appreciate the work to keep the 01-arria10 branch alive for all this time.

No problem, although I think bitrot has set in .

Signature · 2 lines

Best regards,
Marek Vasut

Chee

2016-12-07 12:04 UTC #5 lore raw

PATCH 7/10 arm: socfpga: arria10: Added miscellaneous drivers for Arria10

In reply to dinguyen

Quoted 32 lines · dinguyen

Quoted 17 lines · Chee Tien Fong
From: Tien Fong Chee <[email protected]>
The drivers is restructured such common functions, gen5 functions, and arria10 functions are moved to misc.c, misc_gen5 and misc_arria10
respectively.
Signed-off-by Tien Fong Chee <[email protected]>
Cc Marek Vasut <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Tien Fong <[email protected]>
---
?arch/arm/mach-socfpga/Makefile????????????|????4 +-
?arch/arm/mach-socfpga/include/mach/misc.h |???25 ++
?arch/arm/mach-socfpga/misc.c??????????????|??429 +--------------
Quoted 9 lines
-------------
?arch/arm/mach-socfpga/misc_arria10.c??????|??111 ++++++++ ?arch/arm/mach-socfpga/misc_gen5.c?????????|??363
++++++++++++++++++++++++
?5 files changed, 517 insertions(+), 415 deletions(-) ?create mode 100644 arch/arm/mach-socfpga/include/mach/misc.h ?create mode 100644 arch/arm/mach-socfpga/misc_arria10.c ?create mode 100644 arch/arm/mach-socfpga/misc_gen5.c
The previous patches in this series applied to Marek's 01-arria10 branch,
but this patch does not apply at all:

Quoted 6 lines

error: patch failed: arch/arm/mach-socfpga/misc.c:361
error: arch/arm/mach-socfpga/misc.c: patch does not apply
Also, on the next revision, please add -C to git format-patch.
Dinh

Sorry to hear that. It is too weird the patch didn't applied, but i have no issue with this patch. Are you using git am command?

Dinh Nguyen

maintainer

2016-12-07 15:07 UTC #6 lore raw

PATCH 7/10 arm: socfpga: arria10: Added miscellaneous drivers for Arria10

Quoted 7 lines · Tien Fong

Quoted 7 lines
The previous patches in this series applied to Marek's 01-arria10 branch,
but this patch does not apply at all:
error: patch failed: arch/arm/mach-socfpga/misc.c:361
error: arch/arm/mach-socfpga/misc.c: patch does not apply

Quoted 7 lines

Quoted 3 lines
Also, on the next revision, please add -C to git format-patch.
Dinh
Sorry to hear that. It is too weird the patch didn't applied, but i have no issue with this patch. Are you using git am command?

I tried everything...git am and git apply. Perhaps you have some uncommitted changes in your branch?

Dinh