Michal Simek
3af709092c
net: emaclite: Use indirect register access for rx_ping/pong
...
Do initialization via indirect register access.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:51 +01:00
Michal Simek
a0b2bfb0bf
net: emaclite: Use indirect register access for tx_ping/pong
...
Do initialization via indirect register access.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:51 +01:00
Michal Simek
9a23c49662
net: emaclite: Convert MDIO to use register offset
...
Use u-boot coding style how to setup and access MDIO bus.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:51 +01:00
Michal Simek
d722e8641b
net: emaclite: Add MDIO support to driver
...
Add MDIO support before move to DM.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:51 +01:00
Michal Simek
8ce6947831
net: emaclite: Remove ancient OF probe function
...
Prepare for DM move.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:51 +01:00
Michal Simek
338a5f2bf1
net: Add axi emac to Kconfig
...
Also add dependency on PHYLIB and MII which is required.
Clean PHYLIB dependency from the driver too.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:51 +01:00
Michal Simek
ad499e42be
net: axi_emac: Rename start, stop, write_hwaddr functions
...
Rename few functions to fit to the new name convention used by DM.
Suggested-by: Joe Hershberger <joe.hershberger@ni.com >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:51 +01:00
Michal Simek
97d2363d20
net: axi_emac: Split recv from free_pkt
...
Call net_process_received_packet() by core.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:51 +01:00
Michal Simek
5d0449d4c7
net: axi_emac: Enable access to MDIO in probe
...
Detect phy when driver probes.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:51 +01:00
Michal Simek
75cc93fad7
net: axi_emac: Move driver to DM
...
Move driver to DM.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:51 +01:00
Michal Simek
f09854810c
net: axi_emac: Pass private structure where possible
...
Use axidma_priv instead of ethdevice in preparation of the DM move.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:50 +01:00
Michal Simek
0d78abf5ba
net: axi_emac: Pass private structure to phyread/phywrite
...
Prepare for move to DM.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:50 +01:00
Michal Simek
6609f35b93
net: axi_emac: Put iobase to private structure
...
Saving iobase directly to private structure helps with moving to DM.
There is an option to load iobase from pdata but it is additional load.
Pointer to private structure is available all the time.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:50 +01:00
Michal Simek
f36bbcceba
net: axi_emac: Pass directly pointer to register space
...
Simplify mdio_wait function by passing regs directly.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:50 +01:00
Michal Simek
2652a6219f
net: axi_emac: Show phy address instead of register content
...
Fix debug message.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:50 +01:00
Michal Simek
3e3f8ba26e
net: axi_emac: Fix parentheses around operand !
...
Fix these compilation warning by proper grouping:
In function 'axi_dma_init': drivers/net/xilinx_axi_emac.c:391:7:
warning: suggest parentheses around operand of '!' or change '&' to '&&'
or '!' to '~' [-Wparentheses]
if (!(in_be32(&priv->dmatx->control) |
^
In function 'axiemac_send': drivers/net/xilinx_axi_emac.c:501:21:
warning: suggest parentheses around operand of '!' or change '&' to '&&'
or '!' to '~' [-Wparentheses]
while (timeout && (!in_be32(&priv->dmatx->status) &
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:50 +01:00
Michal Simek
2014a3debc
microblaze: Enable MICREL_KSZ9021
...
To solve enabling ETH_DM where ksz90x1_reg_field is defined only when
additional Micrel type is defined.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:50 +01:00
Michal Simek
48470b7a20
microblaze: Wire-up debug_uart in asm
...
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:50 +01:00
Michal Simek
576e95b428
microblaze: Remove unused I2C macros
...
There is no i2c driver in the current u-boot.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:50 +01:00
Michal Simek
9040f4eeb9
microblaze: Enable PHYLIB via Kconfig
...
Cleanup board configuration.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:49 +01:00
Michal Simek
062f078c3b
microblaze: Do not print eth device when DM_ETH is enabled
...
Doing the same fix as is done for ARM by:
"Avoid calling print_eths() with driver model"
(sha1: ff97380015 )
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Acked-by: Joe Hershberger <joe.hershberger@ni.com >
2016-01-27 15:55:49 +01:00
Michal Simek
f0e353ce55
microblaze: Enable uart16550 DM by default
...
Microblaze is uses uartlite or uart16550 as console drivers.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:49 +01:00
Michal Simek
54e24d3332
serial: uartlite: Add uartlite to Kconfig
...
- Move config option out of board file.
- Remove uartlite address from config file
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Thomas Chou <thomas@wytron.com.tw >
2016-01-27 15:55:49 +01:00
Michal Simek
4166ba3b23
serial: uartlite: Add support for debug console
...
Add support for debug console.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Thomas Chou <thomas@wytron.com.tw >
2016-01-27 15:55:49 +01:00
Michal Simek
93768393d7
serial: uartlite: Move driver to DM
...
Enable SPL DM too.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Thomas Chou <thomas@wytron.com.tw >
2016-01-27 15:55:49 +01:00
Michal Simek
67659e2e94
microblaze: Move baudrate setting out driver selection
...
Preparation of moving to DM. Uartlite ignores baudrate setting.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:49 +01:00
Michal Simek
1cc174d40f
microblaze: Remove CONSOLE_ARG
...
Take it from DT instead.
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:49 +01:00
Ricardo Ribalda Delgado
6a2c1aaae7
ppc: xilinx-ppc4xx-generic: Update xparameters.h
...
-Remove UART address (It is now part of the dts).
-Include dummy ns16550 clock
-Fix address to last test
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:55:32 +01:00
Ricardo Ribalda Delgado
ad7321da8e
configs/xilinx-ppc440-generic: Typos and size
...
-Fix typos (runnining -> running)
-Increase default size
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:43:01 +01:00
Ricardo Ribalda Delgado
f9c690b0f6
configs/xilinx-ppc405-generic: Typos and size
...
-Fix typos (runnining -> running)
-Increase default size
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:43:01 +01:00
Ricardo Ribalda Delgado
5e68f17e24
ppc: dts: Add device tree for xilix-ppc4xx-generic
...
Add device tree example file for xilinx-ppc440-generic and
xilinx-ppc405-generic
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:43:01 +01:00
Ricardo Ribalda Delgado
2150addeff
ppc: xilinx-ppc405-generic: Cleanout header files
...
Now that there is only one header file for all ppc405 files, merge
header files.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:05 +01:00
Ricardo Ribalda Delgado
06a6405ad8
ppc: xilinx-ppc440-generic: Cleanout header files
...
Now that there is only one header file for all ppc440 files, merge
header files.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:05 +01:00
Ricardo Ribalda Delgado
3a40457f23
ppc: ppc405: ppc405-generic_flash_defconfig
...
Remove redundant defconfig file. Boot via flash can be configured via
Kconfig.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:05 +01:00
Ricardo Ribalda Delgado
093eb5daae
ppc: ppc440: ppc440-generic_flash_defconfig
...
Remove redundant defconfig file. Boot via flash can be configured via
Kconfig.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:05 +01:00
Ricardo Ribalda Delgado
bec8dd5fc0
ppc: pp440-generic: Simplify Makefile
...
As a result of the specific board removal, the Makefiles can be
simplified.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:05 +01:00
Ricardo Ribalda Delgado
6de59eb2c2
ppc: pp405-generic: Simplify Makefile
...
As a result of the specific board removal, the Makefiles can be
simplified.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:05 +01:00
Ricardo Ribalda Delgado
5b218ae106
mailaddr: Update mail address
...
The old mail address will stop working soon.
Update it all the files
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:05 +01:00
Ricardo Ribalda Delgado
df48b23428
.mailmap: Add all the mail alias for Ricardo Ribalda
...
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:05 +01:00
Ricardo Ribalda Delgado
583aefb89c
xilinx-ppc440: Remove support for v5fx30teval
...
It is just a specialized version of xilinx-ppc440
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:04 +01:00
Ricardo Ribalda Delgado
70c29dcdbc
ppc: xilinx-ppc405: Remove support for fx12mm
...
It is just a specialized version of the xilinx-ppc405
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:04 +01:00
Ricardo Ribalda Delgado
9ac0efd292
ppc: xilinx-ppc440: Remove support for ml507
...
ml507 is just a specialized version of the xilinx-ppc440-generic
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com >
Reviewed-by: Bin Meng <bmeng.cn@gmail.com >
Reviewed-by: Tom Rini <trini@konsulko.com >
Acked-by: Stefan Roese <sr@denx.de >
Signed-off-by: Michal Simek <michal.simek@xilinx.com >
Reviewed-by: Michal Simek <michal.simek@xilinx.com >
2016-01-27 15:32:04 +01:00
Tom Rini
9e4de7fd4a
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
2016-01-26 17:45:37 -05:00
Hans de Goede
2ca0299579
mvtwsi: Fix breakage introduced by "Fix mvtwsi not working on sun6i and newer sunxi SoCs"
...
"Fix mvtwsi not working on sun6i and newer sunxi SoCs" includes the following:
@@ -189,7 +200,8 @@ static int twsi_start(struct i2c_adapter *adap, int expected_status)
/* globally set TWSIEN in case it was not */
twsi_control_flags |= MVTWSI_CONTROL_TWSIEN;
/* assert START */
- writel(twsi_control_flags | MVTWSI_CONTROL_START, &twsi->control);
+ twsi_control_flags |= MVTWSI_CONTROL_START | MVTWSI_CONTROL_CLEAR_IFLG;
+ writel(twsi_control_flags, &twsi->control);
/* wait for controller to process START */
return twsi_wait(adap, expected_status);
}
The modification of twsi_control_flags done here was introduced while
merging to fix a line > 80 chars, but twsi_control_flags is a global variable
and should not be modified like this here, this commit fixes this, restoring
mvtwsi functionality.
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
2016-01-26 17:58:02 +01:00
Hans de Goede
54be0f0578
sunxi: Bananapro: Set LDO4 to 2.5V
...
According to the Bananapro schematic VDD25-SATA either comes from a
dedicated WL2003E25-5 LTO, or it is connected to LDO4 via a
0 Ohm resistor.
In practice it seems that LDO4 is used, so enable it and set it to 2.5V.
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
2016-01-26 16:20:05 +01:00
Chen-Yu Tsai
f3c5045a95
sunxi: power: axp818: Enable support for ALDOs
...
Previously, AXP818 ALDO support was partially added to Kconfig, but
never enabled in the board file, nor properly set or configured in
Kconfig. The boards continue to work because the AXP818 is designed
to pair with the A83T/H8, and the default voltages match the reference
design's requirements.
Signed-off-by: Chen-Yu Tsai <wens@csie.org >
Acked-by: Hans de Goede <hdegoede@redhat.com >
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
2016-01-26 16:20:05 +01:00
Chen-Yu Tsai
f7b4fff3f0
sunxi: h8_homlet_v2: Drop LDO settings from defconfig
...
The LDO settings in this defconfig are either wrong (ALDOs must not be 0)
or the same as Kconfig defaults.
Signed-off-by: Chen-Yu Tsai <wens@csie.org >
Acked-by: Hans de Goede <hdegoede@redhat.com >
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
2016-01-26 16:20:05 +01:00
Chen-Yu Tsai
0509efb7e9
power: axp818: Add support for DLDO and ELDO regulators
...
AXP818 provides an array of LDOs to provide power to various peripherals.
None of these regulators are critical.
Signed-off-by: Chen-Yu Tsai <wens@csie.org >
Acked-by: Hans de Goede <hdegoede@redhat.com >
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
2016-01-26 16:20:05 +01:00
Chen-Yu Tsai
3517a27ddb
power: axp: merge separate DLDO functions into 1
...
Instead of one function for each DLDO regulator, make 1 function that
takes an extra "index". Since the control bits for the DLDO regulators
are contiguous, this makes the function very simple. This removes a lot
of duplicate code.
Signed-off-by: Chen-Yu Tsai <wens@csie.org >
Acked-by: Hans de Goede <hdegoede@redhat.com >
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
2016-01-26 16:20:05 +01:00
Chen-Yu Tsai
c2caf65da5
power: axp818: Remove duplicate register definition macros
...
Some of the register definitions are duplicated. Drop them.
Signed-off-by: Chen-Yu Tsai <wens@csie.org >
Acked-by: Hans de Goede <hdegoede@redhat.com >
Signed-off-by: Hans de Goede <hdegoede@redhat.com >
2016-01-26 16:20:05 +01:00