aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-10 23:01:30 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-10 23:01:30 -0500
commitc5ce28df0e7c01a1de23c36ebdefcd803f2b6cbb (patch)
tree9830baf38832769e1cf621708889111bbe3c93df /arch
parent29afc4e9a408f2304e09c6dd0dbcfbd2356d0faa (diff)
parent9399f0c51489ae8c16d6559b82a452fdc1895e91 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Miller: 1) More iov_iter conversion work from Al Viro. [ The "crypto: switch af_alg_make_sg() to iov_iter" commit was wrong, and this pull actually adds an extra commit on top of the branch I'm pulling to fix that up, so that the pre-merge state is ok. - Linus ] 2) Various optimizations to the ipv4 forwarding information base trie lookup implementation. From Alexander Duyck. 3) Remove sock_iocb altogether, from CHristoph Hellwig. 4) Allow congestion control algorithm selection via routing metrics. From Daniel Borkmann. 5) Make ipv4 uncached route list per-cpu, from Eric Dumazet. 6) Handle rfs hash collisions more gracefully, also from Eric Dumazet. 7) Add xmit_more support to r8169, e1000, and e1000e drivers. From Florian Westphal. 8) Transparent Ethernet Bridging support for GRO, from Jesse Gross. 9) Add BPF packet actions to packet scheduler, from Jiri Pirko. 10) Add support for uniqu flow IDs to openvswitch, from Joe Stringer. 11) New NetCP ethernet driver, from Muralidharan Karicheri and Wingman Kwok. 12) More sanely handle out-of-window dupacks, which can result in serious ACK storms. From Neal Cardwell. 13) Various rhashtable bug fixes and enhancements, from Herbert Xu, Patrick McHardy, and Thomas Graf. 14) Support xmit_more in be2net, from Sathya Perla. 15) Group Policy extensions for vxlan, from Thomas Graf. 16) Remove Checksum Offload support for vxlan, from Tom Herbert. 17) Like ipv4, support lockless transmit over ipv6 UDP sockets. From Vlad Yasevich. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1494+1 commits) crypto: fix af_alg_make_sg() conversion to iov_iter ipv4: Namespecify TCP PMTU mechanism i40e: Fix for stats init function call in Rx setup tcp: don't include Fast Open option in SYN-ACK on pure SYN-data openvswitch: Only set TUNNEL_VXLAN_OPT if VXLAN-GBP metadata is set ipv6: Make __ipv6_select_ident static ipv6: Fix fragment id assignment on LE arches. bridge: Fix inability to add non-vlan fdb entry net: Mellanox: Delete unnecessary checks before the function call "vunmap" cxgb4: Add support in cxgb4 to get expansion rom version via ethtool ethtool: rename reserved1 memeber in ethtool_drvinfo for expansion ROM version net: dsa: Remove redundant phy_attach() IB/mlx4: Reset flow support for IB kernel ULPs IB/mlx4: Always use the correct port for mirrored multicast attachments net/bonding: Fix potential bad memory access during bonding events tipc: remove tipc_snprintf tipc: nl compat add noop and remove legacy nl framework tipc: convert legacy nl stats show to nl compat tipc: convert legacy nl net id get to nl compat tipc: convert legacy nl net id set to nl compat ...
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/am3517.dtsi1
-rw-r--r--arch/arm/boot/dts/rk3288-evb-rk808.dts23
-rw-r--r--arch/arm/boot/dts/rk3288-evb.dtsi19
-rw-r--r--arch/arm/boot/dts/rk3288.dtsi54
-rw-r--r--arch/arm/boot/dts/stih407-family.dtsi9
-rw-r--r--arch/arm/boot/dts/stih410.dtsi70
-rw-r--r--arch/arm/boot/dts/stih415.dtsi12
-rw-r--r--arch/arm/boot/dts/stih416.dtsi22
-rw-r--r--arch/arm/configs/multi_v7_defconfig1
-rw-r--r--arch/arm/include/asm/mach/irda.h20
-rw-r--r--arch/arm/mach-sa1100/assabet.c2
-rw-r--r--arch/arm/mach-sa1100/collie.c2
-rw-r--r--arch/arm/mach-sa1100/h3100.c2
-rw-r--r--arch/arm/mach-sa1100/h3600.c2
-rw-r--r--arch/microblaze/kernel/timer.c1
15 files changed, 199 insertions, 41 deletions
diff --git a/arch/arm/boot/dts/am3517.dtsi b/arch/arm/boot/dts/am3517.dtsi
index 5a452fdd7c5d..c90724bded10 100644
--- a/arch/arm/boot/dts/am3517.dtsi
+++ b/arch/arm/boot/dts/am3517.dtsi
@@ -31,6 +31,7 @@
31 status = "disabled"; 31 status = "disabled";
32 reg = <0x5c000000 0x30000>; 32 reg = <0x5c000000 0x30000>;
33 interrupts = <67 68 69 70>; 33 interrupts = <67 68 69 70>;
34 syscon = <&omap3_scm_general>;
34 ti,davinci-ctrl-reg-offset = <0x10000>; 35 ti,davinci-ctrl-reg-offset = <0x10000>;
35 ti,davinci-ctrl-mod-reg-offset = <0>; 36 ti,davinci-ctrl-mod-reg-offset = <0>;
36 ti,davinci-ctrl-ram-offset = <0x20000>; 37 ti,davinci-ctrl-ram-offset = <0x20000>;
diff --git a/arch/arm/boot/dts/rk3288-evb-rk808.dts b/arch/arm/boot/dts/rk3288-evb-rk808.dts
index d8c775e6d5fe..e1d3eeb8f094 100644
--- a/arch/arm/boot/dts/rk3288-evb-rk808.dts
+++ b/arch/arm/boot/dts/rk3288-evb-rk808.dts
@@ -15,6 +15,13 @@
15 15
16/ { 16/ {
17 compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288"; 17 compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288";
18
19 ext_gmac: external-gmac-clock {
20 compatible = "fixed-clock";
21 clock-frequency = <125000000>;
22 clock-output-names = "ext_gmac";
23 #clock-cells = <0>;
24 };
18}; 25};
19 26
20&cpu0 { 27&cpu0 {
@@ -152,3 +159,19 @@
152 }; 159 };
153 }; 160 };
154}; 161};
162
163&gmac {
164 phy-supply = <&vcc_phy>;
165 phy-mode = "rgmii";
166 clock_in_out = "input";
167 snps,reset-gpio = <&gpio4 7 0>;
168 snps,reset-active-low;
169 snps,reset-delays-us = <0 10000 1000000>;
170 assigned-clocks = <&cru SCLK_MAC>;
171 assigned-clock-parents = <&ext_gmac>;
172 pinctrl-names = "default";
173 pinctrl-0 = <&rgmii_pins>;
174 tx_delay = <0x30>;
175 rx_delay = <0x10>;
176 status = "ok";
177};
diff --git a/arch/arm/boot/dts/rk3288-evb.dtsi b/arch/arm/boot/dts/rk3288-evb.dtsi
index 6194d673e80b..1c08eb0ecdb9 100644
--- a/arch/arm/boot/dts/rk3288-evb.dtsi
+++ b/arch/arm/boot/dts/rk3288-evb.dtsi
@@ -90,6 +90,19 @@
90 regulator-always-on; 90 regulator-always-on;
91 regulator-boot-on; 91 regulator-boot-on;
92 }; 92 };
93
94 vcc_phy: vcc-phy-regulator {
95 compatible = "regulator-fixed";
96 enable-active-high;
97 gpio = <&gpio0 6 GPIO_ACTIVE_HIGH>;
98 pinctrl-names = "default";
99 pinctrl-0 = <&eth_phy_pwr>;
100 regulator-name = "vcc_phy";
101 regulator-min-microvolt = <3300000>;
102 regulator-max-microvolt = <3300000>;
103 regulator-always-on;
104 regulator-boot-on;
105 };
93}; 106};
94 107
95&emmc { 108&emmc {
@@ -208,6 +221,12 @@
208 rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>; 221 rockchip,pins = <0 14 RK_FUNC_GPIO &pcfg_pull_none>;
209 }; 222 };
210 }; 223 };
224
225 eth_phy {
226 eth_phy_pwr: eth-phy-pwr {
227 rockchip,pins = <0 6 RK_FUNC_GPIO &pcfg_pull_none>;
228 };
229 };
211}; 230};
212 231
213&usb_host0_ehci { 232&usb_host0_ehci {
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index fd19f00784bd..910dcad2088a 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -380,6 +380,22 @@
380 status = "disabled"; 380 status = "disabled";
381 }; 381 };
382 382
383 gmac: ethernet@ff290000 {
384 compatible = "rockchip,rk3288-gmac";
385 reg = <0xff290000 0x10000>;
386 interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;
387 interrupt-names = "macirq";
388 rockchip,grf = <&grf>;
389 clocks = <&cru SCLK_MAC>,
390 <&cru SCLK_MAC_RX>, <&cru SCLK_MAC_TX>,
391 <&cru SCLK_MACREF>, <&cru SCLK_MACREF_OUT>,
392 <&cru ACLK_GMAC>, <&cru PCLK_GMAC>;
393 clock-names = "stmmaceth",
394 "mac_clk_rx", "mac_clk_tx",
395 "clk_mac_ref", "clk_mac_refout",
396 "aclk_mac", "pclk_mac";
397 };
398
383 usb_host0_ehci: usb@ff500000 { 399 usb_host0_ehci: usb@ff500000 {
384 compatible = "generic-ehci"; 400 compatible = "generic-ehci";
385 reg = <0xff500000 0x100>; 401 reg = <0xff500000 0x100>;
@@ -725,6 +741,11 @@
725 bias-disable; 741 bias-disable;
726 }; 742 };
727 743
744 pcfg_pull_none_12ma: pcfg-pull-none-12ma {
745 bias-disable;
746 drive-strength = <12>;
747 };
748
728 i2c0 { 749 i2c0 {
729 i2c0_xfer: i2c0-xfer { 750 i2c0_xfer: i2c0-xfer {
730 rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>, 751 rockchip,pins = <0 15 RK_FUNC_1 &pcfg_pull_none>,
@@ -1068,5 +1089,38 @@
1068 rockchip,pins = <7 23 3 &pcfg_pull_none>; 1089 rockchip,pins = <7 23 3 &pcfg_pull_none>;
1069 }; 1090 };
1070 }; 1091 };
1092
1093 gmac {
1094 rgmii_pins: rgmii-pins {
1095 rockchip,pins = <3 30 3 &pcfg_pull_none>,
1096 <3 31 3 &pcfg_pull_none>,
1097 <3 26 3 &pcfg_pull_none>,
1098 <3 27 3 &pcfg_pull_none>,
1099 <3 28 3 &pcfg_pull_none_12ma>,
1100 <3 29 3 &pcfg_pull_none_12ma>,
1101 <3 24 3 &pcfg_pull_none_12ma>,
1102 <3 25 3 &pcfg_pull_none_12ma>,
1103 <4 0 3 &pcfg_pull_none>,
1104 <4 5 3 &pcfg_pull_none>,
1105 <4 6 3 &pcfg_pull_none>,
1106 <4 9 3 &pcfg_pull_none_12ma>,
1107 <4 4 3 &pcfg_pull_none_12ma>,
1108 <4 1 3 &pcfg_pull_none>,
1109 <4 3 3 &pcfg_pull_none>;
1110 };
1111
1112 rmii_pins: rmii-pins {
1113 rockchip,pins = <3 30 3 &pcfg_pull_none>,
1114 <3 31 3 &pcfg_pull_none>,
1115 <3 28 3 &pcfg_pull_none>,
1116 <3 29 3 &pcfg_pull_none>,
1117 <4 0 3 &pcfg_pull_none>,
1118 <4 5 3 &pcfg_pull_none>,
1119 <4 4 3 &pcfg_pull_none>,
1120 <4 1 3 &pcfg_pull_none>,
1121 <4 2 3 &pcfg_pull_none>,
1122 <4 3 3 &pcfg_pull_none>;
1123 };
1124 };
1071 }; 1125 };
1072}; 1126};
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 3e31d32133b8..d4a8f843cdc8 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -274,5 +274,14 @@
274 274
275 status = "disabled"; 275 status = "disabled";
276 }; 276 };
277
278 usb2_picophy0: phy1 {
279 compatible = "st,stih407-usb2-phy";
280 #phy-cells = <0>;
281 st,syscfg = <&syscfg_core 0x100 0xf4>;
282 resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
283 <&picophyreset STIH407_PICOPHY0_RESET>;
284 reset-names = "global", "port";
285 };
277 }; 286 };
278}; 287};
diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index c05627eb717d..37995f4739d2 100644
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -10,5 +10,75 @@
10#include "stih407-family.dtsi" 10#include "stih407-family.dtsi"
11#include "stih410-pinctrl.dtsi" 11#include "stih410-pinctrl.dtsi"
12/ { 12/ {
13 soc {
14 usb2_picophy1: phy2 {
15 compatible = "st,stih407-usb2-phy";
16 #phy-cells = <0>;
17 st,syscfg = <&syscfg_core 0xf8 0xf4>;
18 resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
19 <&picophyreset STIH407_PICOPHY0_RESET>;
20 reset-names = "global", "port";
21 };
13 22
23 usb2_picophy2: phy3 {
24 compatible = "st,stih407-usb2-phy";
25 #phy-cells = <0>;
26 st,syscfg = <&syscfg_core 0xfc 0xf4>;
27 resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
28 <&picophyreset STIH407_PICOPHY1_RESET>;
29 reset-names = "global", "port";
30 };
31
32 ohci0: usb@9a03c00 {
33 compatible = "st,st-ohci-300x";
34 reg = <0x9a03c00 0x100>;
35 interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>;
36 clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
37 resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
38 <&softreset STIH407_USB2_PORT0_SOFTRESET>;
39 reset-names = "power", "softreset";
40 phys = <&usb2_picophy1>;
41 phy-names = "usb";
42 };
43
44 ehci0: usb@9a03e00 {
45 compatible = "st,st-ehci-300x";
46 reg = <0x9a03e00 0x100>;
47 interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>;
48 pinctrl-names = "default";
49 pinctrl-0 = <&pinctrl_usb0>;
50 clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
51 resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>,
52 <&softreset STIH407_USB2_PORT0_SOFTRESET>;
53 reset-names = "power", "softreset";
54 phys = <&usb2_picophy1>;
55 phy-names = "usb";
56 };
57
58 ohci1: usb@9a83c00 {
59 compatible = "st,st-ohci-300x";
60 reg = <0x9a83c00 0x100>;
61 interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>;
62 clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
63 resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
64 <&softreset STIH407_USB2_PORT1_SOFTRESET>;
65 reset-names = "power", "softreset";
66 phys = <&usb2_picophy2>;
67 phy-names = "usb";
68 };
69
70 ehci1: usb@9a83e00 {
71 compatible = "st,st-ehci-300x";
72 reg = <0x9a83e00 0x100>;
73 interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>;
74 pinctrl-names = "default";
75 pinctrl-0 = <&pinctrl_usb1>;
76 clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>;
77 resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>,
78 <&softreset STIH407_USB2_PORT1_SOFTRESET>;
79 reset-names = "power", "softreset";
80 phys = <&usb2_picophy2>;
81 phy-names = "usb";
82 };
83 };
14}; 84};
diff --git a/arch/arm/boot/dts/stih415.dtsi b/arch/arm/boot/dts/stih415.dtsi
index 9198c12765ea..19b019b5f30e 100644
--- a/arch/arm/boot/dts/stih415.dtsi
+++ b/arch/arm/boot/dts/stih415.dtsi
@@ -153,8 +153,8 @@
153 compatible = "st,stih415-dwmac", "snps,dwmac", "snps,dwmac-3.610"; 153 compatible = "st,stih415-dwmac", "snps,dwmac", "snps,dwmac-3.610";
154 status = "disabled"; 154 status = "disabled";
155 155
156 reg = <0xfe810000 0x8000>, <0x148 0x4>; 156 reg = <0xfe810000 0x8000>;
157 reg-names = "stmmaceth", "sti-ethconf"; 157 reg-names = "stmmaceth";
158 158
159 interrupts = <0 147 0>, <0 148 0>, <0 149 0>; 159 interrupts = <0 147 0>, <0 148 0>, <0 149 0>;
160 interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; 160 interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
@@ -165,7 +165,7 @@
165 snps,mixed-burst; 165 snps,mixed-burst;
166 snps,force_sf_dma_mode; 166 snps,force_sf_dma_mode;
167 167
168 st,syscon = <&syscfg_rear>; 168 st,syscon = <&syscfg_rear 0x148>;
169 169
170 pinctrl-names = "default"; 170 pinctrl-names = "default";
171 pinctrl-0 = <&pinctrl_mii0>; 171 pinctrl-0 = <&pinctrl_mii0>;
@@ -177,8 +177,8 @@
177 device_type = "network"; 177 device_type = "network";
178 compatible = "st,stih415-dwmac", "snps,dwmac", "snps,dwmac-3.610"; 178 compatible = "st,stih415-dwmac", "snps,dwmac", "snps,dwmac-3.610";
179 status = "disabled"; 179 status = "disabled";
180 reg = <0xfef08000 0x8000>, <0x74 0x4>; 180 reg = <0xfef08000 0x8000>;
181 reg-names = "stmmaceth", "sti-ethconf"; 181 reg-names = "stmmaceth";
182 interrupts = <0 150 0>, <0 151 0>, <0 152 0>; 182 interrupts = <0 150 0>, <0 151 0>, <0 152 0>;
183 interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; 183 interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
184 184
@@ -186,7 +186,7 @@
186 snps,mixed-burst; 186 snps,mixed-burst;
187 snps,force_sf_dma_mode; 187 snps,force_sf_dma_mode;
188 188
189 st,syscon = <&syscfg_sbc>; 189 st,syscon = <&syscfg_sbc 0x74>;
190 190
191 resets = <&softreset STIH415_ETH1_SOFTRESET>; 191 resets = <&softreset STIH415_ETH1_SOFTRESET>;
192 reset-names = "stmmaceth"; 192 reset-names = "stmmaceth";
diff --git a/arch/arm/boot/dts/stih416.dtsi b/arch/arm/boot/dts/stih416.dtsi
index fad9073ddeed..ea28ebadab1a 100644
--- a/arch/arm/boot/dts/stih416.dtsi
+++ b/arch/arm/boot/dts/stih416.dtsi
@@ -163,8 +163,8 @@
163 device_type = "network"; 163 device_type = "network";
164 compatible = "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710"; 164 compatible = "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710";
165 status = "disabled"; 165 status = "disabled";
166 reg = <0xfe810000 0x8000>, <0x8bc 0x4>; 166 reg = <0xfe810000 0x8000>;
167 reg-names = "stmmaceth", "sti-ethconf"; 167 reg-names = "stmmaceth";
168 168
169 interrupts = <0 133 0>, <0 134 0>, <0 135 0>; 169 interrupts = <0 133 0>, <0 134 0>, <0 135 0>;
170 interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; 170 interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
@@ -172,7 +172,7 @@
172 snps,pbl = <32>; 172 snps,pbl = <32>;
173 snps,mixed-burst; 173 snps,mixed-burst;
174 174
175 st,syscon = <&syscfg_rear>; 175 st,syscon = <&syscfg_rear 0x8bc>;
176 resets = <&softreset STIH416_ETH0_SOFTRESET>; 176 resets = <&softreset STIH416_ETH0_SOFTRESET>;
177 reset-names = "stmmaceth"; 177 reset-names = "stmmaceth";
178 pinctrl-names = "default"; 178 pinctrl-names = "default";
@@ -185,15 +185,15 @@
185 device_type = "network"; 185 device_type = "network";
186 compatible = "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710"; 186 compatible = "st,stih416-dwmac", "snps,dwmac", "snps,dwmac-3.710";
187 status = "disabled"; 187 status = "disabled";
188 reg = <0xfef08000 0x8000>, <0x7f0 0x4>; 188 reg = <0xfef08000 0x8000>;
189 reg-names = "stmmaceth", "sti-ethconf"; 189 reg-names = "stmmaceth";
190 interrupts = <0 136 0>, <0 137 0>, <0 138 0>; 190 interrupts = <0 136 0>, <0 137 0>, <0 138 0>;
191 interrupt-names = "macirq", "eth_wake_irq", "eth_lpi"; 191 interrupt-names = "macirq", "eth_wake_irq", "eth_lpi";
192 192
193 snps,pbl = <32>; 193 snps,pbl = <32>;
194 snps,mixed-burst; 194 snps,mixed-burst;
195 195
196 st,syscon = <&syscfg_sbc>; 196 st,syscon = <&syscfg_sbc 0x7f0>;
197 197
198 resets = <&softreset STIH416_ETH1_SOFTRESET>; 198 resets = <&softreset STIH416_ETH1_SOFTRESET>;
199 reset-names = "stmmaceth"; 199 reset-names = "stmmaceth";
@@ -283,21 +283,21 @@
283 283
284 miphy365x_phy: phy@fe382000 { 284 miphy365x_phy: phy@fe382000 {
285 compatible = "st,miphy365x-phy"; 285 compatible = "st,miphy365x-phy";
286 st,syscfg = <&syscfg_rear>; 286 st,syscfg = <&syscfg_rear 0x824 0x828>;
287 #address-cells = <1>; 287 #address-cells = <1>;
288 #size-cells = <1>; 288 #size-cells = <1>;
289 ranges; 289 ranges;
290 290
291 phy_port0: port@fe382000 { 291 phy_port0: port@fe382000 {
292 #phy-cells = <1>; 292 #phy-cells = <1>;
293 reg = <0xfe382000 0x100>, <0xfe394000 0x100>, <0x824 0x4>; 293 reg = <0xfe382000 0x100>, <0xfe394000 0x100>;
294 reg-names = "sata", "pcie", "syscfg"; 294 reg-names = "sata", "pcie";
295 }; 295 };
296 296
297 phy_port1: port@fe38a000 { 297 phy_port1: port@fe38a000 {
298 #phy-cells = <1>; 298 #phy-cells = <1>;
299 reg = <0xfe38a000 0x100>, <0xfe804000 0x100>, <0x828 0x4>; 299 reg = <0xfe38a000 0x100>, <0xfe804000 0x100>;
300 reg-names = "sata", "pcie", "syscfg"; 300 reg-names = "sata", "pcie";
301 }; 301 };
302 }; 302 };
303 303
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index bc393b7e5ece..444685c44055 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -456,6 +456,7 @@ CONFIG_OMAP_USB2=y
456CONFIG_TI_PIPE3=y 456CONFIG_TI_PIPE3=y
457CONFIG_PHY_MIPHY365X=y 457CONFIG_PHY_MIPHY365X=y
458CONFIG_PHY_STIH41X_USB=y 458CONFIG_PHY_STIH41X_USB=y
459CONFIG_PHY_STIH407_USB=y
459CONFIG_PHY_SUN4I_USB=y 460CONFIG_PHY_SUN4I_USB=y
460CONFIG_EXT4_FS=y 461CONFIG_EXT4_FS=y
461CONFIG_AUTOFS4_FS=y 462CONFIG_AUTOFS4_FS=y
diff --git a/arch/arm/include/asm/mach/irda.h b/arch/arm/include/asm/mach/irda.h
deleted file mode 100644
index 38f77b5e56cf..000000000000
--- a/arch/arm/include/asm/mach/irda.h
+++ /dev/null
@@ -1,20 +0,0 @@
1/*
2 * arch/arm/include/asm/mach/irda.h
3 *
4 * Copyright (C) 2004 Russell King.
5 *
6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 2 as
8 * published by the Free Software Foundation.
9 */
10#ifndef __ASM_ARM_MACH_IRDA_H
11#define __ASM_ARM_MACH_IRDA_H
12
13struct irda_platform_data {
14 int (*startup)(struct device *);
15 void (*shutdown)(struct device *);
16 int (*set_power)(struct device *, unsigned int state);
17 void (*set_speed)(struct device *, unsigned int speed);
18};
19
20#endif
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index 7dd894ece9ae..d28ecb9ef172 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -37,7 +37,7 @@
37 37
38#include <asm/mach/arch.h> 38#include <asm/mach/arch.h>
39#include <asm/mach/flash.h> 39#include <asm/mach/flash.h>
40#include <asm/mach/irda.h> 40#include <linux/platform_data/irda-sa11x0.h>
41#include <asm/mach/map.h> 41#include <asm/mach/map.h>
42#include <mach/assabet.h> 42#include <mach/assabet.h>
43#include <linux/platform_data/mfd-mcp-sa11x0.h> 43#include <linux/platform_data/mfd-mcp-sa11x0.h>
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index b90c7d828391..7fcbe3d119c7 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -43,7 +43,7 @@
43#include <asm/mach/arch.h> 43#include <asm/mach/arch.h>
44#include <asm/mach/flash.h> 44#include <asm/mach/flash.h>
45#include <asm/mach/map.h> 45#include <asm/mach/map.h>
46#include <asm/mach/irda.h> 46#include <linux/platform_data/irda-sa11x0.h>
47 47
48#include <asm/hardware/scoop.h> 48#include <asm/hardware/scoop.h>
49#include <asm/mach/sharpsl_param.h> 49#include <asm/mach/sharpsl_param.h>
diff --git a/arch/arm/mach-sa1100/h3100.c b/arch/arm/mach-sa1100/h3100.c
index 3c43219bc881..c6b412054a3c 100644
--- a/arch/arm/mach-sa1100/h3100.c
+++ b/arch/arm/mach-sa1100/h3100.c
@@ -18,7 +18,7 @@
18 18
19#include <asm/mach-types.h> 19#include <asm/mach-types.h>
20#include <asm/mach/arch.h> 20#include <asm/mach/arch.h>
21#include <asm/mach/irda.h> 21#include <linux/platform_data/irda-sa11x0.h>
22 22
23#include <mach/h3xxx.h> 23#include <mach/h3xxx.h>
24#include <mach/irqs.h> 24#include <mach/irqs.h>
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 5be54c214c7c..118338efd790 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -18,7 +18,7 @@
18 18
19#include <asm/mach-types.h> 19#include <asm/mach-types.h>
20#include <asm/mach/arch.h> 20#include <asm/mach/arch.h>
21#include <asm/mach/irda.h> 21#include <linux/platform_data/irda-sa11x0.h>
22 22
23#include <mach/h3xxx.h> 23#include <mach/h3xxx.h>
24#include <mach/irqs.h> 24#include <mach/irqs.h>
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index dd96f0e4bfa2..c8977450e28c 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -17,6 +17,7 @@
17#include <linux/clockchips.h> 17#include <linux/clockchips.h>
18#include <linux/of_address.h> 18#include <linux/of_address.h>
19#include <linux/of_irq.h> 19#include <linux/of_irq.h>
20#include <linux/timecounter.h>
20#include <asm/cpuinfo.h> 21#include <asm/cpuinfo.h>
21 22
22static void __iomem *timer_baseaddr; 23static void __iomem *timer_baseaddr;