mvebu: add images for additional ESPRESSObin boards
This commit adds support for different iterations of ESPRESSObin.
The added variants are:
ESPRESSObin with soldered eMMC,
ESPRESSObin V7, compared to V5 some passive elements changed and ethernet
ports labels positions have been reversed,
ESPRESSObin V7 with soldered eMMC.
Please refer to:
584d7c5 ("mvebu: new subtarget cortex A53")
for instruction how to boot OpenWrt image placed on SD card. It is
advised for owners of V5 and previous with bootloader based on U-Boot
2015.01, to upgrade the latest version available at:
http://espressobin.net/tech-spec.
Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl>
			
			
This commit is contained in:
		 Tomasz Maciej Nowak
					Tomasz Maciej Nowak
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							ee96fa15b1
						
					
				
				
					commit
					de3387654b
				
			| @@ -0,0 +1,28 @@ | |||||||
|  | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||||||
|  | /* | ||||||
|  |  * Device Tree file for Globalscale Marvell ESPRESSOBin Board with eMMC | ||||||
|  |  * Copyright (C) 2018 Marvell | ||||||
|  |  * | ||||||
|  |  * Romain Perier <romain.perier@free-electrons.com> | ||||||
|  |  * Konstantin Porotchkin <kostap@marvell.com> | ||||||
|  |  * | ||||||
|  |  */ | ||||||
|  |  | ||||||
|  | #include "armada-3720-espressobin.dts" | ||||||
|  |  | ||||||
|  | / { | ||||||
|  | 	model = "Globalscale Marvell ESPRESSOBin Board (eMMC)"; | ||||||
|  | 	compatible = "globalscale,espressobin-emmc", "globalscale,espressobin", | ||||||
|  | 		     "marvell,armada3720", "marvell,armada3710"; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &sdhci0 { | ||||||
|  | 	status = "okay"; | ||||||
|  |  | ||||||
|  | 	#address-cells = <1>; | ||||||
|  | 	#size-cells = <0>; | ||||||
|  | 	mmccard: mmccard@0 { | ||||||
|  | 		compatible = "mmc-card"; | ||||||
|  | 		reg = <0>; | ||||||
|  | 	}; | ||||||
|  | }; | ||||||
| @@ -0,0 +1,43 @@ | |||||||
|  | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||||||
|  | /* | ||||||
|  |  * Device Tree file for Globalscale Marvell ESPRESSOBin Board V7 with eMMC | ||||||
|  |  * Copyright (C) 2018 Marvell | ||||||
|  |  * | ||||||
|  |  * Romain Perier <romain.perier@free-electrons.com> | ||||||
|  |  * Konstantin Porotchkin <kostap@marvell.com> | ||||||
|  |  * | ||||||
|  |  */ | ||||||
|  |  | ||||||
|  | #include "armada-3720-espressobin.dts" | ||||||
|  |  | ||||||
|  | / { | ||||||
|  | 	model = "Globalscale Marvell ESPRESSOBin Board V7 (eMMC)"; | ||||||
|  | 	compatible = "globalscale,espressobin-v7-emmc", "globalscale,espressobin-v7", | ||||||
|  | 		     "globalscale,espressobin", "marvell,armada3720", | ||||||
|  | 		     "marvell,armada3710"; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &ports { | ||||||
|  | 	port@1 { | ||||||
|  | 		reg = <1>; | ||||||
|  | 		label = "lan1"; | ||||||
|  | 		phy-handle = <&switch0phy0>; | ||||||
|  | 	}; | ||||||
|  |  | ||||||
|  | 	port@3 { | ||||||
|  | 		reg = <3>; | ||||||
|  | 		label = "wan"; | ||||||
|  | 		phy-handle = <&switch0phy2>; | ||||||
|  | 	}; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &sdhci0 { | ||||||
|  | 	status = "okay"; | ||||||
|  |  | ||||||
|  | 	#address-cells = <1>; | ||||||
|  | 	#size-cells = <0>; | ||||||
|  | 	mmccard: mmccard@0 { | ||||||
|  | 		compatible = "mmc-card"; | ||||||
|  | 		reg = <0>; | ||||||
|  | 	}; | ||||||
|  | }; | ||||||
| @@ -0,0 +1,31 @@ | |||||||
|  | // SPDX-License-Identifier: (GPL-2.0+ OR MIT) | ||||||
|  | /* | ||||||
|  |  * Device Tree file for Globalscale Marvell ESPRESSOBin Board V7 | ||||||
|  |  * Copyright (C) 2018 Marvell | ||||||
|  |  * | ||||||
|  |  * Romain Perier <romain.perier@free-electrons.com> | ||||||
|  |  * Konstantin Porotchkin <kostap@marvell.com> | ||||||
|  |  * | ||||||
|  |  */ | ||||||
|  |  | ||||||
|  | #include "armada-3720-espressobin.dts" | ||||||
|  |  | ||||||
|  | / { | ||||||
|  | 	model = "Globalscale Marvell ESPRESSOBin Board V7"; | ||||||
|  | 	compatible = "globalscale,espressobin-v7", "globalscale,espressobin", | ||||||
|  | 		     "marvell,armada3720", "marvell,armada3710"; | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | &ports { | ||||||
|  | 	port@1 { | ||||||
|  | 		reg = <1>; | ||||||
|  | 		label = "lan1"; | ||||||
|  | 		phy-handle = <&switch0phy0>; | ||||||
|  | 	}; | ||||||
|  |  | ||||||
|  | 	port@3 { | ||||||
|  | 		reg = <3>; | ||||||
|  | 		label = "wan"; | ||||||
|  | 		phy-handle = <&switch0phy2>; | ||||||
|  | 	}; | ||||||
|  | }; | ||||||
| @@ -7,6 +7,27 @@ define Device/globalscale_espressobin | |||||||
| endef | endef | ||||||
| TARGET_DEVICES += globalscale_espressobin | TARGET_DEVICES += globalscale_espressobin | ||||||
|  |  | ||||||
|  | define Device/globalscale_espressobin-emmc | ||||||
|  |   $(call Device/Default-arm64) | ||||||
|  |   DEVICE_TITLE := ESPRESSObin eMMC (Marvell Armada 3700 Community Board) | ||||||
|  |   DEVICE_DTS := armada-3720-espressobin-emmc | ||||||
|  | endef | ||||||
|  | TARGET_DEVICES += globalscale_espressobin-emmc | ||||||
|  |  | ||||||
|  | define Device/globalscale_espressobin-v7 | ||||||
|  |   $(call Device/Default-arm64) | ||||||
|  |   DEVICE_TITLE := ESPRESSObin V7 (Marvell Armada 3700 Community Board) | ||||||
|  |   DEVICE_DTS := armada-3720-espressobin-v7 | ||||||
|  | endef | ||||||
|  | TARGET_DEVICES += globalscale_espressobin-v7 | ||||||
|  |  | ||||||
|  | define Device/globalscale_espressobin-v7-emmc | ||||||
|  |   $(call Device/Default-arm64) | ||||||
|  |   DEVICE_TITLE := ESPRESSObin V7 eMMC (Marvell Armada 3700 Community Board) | ||||||
|  |   DEVICE_DTS := armada-3720-espressobin-v7-emmc | ||||||
|  | endef | ||||||
|  | TARGET_DEVICES += globalscale_espressobin-v7-emmc | ||||||
|  |  | ||||||
| define Device/marvell_armada-3720-db | define Device/marvell_armada-3720-db | ||||||
|   $(call Device/Default-arm64) |   $(call Device/Default-arm64) | ||||||
|   DEVICE_TITLE := Marvell Armada 3720 Development Board DB-88F3720-DDR3 |   DEVICE_TITLE := Marvell Armada 3720 Development Board DB-88F3720-DDR3 | ||||||
|   | |||||||
| @@ -0,0 +1,40 @@ | |||||||
|  | From eefe328439642101774f0f5c4ea0dc6ba1cfb687 Mon Sep 17 00:00:00 2001 | ||||||
|  | From: Ding Tao <miyatsu@qq.com> | ||||||
|  | Date: Fri, 26 Oct 2018 11:50:27 +0000 | ||||||
|  | Subject: [PATCH] arm64: dts: marvell: armada37xx: Add emmc/sdio pinctrl | ||||||
|  |  definition | ||||||
|  |  | ||||||
|  | Add emmc/sdio pinctrl definition for marvell armada37xx SoCs. | ||||||
|  |  | ||||||
|  | Signed-off-by: Ding Tao <miyatsu@qq.com> | ||||||
|  | Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | ||||||
|  | --- | ||||||
|  |  arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 10 ++++++++++ | ||||||
|  |  1 file changed, 10 insertions(+) | ||||||
|  |  | ||||||
|  | --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi | ||||||
|  | +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi | ||||||
|  | @@ -218,6 +218,11 @@ | ||||||
|  |  					groups = "uart2"; | ||||||
|  |  					function = "uart"; | ||||||
|  |  				}; | ||||||
|  | + | ||||||
|  | +				mmc_pins: mmc-pins { | ||||||
|  | +					groups = "emmc_nb"; | ||||||
|  | +					function = "emmc"; | ||||||
|  | +				}; | ||||||
|  |  			}; | ||||||
|  |   | ||||||
|  |  			nb_pm: syscon@14000 { | ||||||
|  | @@ -247,6 +252,11 @@ | ||||||
|  |  					function = "mii"; | ||||||
|  |  				}; | ||||||
|  |   | ||||||
|  | +				sdio_pins: sdio-pins { | ||||||
|  | +					groups = "sdio_sb"; | ||||||
|  | +					function = "sdio"; | ||||||
|  | +				}; | ||||||
|  | + | ||||||
|  |  			}; | ||||||
|  |   | ||||||
|  |  			eth0: ethernet@30000 { | ||||||
| @@ -0,0 +1,49 @@ | |||||||
|  | From 43ebc7c1b3ed8198b9acf3019eca16e722f7331c Mon Sep 17 00:00:00 2001 | ||||||
|  | From: Ding Tao <miyatsu@qq.com> | ||||||
|  | Date: Fri, 26 Oct 2018 11:50:28 +0000 | ||||||
|  | Subject: [PATCH] arm64: dts: marvell: armada-37xx: Enable emmc on espressobin | ||||||
|  |  | ||||||
|  | The ESPRESSObin board has a emmc interface available on U11: declare it | ||||||
|  | and let the bootloader enable it if the emmc is present. | ||||||
|  |  | ||||||
|  | [gregory.clement@bootlin.com: disable the emmc by default] | ||||||
|  | Signed-off-by: Ding Tao <miyatsu@qq.com> | ||||||
|  | Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com> | ||||||
|  | --- | ||||||
|  |  .../dts/marvell/armada-3720-espressobin.dts   | 22 +++++++++++++++++++ | ||||||
|  |  1 file changed, 22 insertions(+) | ||||||
|  |  | ||||||
|  | --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | ||||||
|  | +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | ||||||
|  | @@ -93,9 +93,31 @@ | ||||||
|  |  	cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>; | ||||||
|  |  	marvell,pad-type = "sd"; | ||||||
|  |  	vqmmc-supply = <&vcc_sd_reg1>; | ||||||
|  | + | ||||||
|  | +	pinctrl-names = "default"; | ||||||
|  | +	pinctrl-0 = <&sdio_pins>; | ||||||
|  |  	status = "okay"; | ||||||
|  |  }; | ||||||
|  |   | ||||||
|  | +/* U11 */ | ||||||
|  | +&sdhci0 { | ||||||
|  | +	non-removable; | ||||||
|  | +	bus-width = <8>; | ||||||
|  | +	mmc-ddr-1_8v; | ||||||
|  | +	mmc-hs400-1_8v; | ||||||
|  | +	marvell,xenon-emmc; | ||||||
|  | +	marvell,xenon-tun-count = <9>; | ||||||
|  | +	marvell,pad-type = "fixed-1-8v"; | ||||||
|  | + | ||||||
|  | +	pinctrl-names = "default"; | ||||||
|  | +	pinctrl-0 = <&mmc_pins>; | ||||||
|  | +/* | ||||||
|  | + * This eMMC is not populated on all boards, so disable it by | ||||||
|  | + * default and let the bootloader enable it, if it is present | ||||||
|  | + */ | ||||||
|  | +	status = "disabled"; | ||||||
|  | +}; | ||||||
|  | + | ||||||
|  |  &spi0 { | ||||||
|  |  	status = "okay"; | ||||||
|  |   | ||||||
| @@ -29,7 +29,7 @@ Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com> | |||||||
|  |  | ||||||
| --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | ||||||
| +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | ||||||
| @@ -101,25 +101,9 @@ | @@ -123,25 +123,9 @@ | ||||||
|   |   | ||||||
|  	flash@0 { |  	flash@0 { | ||||||
|  		reg = <0>; |  		reg = <0>; | ||||||
|   | |||||||
| @@ -0,0 +1,26 @@ | |||||||
|  | From 6ea9a1ee9367fb35acff1c08a0dc4213ff4687a0 Mon Sep 17 00:00:00 2001 | ||||||
|  | From: Tomasz Maciej Nowak <tmn505@gmail.com> | ||||||
|  | Date: Tue, 9 Apr 2019 15:53:42 +0200 | ||||||
|  | Subject: [PATCH] arm64: dts: marvell: armada-3720-espressobin: add ports | ||||||
|  |  phandle | ||||||
|  |  | ||||||
|  | Instead of referencing the whole mdio node, add ports phandle to adjust | ||||||
|  | port labels in dts for different hardware iterations of ESPRESSObin | ||||||
|  | boards. | ||||||
|  |  | ||||||
|  | Signed-off-by: Tomasz Maciej Nowak <tmn505@gmail.com> | ||||||
|  | --- | ||||||
|  |  arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | 2 +- | ||||||
|  |  1 file changed, 1 insertion(+), 1 deletion(-) | ||||||
|  |  | ||||||
|  | --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | ||||||
|  | +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | ||||||
|  | @@ -153,7 +153,7 @@ | ||||||
|  |   | ||||||
|  |  		dsa,member = <0 0>; | ||||||
|  |   | ||||||
|  | -		ports { | ||||||
|  | +		ports: ports { | ||||||
|  |  			#address-cells = <1>; | ||||||
|  |  			#size-cells = <0>; | ||||||
|  |   | ||||||
		Reference in New Issue
	
	Block a user