platform/kernel/u-boot.git
5 years agoMerge tag 'fsl-qoriq-for-v2018.11-rc1' of git://git.denx.de/u-boot-fsl-qoriq
Tom Rini [Sat, 29 Sep 2018 15:47:32 +0000 (11:47 -0400)]
Merge tag 'fsl-qoriq-for-v2018.11-rc1' of git://git.denx.de/u-boot-fsl-qoriq

Switch to driver model for eSDHC on Layerscape SoCs including LS1021A,
LS1043A, LS1046A, LS1088A, LS2088A.
Switch to driver model for SATA on LS1021A and LS1043A.
Add support for LS1012AFRWY rev C board.
Enable SMMU for LS1043A.

5 years agoConvert CONFIG_DISABLE_CONSOLE to Kconfig
Christian Gmeiner [Mon, 10 Sep 2018 10:43:16 +0000 (12:43 +0200)]
Convert CONFIG_DISABLE_CONSOLE to Kconfig

This converts the following to Kconfig:
   CONFIG_DISABLE_CONSOLE

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
5 years agoARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL
Adam Ford [Wed, 19 Sep 2018 21:06:49 +0000 (16:06 -0500)]
ARM: da850evm_direct_nor_defconfig: Enable DM_SERIAL

With DM enabled, this patch enables DM_SERIAL and removes
the NS16550 initialization from da850_lowlevel since the driver
will take care of that itself.

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agoARM: omap3_logic: Remove non-DM MMC initialization
Adam Ford [Wed, 12 Sep 2018 03:15:05 +0000 (22:15 -0500)]
ARM: omap3_logic: Remove non-DM MMC initialization

With DM_MMC working for both SPL and U-Boot, this patch removes
the legacy style of initializing the MMC driver.

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agoARM: omap3_logic: Remove some manual pin-muxing
Adam Ford [Sun, 9 Sep 2018 21:12:11 +0000 (16:12 -0500)]
ARM: omap3_logic: Remove some manual pin-muxing

With the pinctrl function enabled and the device tree setting up
the pins we want to use, this patch removes the manual pinmuxing
except for that which is not done by the device tree and minimal
pins necessary for SPL (like serial, GPMC, and MMC)

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agoARM: am3517_evm: Enable TCA6416PW GPIO Expander
Adam Ford [Sun, 9 Sep 2018 14:21:21 +0000 (09:21 -0500)]
ARM: am3517_evm: Enable TCA6416PW GPIO Expander

With DM_I2C and DM_GPIO working, this patch can enable the
GPIO expander on the I2C bus.  This GPIO expander is connected
to some of the DIP switches and can now read the status of these
pins.

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agoARM: da850evm: Pinctrl for da850evm
Adam Ford [Sun, 9 Sep 2018 13:50:40 +0000 (08:50 -0500)]
ARM: da850evm: Pinctrl for da850evm

The simple pin controller works for da850, so this patch enables
this to pin-mux the pins defined in the device tree for the da850evm.

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agoARM: da850evm: Enable CMD_DM for da850evm
Adam Ford [Sun, 9 Sep 2018 13:50:39 +0000 (08:50 -0500)]
ARM: da850evm: Enable CMD_DM for da850evm

With DM enabled, this patch enables the 'dm' command to access
the dm tree, uclass and devres.

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agoARM: am3517_evm: Enable Pinctrl
Adam Ford [Sun, 9 Sep 2018 12:25:30 +0000 (07:25 -0500)]
ARM: am3517_evm: Enable Pinctrl

The simple pinctrl driver currently available works with the omap3.
Enabling this will use the device tree to automatically set the
pin-muxing for various drivers.

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agocmd: Relocate poweroff under Device access commands
Adam Ford [Sun, 9 Sep 2018 12:05:57 +0000 (07:05 -0500)]
cmd: Relocate poweroff under Device access commands

Previously poweroff was located under boot.  It seems to make more
sense to have it located under the Device access commands.

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agoARM: DTS: various omap3: Remove cd-inverted from u-boot.dtsi
Adam Ford [Sat, 8 Sep 2018 13:16:24 +0000 (08:16 -0500)]
ARM: DTS: various omap3: Remove cd-inverted from u-boot.dtsi

With the omap_mmc driver no longer supporting cd-inverted, this
patch removes all these references since they are not needed.

Signed-off-by: Adam Ford <aford173@gmail.com>
5 years agommc: omap_mmc: Remove invert references
Adam Ford [Sat, 8 Sep 2018 13:16:23 +0000 (08:16 -0500)]
mmc: omap_mmc: Remove invert references

With DM_GPIO and DM_MMC translating GPIO_ACTIVE_LOW, any boards
using the 'cd-invert' option will no longer need to do this.  This
patch removes the support for 'invert' from the MMC driver.

