Skip to content

Commit 9fdbbe8

Browse files
committed
Merge tag 'zynq-dt-for-v5.15' of https://github.com/Xilinx/linux-xlnx into arm/dt
ARM: dts: Zynq DT changes for v5.15 - Enable nand flash controller for ebaz4205 board * tag 'zynq-dt-for-v5.15' of https://github.com/Xilinx/linux-xlnx: ARM: dts: ebaz4205: enable NAND support ARM: dts: zynq: add NAND flash controller node Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents bb4544c + c387eea commit 9fdbbe8

File tree

2 files changed

+33
-0
lines changed

2 files changed

+33
-0
lines changed

arch/arm/boot/dts/zynq-7000.dtsi

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,27 @@
252252
#size-cells = <0>;
253253
};
254254

255+
smcc: memory-controller@e000e000 {
256+
compatible = "arm,pl353-smc-r2p1", "arm,primecell";
257+
reg = <0xe000e000 0x0001000>;
258+
status = "disabled";
259+
clock-names = "memclk", "apb_pclk";
260+
clocks = <&clkc 11>, <&clkc 44>;
261+
ranges = <0x0 0x0 0xe1000000 0x1000000 /* Nand CS region */
262+
0x1 0x0 0xe2000000 0x2000000 /* SRAM/NOR CS0 region */
263+
0x2 0x0 0xe4000000 0x2000000>; /* SRAM/NOR CS1 region */
264+
#address-cells = <2>;
265+
#size-cells = <1>;
266+
267+
nfc0: nand-controller@0,0 {
268+
compatible = "arm,pl353-nand-r2p1";
269+
reg = <0 0 0x1000000>;
270+
status = "disabled";
271+
#address-cells = <1>;
272+
#size-cells = <0>;
273+
};
274+
};
275+
255276
sdhci0: mmc@e0100000 {
256277
compatible = "arasan,sdhci-8.9a";
257278
status = "disabled";

arch/arm/boot/dts/zynq-ebaz4205.dts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@
4848
pinctrl-0 = <&pinctrl_gpio0_default>;
4949
};
5050

51+
&nfc0 {
52+
status = "okay";
53+
54+
nand@0 {
55+
reg = <0>;
56+
};
57+
};
58+
5159
&pinctrl0 {
5260
pinctrl_gpio0_default: gpio0-default {
5361
mux {
@@ -118,6 +126,10 @@
118126
};
119127
};
120128

129+
&smcc {
130+
status = "okay";
131+
};
132+
121133
&sdhci0 {
122134
status = "okay";
123135
disable-wp;

0 commit comments

Comments
 (0)