Skip to content

drivers/spi: Add support for the quad enhanced mode #7587

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

Open
martamomotko wants to merge 1 commit into
base: rpi-6.18.y
Choose a base branch
from
Open

drivers/spi: Add support for the quad enhanced mode #7587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3316,6 +3316,8 @@ Load: dtoverlay=jedec-spi-nor,<param>=<val>
Params: spi<n>-<m> Enable flash device on SPI<n>, CS#<m>
fastr Add fast read capability to the flash device
speed Maximum SPI frequency (Hz)
quad Enable quad (4-wire) I/O mode, which also
uses GPIOs 0 and 1
flash-spi<n>-<m> Same as spi<n>-<m> (deprecated)
flash-fastr-spi<n>-<m> Same as spi<n>->m>,fastr (deprecated)

Expand Down
14 changes: 14 additions & 0 deletions arch/arm/boot/dts/overlays/jedec-spi-nor-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// flash-spi<n>-<m> - Enables flash device on SPI<n>, CS#<m>.
// flash-fastr-spi<n>-<m> - Enables flash device with fast read capability on SPI<n>, CS#<m>.
// speed - Set the SPI clock speed in Hz
// quad - Enable quad (4-wire) I/O mode
//
// If devices are present on SPI1 or SPI2, those interfaces must be enabled with one of the spi1-1/2/3cs and/or spi2-1/2/3cs overlays.
//
Expand Down Expand Up @@ -89,6 +90,13 @@
};
};

fragment@9 {
target = <&spi0_pins>;
__dormant__ {
pins = "gpio9", "gpio10", "gpio11", "gpio0", "gpio1";
};
};

payload: fragment@100 {
target = <&spi0>;
__overlay__ {
Expand All @@ -100,6 +108,9 @@
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <500000>;
/* The defaults. The quad parameter changes them. */
spi-rx-bus-width = <1>;
spi-tx-bus-width = <1>;
};
};
};
Expand Down Expand Up @@ -131,6 +142,9 @@
flash-fastr-spi2-2 = <0>,"+7+8", <&payload>,"target:0=",<&spi2>, <&spi_nor>,"reg:0=2";
fastr = <0>,"+8";
speed = <&spi_nor>, "spi-max-frequency:0";
quad = <0>,"+9",
<&spi_nor>,"spi-rx-bus-width:0=4",
<&spi_nor>,"spi-tx-bus-width:0=4";
};
};

1 change: 1 addition & 0 deletions drivers/mtd/spi-nor/issi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ static const struct flash_info issi_nor_parts[] = {
.id = SNOR_ID(0x9d, 0x60, 0x18),
.name = "is25lp128",
.size = SZ_16M,
.flags = SPI_NOR_QUAD_PP,
.no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ,
}, {
.id = SNOR_ID(0x9d, 0x60, 0x19),
Expand Down
2 changes: 1 addition & 1 deletion drivers/spi/spi-dw-bt1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ static ssize_t dw_spi_bt1_dirmap_read(struct spi_mem_dirmap_desc *desc,

dw_spi_enable_chip(dws, 0);

dw_spi_update_config(dws, mem->spi, &cfg);
dw_spi_update_config(dws, mem->spi, &cfg, NULL);

dw_spi_umask_intr(dws, DW_SPI_INT_RXFI);

Expand Down
Loading
Loading