Signed-off-by: Adam Ford <aford173@gmail.com>
[trini: Fix warning over when !DM_GPIO]
Signed-off-by: Tom Rini <trini@konsulko.com>
5 years agoARM: dts: at91: sama5d4_xplained: add onewire connector for LCD eeprom
Eugen Hristev [Tue, 18 Sep 2018 07:35:57 +0000 (10:35 +0300)]
ARM: dts: at91: sama5d4_xplained: add onewire connector for LCD eeprom

Add onewire node in device tree for TM series LCDs

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoARM: dts: at91: sama5d2_ptc: add onewire connector for LCD eeprom
Eugen Hristev [Tue, 18 Sep 2018 07:35:56 +0000 (10:35 +0300)]
ARM: dts: at91: sama5d2_ptc: add onewire connector for LCD eeprom

Add onewire node in device tree for TM series LCDs

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoARM: dts: at91: sama5d27_som1_ek: add onewire connector for LCD eeprom
Eugen Hristev [Tue, 18 Sep 2018 07:35:55 +0000 (10:35 +0300)]
ARM: dts: at91: sama5d27_som1_ek: add onewire connector for LCD eeprom

Add onewire node in device tree for TM series LCDs

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoARM: dts: at91: sama5d3_xplained: add onewire connector for LCD eeprom
Eugen Hristev [Tue, 18 Sep 2018 07:35:54 +0000 (10:35 +0300)]
ARM: dts: at91: sama5d3_xplained: add onewire connector for LCD eeprom

Add onewire node in device tree for TM series LCDs

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoARM: dts: at91: sama5d2_xplained: add onewire connector for LCD eeprom
Eugen Hristev [Tue, 18 Sep 2018 07:35:53 +0000 (10:35 +0300)]
ARM: dts: at91: sama5d2_xplained: add onewire connector for LCD eeprom

Add onewire node in device tree for TM series LCDs

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d4_xplained: add fdt overlay support
Eugen Hristev [Tue, 18 Sep 2018 07:35:52 +0000 (10:35 +0300)]
configs: sama5d4_xplained: add fdt overlay support

Add commands for fdt overlay merging. This is required for the boot scripts
that detect PDAs and apply specific overlays to the DTB passed on to kernel.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d27_som1_ek: add fdt overlay support
Eugen Hristev [Tue, 18 Sep 2018 07:35:51 +0000 (10:35 +0300)]
configs: sama5d27_som1_ek: add fdt overlay support

Add commands for fdt overlay merging. This is required for the boot scripts
that detect PDAs and apply specific overlays to the DTB passed on to kernel.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d2_ptc_ek: add fdt overlay support
Eugen Hristev [Tue, 18 Sep 2018 07:35:50 +0000 (10:35 +0300)]
configs: sama5d2_ptc_ek: add fdt overlay support

Add commands for fdt overlay merging. This is required for the boot scripts
that detect PDAs and apply specific overlays to the DTB passed on to kernel.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d3_xplained: add fdt overlay support
Eugen Hristev [Tue, 18 Sep 2018 07:35:49 +0000 (10:35 +0300)]
configs: sama5d3_xplained: add fdt overlay support

Add commands for fdt overlay merging. This is required for the boot scripts
that detect PDAs and apply specific overlays to the DTB passed on to kernel.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d2_xplained: add fdt overlay support
Eugen Hristev [Tue, 18 Sep 2018 07:35:48 +0000 (10:35 +0300)]
configs: sama5d2_xplained: add fdt overlay support

Add commands for fdt overlay merging. This is required for the boot scripts
that detect PDAs and apply specific overlays to the DTB passed on to kernel.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoboard: sama5d4_xplained: add pda detect call at init time
Eugen Hristev [Tue, 18 Sep 2018 07:35:47 +0000 (10:35 +0300)]
board: sama5d4_xplained: add pda detect call at init time

Call the PDA detection mechanism at boot time so we can have
the pda environment variable ready for use.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoboard: sama5d2_ptc_ek: add pda detect call at init time
Eugen Hristev [Tue, 18 Sep 2018 07:35:46 +0000 (10:35 +0300)]
board: sama5d2_ptc_ek: add pda detect call at init time

Call the PDA detection mechanism at boot time so we can have
the pda environment variable ready for use.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoboard: sama5d27_som1_ek: add pda detect call at init time
Eugen Hristev [Tue, 18 Sep 2018 07:35:45 +0000 (10:35 +0300)]
board: sama5d27_som1_ek: add pda detect call at init time

Call the PDA detection mechanism at boot time so we can have
the pda environment variable ready for use.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoboard: sama5d3_xplained: add pda detect call at init time
Eugen Hristev [Tue, 18 Sep 2018 07:35:44 +0000 (10:35 +0300)]
board: sama5d3_xplained: add pda detect call at init time

Call the PDA detection mechanism at boot time so we can have
the pda environment variable ready for use.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoboard: sama5d2_xplained: add pda detect call at init time
Eugen Hristev [Tue, 18 Sep 2018 07:35:43 +0000 (10:35 +0300)]
board: sama5d2_xplained: add pda detect call at init time

