forked from mirrors/linux
		
	 6fc979179c
			
		
	
	
		6fc979179c
		
	
	
	
	
		
			
			Commit3b79919946("ARM: dts: armada-370-xp: update NAND node with new bindings") updated some Marvell Armada DT description to use the new NAND controller bindings, but did it incorrectly for a number of boards: armada-xp-gp, armada-xp-db and armada-xp-lenovo-ix4-300d. Due to this, the NAND is no longer detected on those platforms. This commit fixes that by properly using the new NAND DT binding. This commit was runtime-tested on Armada XP GP, the two other platforms are only compile-tested. Fixes:3b79919946("ARM: dts: armada-370-xp: update NAND node with new bindings") Cc: Miquel Raynal <miquel.raynal@bootlin.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
		
			
				
	
	
		
			245 lines
		
	
	
	
		
			4.6 KiB
		
	
	
	
		
			Text
		
	
	
	
	
	
			
		
		
	
	
			245 lines
		
	
	
	
		
			4.6 KiB
		
	
	
	
		
			Text
		
	
	
	
	
	
| // SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 | |
| /*
 | |
|  * Device Tree file for Marvell Armada XP evaluation board
 | |
|  * (DB-78460-BP)
 | |
|  *
 | |
|  * Copyright (C) 2012-2014 Marvell
 | |
|  *
 | |
|  * Lior Amsalem <alior@marvell.com>
 | |
|  * Gregory CLEMENT <gregory.clement@free-electrons.com>
 | |
|  * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 | |
|  *
 | |
|   *
 | |
|  * Note: this Device Tree assumes that the bootloader has remapped the
 | |
|  * internal registers to 0xf1000000 (instead of the default
 | |
|  * 0xd0000000). The 0xf1000000 is the default used by the recent,
 | |
|  * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier
 | |
|  * boards were delivered with an older version of the bootloader that
 | |
|  * left internal registers mapped at 0xd0000000. If you are in this
 | |
|  * situation, you should either update your bootloader (preferred
 | |
|  * solution) or the below Device Tree should be adjusted.
 | |
|  */
 | |
| 
 | |
| /dts-v1/;
 | |
| #include "armada-xp-mv78460.dtsi"
 | |
| 
 | |
