Skip to content

spi: apple: use APPLE_SPI_FIFO_DEPTH in apple_spi_tx #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jannau wants to merge 4 commits into from
Closed

spi: apple: use APPLE_SPI_FIFO_DEPTH in apple_spi_tx #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0058b33
spi: apple: Add driver for Apple SPI controller
marcan Dec 9, 2021
4aa8704
arm64: dts: apple: t6000: Add spi1 node
marcan Dec 9, 2021
139e005
arm64: dts: apple: t600x-j314-j316: Add NOR flash node
marcan Dec 9, 2021
bcac1a2
fixup! spi: apple: Add driver for Apple SPI controller
jannau Dec 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions arch/arm64/boot/dts/apple/t6001.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@
clock-output-names = "clkref";
};

clk_200m: clock-200m {
compatible = "fixed-clock";
#clock-cells = <0>;
clock-frequency = <200000000>;
clock-output-names = "clk_200m";
};

soc {
compatible = "simple-bus";
#address-cells = <2>;
Expand Down Expand Up @@ -322,6 +329,13 @@
<APPLE_PINMUX(101, 1)>;
};

spi1_pins: spi1-pins {
pinmux = <APPLE_PINMUX(10, 1)>,
<APPLE_PINMUX(11, 1)>,
<APPLE_PINMUX(32, 1)>,
<APPLE_PINMUX(33, 1)>;
};

pcie_pins: pcie-pins {
pinmux = <APPLE_PINMUX(0, 1)>,
<APPLE_PINMUX(1, 1)>,
Expand Down Expand Up @@ -413,6 +427,20 @@
status = "disabled";
};

spi1: spi@39b104000 {
compatible = "apple,t6000-spi", "apple,spi";
reg = <0x3 0x9b104000 0x0 0x4000>;
interrupt-parent = <&aic>;
interrupts = <AIC_IRQ 0 1107 IRQ_TYPE_LEVEL_HIGH>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clk_200m>;
pinctrl-0 = <&spi1_pins>;
pinctrl-names = "default";
power-domains = <&ps_spi1>;
status = "disabled";
};

serial0: serial@39b200000 {
compatible = "apple,s5l-uart";
reg = <0x3 0x9b200000 0x0 0x1000>;
Expand Down
12 changes: 12 additions & 0 deletions arch/arm64/boot/dts/apple/t600x-j314-j316.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,18 @@
};
};

&spi1 {
status = "ok";

flash@0 {
compatible = "jedec,spi-nor";
reg = <0x0>;
spi-max-frequency = <25000000>;
#address-cells = <1>;
#size-cells = <1>;
};
};

/* PCIe devices */
&port00 {
/* WLAN */
Expand Down
8 changes: 8 additions & 0 deletions drivers/spi/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,14 @@ config SPI_ALTERA_DFL
Altera SPI master controller. The SPI master is connected
to a SPI slave to Avalon bridge in a Intel MAX BMC.

config SPI_APPLE
tristate "Apple SoC SPI Controller platform driver"
depends on ARCH_APPLE || COMPILE_TEST
help
This enables support for the SPI controller present on
many Apple SoCs, including the t8103 (M1) and t600x
(M1 Pro/Max).

config SPI_AR934X
tristate "Qualcomm Atheros AR934X/QCA95XX SPI controller driver"
depends on ATH79 || COMPILE_TEST
Expand Down
1 change: 1 addition & 0 deletions drivers/spi/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ obj-$(CONFIG_SPI_LOOPBACK_TEST) += spi-loopback-test.o
obj-$(CONFIG_SPI_ALTERA) += spi-altera-platform.o
obj-$(CONFIG_SPI_ALTERA_CORE) += spi-altera-core.o
obj-$(CONFIG_SPI_ALTERA_DFL) += spi-altera-dfl.o
obj-$(CONFIG_SPI_APPLE) += spi-apple.o
obj-$(CONFIG_SPI_AR934X) += spi-ar934x.o
obj-$(CONFIG_SPI_ARMADA_3700) += spi-armada-3700.o
obj-$(CONFIG_SPI_ATMEL) += spi-atmel.o
Expand Down
Loading