January 2016 - U-Boot

[U-Boot] Please pull u-boot-rockchip
by Simon Glass 23 Jan '16

23 Jan '16

Hi Tom, This includes some kylin improvements for Android booting, support for a new Rockchip board (Rock 2), Rockchip display support using eDP and HDMI with the new driver-model video uclass, and Chrome OS EC support for Jerry. The following changes since commit 6905f4d3c7be46fed4859f51f0a8f9a1107c22e7: Merge git://git.denx.de/u-boot-dm (2016-01-21 11:49:49 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git for you to fetch changes up to f138713073b5587b195cb73e12394e57c15cbb01: rockchip: Update the README (2016-01-21 20:42:37 -0700) ---------------------------------------------------------------- Jeffy Chen (5): ARM: bootm: Try to use relocated ramdisk rockchip: rk3036: Bind GPIO banks rockchip: kylin: Add default gpt partition table rockchip: kylin: Check fastboot request rockchip: kylin: Store env in emmc Masahiro Yamada (1): clk: add fixed rate clock driver Simon Glass (87): dm: clk: Add support for decoding clocks from the device tree dm: core: Don't set pinctrl for pinctrl devices dm: pinctrl: Add a function to parse PIN_CONFIG flags dm: pmic: Add 'reg status' to show all regulators dts: Bring in pinctrl device tree binding power: Add base support for the RK808 PMIC power: Add support for RK808 regulators dm: Add a power sequencing uclass rockchip: Avoid using MMC code when not booting from MMC rockchip: Convert the PMU IOMUX registers into an array rockchip: mmc: Use a pwrseq device if available rockchip: Correct the defconfig order rockchip: Use pwrseq for MMC start-up on jerry rockchip: jerry: Disable pmic-int-1 setup to avoid a hang rockchip: Use a separate clock ID for clocks rockchip: clock: Rename the general clock variable to gclk_rate rockchip: clk: Add a function to get a peripheral clock rate rockchip: clock: Add a function to find a clock by ID rockchip: i2c: Update the driver to use the new clock ID rockchip: spi: Update the driver to use the new clock ID rockchip: spi: Avoid setting the pinctrl twice rockchip: mmc: Update the driver to use the new clock ID rockchip: pinctrl: Add a full pinctrl driver rockchip: Move firefly and jerry to use the full pinctrl rockchip: jerry: Enable the RK808 PMIC and regulator rockchip: Disable simple-bus in SPL for firefly-rk3288, jerry rockchip: jerry: Drop unused options gpio: Allow 's' as an abbreviation for 'status' cros_ec: Disable the Chrome OS EC in SPL dm: i2c: Allow muxes to be enabled for SPL separately spi: Correct device tree usage in spi_flash_decode_fdt() dm: power: Allow regulators to be omitted from SPL dm: pinctrl: Add a way for a GPIO driver to obtain a pin function dm: core: Export uclass_find_device_by_of_offset() dm: power: Tidy up debugging output and return values dm: power: Allow regulators to not implement all operations dm: clk: Add a simple version of clk_get_by_index() rockchip: sdram: Use the rk_clr/setreg() interface rockchip: reset: Use the rk_clr/setreg() interface rockchip: spi: Remember the last speed to avoid re-setting it rockchip: spi: Correct the bus init code rockchip: clk: Make rkclk_get_clk() SoC-specific rockchip: pinctrl: Reduce the size for SPL rockchip: pinctrl: Implement the get_gpio_mux() method rockchip: gpio: Read the GPIO value correctly rockchip: gpio: Implement the get_function() method rockchip: spi: Implement the delays rockchip: spi: Correct chip-enable code rockchip: spi: Remove the explicit pinctrl setting rockchip: jerry: Enable the Chrome OS EC stdio: Correct a build error with driver model gpio: Warn about invalid GPIOs used with the 'gpio' command video: Name consoles by their number video: Add a function to control cache flushing video: bridge: Allow GPIOs to be optional dm: pwm: Add a PWM uclass pwm: rockchip: Add a PWM driver for Rockchip SoCs dm: backlight: Add a backlight uclass dm: backlight: Add a driver for a PWM backlight dm: panel: Add a panel uclass video: panel: Add a simple panel driver dm: video: Repurpose the 'displayport' uclass to 'display' rockchip: Rename the CRU_MODE_CON fields rockchip: clk: Add support for clocks needed by the displays rockchip: video: Add a display driver for rockchip HDMI rockchip: video: Add a display driver for rockchip eDP rockchip: video: Add a video-output driver rockchip: Don't skip low-level init rockchip: Add a simple 'clock' command rockchip: Add a script to parse datasheets rockchip: config: Enable the 'gpio' command rockchip: sdram: Tidy up a few comments rockchip: sdram: Use syscon_get_first_range() where possible rockchip: Tidy up the register-access macros rockchip: spl: Drop MMC support code when not needed rockchip: jerry: Fix the SDRAM timing rockchip: rk3288: clock: Fix various minor errors rockchip: rk3288: pinctrl: Fix HDMI pinctrl rockchip: spl: Support full-speed CPU in SPL rockchip: jerry: Add support for timing SPI flash speed rockchip: jerry: Enable EDP and HDMI video output rockchip: firefly-rk3288: Enable HDMI output rockchip: dts: Sync up SPDIF node with Linux rockchip: rock2: Bring in device tree files from Linux rockchip: rock2: dts: Make changes for U-Boot rockchip: Add support for Raxda Rock 2 rockchip: Update the README arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3288-jerry.dts | 5 + arch/arm/dts/rk3288-rock2-som.dtsi | 278 +++++++++++++++ arch/arm/dts/rk3288-rock2-square.dts | 201 +++++++++++ arch/arm/dts/rk3288-veyron-chromebook.dtsi | 4 + arch/arm/dts/rk3288-veyron.dtsi | 24 +- arch/arm/dts/rk3288.dtsi | 22 ++ arch/arm/include/asm/arch-rockchip/clock.h | 17 + arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 70 ++-- arch/arm/include/asm/arch-rockchip/edp_rk3288.h | 636 ++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-rockchip/hardware.h | 7 +- arch/arm/include/asm/arch-rockchip/hdmi_rk3288.h | 456 ++++++++++++++++++++++++ arch/arm/include/asm/arch-rockchip/pmu_rk3288.h | 12 +- arch/arm/include/asm/arch-rockchip/pwm.h | 41 +++ arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 349 +++++++++++++++++++ arch/arm/lib/bootm.c | 12 +- arch/arm/mach-rockchip/Makefile | 1 - arch/arm/mach-rockchip/board.c | 28 ++ arch/arm/mach-rockchip/common.c | 28 -- arch/arm/mach-rockchip/rk3288-board-spl.c | 10 + arch/arm/mach-rockchip/rk3288/Kconfig | 19 + arch/arm/mach-rockchip/rk3288/reset_rk3288.c | 4 +- arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 64 ++-- board/kylin/kylin_rk3036/kylin_rk3036.c | 32 ++ board/radxa/rock2/Kconfig | 15 + board/radxa/rock2/MAINTAINERS | 6 + board/radxa/rock2/Makefile | 7 + board/radxa/rock2/rock2.c | 7 + common/cmd_gpio.c | 6 +- common/cmd_regulator.c | 66 +++- common/stdio.c | 3 + configs/chromebook_jerry_defconfig | 32 +- configs/firefly-rk3288_defconfig | 14 +- configs/nyan-big_defconfig | 2 +- configs/rock2_defconfig | 53 +++ doc/README.rockchip | 53 +-- doc/device-tree-bindings/pinctrl/pinctrl-bindings.txt | 236 +++++++++++++ drivers/Kconfig | 2 + drivers/clk/Makefile | 2 +- drivers/clk/clk-uclass.c | 44 +++ drivers/clk/clk_fixed_rate.c | 57 +++ drivers/clk/clk_rk3036.c | 33 +- drivers/clk/clk_rk3288.c | 439 +++++++++++++++++++----- drivers/core/device.c | 6 +- drivers/core/uclass.c | 4 +- drivers/gpio/rk_gpio.c | 42 ++- drivers/i2c/Makefile | 4 +- drivers/i2c/muxes/Kconfig | 9 + drivers/i2c/muxes/Makefile | 2 +- drivers/i2c/rk_i2c.c | 38 +- drivers/misc/Kconfig | 18 + drivers/misc/Makefile | 3 + drivers/misc/pwrseq-uclass.c | 24 ++ drivers/mmc/rockchip_dw_mmc.c | 60 +++- drivers/mtd/spi/spi_flash.c | 9 +- drivers/pinctrl/pinctrl-uclass.c | 22 ++ drivers/pinctrl/rockchip/pinctrl_rk3036.c | 8 + drivers/pinctrl/rockchip/pinctrl_rk3288.c | 292 +++++++++++++++- drivers/power/pmic/Kconfig | 30 ++ drivers/power/pmic/Makefile | 1 + drivers/power/pmic/pmic-uclass.c | 13 +- drivers/power/pmic/rk808.c | 102 ++++++ drivers/power/regulator/Kconfig | 18 + drivers/power/regulator/Makefile | 5 +- drivers/power/regulator/regulator-uclass.c | 4 +- drivers/power/regulator/rk808.c | 301 ++++++++++++++++ drivers/pwm/Kconfig | 19 + drivers/pwm/Makefile | 2 + drivers/pwm/pwm-uclass.c | 36 ++ drivers/pwm/rk_pwm.c | 103 ++++++ drivers/spi/rk_spi.c | 84 +++-- drivers/video/Kconfig | 23 +- drivers/video/Makefile | 8 +- drivers/video/backlight-uclass.c | 25 ++ drivers/video/bridge/video-bridge-uclass.c | 11 +- drivers/video/display-uclass.c | 52 +++ drivers/video/dp-uclass.c | 34 -- drivers/video/panel-uclass.c | 25 ++ drivers/video/pwm_backlight.c | 134 ++++++++ drivers/video/rockchip/Makefile | 8 + drivers/video/rockchip/rk_edp.c | 1085 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/video/rockchip/rk_hdmi.c | 933 ++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/video/rockchip/rk_vop.c | 346 +++++++++++++++++++ drivers/video/simple_panel.c | 99 ++++++ drivers/video/tegra124/display.c | 18 +- drivers/video/tegra124/dp.c | 9 +- drivers/video/vidconsole-uclass.c | 7 +- drivers/video/video-uclass.c | 7 + include/backlight.h | 31 ++ include/clk.h | 24 ++ include/configs/chromebook_jerry.h | 19 + include/configs/firefly-rk3288.h | 9 + include/configs/kylin_rk3036.h | 44 +++ include/configs/rk3288_common.h | 10 +- include/configs/rock2.h | 31 ++ include/configs/sandbox.h | 8 +- include/{displayport.h => display.h} | 33 +- include/dm/pinctrl.h | 45 +++ include/dm/uclass-id.h | 6 +- include/dm/uclass-internal.h | 16 + include/edid.h | 1 + include/panel.h | 31 ++ include/power/rk808_pmic.h | 77 +++++ include/pwm.h | 53 +++ include/pwrseq.h | 18 + include/video.h | 8 + tools/rkmux.py | 218 ++++++++++++ 107 files changed, 7759 insertions(+), 404 deletions(-) create mode 100644 arch/arm/dts/rk3288-rock2-som.dtsi create mode 100644 arch/arm/dts/rk3288-rock2-square.dts create mode 100644 arch/arm/include/asm/arch-rockchip/edp_rk3288.h create mode 100644 arch/arm/include/asm/arch-rockchip/hdmi_rk3288.h create mode 100644 arch/arm/include/asm/arch-rockchip/pwm.h create mode 100644 arch/arm/include/asm/arch-rockchip/vop_rk3288.h delete mode 100644 arch/arm/mach-rockchip/common.c create mode 100644 board/radxa/rock2/Kconfig create mode 100644 board/radxa/rock2/MAINTAINERS create mode 100644 board/radxa/rock2/Makefile create mode 100644 board/radxa/rock2/rock2.c create mode 100644 configs/rock2_defconfig create mode 100644 doc/device-tree-bindings/pinctrl/pinctrl-bindings.txt create mode 100644 drivers/clk/clk_fixed_rate.c create mode 100644 drivers/misc/pwrseq-uclass.c create mode 100644 drivers/power/pmic/rk808.c create mode 100644 drivers/power/regulator/rk808.c create mode 100644 drivers/pwm/Kconfig create mode 100644 drivers/pwm/pwm-uclass.c create mode 100644 drivers/pwm/rk_pwm.c create mode 100644 drivers/video/backlight-uclass.c create mode 100644 drivers/video/display-uclass.c delete mode 100644 drivers/video/dp-uclass.c create mode 100644 drivers/video/panel-uclass.c create mode 100644 drivers/video/pwm_backlight.c create mode 100644 drivers/video/rockchip/Makefile create mode 100644 drivers/video/rockchip/rk_edp.c create mode 100644 drivers/video/rockchip/rk_hdmi.c create mode 100644 drivers/video/rockchip/rk_vop.c create mode 100644 drivers/video/simple_panel.c create mode 100644 include/backlight.h create mode 100644 include/configs/rock2.h rename include/{displayport.h => display.h} (59%) create mode 100644 include/panel.h create mode 100644 include/power/rk808_pmic.h create mode 100644 include/pwrseq.h create mode 100755 tools/rkmux.py Regards, Simon