Call the PDA detection mechanism at boot time so we can have
the pda environment variable ready for use.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoboard: atmel: add support for pda detection
Eugen Hristev [Tue, 18 Sep 2018 07:35:42 +0000 (10:35 +0300)]
board: atmel: add support for pda detection

This adds the support for PDA detection as common code for
Atmel boards.
Using the one wire interface over GPIO , an EEPROM memory is read
and compared to preprogrammed values for PDA screens TM4300, TM7000
and TM7000B.
Once the PDA is detected, an environment variable is set accordingly.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d4_xplained: add onewire and eeprom drivers
Eugen Hristev [Tue, 18 Sep 2018 07:35:41 +0000 (10:35 +0300)]
configs: sama5d4_xplained: add onewire and eeprom drivers

SAMA5D4 SoC can have extra clip boards (PDAs) connected, which have
an EEPROM memory for identification. A special GPIO can be used to read
this memory over 1wire protocol.
Enabling one wire and eeprom drivers for this memory.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d2_ptc_ek: add onewire and eeprom drivers
Eugen Hristev [Tue, 18 Sep 2018 07:35:40 +0000 (10:35 +0300)]
configs: sama5d2_ptc_ek: add onewire and eeprom drivers

SAMA5D2 SoC can have extra clip boards (PDAs) connected, which have
an EEPROM memory for identification. A special GPIO can be used to read
this memory over 1wire protocol.
Enabling one wire and eeprom drivers for this memory.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d27_som1_ek: add onewire and eeprom drivers
Eugen Hristev [Tue, 18 Sep 2018 07:35:39 +0000 (10:35 +0300)]
configs: sama5d27_som1_ek: add onewire and eeprom drivers

SAMA5D2 SoC can have extra clip boards (PDAs) connected, which have
an EEPROM memory for identification. A special GPIO can be used to read
this memory over 1wire protocol.
Enabling one wire and eeprom drivers for this memory.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d3_xplained: add onewire and eeprom drivers
Eugen Hristev [Tue, 18 Sep 2018 07:35:38 +0000 (10:35 +0300)]
configs: sama5d3_xplained: add onewire and eeprom drivers

SAMA5D3 SoC can have extra clip boards (PDAs) connected, which have
an EEPROM memory for identification. A special GPIO can be used to read
this memory over 1wire protocol.
Enabling one wire and eeprom drivers for this memory.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sama5d2_xplained: add onewire and eeprom drivers
Eugen Hristev [Tue, 18 Sep 2018 07:35:37 +0000 (10:35 +0300)]
configs: sama5d2_xplained: add onewire and eeprom drivers

SAMA5D2 SoC can have extra clip boards (PDAs) connected, which have
an EEPROM memory for identification. A special GPIO can be used to read
this memory over 1wire protocol.
Enabling one wire and eeprom drivers for this memory.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoconfigs: sandbox: add onewire w1 and sandbox eeprom
Eugen Hristev [Tue, 18 Sep 2018 07:35:36 +0000 (10:35 +0300)]
configs: sandbox: add onewire w1 and sandbox eeprom

To be able to test Dallas onewire protocol and one wire eeproms driver
and subsystem, add in sandbox defconfig the drivers' config.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agosandbox: DTS: w1: add node for one wire interface on GPIO
Eugen Hristev [Tue, 18 Sep 2018 07:35:35 +0000 (10:35 +0300)]
sandbox: DTS: w1: add node for one wire interface on GPIO

Add a node for the one wire uclass and one wire gpio driver
in sandbox.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agopinctrl: sandbox: add gpio onewire w1 group
Eugen Hristev [Tue, 18 Sep 2018 07:35:34 +0000 (10:35 +0300)]
pinctrl: sandbox: add gpio onewire w1 group

Add onewire "w1" groups and pin function for onewire GPIOs in sandbox.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agow1: add command for onewire protocol
Eugen Hristev [Tue, 18 Sep 2018 07:35:33 +0000 (10:35 +0300)]
w1: add command for onewire protocol

Add basic command for bus information and read for onewire
bus using Dallas 1-Wire protocol.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agodt-bindings: w1-eeprom: eep_sandbox: create bindings
Eugen Hristev [Tue, 18 Sep 2018 07:35:32 +0000 (10:35 +0300)]
dt-bindings: w1-eeprom: eep_sandbox: create bindings

Bindings for sandbox onewire eeprom driver

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoW1-EEPROM: add sandbox driver
Eugen Hristev [Tue, 18 Sep 2018 07:35:31 +0000 (10:35 +0300)]
W1-EEPROM: add sandbox driver

