diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-11 14:22:32 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-11 14:22:32 +0200 |
| commit | f7dbcd17703157c0063c619714a765e3116caa83 (patch) | |
| tree | f62df7ec2fcb9d696357926b92fa41ec268f757d /Documentation | |
| parent | d210a0023590dbebb2f547d1ca3fc845b223430a (diff) | |
| parent | 4a851d714eadeabd65c7e321a2e7830f77d945c4 (diff) | |
Merge tag 'fsi-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi into char-misc-next
Joel writes:
FSI changes for 5.10
- Misc code cleanups. Thanks to Colin, Xu and Rikard
- Features for the ASPEED FSI master
* Detect connection type and routing for Tacoma
* Run at full speed (200MHz) by default
* Set bus speed with a parameter
* CFAM reset GPIO
* 23 bit addressing
- Core features
* Disable unused links
* Set LBUS ownership
* tag 'fsi-for-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi:
fsi: aspeed: Support CFAM reset GPIO
fsi: aspeed: Add module param for bus divisor
fsi: aspeed: Run the bus at maximum speed
fsi: aspeed: Support cabled FSI
dt-bindings: fsi: Document gpios
fsi: scom: Constify scom_ids
fsi: sbefifo: Constify sbefifo_ids
fsi: master: Constify hub_master_ids
fsi: master: Remove link enable read-back
fsi: core: Set slave local bus ownership during init
fsi: core: Disable link when slave init fails
fsi: master: Add boolean parameter to link_enable function
fsi: fsi-occ: fix return value check in occ_probe()
fsi: aspeed: Enable 23-bit addressing
fsi: master-ast-cf: fix spelling mistake "firwmare" -> "firmware"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-bus-fsi | 8 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-fsi b/Documentation/ABI/testing/sysfs-bus-fsi index 320697bdf41d..d148214181a1 100644 --- a/Documentation/ABI/testing/sysfs-bus-fsi +++ b/Documentation/ABI/testing/sysfs-bus-fsi @@ -36,3 +36,11 @@ Contact: linux-fsi@lists.ozlabs.org Description: Provides a means of reading/writing a 32 bit value from/to a specified FSI bus address. + +What: /sys/bus/platform/devices/../cfam_reset +Date: Sept 2020 +KernelVersion: 5.10 +Contact: linux-fsi@lists.ozlabs.org +Description: + Provides a means of resetting the cfam that is attached to the + FSI device. diff --git a/Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt b/Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt index b758f91914f7..9853fefff5d8 100644 --- a/Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt +++ b/Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt @@ -12,6 +12,13 @@ Required properties: - pinctrl-0: phandle to pinctrl node - pinctrl-names: pinctrl state +Optional properties: + - cfam-reset-gpios: GPIO for CFAM reset + + - fsi-routing-gpios: GPIO for setting the FSI mux (internal or cabled) + - fsi-mux-gpios: GPIO for detecting the desired FSI mux state + + Examples: fsi-master { @@ -21,4 +28,9 @@ Examples: pinctrl-names = "default"; pinctrl-0 = <&pinctrl_fsi1_default>; clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; + + fsi-routing-gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_HIGH>; + fsi-mux-gpios = <&gpio0 ASPEED_GPIO(B, 0) GPIO_ACTIVE_HIGH>; + + cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_LOW>; }; |