2 1

[U-Boot] [PATCH 1/2] net: Add bootfile in DHCP Request
by amessier.tyco＠gmail.com 22 Jan '16

22 Jan '16

From: Alexandre Messier <amessier(a)tycoint.com> Add the bootfile name in the DHCP Request packet, in addition to it already being sent in the DHCP Discover. This is needed by some DHCP servers so that the bootfile name is properly returned by the server to the client in the DHCP Ack, as expected by U-Boot. Signed-off-by: Alexandre Messier <amessier(a)tycoint.com> --- README | 5 +++++ net/bootp.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/README b/README index 0dc657d..05966ab 100644 --- a/README +++ b/README @@ -2191,6 +2191,7 @@ CBFS (Coreboot Filesystem) support CONFIG_BOOTP_TIMEOFFSET CONFIG_BOOTP_VENDOREX CONFIG_BOOTP_MAY_FAIL + CONFIG_BOOTP_DHCPREQ_BOOTFILE CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip environment variable, not the BOOTP server. @@ -2231,6 +2232,10 @@ CBFS (Coreboot Filesystem) support the DHCP timeout and retry process takes a longer than this delay. + CONFIG_BOOTP_DHCPREQ_BOOTFILE - Set the bootfile name in + DHCPREQUEST packet, in addition to DHCPDISCOVER. This may be + needed by some DHCP servers in specific cases. + - Link-local IP address negotiation: Negotiate with other link-local clients on the local network for an address that doesn't require explicit configuration. diff --git a/net/bootp.c b/net/bootp.c index b2f8ad4..8da94cf 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -918,6 +918,9 @@ static void dhcp_send_request_packet(struct bootp_hdr *bp_offer) net_write_ip(&bp->bp_giaddr, zero_ip); memcpy(bp->bp_chaddr, net_ethaddr, 6); +#if defined(CONFIG_BOOTP_DHCPREQ_BOOTFILE) + copy_filename(bp->bp_file, net_boot_file_name, sizeof(bp->bp_file)); +#endif /* * ID is the id of the OFFER packet -- 1.8.3.1