Add a sandbox driver for a one wire EEPROM memory

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agodt-bindings: w1-eeprom: ds24xxx: create bindings
Eugen Hristev [Tue, 18 Sep 2018 07:35:30 +0000 (10:35 +0300)]
dt-bindings: w1-eeprom: ds24xxx: create bindings

Bindings for Maxim's ds24 onewire EEPROM families driver

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoW1-EEPROM: add support for Maxim DS24 eeprom families
Maxime Ripard [Tue, 18 Sep 2018 07:35:29 +0000 (10:35 +0300)]
W1-EEPROM: add support for Maxim DS24 eeprom families

Add a driver that supports Maxim 1 wire EEPROMs families
DS24B33 and DS2431.
Can be extended for other families as well.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[eugen.hristev@microchip.com: reworked driver]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agow1: identify devices with w1-eeprom uclass
Eugen Hristev [Tue, 18 Sep 2018 07:35:28 +0000 (10:35 +0300)]
w1: identify devices with w1-eeprom uclass

When a new device is discovered, this may be a w1 eeprom device.
Attempt to find the proper node and driver from the w1-eeprom subsystem.

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agoW1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs
Maxime Ripard [Tue, 18 Sep 2018 07:35:27 +0000 (10:35 +0300)]
W1-EEPROM: Add an W1-EEPROM uclass for 1 wire EEPROMs

We might want to access data stored onto one wire EEPROMs.
Create a framework to provide a consistent API.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[eugen.hristev@microchip.com: reworked patch]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agodt-bindings: W1: w1-gpio: added bindings for w1-gpio
Eugen Hristev [Tue, 18 Sep 2018 07:35:26 +0000 (10:35 +0300)]
dt-bindings: W1: w1-gpio: added bindings for w1-gpio

Added bindings specification for bitbanged gpio driver for Dallas
one wire protocol

Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agow1: Add 1-Wire gpio driver
Maxime Ripard [Tue, 18 Sep 2018 07:35:25 +0000 (10:35 +0300)]
w1: Add 1-Wire gpio driver

Add a bus driver for bitbanging a 1-Wire bus over a GPIO.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[eugen.hristev@microchip.com: fixed some issues]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agow1: Add 1-Wire uclass
Maxime Ripard [Tue, 18 Sep 2018 07:35:24 +0000 (10:35 +0300)]
w1: Add 1-Wire uclass

We might want to use 1-Wire devices connected on boards such as EEPROMs in
U-Boot.

Provide a framework to be able to do that.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
[eugen.hristev@microchip.com: reworked]
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
5 years agocommon: Generic loader for file system
Tien Fong Chee [Fri, 6 Jul 2018 08:28:03 +0000 (16:28 +0800)]
common: Generic loader for file system

This is file system generic loader which can be used to load
the file image from the storage into target such as memory.
The consumer driver would then use this loader to program whatever,
ie. the FPGA device.

Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
5 years agodoc: dtbinding: Add file system firmware loader binding document
Tien Fong Chee [Fri, 6 Jul 2018 08:27:35 +0000 (16:27 +0800)]
doc: dtbinding: Add file system firmware loader binding document

Add a document to describe file system firmware loader binding
information.

Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
5 years agodoc: Add new doc for file system firmware loader driver model
Tien Fong Chee [Fri, 6 Jul 2018 08:27:08 +0000 (16:27 +0800)]
doc: Add new doc for file system firmware loader driver model

Provide information about

- overview of file system firmware loader driver model
- describe storage device and partition in device tree source
- describe fie system firmware loader API

Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
5 years agoblock: Add a function to find block device descriptor
Tien Fong Chee [Fri, 6 Jul 2018 08:26:36 +0000 (16:26 +0800)]
block: Add a function to find block device descriptor

Add a function to find the block device descriptor of the parent
device.

Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
[trini: Move function declaration to avoid warning]
Signed-off-by: Tom Rini <trini@konsulko.com>
5 years agocmd: ubifs: Factor out some checking codes into cmd_ubifs_mount()
Tien Fong Chee [Fri, 6 Jul 2018 08:26:01 +0000 (16:26 +0800)]
cmd: ubifs: Factor out some checking codes into cmd_ubifs_mount()

cmd_ubifs_mount() function would be called directly instead of
involving whole command machinery for mounting ubifs in
generic firmware loader, so some checking codes need to be factored out
into cmd_ubifs_mount() without breaking original functionality design.

Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Heiko Schocher <hs@denx.de>
5 years agocmd: ubifs: Move ubifs_initialized checking into cmd_ubifs_umount()
Tien Fong Chee [Fri, 6 Jul 2018 08:25:12 +0000 (16:25 +0800)]
cmd: ubifs: Move ubifs_initialized checking into cmd_ubifs_umount()

cmd_ubifs_umount() function would be called directly instead of involving
whole command machinery in generic firmware loader, so checking on
ubifs_initialized status need to be done in cmd_ubifs_umount() without
breaking original functionality design.

