Commit cec2caed authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fpga-for-5.4' of... 

Merge tag 'fpga-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga

 into char-misc-next

Moritz writes:

FPGA Manager changes for 5.4-rc1

Here is the first set of changes for the 5.4-rc1 merge window.

They're all more or less cleanup patches:

- Carlos' patch addresses a checkpatch warning
- My first patch changes the return type of a function to align it with
  the fact that nothing checks the return value and it uncoditionally
  returned 0 anyways
- My second patch somehow fell through the cracks before and cleans up
  the FPGA bridge bindings by consolidating them instead of repeating
  the same paragraph over and over again.

All of these patches have been in the last few linux-next releases
without issues.

Signed-off-by: default avatarMoritz Fischer <mdf@kernel.org>

* tag 'fpga-for-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mdf/linux-fpga:
  dt-bindings: fpga: Consolidate bridge properties
  fpga: altera-pr-ip: Make alt_pr_unregister function void
  fpga: altera-cvp: Fix function definition argument
parents f51cf9e2 2949dc44

Documentation/devicetree/bindings/fpga/altera-fpga2sdram-bridge.txt

+1 −4
Original line number Diff line number Diff line
@@ -3,10 +3,7 @@ Altera FPGA To SDRAM Bridge Driver 
Required properties:

- compatible		: Should contain "altr,socfpga-fpga2sdram-bridge"



Optional properties:

- bridge-enable		: 0 if driver should disable bridge at startup

			  1 if driver should enable bridge at startup

			  Default is to leave bridge in current state.

See Documentation/devicetree/bindings/fpga/fpga-bridge.txt for generic bindings.



Example:

	fpga_bridge3: fpga-bridge@ffc25080 {

Documentation/devicetree/bindings/fpga/altera-freeze-bridge.txt

+1 −4
Original line number Diff line number Diff line
@@ -10,10 +10,7 @@ Required properties: 
- compatible		: Should contain "altr,freeze-bridge-controller"

- regs			: base address and size for freeze bridge module



Optional properties:

- bridge-enable		: 0 if driver should disable bridge at startup

			  1 if driver should enable bridge at startup

			  Default is to leave bridge in current state.

See Documentation/devicetree/bindings/fpga/fpga-bridge.txt for generic bindings.



Example:

	freeze-controller@100000450 {

Documentation/devicetree/bindings/fpga/altera-hps2fpga-bridge.txt

+1 −4
Original line number Diff line number Diff line
@@ -9,10 +9,7 @@ Required properties: 
- resets	: Phandle and reset specifier for this bridge's reset

- clocks	: Clocks used by this module.



Optional properties:

- bridge-enable	: 0 if driver should disable bridge at startup.

		  1 if driver should enable bridge at startup.

		  Default is to leave bridge in its current state.

See Documentation/devicetree/bindings/fpga/fpga-bridge.txt for generic bindings.



Example:

	fpga_bridge0: fpga-bridge@ff400000 {

Documentation/devicetree/bindings/fpga/fpga-bridge.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
FPGA Bridge Device Tree Binding



Optional properties:

- bridge-enable		: 0 if driver should disable bridge at startup

			  1 if driver should enable bridge at startup

			  Default is to leave bridge in current state.



Example:

	fpga_bridge3: fpga-bridge@ffc25080 {

		compatible = "altr,socfpga-fpga2sdram-bridge";

		reg = <0xffc25080 0x4>;

		bridge-enable = <0>;

	};

Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt

+2 −6
Original line number Diff line number Diff line
@@ -18,12 +18,8 @@ Required properties: 
- clocks		: input clock to IP

- clock-names		: should contain "aclk"



Optional properties:

- bridge-enable		: 0 if driver should disable bridge at startup

			  1 if driver should enable bridge at startup

			  Default is to leave bridge in current state.



See Documentation/devicetree/bindings/fpga/fpga-region.txt for generic bindings.

See Documentation/devicetree/bindings/fpga/fpga-region.txt and

Documentation/devicetree/bindings/fpga/fpga-bridge.txt for generic bindings.



Example:

	fpga-bridge@100000450 {

CRA Git | Maintained and supported by SUSTech CRA and CCSE