3 3

[U-Boot] [PATCH 1/2] driver: net: ldpaa_eth: Add support of PHY framework
by Prabhakar Kushwaha 22 Jan '16

22 Jan '16

This patch integrate DPAA2 ethernet driver existing PHY framework. Call phy_connect and phy_config as per available DPMAC id defined in SerDes Protcol. Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava(a)nxp.com> Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> --- drivers/net/ldpaa_eth/ldpaa_eth.c | 116 ++++++++++++++++++++++++++++---------- 1 file changed, 85 insertions(+), 31 deletions(-) diff --git a/drivers/net/ldpaa_eth/ldpaa_eth.c b/drivers/net/ldpaa_eth/ldpaa_eth.c index 3857122..0a82bc6 100644 --- a/drivers/net/ldpaa_eth/ldpaa_eth.c +++ b/drivers/net/ldpaa_eth/ldpaa_eth.c @@ -14,15 +14,34 @@ #include <linux/compat.h> #include <fsl-mc/fsl_dpmac.h> +#include <fsl-mc/ldpaa_wriop.h> #include "ldpaa_eth.h" -#undef CONFIG_PHYLIB +#ifdef CONFIG_PHYLIB static int init_phy(struct eth_device *dev) { - /*TODO for external PHY */ + struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)dev->priv; + struct phy_device *phydev = NULL; + struct mii_dev *bus; + + bus = wriop_get_mdio(priv->dpmac_id); + if (bus == NULL) + return 0; + + phydev = phy_connect(bus, wriop_get_phy_address(priv->dpmac_id), + dev, wriop_get_enet_if(priv->dpmac_id)); + if (!phydev) { + printf("Failed to connect\n"); + return -1; + } + + priv->phydev = phydev; + + phy_config(phydev); return 0; } +#endif #ifdef DEBUG static void ldpaa_eth_get_dpni_counter(void) @@ -303,7 +322,9 @@ static int ldpaa_eth_open(struct eth_device *net_dev, bd_t *bd) #ifdef DEBUG struct dpni_link_state link_state; #endif - int err; + int err = 0; + struct mii_dev *bus; + phy_interface_t enet_if; if (net_dev->state == ETH_STATE_ACTIVE) return 0; @@ -317,11 +338,48 @@ static int ldpaa_eth_open(struct eth_device *net_dev, bd_t *bd) printf("ERROR (DPL is deployed. No device available)\n"); return -ENODEV; } + /* DPMAC initialization */ err = ldpaa_dpmac_setup(priv); if (err < 0) goto err_dpmac_setup; +#ifdef CONFIG_PHYLIB + if (priv->phydev) + err = phy_startup(priv->phydev); + if (err) { + printf("%s: Could not initialize\n", + priv->phydev->dev->name); + goto err_dpamc_bind; + } +#else + priv->phydev = (struct phy_device *)malloc(sizeof(struct phy_device)); + memset(priv->phydev, 0, sizeof(struct phy_device)); + + priv->phydev->speed = SPEED_1000; + priv->phydev->link = 1; + priv->phydev->duplex = DUPLEX_FULL; +#endif + + bus = wriop_get_mdio(priv->dpmac_id); + enet_if = wriop_get_enet_if(priv->dpmac_id); + if ((bus == NULL) && + (enet_if == PHY_INTERFACE_MODE_XGMII)) { + priv->phydev = (struct phy_device *) + malloc(sizeof(struct phy_device)); + memset(priv->phydev, 0, sizeof(struct phy_device)); + + priv->phydev->speed = SPEED_10000; + priv->phydev->link = 1; + priv->phydev->duplex = DUPLEX_FULL; + } + + if (!priv->phydev->link) { + printf("%s: No link.\n", priv->phydev->dev->name); + err = -1; + goto err_dpamc_bind; + } + /* DPMAC binding DPNI */ err = ldpaa_dpmac_bind(priv); if (err) @@ -348,28 +406,24 @@ static int ldpaa_eth_open(struct eth_device *net_dev, bd_t *bd) return err; } -#ifdef CONFIG_PHYLIB - /* TODO Check this path */ - err = phy_startup(priv->phydev); - if (err) { - printf("%s: Could not initialize\n", priv->phydev->dev->name); - return err; - } -#else - priv->phydev->speed = SPEED_1000; - priv->phydev->link = 1; - priv->phydev->duplex = DUPLEX_FULL; -#endif - err = dpni_enable(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpni->dpni_handle); if (err < 0) { printf("dpni_enable() failed\n"); return err; } - dpmac_link_state.rate = SPEED_1000; - dpmac_link_state.options = DPMAC_LINK_OPT_AUTONEG; - dpmac_link_state.up = 1; + dpmac_link_state.rate = priv->phydev->speed; + + if (priv->phydev->autoneg == AUTONEG_DISABLE) + dpmac_link_state.options &= ~DPMAC_LINK_OPT_AUTONEG; + else + dpmac_link_state.options |= DPMAC_LINK_OPT_AUTONEG; + + if (priv->phydev->duplex == DUPLEX_HALF) + dpmac_link_state.options |= DPMAC_LINK_OPT_HALF_DUPLEX; + + dpmac_link_state.up = priv->phydev->link; + err = dpmac_set_link_state(dflt_mc_io, MC_CMD_NO_FLAGS, priv->dpmac_handle, &dpmac_link_state); if (err < 0) { @@ -407,10 +461,7 @@ static int ldpaa_eth_open(struct eth_device *net_dev, bd_t *bd) goto err_qdid; } - if (!priv->phydev->link) - printf("%s: No link.\n", priv->phydev->dev->name); - - return priv->phydev->link ? 0 : -1; + return priv->phydev->link; err_qdid: err_rx_flow: @@ -418,9 +469,10 @@ err_rx_flow: err_dpni_bind: ldpaa_dpbp_free(); err_dpbp_setup: -err_dpamc_bind: dpni_close(dflt_mc_io, MC_CMD_NO_FLAGS, dflt_dpni->dpni_handle); err_dpni_setup: +err_dpamc_bind: + dpmac_destroy(dflt_mc_io, MC_CMD_NO_FLAGS, priv->dpmac_handle); err_dpmac_setup: return err; } @@ -429,6 +481,9 @@ static void ldpaa_eth_stop(struct eth_device *net_dev) { struct ldpaa_eth_priv *priv = (struct ldpaa_eth_priv *)net_dev->priv; int err = 0; +#ifdef CONFIG_PHYLIB + struct mii_dev *bus = wriop_get_mdio(priv->dpmac_id); +#endif if ((net_dev->state == ETH_STATE_PASSIVE) || (net_dev->state == ETH_STATE_INIT)) @@ -453,7 +508,10 @@ static void ldpaa_eth_stop(struct eth_device *net_dev) printf("dpni_disable() failed\n"); #ifdef CONFIG_PHYLIB - phy_shutdown(priv->phydev); + if (priv->phydev && bus != NULL) + phy_shutdown(priv->phydev); + else + free(priv->phydev); #endif ldpaa_dpbp_free(); @@ -798,15 +856,11 @@ static int ldpaa_eth_netdev_init(struct eth_device *net_dev, net_dev->halt = ldpaa_eth_stop; net_dev->send = ldpaa_eth_tx; net_dev->recv = ldpaa_eth_pull_dequeue_rx; -/* - TODO: PHY MDIO information - priv->bus = info->bus; - priv->phyaddr = info->phy_addr; - priv->enet_if = info->enet_if; -*/ +#ifdef CONFIG_PHYLIB if (init_phy(net_dev)) return 0; +#endif err = eth_register(net_dev); if (err < 0) { -- 1.9.1

