May 2017 - U-Boot

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 10 May '17

10 May '17

Hello Tom, please pull from u-boot-i2c.git master travis build is clean: https://travis-ci.org/hsdenx/u-boot-i2c/builds/230238863 The following changes since commit 2f92629112a1055ed37f8b05dfcf00c3f1875503: Merge branch 'next' of git://git.denx.de/u-boot-spi (2017-05-08 15:44:52 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to 1743d040b1df8001e22bd0dce95b64b91553f47e: ARM: keystone: Enable DM_I2C by default (2017-05-09 09:05:13 +0200) ---------------------------------------------------------------- Cooper Jr., Franklin (8): i2c: davinci: Split functions into two parts for future DM support drivers: i2c: davinci_i2c: Update davinci i2c driver to driver model ti: common: board_detect: Introduce function to set the address length. ti: common: board_detect: Set alen to expected value before i2c read ARM: dts: k2g: Add I2C nodes to 66AK2Gx ARM: dts: keystone2: add I2C aliases for davinci I2C nodes ARM: dts: keystone-k2g-evm: Enable I2C0 and I2C1 ARM: keystone: Enable DM_I2C by default arch/arm/dts/keystone-k2g-evm.dts | 8 +++++ arch/arm/dts/keystone-k2g.dtsi | 32 ++++++++++++++++++ arch/arm/dts/keystone.dtsi | 3 ++ arch/arm/mach-keystone/Kconfig | 4 +++ board/ti/common/board_detect.c | 61 ++++++++++++++++++++++++++++++++-- drivers/i2c/davinci_i2c.c | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------- 6 files changed, 306 insertions(+), 79 deletions(-) bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

[U-Boot] [PATCH] sun5i: Add A13 Olimex SOM Wifi board support
by Jagan Teki 09 May '17

09 May '17

