summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKuldeep Singh <kuldeep.singh@nxp.com>2020-01-08 15:50:44 +0530
committerJason Liu <jason.hui.liu@nxp.com>2020-02-26 04:17:32 +0800
commite8df7f7543f9256a599639a3d983df295a339e2e (patch)
tree36fb448629006d96511a7d6ab9043a950ecb31eb
parent41bfdd516e6a74a016b4df3e8c4ccd386b84aa80 (diff)
arm64: dts: ls1012ardb: Update qspi node property
Use generic node name and specific label name. Add m25p,fast-read. Use dt-bindings constants in interrupts instead of using numbers. Signed-off-by: Kuldeep Singh <kuldeep.singh@nxp.com> (cherry picked from commit 58f10e679079d68275f961f131bb146abf532b6d)
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts3
-rw-r--r--arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi2
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
index 7f1f304e583b..57a1e0d9b5e8 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
@@ -89,11 +89,12 @@
&qspi {
status = "okay";
- qflash0: s25fs512s@0 {
+ s25fs512s0: flash@0 {
compatible = "jedec,spi-nor";
#address-cells = <1>;
#size-cells = <1>;
spi-max-frequency = <20000000>;
+ m25p,fast-read;
reg = <0>;
spi-rx-bus-width = <1>;
spi-tx-bus-width = <1>;
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
index 9f3839bf08ad..df48daea83a2 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
@@ -391,7 +391,7 @@
reg = <0x0 0x1550000 0x0 0x10000>,
<0x0 0x40000000 0x0 0x10000000>;
reg-names = "QuadSPI", "QuadSPI-memory";
- interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>;
+ interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "qspi_en", "qspi";
clocks = <&clockgen 4 0>, <&clockgen 4 0>;
status = "disabled";