3 2

[U-Boot] [PATCH V2 1/8] test/py: fix timeout to be absolute
by Stephen Warren 22 Jan '16

22 Jan '16

From: Stephen Warren <swarren(a)nvidia.com> Currently, Spawn.expect() imposes its timeout solely upon receipt of new data, not on its overall operation. In theory, this could cause the timeout not to fire if U-Boot continually generated output that did not match the expected patterns. Fix the code to additionally impose a timeout on overall operation, which is the intended mode of operation. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> Reviewed-by: Lukasz Majewski <l.majewski(a)samsung.com> Acked-by: Simon Glass <sjg(a)chromium.org> --- test/py/u_boot_spawn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/py/u_boot_spawn.py b/test/py/u_boot_spawn.py index 1baee63df25c..df4c67597cab 100644 --- a/test/py/u_boot_spawn.py +++ b/test/py/u_boot_spawn.py @@ -122,6 +122,7 @@ class Spawn(object): if type(patterns[pi]) == type(''): patterns[pi] = re.compile(patterns[pi]) + tstart_s = time.time() try: while True: earliest_m = None @@ -142,7 +143,11 @@ class Spawn(object): self.after = self.buf[pos:posafter] self.buf = self.buf[posafter:] return earliest_pi - events = self.poll.poll(self.timeout) + tnow_s = time.time() + tdelta_ms = (tnow_s - tstart_s) * 1000 + if tdelta_ms > self.timeout: + raise Timeout() + events = self.poll.poll(self.timeout - tdelta_ms) if not events: raise Timeout() c = os.read(self.fd, 1024) -- 2.7.0

