GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-17 20:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm: dts: change MT7629 to use spi-mem rather than qspi

Browse source 
The original mtk_qspi driver has been removed. We change MT7629 to use
newly added mtk-spimem driver.

Signed-off-by: Weijie Gao <weijie.gao@mediatek.com>
Acked-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
Weijie Gao 2019-07-22 10:35:10 +08:00 • committed by Tom Rini
parent 7127151d53
commit 102b0b1119
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
arch/arm/dts/mt7629-rfb.dts
View file

@ -13,7 +13,7 @@
compatible = "mediatek,mt7629-rfb", "mediatek,mt7629"; compatible = "mediatek,mt7629-rfb", "mediatek,mt7629";
aliases { aliases {
spi0 = &qspi; spi0 = &snfi;
}; };
chosen { chosen {
@ -33,7 +33,14 @@
}; };
&pinctrl { &pinctrl {
qspi_pins: qspi-pins { snfi_pins: snfi-pins {
mux {
function = "flash";
groups = "snfi";
};
};
snor_pins: snor-pins {
mux { mux {
function = "flash"; function = "flash";
groups = "spi_nor"; groups = "spi_nor";
@ -55,9 +62,10 @@
}; };
}; };
&qspi { &snfi {
pinctrl-names = "default"; pinctrl-names = "default", "snfi";
pinctrl-0 = <&qspi_pins>; pinctrl-0 = <&snor_pins>;
pinctrl-1 = <&snfi_pins>;
status = "okay"; status = "okay";
spi-flash@0{ spi-flash@0{

14
arch/arm/dts/mt7629.dtsi
View file

@ -215,10 +215,16 @@
status = "disabled"; status = "disabled";
}; };
qspi: qspi@11014000 { snfi: snfi@1100d000 {
compatible = "mediatek,mt7629-qspi"; compatible = "mediatek,mtk-snfi-spi";
reg = <0x11014000 0xe0>, <0x30000000 0x10000000>; reg = <0x1100d000 0x2000>;
reg-names = "reg_base", "mem_base"; clocks = <&pericfg CLK_PERI_NFI_PD>,
<&pericfg CLK_PERI_SNFI_PD>;
clock-names = "nfi_clk", "pad_clk";
assigned-clocks = <&topckgen CLK_TOP_AXI_SEL>,
<&topckgen CLK_TOP_NFI_INFRA_SEL>;
assigned-clock-parents = <&topckgen CLK_TOP_SYSPLL1_D2>,
<&topckgen CLK_TOP_UNIVPLL2_D8>;
status = "disabled"; status = "disabled";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;