diff options
author | LCPD Auto Merger | 2016-05-27 11:20:52 -0500 |
---|---|---|
committer | LCPD Auto Merger | 2016-05-27 11:20:52 -0500 |
commit | 91f5da0656fbdb200fabe19a6b320e4fd3e72938 (patch) | |
tree | 8e9f90fd6132c4db87b05907f37c325c59e3e798 | |
parent | 4dbc9c5ebe462e02343383b5bfbe4cc81e5ec053 (diff) | |
parent | 8c8c59fd95cdfccffd56b06714675130cd985b9c (diff) | |
download | kernel-audio-91f5da0656fbdb200fabe19a6b320e4fd3e72938.tar.gz kernel-audio-91f5da0656fbdb200fabe19a6b320e4fd3e72938.tar.xz kernel-audio-91f5da0656fbdb200fabe19a6b320e4fd3e72938.zip |
Merge branch 'connectivity-ti-linux-4.4.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-4.4.y
TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-4.4.y
* 'connectivity-ti-linux-4.4.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
HACK: net: prueth: Fix net transmit queue stall
ARM: dts: keystone-k2*: Increase SPI Flash partition size for U-Boot
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
-rw-r--r-- | arch/arm/boot/dts/keystone-k2e-evm.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2g-evm.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2hk-evm.dts | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/keystone-k2l-evm.dts | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/ti/prueth.c | 1 |
5 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/keystone-k2e-evm.dts b/arch/arm/boot/dts/keystone-k2e-evm.dts index 9e17f90d33bc..89388f3d7c22 100644 --- a/arch/arm/boot/dts/keystone-k2e-evm.dts +++ b/arch/arm/boot/dts/keystone-k2e-evm.dts | |||
@@ -158,13 +158,13 @@ | |||
158 | 158 | ||
159 | partition@0 { | 159 | partition@0 { |
160 | label = "u-boot-spl"; | 160 | label = "u-boot-spl"; |
161 | reg = <0x0 0x80000>; | 161 | reg = <0x0 0x100000>; |
162 | read-only; | 162 | read-only; |
163 | }; | 163 | }; |
164 | 164 | ||
165 | partition@1 { | 165 | partition@1 { |
166 | label = "misc"; | 166 | label = "misc"; |
167 | reg = <0x80000 0xf80000>; | 167 | reg = <0x100000 0xf00000>; |
168 | }; | 168 | }; |
169 | }; | 169 | }; |
170 | }; | 170 | }; |
diff --git a/arch/arm/boot/dts/keystone-k2g-evm.dts b/arch/arm/boot/dts/keystone-k2g-evm.dts index 035039ef24ad..af457db4fd97 100644 --- a/arch/arm/boot/dts/keystone-k2g-evm.dts +++ b/arch/arm/boot/dts/keystone-k2g-evm.dts | |||
@@ -459,13 +459,13 @@ | |||
459 | 459 | ||
460 | partition@0 { | 460 | partition@0 { |
461 | label = "u-boot-spl"; | 461 | label = "u-boot-spl"; |
462 | reg = <0x0 0x80000>; | 462 | reg = <0x0 0x100000>; |
463 | read-only; | 463 | read-only; |
464 | }; | 464 | }; |
465 | 465 | ||
466 | partition@1 { | 466 | partition@1 { |
467 | label = "misc"; | 467 | label = "misc"; |
468 | reg = <0x80000 0xf80000>; | 468 | reg = <0x100000 0xf00000>; |
469 | }; | 469 | }; |
470 | }; | 470 | }; |
471 | }; | 471 | }; |
diff --git a/arch/arm/boot/dts/keystone-k2hk-evm.dts b/arch/arm/boot/dts/keystone-k2hk-evm.dts index d1e73d235496..071e01c2b7d2 100644 --- a/arch/arm/boot/dts/keystone-k2hk-evm.dts +++ b/arch/arm/boot/dts/keystone-k2hk-evm.dts | |||
@@ -186,13 +186,13 @@ | |||
186 | 186 | ||
187 | partition@0 { | 187 | partition@0 { |
188 | label = "u-boot-spl"; | 188 | label = "u-boot-spl"; |
189 | reg = <0x0 0x80000>; | 189 | reg = <0x0 0x100000>; |
190 | read-only; | 190 | read-only; |
191 | }; | 191 | }; |
192 | 192 | ||
193 | partition@1 { | 193 | partition@1 { |
194 | label = "misc"; | 194 | label = "misc"; |
195 | reg = <0x80000 0xf80000>; | 195 | reg = <0x100000 0xf00000>; |
196 | }; | 196 | }; |
197 | }; | 197 | }; |
198 | }; | 198 | }; |
diff --git a/arch/arm/boot/dts/keystone-k2l-evm.dts b/arch/arm/boot/dts/keystone-k2l-evm.dts index a01cc50947bb..998e2dfd569a 100644 --- a/arch/arm/boot/dts/keystone-k2l-evm.dts +++ b/arch/arm/boot/dts/keystone-k2l-evm.dts | |||
@@ -135,13 +135,13 @@ | |||
135 | 135 | ||
136 | partition@0 { | 136 | partition@0 { |
137 | label = "u-boot-spl"; | 137 | label = "u-boot-spl"; |
138 | reg = <0x0 0x80000>; | 138 | reg = <0x0 0x100000>; |
139 | read-only; | 139 | read-only; |
140 | }; | 140 | }; |
141 | 141 | ||
142 | partition@1 { | 142 | partition@1 { |
143 | label = "misc"; | 143 | label = "misc"; |
144 | reg = <0x80000 0xf80000>; | 144 | reg = <0x100000 0xf00000>; |
145 | }; | 145 | }; |
146 | }; | 146 | }; |
147 | }; | 147 | }; |
diff --git a/drivers/net/ethernet/ti/prueth.c b/drivers/net/ethernet/ti/prueth.c index d08fc7b2ae27..5986d74545a2 100644 --- a/drivers/net/ethernet/ti/prueth.c +++ b/drivers/net/ethernet/ti/prueth.c | |||
@@ -1196,7 +1196,6 @@ static int emac_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
1196 | fail_tx: | 1196 | fail_tx: |
1197 | /* error */ | 1197 | /* error */ |
1198 | ndev->stats.tx_dropped++; | 1198 | ndev->stats.tx_dropped++; |
1199 | netif_stop_queue(ndev); | ||
1200 | 1199 | ||
1201 | return NETDEV_TX_BUSY; | 1200 | return NETDEV_TX_BUSY; |
1202 | } | 1201 | } |