2 15

[U-Boot] [PATCH 2/2] net: bootp: Add BOOTP specific config for timeout value
by amessier.tyco＠gmail.com 22 Jan '16

22 Jan '16

From: Alexandre Messier <amessier(a)tycoint.com> There is currently one config option (CONFIG_NET_RETRY_COUNT) that is available to tune the retries of the network stack. Unfortunately, it is global to all protocols, and the value is interpreted differently in all of them. Add a new config option that sets directly the timeout delay used by BOOTP, instead of it being derived from CONFIG_NET_RETRY_COUNT. Signed-off-by: Alexandre Messier <amessier(a)tycoint.com> --- README | 6 ++++++ net/bootp.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/README b/README index 05966ab..9703f83 100644 --- a/README +++ b/README @@ -2191,6 +2191,7 @@ CBFS (Coreboot Filesystem) support CONFIG_BOOTP_TIMEOFFSET CONFIG_BOOTP_VENDOREX CONFIG_BOOTP_MAY_FAIL + CONFIG_BOOTP_TIMEOUT_MS CONFIG_BOOTP_DHCPREQ_BOOTFILE CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip @@ -2232,6 +2233,11 @@ CBFS (Coreboot Filesystem) support the DHCP timeout and retry process takes a longer than this delay. + CONFIG_BOOTP_TIMEOUT_MS - Explicitly configure the BOOTP + timeout in milliseconds, instead of basing it on the configured + number of retries, which is either CONFIG_NET_RETRY_COUNT or + the BOOTP default value of 5 retries. + CONFIG_BOOTP_DHCPREQ_BOOTFILE - Set the bootfile name in DHCPREQUEST packet, in addition to DHCPDISCOVER. This may be needed by some DHCP servers in specific cases. diff --git a/net/bootp.c b/net/bootp.c index 8da94cf..edb0b39 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -33,12 +33,16 @@ * execute that many retries, and keep sending retry packets until that time * is reached. */ +#ifndef CONFIG_BOOTP_TIMEOUT_MS #ifndef CONFIG_NET_RETRY_COUNT # define TIMEOUT_COUNT 5 /* # of timeouts before giving up */ #else # define TIMEOUT_COUNT (CONFIG_NET_RETRY_COUNT) #endif #define TIMEOUT_MS ((3 + (TIMEOUT_COUNT * 5)) * 1000) +#else +#define TIMEOUT_MS CONFIG_BOOTP_TIMEOUT_MS +#endif #define PORT_BOOTPS 67 /* BOOTP server UDP port */ #define PORT_BOOTPC 68 /* BOOTP client UDP port */ -- 1.8.3.1

3 2

[U-Boot] [Patch V2 1/3] qe: move drivers/qe/qe.h to include/fsl_qe.h
by Gong Qianyu 22 Jan '16

22 Jan '16