| / {
 | |
| 	model = "Marvell Armada XP Evaluation Board";
 | |
| 	compatible = "marvell,axp-db", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
 | |
| 
 | |
| 	chosen {
 | |
| 		stdout-path = "serial0:115200n8";
 | |
| 	};
 | |
| 
 | |
| 	memory@0 {
 | |
| 		device_type = "memory";
 | |
| 		reg = <0 0x00000000 0 0x80000000>; /* 2 GB */
 | |
| 	};
 | |
| 
 | |
| 	soc {
 | |
| 		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
 | |
| 			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
 | |
| 			  MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000
 | |
| 			  MBUS_ID(0x09, 0x09) 0 0 0xf1100000 0x10000
 | |
| 			  MBUS_ID(0x09, 0x05) 0 0 0xf1110000 0x10000
 | |
| 			  MBUS_ID(0x0c, 0x04) 0 0 0xf1200000 0x100000>;
 | |
| 
 | |
| 		devbus-bootcs {
 | |
| 			status = "okay";
 | |
| 
 | |
| 			/* Device Bus parameters are required */
 | |
| 
 | |
| 			/* Read parameters */
 | |
| 			devbus,bus-width    = <16>;
 | |
| 			devbus,turn-off-ps  = <60000>;
 | |
| 			devbus,badr-skew-ps = <0>;
 | |
| 			devbus,acc-first-ps = <124000>;
 | |
| 			devbus,acc-next-ps  = <248000>;
 | |
| 			devbus,rd-setup-ps  = <0>;
 | |
| 			devbus,rd-hold-ps   = <0>;
 | |
| 
 | |
| 			/* Write parameters */
 | |
| 			devbus,sync-enable = <0>;
 | |
| 			devbus,wr-high-ps  = <60000>;
 | |
| 			devbus,wr-low-ps   = <60000>;
 | |
| 			devbus,ale-wr-ps   = <60000>;
 | |
| 
 | |
| 			/* NOR 16 MiB */
 | |
| 			nor@0 {
 | |
| 				compatible = "cfi-flash";
 | |
| 				reg = <0 0x1000000>;
 | |
| 				bank-width = <2>;
 | |
| 			};
 | |
| 		};
 | |
| 
 | |
| 		internal-regs {
 | |
| 			serial@12000 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 			serial@12100 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 			serial@12200 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 			serial@12300 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			sata@a0000 {
 | |
| 				nr-ports = <2>;
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			ethernet@70000 {
 | |
| 				status = "okay";
 | |
| 				phy = <&phy0>;
 | |
| 				phy-mode = "rgmii-id";
 | |
| 				buffer-manager = <&bm>;
 | |
| 				bm,pool-long = <0>;
 | |
| 			};
 | |
| 			ethernet@74000 {
 | |
| 				status = "okay";
 | |
| 				phy = <&phy1>;
 | |
| 				phy-mode = "rgmii-id";
 | |
| 				buffer-manager = <&bm>;
 | |
| 				bm,pool-long = <1>;
 | |
| 			};
 | |
| 			ethernet@30000 {
 | |
| 				status = "okay";
 | |
| 				phy = <&phy2>;
 | |
| 				phy-mode = "sgmii";
 | |
| 				buffer-manager = <&bm>;
 | |
| 				bm,pool-long = <2>;
 | |
| 			};
 | |
| 			ethernet@34000 {
 | |
| 				status = "okay";
 | |
| 				phy = <&phy3>;
 | |
| 				phy-mode = "sgmii";
 | |
| 				buffer-manager = <&bm>;
 | |
| 				bm,pool-long = <3>;
 | |
| 			};
 | |
| 
 | |
| 			bm@c0000 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			mvsdio@d4000 {
 | |
| 				pinctrl-0 = <&sdio_pins>;
 | |
| 				pinctrl-names = "default";
 | |
| 				status = "okay";
 | |
| 				/* No CD or WP GPIOs */
 | |
| 				broken-cd;
 | |
| 			};
 | |
| 
 | |
| 			usb@50000 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			usb@51000 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			usb@52000 {
 | |
| 				status = "okay";
 | |
| 			};
 | |
| 
 | |
| 			nand-controller@d0000 {
 | |
| 				status = "okay";
 | |
| 
 | |
| 				nand@0 {
 | |
| 					reg = <0>;
 | |
| 					label = "pxa3xx_nand-0";
 | |
| 					nand-rb = <0>;
 | |
| 					nand-on-flash-bbt;
 | |
| 
 | |
| 					partitions {
 | |
| 						compatible = "fixed-partitions";
 | |
| 						#address-cells = <1>;
 | |
| 						#size-cells = <1>;
 | |
| 
 | |
| 						partition@0 {
 | |
| 							label = "U-Boot";
 | |
| 							reg = <0 0x800000>;
 | |
| 						};
 | |
| 						partition@800000 {
 | |
| 							label = "Linux";
 | |
| 							reg = <0x800000 0x800000>;
 | |
| 						};
 | |
| 						partition@1000000 {
 | |
| 							label = "Filesystem";
 | |
| 							reg = <0x1000000 0x3f000000>;
 | |
| 						};
 | |
| 					};
 | |
| 				};
 | |
| 			};
 | |
| 		};
 | |
| 
 | |
| 		bm-bppi {
 | |
| 			status = "okay";
 | |
| 		};
 | |
| 	};
 | |
| };
 | |
| 
 | |
| &pciec {
 | |
| 	status = "okay";
 | |
| 
 | |
| 	/*
 | |
| 	 * All 6 slots are physically present as
 | |
| 	 * standard PCIe slots on the board.
 | |
| 	 */
 | |
| 	pcie@1,0 {
 | |
| 		/* Port 0, Lane 0 */
 | |
| 		status = "okay";
 | |
| 	};
 | |
| 	pcie@2,0 {
 | |
| 		/* Port 0, Lane 1 */
 | |
| 		status = "okay";
 | |
| 	};
 | |
| 	pcie@3,0 {
 | |
| 		/* Port 0, Lane 2 */
 | |
| 		status = "okay";
 | |
| 	};
 | |
| 	pcie@4,0 {
 | |
| 		/* Port 0, Lane 3 */
 | |
| 		status = "okay";
 | |
| 	};
 | |
| 	pcie@9,0 {
 | |
| 		/* Port 2, Lane 0 */
 | |
| 		status = "okay";
 | |
| 	};
 | |
| 	pcie@a,0 {
 | |
| 		/* Port 3, Lane 0 */
 | |
| 		status = "okay";
 | |
| 	};
 | |
| };
 | |
| 
 | |
| &mdio {
 | |
| 	phy0: ethernet-phy@0 {
 | |
| 		reg = <0>;
 | |
| 	};
 | |
| 
 | |
| 	phy1: ethernet-phy@1 {
 | |
| 		reg = <1>;
 | |
| 	};
 | |
| 
 | |
| 	phy2: ethernet-phy@2 {
 | |
| 		reg = <25>;
 | |
| 	};
 | |
| 
 | |
| 	phy3: ethernet-phy@3 {
 | |
| 		reg = <27>;
 | |
| 	};
 | |
| };
 | |
| 
 | |
| &spi0 {
 | |
| 	status = "okay";
 | |
| 
 | |
| 	spi-flash@0 {
 | |
| 		#address-cells = <1>;
 | |
| 		#size-cells = <1>;
 | |
| 		compatible = "m25p64", "jedec,spi-nor";
 | |
| 		reg = <0>; /* Chip select 0 */
 | |
| 		spi-max-frequency = <20000000>;
 | |
| 	};
 | |
| };
 |