Add support for Olimex A13-512-SOM board, and this particular design is like A13-SOM-WIFI can mount on-top of A13-SOM. Boot Log: -------- U-Boot SPL 2017.05-rc2-00063-g2c831b5-dirty (May 05 2017 - 16:55:59) DRAM: 512 MiB CPU: 1008000000Hz, AXI/AHB/APB: 3/2/2 Trying to boot from MMC1 U-Boot 2017.05-rc2-00063-g2c831b5-dirty (May 05 2017 - 16:55:59 +0530) Allwinner Technology CPU: Allwinner A13 (SUN5I) Model: Olimex A13-Olinuxino SOM Wifi I2C: ready DRAM: 512 MiB MMC: SUNXI SD/MMC: 0 *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Net: No ethernet found. starting USB... USB0: USB EHCI 1.00 USB1: USB OHCI 1.0 scanning bus 0 for devices... 2 USB Device(s) found scanning usb for storage devices... 0 Storage Device(s) found Hit any key to stop autoboot: 0 Cc: Maxime Ripard <maxime.ripard(a)free-electrons.com> Signed-off-by: Jagan Teki <jagan(a)openedev.com> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun5i-a13-olinuxino-som-wifi.dts | 173 ++++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 + configs/A13-OLinuXino-SOM-Wifi_defconfig | 18 +++ 4 files changed, 197 insertions(+) create mode 100644 arch/arm/dts/sun5i-a13-olinuxino-som-wifi.dts create mode 100644 configs/A13-OLinuXino-SOM-Wifi_defconfig diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 959e23d..8031d97 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -226,6 +226,7 @@ dtb-$(CONFIG_MACH_SUN5I) += \ sun5i-a13-inet-98v-rev2.dtb \ sun5i-a13-olinuxino.dtb \ sun5i-a13-olinuxino-micro.dtb \ + sun5i-a13-olinuxino-som-wifi.dtb \ sun5i-a13-q8-tablet.dtb \ sun5i-a13-utoo-p66.dtb \ sun5i-gr8-chip-pro.dtb \ diff --git a/arch/arm/dts/sun5i-a13-olinuxino-som-wifi.dts b/arch/arm/dts/sun5i-a13-olinuxino-som-wifi.dts new file mode 100644 index 0000000..cda2d1c --- /dev/null +++ b/arch/arm/dts/sun5i-a13-olinuxino-som-wifi.dts @@ -0,0 +1,173 @@ +/* + * Copyright 2012 Maxime Ripard <maxime.ripard(a)free-electrons.com> + * Copyright 2013 Hans de Goede <hdegoede(a)redhat.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "sun5i-a13.dtsi" +#include "sunxi-common-regulators.dtsi" + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/pinctrl/sun4i-a10.h> + +/ { + model = "Olimex A13-Olinuxino SOM Wifi"; + compatible = "olimex,a13-olinuxino-som-wifi", "allwinner,sun5i-a13"; + + aliases { + serial0 = &uart1; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pins_olinuxinom>; + + power { + label = "a13-olinuxino-micro:green:power"; + gpios = <&pio 6 9 GPIO_ACTIVE_HIGH>; + default-state = "on"; + }; + }; +}; + +&ehci0 { + status = "okay"; +}; + +&mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxinom>; + vmmc-supply = <&reg_vcc3v3>; + bus-width = <4>; + cd-gpios = <&pio 6 0 GPIO_ACTIVE_HIGH>; /* PG0 */ + cd-inverted; + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&otg_sram { + status = "okay"; +}; + +&pio { + mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 { + allwinner,pins = "PG0"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + }; + + led_pins_olinuxinom: led_pins@0 { + allwinner,pins = "PG9"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_20_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + usb0_id_detect_pin: usb0_id_detect_pin@0 { + allwinner,pins = "PG2"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; + }; + + usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { + allwinner,pins = "PG1"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>; + }; + + usb0_vbus_pin_olinuxinom: usb0_vbus_pin@0 { + allwinner,pins = "PG12"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + usb1_vbus_pin_olinuxinom: usb1_vbus_pin@0 { + allwinner,pins = "PG11"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; +}; + +&reg_usb0_vbus { + pinctrl-0 = <&usb0_vbus_pin_olinuxinom>; + gpio = <&pio 6 12 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&reg_usb1_vbus { + pinctrl-0 = <&usb1_vbus_pin_olinuxinom>; + gpio = <&pio 6 11 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1_pins_b>; + status = "okay"; +}; + +&usb_otg { + dr_mode = "otg"; + status = "okay"; +}; + +&usbphy { + pinctrl-names = "default"; + pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>; + usb0_id_det-gpio = <&pio 6 2 GPIO_ACTIVE_HIGH>; /* PG2 */ + usb0_vbus_det-gpio = <&pio 6 1 GPIO_ACTIVE_HIGH>; /* PG1 */ + usb0_vbus-supply = <&reg_usb0_vbus>; + usb1_vbus-supply = <&reg_usb1_vbus>; + status = "okay"; +}; diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index a512a20..e263844 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -73,6 +73,11 @@ F: include/configs/sun9i.h F: configs/Merrii_A80_Optimus_defconfig F: include/configs/sun50i.h +A13-OLIMEX-SOM-WIFI BOARD +M: Jagan Teki <jagan(a)openedev.com> +S: Maintained +F: configs/A13-OLinuXino-SOM-Wifi_defconfig + A20-OLIMEX-SOM-EVB BOARD M: Marcus Cooper <codekipper(a)gmail.com> S: Maintained diff --git a/configs/A13-OLinuXino-SOM-Wifi_defconfig b/configs/A13-OLinuXino-SOM-Wifi_defconfig new file mode 100644 index 0000000..072d9b5 --- /dev/null +++ b/configs/A13-OLinuXino-SOM-Wifi_defconfig @@ -0,0 +1,18 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN5I=y +CONFIG_DRAM_CLK=408 +CONFIG_DRAM_EMR1=0 +CONFIG_MMC0_CD_PIN="PG0" +CONFIG_USB1_VBUS_PIN="PG11" +CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino-som-wifi" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SUNXI_NO_PMIC=y +CONFIG_USB_EHCI_HCD=y -- 1.9.1

2 1

[U-Boot] [PATCH] Add ARM errata workaround 852421 and 852423 for Cortex-A17
by Nisal Menuka 09 May '17

09 May '17

ARM errata 852421 and 852423 applies to r1p0, r1p1 and r1p2 revisions of Cortex-A17 processors. These workarounds exist in Linux kernel and I thought it would be better to add them in to U-Boot. Signed-off-by: Nisal Menuka <nisalmenuka23(a)gmail.com> --- arch/arm/cpu/armv7/start.S | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 1a6aee9..f06fd28 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -283,6 +283,18 @@ skip_errata_621766: skip_errata_725233: #endif +#ifdef CONFIG_ARM_ERRATA_852421 + mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register + orr r0, r0, #1 << 24 @ set bit #24 + mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register +#endif + +#ifdef CONFIG_ARM_ERRATA_852423 + mrc p15, 0, r0, c15, c0, 1 @ read diagnostic register + orr r0, r0, #1 << 12 @ set bit #12 + mcr p15, 0, r0, c15, c0, 1 @ write diagnostic register +#endif + mov pc, r5 @ back to my caller ENDPROC(cpu_init_cp15) -- 2.7.4

4 4

[U-Boot] [PATCH] arm: mvebu: Minor fixes in the AXP / A38x SERDES code
by Stefan Roese 09 May '17

09 May '17

From: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> - Fix spelling error of SERDES_VERSION - Remove superfluous definition of this macro - Remove unnecessary include of i2c.h Signed-off-by: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> Signed-off-by: Stefan Roese <sr(a)denx.de> --- arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c | 2 -- arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c | 4 ++-- arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c | 6 +++--- arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c | 1 - 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c index 104e7e88d7..0dfb9452e6 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c +++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec-38x.c @@ -13,8 +13,6 @@ #include "high_speed_env_spec.h" #include "sys_env_lib.h" -#define SERDES_VERION "2.0" - u8 selectors_serdes_rev1_map[LAST_SERDES_TYPE][MAX_SERDES_LANES] = { /* 0 1 2 3 4 5 */ {0x1, 0x1, NA, NA, NA, NA}, /* PEX0 */ diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c index 820219e68e..883b90776a 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c +++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c @@ -27,7 +27,7 @@ */ struct cfg_seq serdes_seq_db[SERDES_LAST_SEQ]; -#define SERDES_VERION "2.0" +#define SERDES_VERSION "2.0" #define ENDED_OK "High speed PHY - Ended Successfully\n" #define LINK_WAIT_CNTR 100 @@ -1416,7 +1416,7 @@ int serdes_phy_config(void) DEBUG_INIT_FULL_S("\n### ctrl_high_speed_serdes_phy_config ###\n"); DEBUG_INIT_S("High speed PHY - Version: "); - DEBUG_INIT_S(SERDES_VERION); + DEBUG_INIT_S(SERDES_VERSION); DEBUG_INIT_S("\n"); /* Init serdes sequences DB */ diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c index 5925bae69f..b0e193b78c 100644 --- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c +++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_lib.c @@ -14,7 +14,7 @@ #include "high_speed_env_spec.h" #include "board_env_spec.h" -#define SERDES_VERION "2.1.5" +#define SERDES_VERSION "2.1.5" #define ENDED_OK "High speed PHY - Ended Successfully\n" static const u8 serdes_cfg[][SERDES_LAST_UNIT] = BIN_SERDES_CFG; @@ -285,12 +285,12 @@ int serdes_phy_config(void) if (reg_read(REG_BOOTROM_ROUTINE_ADDR) & (1 << REG_BOOTROM_ROUTINE_DRAM_INIT_OFFS)) { DEBUG_INIT_S("High speed PHY - Version: "); - DEBUG_INIT_S(SERDES_VERION); + DEBUG_INIT_S(SERDES_VERSION); DEBUG_INIT_S(" - 2nd boot - Skip\n"); return MV_OK; } DEBUG_INIT_S("High speed PHY - Version: "); - DEBUG_INIT_S(SERDES_VERION); + DEBUG_INIT_S(SERDES_VERSION); DEBUG_INIT_S(" (COM-PHY-V20)\n"); /* diff --git a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c index 115ec2cd60..704a59fa15 100644 --- a/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c +++ b/arch/arm/mach-mvebu/serdes/axp/high_speed_env_spec.c @@ -5,7 +5,6 @@ */ #include <common.h> -#include <i2c.h> #include <spl.h> #include <asm/io.h> #include <asm/arch/cpu.h> -- 2.12.2

1 1

[U-Boot] [PATCH 0/3] Marvell A7K/A8K PCIe fixes and extensions
by kostap＠marvell.com 09 May '17

09 May '17

From: Konstantin Porotchkin <kostap(a)marvell.com> This patch series includes fix for the mvebu DW PCIe driver that allows scanning of empty (unlinked) PCIe slots. The default DTS file for Armada-8040-DB is re-arranged and aligned with Marvell default configuration "A" for this board. PCIe devices scan is added to the early init stage for eliminating need for usage of "pci enum" command on every reboot. Konstantin Porotchkin (3): arm64: mvebu: Trigger PCI devices scan at early init stage fix: mvebu: pcie_dw: Allow probing empty PCIe slots mvebu: dts: a80x0: Sync the DB DTS with standard config A arch/arm/dts/armada-8040-db.dts | 222 +++++++++++++++++++------------------ arch/arm/mach-mvebu/arm64-common.c | 13 ++- drivers/pci/pcie_dw_mvebu.c | 10 +- 3 files changed, 131 insertions(+), 114 deletions(-) -- 2.7.4

4 11

[U-Boot] [PATCH 0/5] Add support for NAND flash to A7K/A8K SoC family
by kostap＠marvell.com 09 May '17

09 May '17

From: Konstantin Porotchkin <kostap(a)marvell.com> This patch series adds NAND flash support to Marvell A7K/A8K SoC families. Additionally it fixes the pxa3xx driver by enforcing usage of DTS-supplied NAND parameters instead of using the hardcoded ones. The Marvell "bubt" command code related to NAND flash is updated according to new DM driver APIs. Added a default configuration file for Armada-7040 DB with NAND flash selected as a boot device instead of default SPI flash. Added a DTS file for this setup that includes proper MPPs configuration. These patches should be applied on top of the following patch that was sent to the u-boot list earlier: "fix: nand: Fix nand RW access wrappers" Konstantin Porotchkin (5): fix: nand: pxa3xx: Remove hardcode values from the driver arm64: mvebu: a8k: Add support for NAND clock get arm64: mvebu: Fix the bubt comamnd NAND device support arm64: a8k: dts: Add support for NAND devices on A8K platform arm64: mvebu: a8k: Add NAND configuration parameters arch/arm/dts/Makefile | 1 + arch/arm/dts/armada-7040-db-nand.dts | 222 ++++++++++++++++++++++++++++++++ arch/arm/dts/armada-7040-db.dts | 1 + arch/arm/dts/armada-cp110-master.dtsi | 13 ++ arch/arm/mach-mvebu/armada8k/cpu.c | 16 +++ cmd/mvebu/bubt.c | 13 +- configs/mvebu_db-88f7040-nand_defconfig | 72 +++++++++++ drivers/mtd/nand/pxa3xx_nand.c | 62 +++++++-- include/configs/mvebu_armada-8k.h | 11 ++ 9 files changed, 397 insertions(+), 14 deletions(-) create mode 100644 arch/arm/dts/armada-7040-db-nand.dts create mode 100644 configs/mvebu_db-88f7040-nand_defconfig -- 2.7.4

4 16

[U-Boot] [PATCH v2 2/5] arm64: mvebu: a8k: Add support for NAND clock get
by kostap＠marvell.com 09 May '17

09 May '17

From: Konstantin Porotchkin <kostap(a)marvell.com> Implement mvebu_get_nand_clock call for A8K family. This function is used by PXA3XX NAND driver. Signed-off-by: Konstantin Porotchkin <kostap(a)marvell.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Igal Liberman <igall(a)marvell.com> Cc: Nadav Haklai <nadavh(a)marvell.com> --- Changes from v1: - Add TODO notice for moving the functionality to a future clock driver arch/arm/mach-mvebu/armada8k/cpu.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/mach-mvebu/armada8k/cpu.c b/arch/arm/mach-mvebu/armada8k/cpu.c index 2325e9a..38e7d33 100644 --- a/arch/arm/mach-mvebu/armada8k/cpu.c +++ b/arch/arm/mach-mvebu/armada8k/cpu.c @@ -110,3 +110,21 @@ void reset_cpu(ulong ignored) reg &= ~(1 << RFU_SW_RESET_OFFSET); writel(reg, RFU_GLOBAL_SW_RST); } + +/* + * TODO - implement this functionality using platform + * clock driver once it gets available + * Return NAND clock in Hz + */ +u32 mvebu_get_nand_clock(void) +{ + unsigned long NAND_FLASH_CLK_CTRL = 0xF2440700UL; + unsigned long NF_CLOCK_SEL_MASK = 0x1; + u32 reg; + + reg = readl(NAND_FLASH_CLK_CTRL); + if (reg & NF_CLOCK_SEL_MASK) + return 400 * 1000000; + else + return 250 * 1000000; +} -- 2.7.4

2 8

[U-Boot] [PATCH v2 1/3] arm64: mvebu: Trigger PCI devices scan at early init stage
by kostap＠marvell.com 09 May '17

09 May '17

From: Konstantin Porotchkin <kostap(a)marvell.com> Add PCIe initialization at early init stage. This operation has a side effect of detecting all PCIe plug-in cards, so the operator is not obligated to issue "pci enum" command though CLI for this purpose. Signed-off-by: Konstantin Porotchkin <kostap(a)marvell.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Igal Liberman <igall(a)marvell.com> Cc: Nadav Haklai <nadavh(a)marvell.com> --- Changes from v1: - Remove changes to SATA devices scan arch/arm/mach-mvebu/arm64-common.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 8f02655..45e6d35 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -8,6 +8,7 @@ #include <dm.h> #include <fdtdec.h> #include <libfdt.h> +#include <pci.h> #include <asm/io.h> #include <asm/system.h> #include <asm/arch/cpu.h> @@ -145,5 +146,10 @@ int arch_early_init_r(void) /* Cause the SATA device to do its early init */ uclass_first_device(UCLASS_AHCI, &dev); +#ifdef CONFIG_DM_PCI + /* Trigger PCIe devices detection */ + pci_init(); +#endif + return 0; } -- 2.7.4

2 2

[U-Boot] [PATCH] fix: mvebu_ comphy: Update COMPHY sequence number
by kostap＠marvell.com 09 May '17

09 May '17

From: Konstantin Porotchkin <kostap(a)marvell.com> Use local static counter for maintaining the COMPHY chip-ID upon its initialization. The dev->seq originally used as the COMPHY chip-ID depends on the device tree scan order and produces wrong results that breaks the deficated PHYs init flow, which in turn breaks the USB support. Change-Id: I4e3f7ec36590a7f95dc94d9269a3c47fb708c4a9 Signed-off-by: Konstantin Porotchkin <kostap(a)marvell.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Igal Liberman <igall(a)marvell.com> Cc: Stefan Chulski <stefanc(a)marvell.com> Cc: Nadav Haklai <nadavh(a)marvell.com> --- drivers/phy/marvell/comphy_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/phy/marvell/comphy_core.c b/drivers/phy/marvell/comphy_core.c index caa1928..7729e4b 100644 --- a/drivers/phy/marvell/comphy_core.c +++ b/drivers/phy/marvell/comphy_core.c @@ -113,6 +113,7 @@ static int comphy_probe(struct udevice *dev) int subnode; int lane; int last_idx = 0; + static int current_idx; /* Save base addresses for later use */ chip_cfg->comphy_base_addr = (void *)dev_get_addr_index(dev, 0); @@ -175,7 +176,7 @@ static int comphy_probe(struct udevice *dev) } /* Save comphy index for MultiCP devices (A8K) */ - chip_cfg->comphy_index = dev->seq; + chip_cfg->comphy_index = current_idx++; /* PHY power UP sequence */ chip_cfg->ptr_comphy_chip_init(chip_cfg, comphy_map_data); /* PHY print SerDes status */ -- 2.7.4

2 2

[U-Boot] [PATCH] ARM: mvebu: switch db-88f6820-amc to DM for i2c
by Chris Packham 09 May '17

09 May '17

Move existing configuration from header file to defconfig or dts as appropriate. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- arch/arm/dts/armada-385-amc.dts | 3 +++ configs/db-88f6820-amc_defconfig | 2 ++ include/configs/db-88f6820-amc.h | 7 ------- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-amc.dts index a5a8a7f186db..4649c910c7b0 100644 --- a/arch/arm/dts/armada-385-amc.dts +++ b/arch/arm/dts/armada-385-amc.dts @@ -54,6 +54,7 @@ aliases { ethernet0 = &eth0; ethernet1 = &eth1; + i2c0 = &i2c0; spi1 = &spi1; }; @@ -68,6 +69,8 @@ internal-regs { i2c@11000 { + clock-frequency = <100000>; + u-boot,i2c-slave-addr = <0x0>; pinctrl-names = "default"; pinctrl-0 = <&i2c0_pins>; status = "okay"; diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index e90526a40226..63fc4db6c882 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -36,6 +36,8 @@ CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set # CONFIG_SPL_PARTITION_UUIDS is not set CONFIG_SPL_OF_TRANSLATE=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index ba5c0901b1af..1cdefa054967 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -27,13 +27,6 @@ #define CONFIG_CMD_ENV #define CONFIG_CMD_PCI -/* I2C */ -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_MVTWSI -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE -#define CONFIG_SYS_I2C_SLAVE 0x0 -#define CONFIG_SYS_I2C_SPEED 100000 - /* SPI NOR flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_BUS 1 #define CONFIG_SF_DEFAULT_SPEED 1000000 -- 2.11.0.24.ge6920cf

3 3