As the QE firmware struct is shared with Fman, move the header file out of drivers/qe/. Signed-off-by: Gong Qianyu <Qianyu.Gong(a)nxp.com> --- V2: - New patch. drivers/net/fm/fm.c | 2 +- drivers/qe/fdt.c | 2 +- drivers/qe/qe.c | 2 +- drivers/qe/uccf.c | 2 +- drivers/qe/uccf.h | 2 +- drivers/qe/uec.c | 2 +- drivers/qe/uec.h | 2 +- drivers/qe/uec_phy.c | 2 +- drivers/qe/qe.h => include/fsl_qe.h | 0 9 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 40fbf19..e2a8ed3 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -10,7 +10,7 @@ #include <asm/errno.h> #include "fm.h" -#include "../../qe/qe.h" /* For struct qe_firmware */ +#include <fsl_qe.h> /* For struct qe_firmware */ #ifdef CONFIG_SYS_QE_FMAN_FW_IN_NAND #include <nand.h> diff --git a/drivers/qe/fdt.c b/drivers/qe/fdt.c index dfae4bf..4f48f98 100644 --- a/drivers/qe/fdt.c +++ b/drivers/qe/fdt.c @@ -10,7 +10,7 @@ #include <common.h> #include <libfdt.h> #include <fdt_support.h> -#include "qe.h" +#include <fsl_qe.h> #ifdef CONFIG_QE DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 08620b2..8f00817 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -12,7 +12,7 @@ #include "asm/errno.h" #include "asm/io.h" #include "linux/immap_qe.h" -#include "qe.h" +#include <fsl_qe.h> #ifdef CONFIG_LS102XA #include <asm/arch/immap_ls102xa.h> #endif diff --git a/drivers/qe/uccf.c b/drivers/qe/uccf.c index 85386bf..e011886 100644 --- a/drivers/qe/uccf.c +++ b/drivers/qe/uccf.c @@ -12,8 +12,8 @@ #include "asm/errno.h" #include "asm/io.h" #include "linux/immap_qe.h" -#include "qe.h" #include "uccf.h" +#include <fsl_qe.h> void ucc_fast_transmit_on_demand(ucc_fast_private_t *uccf) { diff --git a/drivers/qe/uccf.h b/drivers/qe/uccf.h index 55941e4..aa817e7 100644 --- a/drivers/qe/uccf.h +++ b/drivers/qe/uccf.h @@ -11,8 +11,8 @@ #define __UCCF_H__ #include "common.h" -#include "qe.h" #include "linux/immap_qe.h" +#include <fsl_qe.h> /* Fast or Giga ethernet */ diff --git a/drivers/qe/uec.c b/drivers/qe/uec.c index e0ab04a..40cccc2 100644 --- a/drivers/qe/uec.c +++ b/drivers/qe/uec.c @@ -12,11 +12,11 @@ #include "asm/errno.h" #include "asm/io.h" #include "linux/immap_qe.h" -#include "qe.h" #include "uccf.h" #include "uec.h" #include "uec_phy.h" #include "miiphy.h" +#include <fsl_qe.h> #include <phy.h> /* Default UTBIPAR SMI address */ diff --git a/drivers/qe/uec.h b/drivers/qe/uec.h index 6b559f7..22e248f 100644 --- a/drivers/qe/uec.h +++ b/drivers/qe/uec.h @@ -10,8 +10,8 @@ #ifndef __UEC_H__ #define __UEC_H__ -#include "qe.h" #include "uccf.h" +#include <fsl_qe.h> #include <phy.h> #define MAX_TX_THREADS 8 diff --git a/drivers/qe/uec_phy.c b/drivers/qe/uec_phy.c index e701787..272874d 100644 --- a/drivers/qe/uec_phy.c +++ b/drivers/qe/uec_phy.c @@ -16,11 +16,11 @@ #include "asm/errno.h" #include "linux/immap_qe.h" #include "asm/io.h" -#include "qe.h" #include "uccf.h" #include "uec.h" #include "uec_phy.h" #include "miiphy.h" +#include <fsl_qe.h> #include <phy.h> #define ugphy_printk(format, arg...) \ diff --git a/drivers/qe/qe.h b/include/fsl_qe.h similarity index 100% rename from drivers/qe/qe.h rename to include/fsl_qe.h -- 2.1.0.27.g96db324

2 4

[U-Boot] [PATCH v2 00/37] rockchip: Add support for display and keyboard
by Simon Glass 22 Jan '16

22 Jan '16

