diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:31:08 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2016-10-10 08:31:08 +0200 |
commit | 64b164356a103b86a899aea297774998adfe62e9 (patch) | |
tree | f991654a3672ebe88ada804d6fce87068764b9e2 /drivers | |
parent | b85e0cba7db533ebc8e6753e09ed471ddebfe4d9 (diff) | |
parent | d66e242213320a4fed9960eee0ecc870a9e4c616 (diff) | |
download | barebox-64b164356a103b86a899aea297774998adfe62e9.tar.gz barebox-64b164356a103b86a899aea297774998adfe62e9.tar.xz |
Merge branch 'for-next/mvebu'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/mvneta.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/armada-370.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/mvebu/common.c | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 1690f3b576..5c163cebc7 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -395,6 +395,7 @@ static int mvneta_send(struct eth_device *edev, void *data, int len) /* Flush transmit data */ dma_sync_single_for_device((unsigned long)data, len, DMA_TO_DEVICE); + memset(txdesc, 0, sizeof(*txdesc)); /* Fill the Tx descriptor */ txdesc->cmd_sts = MVNETA_TX_L4_CSUM_NOT | MVNETA_TXD_FLZ_DESC; txdesc->buf_ptr = (u32)data; diff --git a/drivers/pinctrl/mvebu/armada-370.c b/drivers/pinctrl/mvebu/armada-370.c index 1c79bd62af..c2c1a0fa63 100644 --- a/drivers/pinctrl/mvebu/armada-370.c +++ b/drivers/pinctrl/mvebu/armada-370.c @@ -362,7 +362,7 @@ static struct mvebu_mpp_mode mv88f6710_mpp_modes[] = { MPP_FUNCTION(0x5, "audio", "mclk"), MPP_FUNCTION(0x6, "uart0", "cts")), MPP_MODE(63, "mpp63", armada_370_mpp_ctrl, - MPP_FUNCTION(0x0, "gpo", NULL), + MPP_FUNCTION(0x0, "gpio", NULL), MPP_FUNCTION(0x1, "spi0", "sck"), MPP_FUNCTION(0x2, "tclk", NULL)), MPP_MODE(64, "mpp64", armada_370_mpp_ctrl, diff --git a/drivers/pinctrl/mvebu/common.c b/drivers/pinctrl/mvebu/common.c index 5327052867..ae16b39268 100644 --- a/drivers/pinctrl/mvebu/common.c +++ b/drivers/pinctrl/mvebu/common.c @@ -78,7 +78,8 @@ static int mvebu_pinctrl_set_state(struct pinctrl_device *pdev, set = mvebu_pinctrl_find_setting_by_name(pctl, mode, function); if (!set) { - dev_err(pdev->dev, "unsupported function %s on pin %s", + dev_err(pdev->dev, + "unsupported function %s on pin %s\n", function, group); continue; } |