Merge branch 'for-next/omap'

Merge branch 'for-next/mvebu'

Merge branch 'for-next/misc'

Merge branch 'for-next/mips'

Merge branch 'for-next/imx'

x86: asm: include asm-generic.h ...

make io[read,write]* defines available on x86 platform

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

asm-generic: partially sync io.h with linux kernel ...

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

at91: sync mach/barebox-arm-head.h ...

From 308f9f6 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Fri, 7 Jul 2017 17:53:59 +0200
Subject: [PATCH 1/2] at91: sync mach/barebox-arm-head.h

To prepare for multi image support synch the barebox-arm-head.h
header with the arm version.
This include the reservation of a small area for board specific use

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arm: configs: AM335x: Enable mmc-extcsd command ...

This tool is for setting up eMMC devices.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arm: dts: am335x: Add phycore emmc device tree ...

Add a new device tree for phyCORE SOMs with EMMC enabled and NAND
disabled.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arm: dts: Enable NAND in DTS instead of DTSI ...

Starting with PCM-062, NAND isn't the main non-volatile memory for the
AM335x. Because that, NAND has be disabled in the SOM dtsi file and will
be enabled in a specific NAND SOM file.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

arm: dts: am335x: Add emmc node to phycore-som ...

Add the EMMC node to the phycore-som device tree. It's by default
disabled, because NAND is the primary boot device.

Signed-off-by: Daniel Schultz <d.schultz@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

atmel_lcdfb: define power_control gpio in platform_data ...

Simplify board specific code by specifying the power_control
gpio direct in platform data.
Move registration of the GPIO to the driver so we no longer
need to duplicate this for each board.

As an intended side-effect there is no longer
any references to platform_data outside atmel_lcdc_register()
so remove it from struct atmel_lcdfb_info

The implementation assumes that GPIO=0 is the same as no power control.
This prevents us from using any GPIO=0 for power control,
but this is not considered a problem for current users.
Future DT users will not have this limitation.

This commit include a fix so we will actually power
down if requested. Previously this was hardcoded to ON.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

ARM: phycore-imx6ul: use MAC address from OCOTP ...

The Phycore MX6UL modules are correctly fused with a MAC address.
Use this for the Barebox network connection and fixing up the kernel
DT.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/mips'

ARM: mvebu: armada-xp: configure PLL and PHY register ...

The PLL setup is needed to use the USB ports in Linux.

This code is ported from mainline U-Boot arch/arm/mach-mvebu/cpu.c.

Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: tplink-mr3020.dts: add partition table ...

We need partition table for barebox update handler
and for barebox environment

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: tplink-mr3020_defconfig: enable more options ...

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: tplink-mr3020: pbl: move hornet_mips24k_cp0_setup after flash addr test ...

this is needed to start zbarebox.bin from running barebox.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: tplink-mr3020: pbl: move WMAC init after flash addr test ...

if this function is called in the RAM, we won't be able to
continue start sequence.
It brakes boot over JTAG use case.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: ath79: add TP-Link WDR4300 board support ...

This provides low level initialization of pll and ddr2. Resulting binary
should work from SRAM, DDR2 and SPI flash. If started from DDR2 RAM
level initialization will skipped.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: ath79: add initial QCA AR9344 SoC support ...

According to the documentation:
"The AR9344 is a highly integrated and feature-rich IEEE 802.11n 2x2 2.4/5 GHz
System-on-a-Chip (SoC) for advanced WLAN platforms.

It includes a MIPS 74Kc processor, PCI Express 1.1 Root Complex and Endpoint
interfaces, five port IEEE 802.3 Fast Ethernet Switch with MAC/PHY,
one MII/RMII/RGMII interface, one USB 2.0 MAC/PHY, and external memory
interface for serial Flash, SDRAM, DDR1 or DDR2, I2S/SPDIF-Out audio interface,
SLIC VOIP/PCM interface, two UARTs, and GPIOs that can be used for LED
controls or other general purpose interface configurations.
The AR9344 supports 802.11n operations up to 144 Mbps for 20 MHz and 300 Mbps
for 40 MHz respectively, and 802.11a/b/g data rates.
Additional features include Maximal Likelihood (ML) decoding, Low-Density
Parity Check (LDPC), Maximal Ratio Combining (MRC), Tx Beamforming (TxBF), and
On-Chip One-Time Programmable (OTP) memory."

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: ath79: provide CONFIG_SOC_QCA_AR9331 option ...

QCA AR9331 and QCA AR9344 have some similar part but different uart engines.
We need this flag to provide common debug_ll support.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: add virt_to_phys() and phys_to_virt() ...

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

MIPS: ath79: add barebox update handler ...

Most of ar93xx SoCs seem to work only with spi.
spifash handler should be enough for now.

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

ARM: imx: phyCORE i.MX7: use register defines in dcd table ...

This was done using scripts/regsubst.pl.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

ARM: imx7: sabreSD: remove duplicate DT nodes ...

The latest upstream DTs have been merged, so remove the now duplicate
DT nodes.

Fixes: a0a5a7b84ff8 (ARM: i.MX: Add support for NXP i.MX7 SABRESD board)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

ARM: imx: add stub for imx7_uart_setup_ll ...

Fixes: 28e8db159f25 (ARM: i.MX: Add imx7_uart_setup_ll())
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

ARM: imx: ccmx53: select I2C ...

The board file needs i2c support to enable a regulator.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

ARM: imx: build imx6.o as ARMv7 ...

Otherwise the WFI instruction might not be available in a multi-image build.

Fixes: 1e9458720a23 (ARM: i.MX: provide handler for power off over standby)
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>