This series adds display drivers for rockchip and enables them on jerry, firefly-rk3288 (HDMI only) and rock2 (HDMI only). It builds on the recent keyboard series. Driver are provided for video displays (EDP and HDMI) and the VOP (video output processor). This series also adds several new uclasses: - PWM (Pulse-width modulation) - Panel (used for LCD panels) - Display (renamed from DisplayPort - a generic display with power, etc.) - Backlight (used for LCD backlights) Since most of this implementation is device-tree-controlled it is fairly easy to enable HDMI on the other RK3288 devices. This series adds this for Firefly-RK3288. It also includes Radxa Rock 2 as a separate board since a device tree file is now available in Linux. HDMI is enabled on that board also. There remain quite a few things still to do for core rockchip support. Here are a few noticed while preparing this series: - Clocks / caches are not working correctly. The 'dhry' command shows approximately 60 DMIPS when supposedly running at 1.8GHz. Turning the cache on or off makes no difference. The platform should run at over 2000 DMIPS by my estimate. This problem is common on ARM platforms. For example I found: beaver (Tegra) 818 DMIPS pit (Exynos) 276 DMIPS snow (Exynos) 521 DMIPS - HDMI EDID-reading does not work on Jerry, perhaps because the clocks are not running as they should. It seems to work fine on other boards. This series is available at u-boot-dm/rkd-working Changes in v2: - Update for new clk_get_by_index() API - Update for new clk_get_by_index() API - Rebase to upstream/master Simon Glass (37): stdio: Correct a build error with driver model gpio: Warn about invalid GPIOs used with the 'gpio' command video: Name consoles by their number video: Add a function to control cache flushing video: bridge: Allow GPIOs to be optional dm: pwm: Add a PWM uclass pwm: rockchip: Add a PWM driver for Rockchip SoCs dm: backlight: Add a backlight uclass dm: backlight: Add a driver for a PWM backlight dm: panel: Add a panel uclass video: panel: Add a simple panel driver dm: video: Repurpose the 'displayport' uclass to 'display' rockchip: Rename the CRU_MODE_CON fields rockchip: clk: Add support for clocks needed by the displays rockchip: video: Add a display driver for rockchip HDMI rockchip: video: Add a display driver for rockchip eDP rockchip: video: Add a video-output driver rockchip: Don't skip low-level init rockchip: Add a simple 'clock' command rockchip: Add a script to parse datasheets rockchip: config: Enable the 'gpio' command rockchip: sdram: Tidy up a few comments rockchip: sdram: Use syscon_get_first_range() where possible rockchip: Tidy up the register-access macros rockchip: spl: Drop MMC support code when not needed rockchip: jerry: Fix the SDRAM timing rockchip: rk3288: clock: Fix various minor errors rockchip: rk3288: pinctrl: Fix HDMI pinctrl rockchip: spl: Support full-speed CPU in SPL rockchip: jerry: Add support for timing SPI flash speed rockchip: jerry: Enable EDP and HDMI video output rockchip: firefly-rk3288: Enable HDMI output rockchip: dts: Sync up SPDIF node with Linux rockchip: rock2: Bring in device tree files from Linux rockchip: rock2: dts: Make changes for U-Boot rockchip: Add support for Raxda Rock 2 rockchip: Update the README arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3288-jerry.dts | 5 + arch/arm/dts/rk3288-rock2-som.dtsi | 278 ++++++ arch/arm/dts/rk3288-rock2-square.dts | 201 ++++ arch/arm/dts/rk3288-veyron.dtsi | 4 +- arch/arm/dts/rk3288.dtsi | 22 + arch/arm/include/asm/arch-rockchip/clock.h | 5 + arch/arm/include/asm/arch-rockchip/cru_rk3288.h | 70 +- arch/arm/include/asm/arch-rockchip/edp_rk3288.h | 636 +++++++++++++ arch/arm/include/asm/arch-rockchip/hardware.h | 7 +- arch/arm/include/asm/arch-rockchip/hdmi_rk3288.h | 456 +++++++++ arch/arm/include/asm/arch-rockchip/pwm.h | 41 + arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 349 +++++++ arch/arm/mach-rockchip/board.c | 28 + arch/arm/mach-rockchip/rk3288-board-spl.c | 10 +- arch/arm/mach-rockchip/rk3288/Kconfig | 19 + arch/arm/mach-rockchip/rk3288/sdram_rk3288.c | 57 +- board/radxa/rock2/Kconfig | 15 + board/radxa/rock2/MAINTAINERS | 6 + board/radxa/rock2/Makefile | 7 + board/radxa/rock2/rock2.c | 7 + common/cmd_gpio.c | 4 +- common/stdio.c | 3 + configs/chromebook_jerry_defconfig | 7 + configs/firefly-rk3288_defconfig | 7 + configs/nyan-big_defconfig | 2 +- configs/rock2_defconfig | 53 ++ doc/README.rockchip | 53 +- drivers/Kconfig | 2 + drivers/clk/clk_rk3288.c | 290 +++++- drivers/pinctrl/rockchip/pinctrl_rk3288.c | 2 + drivers/pwm/Kconfig | 19 + drivers/pwm/Makefile | 2 + drivers/pwm/pwm-uclass.c | 36 + drivers/pwm/rk_pwm.c | 103 ++ drivers/video/Kconfig | 23 +- drivers/video/Makefile | 8 +- drivers/video/backlight-uclass.c | 25 + drivers/video/bridge/video-bridge-uclass.c | 11 +- drivers/video/display-uclass.c | 52 ++ drivers/video/dp-uclass.c | 34 - drivers/video/panel-uclass.c | 25 + drivers/video/pwm_backlight.c | 134 +++ drivers/video/rockchip/Makefile | 8 + drivers/video/rockchip/rk_edp.c | 1085 ++++++++++++++++++++++ drivers/video/rockchip/rk_hdmi.c | 933 +++++++++++++++++++ drivers/video/rockchip/rk_vop.c | 346 +++++++ drivers/video/simple_panel.c | 99 ++ drivers/video/tegra124/display.c | 18 +- drivers/video/tegra124/dp.c | 9 +- drivers/video/vidconsole-uclass.c | 7 +- drivers/video/video-uclass.c | 7 + include/backlight.h | 31 + include/configs/chromebook_jerry.h | 14 +- include/configs/firefly-rk3288.h | 9 +- include/configs/rk3288_common.h | 2 +- include/configs/rock2.h | 31 + include/configs/sandbox.h | 8 +- include/{displayport.h => display.h} | 33 +- include/dm/uclass-id.h | 5 +- include/edid.h | 1 + include/panel.h | 31 + include/pwm.h | 53 ++ include/video.h | 8 + tools/rkmux.py | 218 +++++ 65 files changed, 5872 insertions(+), 203 deletions(-) create mode 100644 arch/arm/dts/rk3288-rock2-som.dtsi create mode 100644 arch/arm/dts/rk3288-rock2-square.dts create mode 100644 arch/arm/include/asm/arch-rockchip/edp_rk3288.h create mode 100644 arch/arm/include/asm/arch-rockchip/hdmi_rk3288.h create mode 100644 arch/arm/include/asm/arch-rockchip/pwm.h create mode 100644 arch/arm/include/asm/arch-rockchip/vop_rk3288.h create mode 100644 board/radxa/rock2/Kconfig create mode 100644 board/radxa/rock2/MAINTAINERS create mode 100644 board/radxa/rock2/Makefile create mode 100644 board/radxa/rock2/rock2.c create mode 100644 configs/rock2_defconfig create mode 100644 drivers/pwm/Kconfig create mode 100644 drivers/pwm/pwm-uclass.c create mode 100644 drivers/pwm/rk_pwm.c create mode 100644 drivers/video/backlight-uclass.c create mode 100644 drivers/video/display-uclass.c delete mode 100644 drivers/video/dp-uclass.c create mode 100644 drivers/video/panel-uclass.c create mode 100644 drivers/video/pwm_backlight.c create mode 100644 drivers/video/rockchip/Makefile create mode 100644 drivers/video/rockchip/rk_edp.c create mode 100644 drivers/video/rockchip/rk_hdmi.c create mode 100644 drivers/video/rockchip/rk_vop.c create mode 100644 drivers/video/simple_panel.c create mode 100644 include/backlight.h create mode 100644 include/configs/rock2.h rename include/{displayport.h => display.h} (59%) create mode 100644 include/panel.h create mode 100755 tools/rkmux.py -- 2.7.0.rc3.207.g0ac5344