Signed-off-by: Tien Fong Chee <tien.fong.chee@intel.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Reviewed-by: Heiko Schocher <hs@denx.de>
[trini: Fix conflicting type error in cmd/ubi.c]
Signed-off-by: Tom Rini <trini@konsulko.com>
5 years agoarmv7: ls102xa: Disable QE before enter deep sleep
Ran Wang [Wed, 26 Sep 2018 05:46:30 +0000 (13:46 +0800)]
armv7: ls102xa: Disable QE before enter deep sleep

Otherwise system will hang after executing wfi.

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agodrivers: qe: Move CONFIG_U_QE to Kconfig
Ran Wang [Wed, 26 Sep 2018 05:46:29 +0000 (13:46 +0800)]
drivers: qe: Move CONFIG_U_QE to Kconfig

Signed-off-by: Ran Wang <ran.wang_1@nxp.com>
[York S: revised subject line and removed commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agonet: fman: Support both new and legacy FMan Compatibles
Zhao Qiang [Wed, 29 Aug 2018 03:46:34 +0000 (11:46 +0800)]
net: fman: Support both new and legacy FMan Compatibles

Recently the FMan Port and MAC compatibles were changed. This patch
aligns the FMan Port and MAC compatibles to the new FMan device tree
binding document. The FMan device tree binding document can be found
in the Linux kernel version 3.18.0, commit
297d35fd2a7d3fbd4e5c0f0c1c18213117ba11ba
./Documentation/devicetree/bindings/powerpc/fsl/fman.txt

This patch doesn't affect legacy compatibles support.

Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com>
[York S: reformatted commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agols2080ardb: remove dhcp function from env as boot source
Priyanka Jain [Tue, 18 Sep 2018 05:27:27 +0000 (10:57 +0530)]
ls2080ardb: remove dhcp function from env as boot source

Signed-off-by: Priyanka Jain <priyanka.jain@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agols1088a: remove dhcp function from u-boot env as boot source
Pramod Kumar [Fri, 14 Sep 2018 11:24:33 +0000 (16:54 +0530)]
ls1088a: remove dhcp function from u-boot env as boot source

Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agols1012a: remove debug info from u-boot log
Pramod Kumar [Wed, 12 Sep 2018 08:46:49 +0000 (14:16 +0530)]
ls1012a: remove debug info from u-boot log

Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: ls1043a: enable icid setup for qman portals
Laurentiu Tudor [Mon, 27 Aug 2018 14:34:00 +0000 (17:34 +0300)]
armv8: ls1043a: enable icid setup for qman portals

Enable support for ICID setup of qman portals and the required device
tree fixups.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: ls1043a: add icid setup support
Laurentiu Tudor [Mon, 27 Aug 2018 14:33:59 +0000 (17:33 +0300)]
armv8: ls1043a: add icid setup support

Reuse the existing ICID setup code done for LS1046A smmu enablement
and add the equivalent setup for LS1043A chips.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: ls1043a: advertise QMan v3 in configuration
Laurentiu Tudor [Mon, 27 Aug 2018 14:33:58 +0000 (17:33 +0300)]
armv8: ls1043a: advertise QMan v3 in configuration

The QMan IP block in this SoC is version 3.2 so advertise
this in the SoC configuration header.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: fsl-layerscape: add missing qe base address define
Laurentiu Tudor [Mon, 27 Aug 2018 14:33:57 +0000 (17:33 +0300)]
armv8: fsl-layerscape: add missing qe base address define

Add define for QUICC Engine register block base address.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
[York S: revised commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agodriver: net: fsl-mc: Memset MC reserve ram memory before usage
Prabhakar Kushwaha [Mon, 27 Aug 2018 07:28:52 +0000 (12:58 +0530)]
driver: net: fsl-mc: Memset MC reserve ram memory before usage

Memory reserved for Management Complex needs to be cleaned before any
usage.

Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
[York S: revised commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agou-boot: fixup the iommu-map property of fsl-mc node
Nipun Gupta [Mon, 20 Aug 2018 10:31:14 +0000 (16:01 +0530)]
u-boot: fixup the iommu-map property of fsl-mc node

The iommu-map property in the fsl-mc node is updated by
valid stream-ids by u-boot. This patch is to fixup this
property for LS208x and LS1088.

Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agols1012afrwy: Add ls1012afrwy revC board support.
Pramod Kumar [Tue, 14 Aug 2018 04:19:55 +0000 (09:49 +0530)]
ls1012afrwy: Add ls1012afrwy revC board support.

LS1012AFRWY supports three board revisions.
Revision A and B board are collectively identified as revA/B,
Revision C board is identifies as revC.

Signed-off-by: Pramod Kumar <pramod.kumar_1@nxp.com>
[York S: revised commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoscsi: ceva: add ls1021a soc support.
Peng Ma [Wed, 1 Aug 2018 06:15:43 +0000 (14:15 +0800)]
scsi: ceva: add ls1021a soc support.

Add ahci compatible support for ls1021a soc.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarm: ls1021atwr: enable DM support for sata
Peng Ma [Wed, 1 Aug 2018 06:15:42 +0000 (14:15 +0800)]
arm: ls1021atwr: enable DM support for sata

Enable related configs to support sata DM feature.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv7: dts: fsl-ls1021a: add sata node support enable sata for ls1021a-qds and ls1021...
Peng Ma [Wed, 1 Aug 2018 06:15:41 +0000 (14:15 +0800)]
armv7: dts: fsl-ls1021a: add sata node support enable sata for ls1021a-qds and ls1021a-twr

Add sata node to support this feature.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv7: fsl: remove sata support
Peng Ma [Wed, 1 Aug 2018 06:15:40 +0000 (14:15 +0800)]
armv7: fsl: remove sata support

Remove the old implementation in order to enable DM for sata

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarm64: ls1043aqds: enable DM support for sata
Peng Ma [Wed, 1 Aug 2018 03:35:16 +0000 (11:35 +0800)]
arm64: ls1043aqds: enable DM support for sata

Enable related configs to support sata DM feature.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoscsi: ceva: add ls1043a soc support
Peng Ma [Wed, 1 Aug 2018 03:35:15 +0000 (11:35 +0800)]
scsi: ceva: add ls1043a soc support

Add ahci compatible support for ls1043a soc.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: dts: fsl-ls1043a: add sata node support
Peng Ma [Wed, 1 Aug 2018 03:35:14 +0000 (11:35 +0800)]
armv8: dts: fsl-ls1043a: add sata node support

Add sata node to support ls1043a.

Signed-off-by: Peng Ma <peng.ma@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoEnable CONFIG_BLK and CONFIG_DM_MMC to Kconfig
Yinbo Zhu [Tue, 25 Sep 2018 06:47:13 +0000 (14:47 +0800)]
Enable CONFIG_BLK and CONFIG_DM_MMC to Kconfig

This enables the folowing to Kconfig:
CONFIG_BLK
CONFIG_DM_MMC

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv7: ls1021a: enable esdhc
Yinbo Zhu [Tue, 25 Sep 2018 06:47:12 +0000 (14:47 +0800)]
armv7: ls1021a: enable esdhc

This patch is to enable eSDHC for ls1021a.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: ls1046a: add eSDHC node
Yinbo Zhu [Tue, 25 Sep 2018 06:47:11 +0000 (14:47 +0800)]
armv8: ls1046a: add eSDHC node

This patch is to add eSDHC node for ls1046a.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: ls1043a: add eSDHC node
Yinbo Zhu [Tue, 25 Sep 2018 06:47:10 +0000 (14:47 +0800)]
armv8: ls1043a: add eSDHC node

This patch is to add eSDHC node for ls1043a.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: ls1088a: add eSDHC node
Yinbo Zhu [Tue, 25 Sep 2018 06:47:09 +0000 (14:47 +0800)]
armv8: ls1088a: add eSDHC node

This patch is to add eSDHC node for ls1088a.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8: ls2088a: add eSDHC node
Yinbo Zhu [Tue, 25 Sep 2018 06:47:08 +0000 (14:47 +0800)]
armv8: ls2088a: add eSDHC node

This patch is to add eSDHC node for ls2088a.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoarmv8/ls1088a/ls2088a: esdhc: Add esdhc clock support
Yinbo Zhu [Tue, 25 Sep 2018 06:47:07 +0000 (14:47 +0800)]
armv8/ls1088a/ls2088a: esdhc: Add esdhc clock support

This patch adds esdhc clock support for ls1088a and ls2088a.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoppa/fm/qe: use block layer in ppa/fm/qe driver
Yinbo Zhu [Tue, 25 Sep 2018 06:47:06 +0000 (14:47 +0800)]
ppa/fm/qe: use block layer in ppa/fm/qe driver

At present the MMC subsystem maintains its own list of MMC devices.
This cannot work with driver model when CONFIG_BLK is enabled, use
blk_dread to replace previous mmc read interface, use
mmc_get_blk_desc to get the mmc device property.

Signed-off-by: Yinbo Zhu <yinbo.zhu@nxp.com>
[York S: reformatted commit message]
Reviewed-by: York Sun <york.sun@nxp.com>
5 years agoMerge tag 'xilinx-for-v2018.11' of git://git.denx.de/u-boot-microblaze
Tom Rini [Thu, 27 Sep 2018 12:29:10 +0000 (08:29 -0400)]
Merge tag 'xilinx-for-v2018.11' of git://git.denx.de/u-boot-microblaze

Xilinx changes for v2018.11

- Handle BOARD_LATE_INIT via Kconfig

SPL:
- Enable GZIP for all partitions types(not only for kernel)

ZynqMP:
- Rearrange pmufw version handling
- Support newer PMUFW with improved fpga load sequence

Zynq:
- Cleanup config file
- Simplify zybo config by enabling option via Kconfig

net:
- Fix gems max-speed property reading
- Enable support for fixed-link phys

5 years agonet: zynq_gem: Add support for fixed-link phy
Michal Simek [Thu, 20 Sep 2018 07:42:27 +0000 (09:42 +0200)]
net: zynq_gem: Add support for fixed-link phy

Based on dt-specs fixed-link doesn't require phy-handle to be used.
Fix driver to only read phy related setting when phy-handle is found.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
5 years agoMerge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Tom Rini [Wed, 26 Sep 2018 19:14:02 +0000 (15:14 -0400)]
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

Patch queue for efi - 2018-09-26

A lot of goodness in this release. We're *very* close to running the
UEFI Shell and SCT natively. The only missing piece are HII protocols.

  - FAT write support (needed for SCT)
  - improved FAT directory support (needed for SCT)
  - RTC support with QEMU -M virt
  - Sandbox support (run UEFI binaries in Linux - yay)
  - Proper UTF-16 support
  - EFI_UNICODE_COLLATION_PROTOCOL support (for UEFI Shell)
  - EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL support (for UEFI Shell)
  - Fix window size determination
  - Fix Tegra by explicitly unmapping RAM
  - Clean up handle entanglement
  - Lots of generic code cleanup

[trini: Fixup merge conflict in include/configs/qemu-arm.h]
Signed-off-by: Tom Rini <trini@konsulko.com>
5 years agosandbox: Fix set_working_fdt_addr users
Alexander Graf [Wed, 26 Sep 2018 12:07:41 +0000 (14:07 +0200)]
sandbox: Fix set_working_fdt_addr users

When running sandbox with the new pointer sanitization we just recently
introduced, we're running into a case with FIT images where we end up
interpreting pointers as addresses.

What happened is that most callers of set_working_fdt_addr() simply
convert pointers into addresses without taking into account that they
might be 2 separate address spaces. Fix the callers up to map their
pointers into addresses.

This makes sandbox tests pass for me again.

Signed-off-by: Alexander Graf <agraf@suse.de>
5 years agoarm: zynq: zybo: migrate CONFIG_DISPLAY to defconfig
Luis Araneda [Thu, 13 Sep 2018 04:02:07 +0000 (01:02 -0300)]
arm: zynq: zybo: migrate CONFIG_DISPLAY to defconfig

Only add CONFIG_DISPLAY to defconfig because CONFIG_I2C_EDID
is automatically selected by CONFIG_DISPLAY

Signed-off-by: Luis Araneda <luaraneda@gmail.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
5 years agonet: zynq_gem: Fix reading of max-speed property
Siva Durga Prasad Paladugu [Tue, 4 Sep 2018 13:38:53 +0000 (19:08 +0530)]
net: zynq_gem: Fix reading of max-speed property

max-speed property is part of phynode and it has to be
read using ofnode_read_u32_default(). This fixes the issue
of incorrect max-speed read from DT.

Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
5 years agospl: fit: Enable GZIP compression also for no kernel partitions
Michal Simek [Tue, 24 Jul 2018 13:05:00 +0000 (15:05 +0200)]
spl: fit: Enable GZIP compression also for no kernel partitions

There is no reason to limit gzip usage only for OS_BOOT and kernel image
type.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: York Sun <york.sun@nxp.com>
5 years agofpga: zynqmp: Modify PL bitstream loading sequence
Siva Durga Prasad Paladugu [Tue, 21 Aug 2018 10:14:50 +0000 (15:44 +0530)]
fpga: zynqmp: Modify PL bitstream loading sequence

This patch modifies PL bitstream loading sequence as per
latest Xilfpga which supports all variants of bitstream images
generated from vivado and from bootgen. With this new change in
Xilfpga, uboot doesn't need to validate and swap bitstream as it will
be taken care inside Xilfpga. ZynqMP PL driver now checks for supporting
PMUFW version before skipping the validation and swap sequence as there
can be old PMUFW which doesn't supports this feature. In this case, driver
uses old way of PL bitstream loading sequence.

Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
5 years agoarm64: zynqmp: Return pmufw version for zynqmp_pmufw_version()
Siva Durga Prasad Paladugu [Tue, 21 Aug 2018 10:14:49 +0000 (15:44 +0530)]
arm64: zynqmp: Return pmufw version for zynqmp_pmufw_version()

Modify the zynqmp_pmufw_version() routine to return PMUFW version so
that it can be reused wherever required. Get PMUFW version from PMU
only once at bootup and later just return stored value.

Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
5 years agoarm64: zynqmp: Move PM version related macros to .h
Siva Durga Prasad Paladugu [Tue, 21 Aug 2018 10:14:48 +0000 (15:44 +0530)]
arm64: zynqmp: Move PM version related macros to .h

This patch moves the PM version related macros to .h file so that
they can be reused in other files.

Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
5 years agoarm: zynq: Remove useless comments from config file
Michal Simek [Wed, 15 Aug 2018 10:48:52 +0000 (12:48 +0200)]
arm: zynq: Remove useless comments from config file

Moving options to Kconfig some comments are useless now.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
5 years agoarm64: zynqmp: Handle CONFIG_BOARD_LATE_INIT via Kconfig
Michal Simek [Mon, 20 Aug 2018 06:24:14 +0000 (08:24 +0200)]
arm64: zynqmp: Handle CONFIG_BOARD_LATE_INIT via Kconfig

Disable BOARD_LATE_INIT via Kconfig.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
5 years agoconfig.mk: Remove duplicated -fno-strict-aliasing
Bin Meng [Mon, 17 Sep 2018 05:35:29 +0000 (22:35 -0700)]
config.mk: Remove duplicated -fno-strict-aliasing

Now that we already disable the "strict-aliasing" globally, remove
the duplicates in the nds32/riscv/x86 arch-specific Makefiles.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Rick Chen <rick@andestech.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
5 years agoMakefile: Use -fno-strict-aliasing globally
Bin Meng [Mon, 17 Sep 2018 05:35:28 +0000 (22:35 -0700)]
Makefile: Use -fno-strict-aliasing globally

The -fstrict-aliasing option is implicitly enabled at levels -O2,
-O3, -Os by GCC. This option allows the compiler to assume the
strictest aliasing rules applicable to the language being compiled.
For example, the practice of reading from a different union member
than the one most recently written to (called "type-punning") is
common. In this case, "type-punning" only works if the memory is
accessed through the union type, but might not work by taking the
address, casting the resulting pointer and dereferencing the result,
which is an undefined behavior per the "strict aliasing rules".

GCC's -Wstrict-aliasing (included in -Wall) option does not catch
all cases, but does attempt to catch the more common pitfalls. So
there are cases that GCC does not report but the codes are violating
the "strict aliasing rules".

Given lots of codes that may be written to rely on "type-punning",
and Linux kernel disables it by -fno-strict-aliasing globally, since
U-Boot currently does this on nds32/riscv/x86 builds only, extend
this for all architecture builds.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
5 years agoserial: omap: Add support for AM654 uart controller
Lokesh Vutla [Fri, 14 Sep 2018 14:13:35 +0000 (19:43 +0530)]
serial: omap: Add support for AM654 uart controller

AM654 uses a UART controller that is compatible (partially) with
existing OMAP UART, Introduce a compatible for adding support
for this controller.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
5 years agoconfigs: Drop CONFIG_SYS_SCSI_MAXDEVICE
Tuomas Tynkkynen [Wed, 12 Sep 2018 22:28:57 +0000 (01:28 +0300)]
configs: Drop CONFIG_SYS_SCSI_MAXDEVICE

This option has never been used for anything. Drop it.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Reviewed-by: Simon Glass <sjg@chromium.org>
5 years agoata: Drop CONFIG_SYS_SCSI_MAX_* from boards using DM_SCSI
Tuomas Tynkkynen [Wed, 12 Sep 2018 22:28:56 +0000 (01:28 +0300)]
ata: Drop CONFIG_SYS_SCSI_MAX_* from boards using DM_SCSI

These options are not used or necessary when device model is being used
for SCSI. Just drop them.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Reviewed-by: Simon Glass <sjg@chromium.org>
5 years agoata: ahci: Don't cap AHCI port count under CONFIG_DM_SCSI
Tuomas Tynkkynen [Wed, 12 Sep 2018 22:28:55 +0000 (01:28 +0300)]
ata: ahci: Don't cap AHCI port count under CONFIG_DM_SCSI

When using device model this sort of hardcoded limits aren't used or
necessary.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Reviewed-by: Simon Glass <sjg@chromium.org>
5 years agoata: ahci: Loop over the actual number of ports, not the maximum
Tuomas Tynkkynen [Wed, 12 Sep 2018 22:28:54 +0000 (01:28 +0300)]
ata: ahci: Loop over the actual number of ports, not the maximum

The loop in ahci_start_ports() is looping over the maximum number of
SCSI devices in the system, which can be larger than the amount of ports
a particular AHCI controller has. The extra looping isn't directly
harmful because the link_port_map bitmap won't have the bit set for a
nonexistent port, but it is wasteful. Replace the loop limit with the
port count of the AHCI controller instead.

Signed-off-by: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Reviewed-by: Simon Glass <sjg@chromium.org>
5 years agoxtensa: use asm-generic/atomic.h
Chris Packham [Sat, 8 Sep 2018 09:39:07 +0000 (21:39 +1200)]
xtensa: use asm-generic/atomic.h

Make use of asm-generic/atomic.h.

Signed-off-by: Chris Packham <judge.packham@gmail.com>
Acked-by: Max Filippov <jcmvbkbc@gmail.com>