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

Merge tag 'fsi-updates-2018-06-12' of... 

Merge tag 'fsi-updates-2018-06-12' of https://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi into char-misc-next

Ben writes:

FSI updates and sbefifo driver
parents a59f95c7 9f4a8a2d

arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
		compatible = "fsi-master-gpio", "fsi-master";

		#address-cells = <2>;

		#size-cells = <0>;

		no-gpio-delays;



		clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;

		data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
		compatible = "fsi-master-gpio", "fsi-master";

		#address-cells = <2>;

		#size-cells = <0>;

		no-gpio-delays;



		clock-gpios = <&gpio ASPEED_GPIO(AA, 0) GPIO_ACTIVE_HIGH>;

		data-gpios = <&gpio ASPEED_GPIO(E, 0) GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
		compatible = "fsi-master-gpio", "fsi-master";

		#address-cells = <2>;

		#size-cells = <0>;

		no-gpio-delays;



		trans-gpios = <&gpio ASPEED_GPIO(O, 6) GPIO_ACTIVE_HIGH>;

		enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>;

drivers/fsi/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -32,4 +32,11 @@ config FSI_SCOM 
	---help---

	This option enables an FSI based SCOM device driver.



config FSI_SBEFIFO

	tristate "SBEFIFO FSI client device driver"

	---help---

	This option enables an FSI based SBEFIFO device driver. The SBEFIFO is

	a pipe-like FSI device for communicating with the self boot engine

	(SBE) on POWER processors.



endif

drivers/fsi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ obj-$(CONFIG_FSI) += fsi-core.o 
obj-$(CONFIG_FSI_MASTER_HUB) += fsi-master-hub.o

obj-$(CONFIG_FSI_MASTER_GPIO) += fsi-master-gpio.o

obj-$(CONFIG_FSI_SCOM) += fsi-scom.o

obj-$(CONFIG_FSI_SBEFIFO) += fsi-sbefifo.o