arm: dts: enable MTK SPI NOR controller driver

1. Enable MTK SPI NOR controller driver on mt7622 & mt7629.
2. Enable quad mode for read and single mode for write.

Signed-off-by: SkyLake.Huang <skylake.huang@mediatek.com>
This commit is contained in:
SkyLake.Huang 2021-01-20 15:31:34 +08:00 committed by Tom Rini
parent 7a49d61742
commit 3f1250a9e2
6 changed files with 56 additions and 4 deletions

View File

@ -19,7 +19,7 @@
}; };
aliases { aliases {
spi0 = &snfi; spi0 = &snor;
}; };
memory@40000000 { memory@40000000 {
@ -165,11 +165,25 @@
pinctrl-names = "default", "snfi"; pinctrl-names = "default", "snfi";
pinctrl-0 = <&snor_pins>; pinctrl-0 = <&snor_pins>;
pinctrl-1 = <&snfi_pins>; pinctrl-1 = <&snfi_pins>;
status = "disabled";
spi-flash@0{
compatible = "jedec,spi-nor";
reg = <0>;
u-boot,dm-pre-reloc;
};
};
&snor {
pinctrl-names = "default";
pinctrl-0 = <&snor_pins>;
status = "okay"; status = "okay";
spi-flash@0{ spi-flash@0{
compatible = "jedec,spi-nor"; compatible = "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>;
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };
}; };

View File

@ -53,6 +53,17 @@
#size-cells = <0>; #size-cells = <0>;
}; };
snor: snor@11014000 {
compatible = "mediatek,mtk-snor";
reg = <0x11014000 0x1000>;
clocks = <&pericfg CLK_PERI_FLASH_PD>,
<&topckgen CLK_TOP_FLASH_SEL>;
clock-names = "spi", "sf";
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};
timer { timer {
compatible = "arm,armv8-timer"; compatible = "arm,armv8-timer";
interrupt-parent = <&gic>; interrupt-parent = <&gic>;

View File

@ -14,7 +14,7 @@
compatible = "mediatek,mt7629-rfb", "mediatek,mt7629"; compatible = "mediatek,mt7629-rfb", "mediatek,mt7629";
aliases { aliases {
spi0 = &snfi; spi0 = &snor;
}; };
chosen { chosen {
@ -69,11 +69,25 @@
pinctrl-names = "default", "snfi"; pinctrl-names = "default", "snfi";
pinctrl-0 = <&snor_pins>; pinctrl-0 = <&snor_pins>;
pinctrl-1 = <&snfi_pins>; pinctrl-1 = <&snfi_pins>;
status = "disabled";
spi-flash@0{
compatible = "jedec,spi-nor";
reg = <0>;
u-boot,dm-pre-reloc;
};
};
&snor {
pinctrl-names = "default";
pinctrl-0 = <&snor_pins>;
status = "okay"; status = "okay";
spi-flash@0{ spi-flash@0{
compatible = "jedec,spi-nor"; compatible = "jedec,spi-nor";
reg = <0>; reg = <0>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>;
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;
}; };
}; };

View File

@ -223,6 +223,17 @@
#size-cells = <0>; #size-cells = <0>;
}; };
snor: snor@11014000 {
compatible = "mediatek,mtk-snor";
reg = <0x11014000 0x1000>;
clocks = <&pericfg CLK_PERI_FLASH_PD>,
<&topckgen CLK_TOP_FLASH_SEL>;
clock-names = "spi", "sf";
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};
ssusbsys: ssusbsys@1a000000 { ssusbsys: ssusbsys@1a000000 {
compatible = "mediatek,mt7629-ssusbsys", "syscon"; compatible = "mediatek,mt7629-ssusbsys", "syscon";
reg = <0x1a000000 0x1000>; reg = <0x1a000000 0x1000>;

View File

@ -49,7 +49,8 @@ CONFIG_DM_SERIAL=y
CONFIG_MTK_SERIAL=y CONFIG_MTK_SERIAL=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_MTK_SNFI_SPI=y # CONFIG_MTK_SNFI_SPI is not set
CONFIG_MTK_SNOR=y
CONFIG_SYSRESET_WATCHDOG=y CONFIG_SYSRESET_WATCHDOG=y
CONFIG_TIMER=y CONFIG_TIMER=y
CONFIG_MTK_TIMER=y CONFIG_MTK_TIMER=y

View File

@ -75,7 +75,8 @@ CONFIG_DM_SERIAL=y
CONFIG_MTK_SERIAL=y CONFIG_MTK_SERIAL=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_MTK_SNFI_SPI=y # CONFIG_MTK_SNFI_SPI is not set
CONFIG_MTK_SNOR=y
CONFIG_SYSRESET=y CONFIG_SYSRESET=y
CONFIG_SPL_SYSRESET=y CONFIG_SPL_SYSRESET=y
CONFIG_SYSRESET_WATCHDOG=y CONFIG_SYSRESET_WATCHDOG=y