1 74

[U-Boot] [PATCH] Powperpc:u-boot: Fix bug created due to use of __ffs64() in place of custom ffs64()
by Ashish Kumar 22 Jan '16

22 Jan '16

* Return value of ffs64() different to that of __ffs64(), ffs64(0x80000000) = 0x20 __ffs64(0x80000000) = 0x1f, as result of this change -1 from start_align needs to be removed. * Incorrect DDR law was created in case of B4860qds * Tested on B4860qds and T1040 Signed-off-by: Ashish Kumar <Ashish.Kumar(a)nxp.com> --- arch/powerpc/cpu/mpc83xx/law.c | 4 ++-- arch/powerpc/cpu/mpc8xxx/law.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c index 262ae7f..ae9cba8 100644 --- a/arch/powerpc/cpu/mpc83xx/law.c +++ b/arch/powerpc/cpu/mpc83xx/law.c @@ -21,7 +21,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (start == 0) start_align = 1ull << (LAW_SIZE_2G + 1); else - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; @@ -41,7 +41,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (sz) { start += law_sz; - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; ecm = &immap->sysconf.ddrlaw[1]; diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index 24baad4..bd79297 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -188,7 +188,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (start == 0) start_align = 1ull << (LAW_SIZE_32G + 1); else - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; @@ -203,7 +203,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (sz) { start += law_sz; - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; -- 1.7.6.GIT

3 2

[U-Boot] [PATCH 1/8] test/py: fix timeout to be absolute
by Stephen Warren 22 Jan '16

22 Jan '16

From: Stephen Warren <swarren(a)nvidia.com> Currently, Spawn.expect() imposes its timeout solely upon receipt of new data, not on its overall operation. In theory, this could cause the timeout not to fire if U-Boot continually generated output that did not match the expected patterns. Fix the code to additionally impose a timeout on overall operation, which is the intended mode of operation. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/u_boot_spawn.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/py/u_boot_spawn.py b/test/py/u_boot_spawn.py index 1baee63df25c..df4c67597cab 100644 --- a/test/py/u_boot_spawn.py +++ b/test/py/u_boot_spawn.py @@ -122,6 +122,7 @@ class Spawn(object): if type(patterns[pi]) == type(''): patterns[pi] = re.compile(patterns[pi]) + tstart_s = time.time() try: while True: earliest_m = None @@ -142,7 +143,11 @@ class Spawn(object): self.after = self.buf[pos:posafter] self.buf = self.buf[posafter:] return earliest_pi - events = self.poll.poll(self.timeout) + tnow_s = time.time() + tdelta_ms = (tnow_s - tstart_s) * 1000 + if tdelta_ms > self.timeout: + raise Timeout() + events = self.poll.poll(self.timeout - tdelta_ms) if not events: raise Timeout() c = os.read(self.fd, 1024) -- 2.7.0

3 21

[U-Boot] [PATCH 0/7] Add/enable lpuart support on Vybrid based boards
by Bhuvanchandra DV 22 Jan '16

22 Jan '16

- Add serial support to Vybrid device tree. - Enable lpuart support on Colibri VF50/VF61. - Add device tree files to VF610-twr board and enable lpuart support. - Add device tree files to pcm-052 board and enable lpuart support. - Droped legacy code in lpuart serial driver. - Droped non DT defconfigs for Vybrid based boards. - Compile checked for vf610twr and pcm052 since I don't have access to such hardware at my end. Reviewers and testers welcome! Bhuvanchandra DV (7): arm: vf: Enable lpuart support arm: colibri-vf: Enable serial support arm: vf610-twr: Add device tree files arm: pcm052: Add device tree files dm: lpuart: Drop the legacy code arm: vybrid: Drop enabling serial in legacy mode arm: vf: Remove the legacy defconfigs arch/arm/dts/Makefile | 4 +- arch/arm/dts/pcm052.dts | 27 +++++++++++ arch/arm/dts/vf-colibri.dtsi | 10 ++++ arch/arm/dts/vf.dtsi | 14 ++++++ arch/arm/dts/vf610-twr.dts | 27 +++++++++++ configs/colibri_vf_defconfig | 11 ----- configs/colibri_vf_dtb_defconfig | 1 + configs/pcm052_defconfig | 6 --- configs/pcm052_dtb_defconfig | 10 ++++ configs/vf610twr_defconfig | 9 ---- configs/vf610twr_dtb_defconfig | 13 +++++ drivers/serial/serial_lpuart.c | 101 +-------------------------------------- include/configs/colibri_vf.h | 3 -- include/configs/pcm052.h | 3 -- include/configs/vf610twr.h | 3 -- 15 files changed, 107 insertions(+), 135 deletions(-) create mode 100644 arch/arm/dts/pcm052.dts create mode 100644 arch/arm/dts/vf610-twr.dts delete mode 100644 configs/colibri_vf_defconfig delete mode 100644 configs/pcm052_defconfig create mode 100644 configs/pcm052_dtb_defconfig delete mode 100644 configs/vf610twr_defconfig create mode 100644 configs/vf610twr_dtb_defconfig -- 2.7.0

3 18