aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/am335x-bone-common.dtsi1
-rw-r--r--arch/arm/boot/dts/am437x-idk-evm.dts25
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15.dts8
-rw-r--r--arch/arm/boot/dts/dm8168-evm.dts25
-rw-r--r--arch/arm/boot/dts/dm816x.dtsi34
-rw-r--r--arch/arm/boot/dts/dra7-evm.dts8
-rw-r--r--arch/arm/boot/dts/dra7.dtsi8
-rw-r--r--arch/arm/boot/dts/dra72-evm.dts8
-rw-r--r--arch/arm/boot/dts/omap2.dtsi4
-rw-r--r--arch/arm/boot/dts/omap3-n900.dts9
-rw-r--r--arch/arm/boot/dts/omap3.dtsi4
-rw-r--r--arch/arm/boot/dts/omap4.dtsi4
-rw-r--r--arch/arm/boot/dts/omap5.dtsi8
-rw-r--r--arch/arm/configs/multi_v7_defconfig83
-rw-r--r--arch/arm/configs/mvebu_v7_defconfig2
-rw-r--r--arch/arm/configs/omap1_defconfig16
-rw-r--r--arch/arm/configs/omap2plus_defconfig31
-rw-r--r--arch/arm/configs/shmobile_defconfig9
-rw-r--r--arch/arm/configs/sunxi_defconfig2
-rw-r--r--arch/arm/mach-asm9260/Kconfig2
20 files changed, 202 insertions, 89 deletions
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 6cc25ed912ee..2c6248d9a9ef 100644
--- a/arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -195,6 +195,7 @@
195 195
196&usb0 { 196&usb0 {
197 status = "okay"; 197 status = "okay";
198 dr_mode = "peripheral";
198}; 199};
199 200
200&usb1 { 201&usb1 {
diff --git a/arch/arm/boot/dts/am437x-idk-evm.dts b/arch/arm/boot/dts/am437x-idk-evm.dts
index f9a17e2ca8cb..0198f5a62b96 100644
--- a/arch/arm/boot/dts/am437x-idk-evm.dts
+++ b/arch/arm/boot/dts/am437x-idk-evm.dts
@@ -133,20 +133,6 @@
133 >; 133 >;
134 }; 134 };
135 135
136 i2c1_pins_default: i2c1_pins_default {
137 pinctrl-single,pins = <
138 0x15c (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE2) /* spi0_cs0.i2c1_scl */
139 0x158 (PIN_INPUT | SLEWCTRL_FAST | MUX_MODE2) /* spi0_d1.i2c1_sda */
140 >;
141 };
142
143 i2c1_pins_sleep: i2c1_pins_sleep {
144 pinctrl-single,pins = <
145 0x15c (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_cs0.i2c1_scl */
146 0x158 (PIN_INPUT_PULLDOWN | MUX_MODE7) /* spi0_d1.i2c1_sda */
147 >;
148 };
149
150 mmc1_pins_default: pinmux_mmc1_pins_default { 136 mmc1_pins_default: pinmux_mmc1_pins_default {
151 pinctrl-single,pins = < 137 pinctrl-single,pins = <
152 0x100 (PIN_INPUT | MUX_MODE0) /* mmc0_clk.mmc0_clk */ 138 0x100 (PIN_INPUT | MUX_MODE0) /* mmc0_clk.mmc0_clk */
@@ -254,7 +240,7 @@
254 status = "okay"; 240 status = "okay";
255 pinctrl-names = "default", "sleep"; 241 pinctrl-names = "default", "sleep";
256 pinctrl-0 = <&i2c0_pins_default>; 242 pinctrl-0 = <&i2c0_pins_default>;
257 pinctrl-1 = <&i2c0_pins_default>; 243 pinctrl-1 = <&i2c0_pins_sleep>;
258 clock-frequency = <400000>; 244 clock-frequency = <400000>;
259 245
260 at24@50 { 246 at24@50 {
@@ -262,17 +248,10 @@
262 pagesize = <64>; 248 pagesize = <64>;
263 reg = <0x50>; 249 reg = <0x50>;
264 }; 250 };
265};
266
267&i2c1 {
268 status = "okay";
269 pinctrl-names = "default", "sleep";
270 pinctrl-0 = <&i2c1_pins_default>;
271 pinctrl-1 = <&i2c1_pins_default>;
272 clock-frequency = <400000>;
273 251
274 tps: tps62362@60 { 252 tps: tps62362@60 {
275 compatible = "ti,tps62362"; 253 compatible = "ti,tps62362";
254 reg = <0x60>;
276 regulator-name = "VDD_MPU"; 255 regulator-name = "VDD_MPU";
277 regulator-min-microvolt = <950000>; 256 regulator-min-microvolt = <950000>;
278 regulator-max-microvolt = <1330000>; 257 regulator-max-microvolt = <1330000>;
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 03750af3b49a..6463f9ef2b54 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -549,14 +549,6 @@
549 pinctrl-0 = <&usb1_pins>; 549 pinctrl-0 = <&usb1_pins>;
550}; 550};
551 551
552&omap_dwc3_1 {
553 extcon = <&extcon_usb1>;
554};
555
556&omap_dwc3_2 {
557 extcon = <&extcon_usb2>;
558};
559
560&usb2 { 552&usb2 {
561 dr_mode = "peripheral"; 553 dr_mode = "peripheral";
562}; 554};
diff --git a/arch/arm/boot/dts/dm8168-evm.dts b/arch/arm/boot/dts/dm8168-evm.dts
index 857d0289ad4d..d3a29c1b8417 100644
--- a/arch/arm/boot/dts/dm8168-evm.dts
+++ b/arch/arm/boot/dts/dm8168-evm.dts
@@ -35,6 +35,18 @@
35 DM816X_IOPAD(0x0aac, PIN_INPUT | MUX_MODE0) /* SPI_D1 */ 35 DM816X_IOPAD(0x0aac, PIN_INPUT | MUX_MODE0) /* SPI_D1 */
36 >; 36 >;
37 }; 37 };
38
39 usb0_pins: pinmux_usb0_pins {
40 pinctrl-single,pins = <
41 DM816X_IOPAD(0x0d00, MUX_MODE0) /* USB0_DRVVBUS */
42 >;
43 };
44
45 usb1_pins: pinmux_usb0_pins {
46 pinctrl-single,pins = <
47 DM816X_IOPAD(0x0d04, MUX_MODE0) /* USB1_DRVVBUS */
48 >;
49 };
38}; 50};
39 51
40&i2c1 { 52&i2c1 {
@@ -127,3 +139,16 @@
127&mmc1 { 139&mmc1 {
128 vmmc-supply = <&vmmcsd_fixed>; 140 vmmc-supply = <&vmmcsd_fixed>;
129}; 141};
142
143/* At least dm8168-evm rev c won't support multipoint, later may */
144&usb0 {
145 pinctrl-names = "default";
146 pinctrl-0 = <&usb0_pins>;
147 mentor,multipoint = <0>;
148};
149
150&usb1 {
151 pinctrl-names = "default";
152 pinctrl-0 = <&usb1_pins>;
153 mentor,multipoint = <0>;
154};
diff --git a/arch/arm/boot/dts/dm816x.dtsi b/arch/arm/boot/dts/dm816x.dtsi
index d98d0f7de380..3c97b5f2addc 100644
--- a/arch/arm/boot/dts/dm816x.dtsi
+++ b/arch/arm/boot/dts/dm816x.dtsi
@@ -97,10 +97,31 @@
97 97
98 /* Device Configuration Registers */ 98 /* Device Configuration Registers */
99 scm_conf: syscon@600 { 99 scm_conf: syscon@600 {
100 compatible = "syscon"; 100 compatible = "syscon", "simple-bus";
101 reg = <0x600 0x110>; 101 reg = <0x600 0x110>;
102 #address-cells = <1>; 102 #address-cells = <1>;
103 #size-cells = <1>; 103 #size-cells = <1>;
104 ranges = <0 0x600 0x110>;
105
106 usb_phy0: usb-phy@20 {
107 compatible = "ti,dm8168-usb-phy";
108 reg = <0x20 0x8>;
109 reg-names = "phy";
110 clocks = <&main_fapll 6>;
111 clock-names = "refclk";
112 #phy-cells = <0>;
113 syscon = <&scm_conf>;
114 };
115
116 usb_phy1: usb-phy@28 {
117 compatible = "ti,dm8168-usb-phy";
118 reg = <0x28 0x8>;
119 reg-names = "phy";
120 clocks = <&main_fapll 6>;
121 clock-names = "refclk";
122 #phy-cells = <0>;
123 syscon = <&scm_conf>;
124 };
104 }; 125 };
105 126
106 scrm_clocks: clocks { 127 scrm_clocks: clocks {
@@ -357,7 +378,10 @@
357 reg-names = "mc", "control"; 378 reg-names = "mc", "control";
358 interrupts = <18>; 379 interrupts = <18>;
359 interrupt-names = "mc"; 380 interrupt-names = "mc";
360 dr_mode = "otg"; 381 dr_mode = "host";
382 interface-type = <0>;
383 phys = <&usb_phy0>;
384 phy-names = "usb2-phy";
361 mentor,multipoint = <1>; 385 mentor,multipoint = <1>;
362 mentor,num-eps = <16>; 386 mentor,num-eps = <16>;
363 mentor,ram-bits = <12>; 387 mentor,ram-bits = <12>;
@@ -366,13 +390,15 @@
366 390
367 usb1: usb@47401800 { 391 usb1: usb@47401800 {
368 compatible = "ti,musb-am33xx"; 392 compatible = "ti,musb-am33xx";
369 status = "disabled";
370 reg = <0x47401c00 0x400 393 reg = <0x47401c00 0x400
371 0x47401800 0x200>; 394 0x47401800 0x200>;
372 reg-names = "mc", "control"; 395 reg-names = "mc", "control";
373 interrupts = <19>; 396 interrupts = <19>;
374 interrupt-names = "mc"; 397 interrupt-names = "mc";
375 dr_mode = "otg"; 398 dr_mode = "host";
399 interface-type = <0>;
400 phys = <&usb_phy1>;
401 phy-names = "usb2-phy";
376 mentor,multipoint = <1>; 402 mentor,multipoint = <1>;
377 mentor,num-eps = <16>; 403 mentor,num-eps = <16>;
378 mentor,ram-bits = <12>; 404 mentor,ram-bits = <12>;
diff --git a/arch/arm/boot/dts/dra7-evm.dts b/arch/arm/boot/dts/dra7-evm.dts
index 746cddb1b8f5..3290a96ba586 100644
--- a/arch/arm/boot/dts/dra7-evm.dts
+++ b/arch/arm/boot/dts/dra7-evm.dts
@@ -543,14 +543,6 @@
543 }; 543 };
544}; 544};
545 545
546&omap_dwc3_1 {
547 extcon = <&extcon_usb1>;
548};
549
550&omap_dwc3_2 {
551 extcon = <&extcon_usb2>;
552};
553
554&usb1 { 546&usb1 {
555 dr_mode = "peripheral"; 547 dr_mode = "peripheral";
556 pinctrl-names = "default"; 548 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 5827fedafd43..127608d79033 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -249,8 +249,8 @@
249 <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, 249 <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
250 <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; 250 <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
251 #dma-cells = <1>; 251 #dma-cells = <1>;
252 #dma-channels = <32>; 252 dma-channels = <32>;
253 #dma-requests = <127>; 253 dma-requests = <127>;
254 }; 254 };
255 255
256 gpio1: gpio@4ae10000 { 256 gpio1: gpio@4ae10000 {
@@ -1090,8 +1090,8 @@
1090 <0x4A096800 0x40>; /* pll_ctrl */ 1090 <0x4A096800 0x40>; /* pll_ctrl */
1091 reg-names = "phy_rx", "phy_tx", "pll_ctrl"; 1091 reg-names = "phy_rx", "phy_tx", "pll_ctrl";
1092 ctrl-module = <&omap_control_sata>; 1092 ctrl-module = <&omap_control_sata>;
1093 clocks = <&sys_clkin1>; 1093 clocks = <&sys_clkin1>, <&sata_ref_clk>;
1094 clock-names = "sysclk"; 1094 clock-names = "sysclk", "refclk";
1095 #phy-cells = <0>; 1095 #phy-cells = <0>;
1096 }; 1096 };
1097 1097
diff --git a/arch/arm/boot/dts/dra72-evm.dts b/arch/arm/boot/dts/dra72-evm.dts
index 4d8711713610..e0264d0bf7b9 100644
--- a/arch/arm/boot/dts/dra72-evm.dts
+++ b/arch/arm/boot/dts/dra72-evm.dts
@@ -380,14 +380,6 @@
380 phy-supply = <&ldo4_reg>; 380 phy-supply = <&ldo4_reg>;
381}; 381};
382 382
383&omap_dwc3_1 {
384 extcon = <&extcon_usb1>;
385};
386
387&omap_dwc3_2 {
388 extcon = <&extcon_usb2>;
389};
390
391&usb1 { 383&usb1 {
392 dr_mode = "peripheral"; 384 dr_mode = "peripheral";
393 pinctrl-names = "default"; 385 pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 59d1c297bb30..578fa2a54dce 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -87,8 +87,8 @@
87 <14>, 87 <14>,
88 <15>; 88 <15>;
89 #dma-cells = <1>; 89 #dma-cells = <1>;
90 #dma-channels = <32>; 90 dma-channels = <32>;
91 #dma-requests = <64>; 91 dma-requests = <64>;
92 }; 92 };
93 93
94 i2c1: i2c@48070000 { 94 i2c1: i2c@48070000 {
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 60403273f83e..db80f9d376fa 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -16,6 +16,13 @@
16 model = "Nokia N900"; 16 model = "Nokia N900";
17 compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3"; 17 compatible = "nokia,omap3-n900", "ti,omap3430", "ti,omap3";
18 18
19 aliases {
20 i2c0;
21 i2c1 = &i2c1;
22 i2c2 = &i2c2;
23 i2c3 = &i2c3;
24 };
25
19 cpus { 26 cpus {
20 cpu@0 { 27 cpu@0 {
21 cpu0-supply = <&vcc>; 28 cpu0-supply = <&vcc>;
@@ -704,7 +711,7 @@
704 compatible = "smsc,lan91c94"; 711 compatible = "smsc,lan91c94";
705 interrupt-parent = <&gpio2>; 712 interrupt-parent = <&gpio2>;
706 interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */ 713 interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; /* gpio54 */
707 reg = <1 0x300 0xf>; /* 16 byte IO range at offset 0x300 */ 714 reg = <1 0 0xf>; /* 16 byte IO range */
708 bank-width = <2>; 715 bank-width = <2>;
709 pinctrl-names = "default"; 716 pinctrl-names = "default";
710 pinctrl-0 = <&ethernet_pins>; 717 pinctrl-0 = <&ethernet_pins>;
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 01b71111bd55..f4f78c40b564 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -155,8 +155,8 @@
155 <14>, 155 <14>,
156 <15>; 156 <15>;
157 #dma-cells = <1>; 157 #dma-cells = <1>;
158 #dma-channels = <32>; 158 dma-channels = <32>;
159 #dma-requests = <96>; 159 dma-requests = <96>;
160 }; 160 };
161 161
162 omap3_pmx_core: pinmux@48002030 { 162 omap3_pmx_core: pinmux@48002030 {
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 074147cebae4..87401d9f4d8b 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -223,8 +223,8 @@
223 <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, 223 <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
224 <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; 224 <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
225 #dma-cells = <1>; 225 #dma-cells = <1>;
226 #dma-channels = <32>; 226 dma-channels = <32>;
227 #dma-requests = <127>; 227 dma-requests = <127>;
228 }; 228 };
229 229
230 gpio1: gpio@4a310000 { 230 gpio1: gpio@4a310000 {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index b321fdf42c9f..ddff674bd05e 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -238,8 +238,8 @@
238 <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>, 238 <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>,
239 <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>; 239 <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
240 #dma-cells = <1>; 240 #dma-cells = <1>;
241 #dma-channels = <32>; 241 dma-channels = <32>;
242 #dma-requests = <127>; 242 dma-requests = <127>;
243 }; 243 };
244 244
245 gpio1: gpio@4ae10000 { 245 gpio1: gpio@4ae10000 {
@@ -929,8 +929,8 @@
929 <0x4A096800 0x40>; /* pll_ctrl */ 929 <0x4A096800 0x40>; /* pll_ctrl */
930 reg-names = "phy_rx", "phy_tx", "pll_ctrl"; 930 reg-names = "phy_rx", "phy_tx", "pll_ctrl";
931 ctrl-module = <&omap_control_sata>; 931 ctrl-module = <&omap_control_sata>;
932 clocks = <&sys_clkin>; 932 clocks = <&sys_clkin>, <&sata_ref_clk>;
933 clock-names = "sysclk"; 933 clock-names = "sysclk", "refclk";
934 #phy-cells = <0>; 934 #phy-cells = <0>;
935 }; 935 };
936 }; 936 };
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e8a4c955241b..23496228566c 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -16,6 +16,7 @@ CONFIG_ARCH_MVEBU=y
16CONFIG_MACH_ARMADA_370=y 16CONFIG_MACH_ARMADA_370=y
17CONFIG_MACH_ARMADA_375=y 17CONFIG_MACH_ARMADA_375=y
18CONFIG_MACH_ARMADA_38X=y 18CONFIG_MACH_ARMADA_38X=y
19CONFIG_MACH_ARMADA_39X=y
19CONFIG_MACH_ARMADA_XP=y 20CONFIG_MACH_ARMADA_XP=y
20CONFIG_MACH_DOVE=y 21CONFIG_MACH_DOVE=y
21CONFIG_ARCH_BCM=y 22CONFIG_ARCH_BCM=y
@@ -62,6 +63,17 @@ CONFIG_MACH_SPEAR1340=y
62CONFIG_ARCH_STI=y 63CONFIG_ARCH_STI=y
63CONFIG_ARCH_EXYNOS=y 64CONFIG_ARCH_EXYNOS=y
64CONFIG_EXYNOS5420_MCPM=y 65CONFIG_EXYNOS5420_MCPM=y
66CONFIG_ARCH_SHMOBILE_MULTI=y
67CONFIG_ARCH_EMEV2=y
68CONFIG_ARCH_R7S72100=y
69CONFIG_ARCH_R8A73A4=y
70CONFIG_ARCH_R8A7740=y
71CONFIG_ARCH_R8A7779=y
72CONFIG_ARCH_R8A7790=y
73CONFIG_ARCH_R8A7791=y
74CONFIG_ARCH_R8A7794=y
75CONFIG_ARCH_SH73A0=y
76CONFIG_MACH_MARZEN=y
65CONFIG_ARCH_SUNXI=y 77CONFIG_ARCH_SUNXI=y
66CONFIG_ARCH_SIRF=y 78CONFIG_ARCH_SIRF=y
67CONFIG_ARCH_TEGRA=y 79CONFIG_ARCH_TEGRA=y
@@ -84,6 +96,8 @@ CONFIG_PCI_KEYSTONE=y
84CONFIG_PCI_MSI=y 96CONFIG_PCI_MSI=y
85CONFIG_PCI_MVEBU=y 97CONFIG_PCI_MVEBU=y
86CONFIG_PCI_TEGRA=y 98CONFIG_PCI_TEGRA=y
99CONFIG_PCI_RCAR_GEN2=y
100CONFIG_PCI_RCAR_GEN2_PCIE=y
87CONFIG_PCIEPORTBUS=y 101CONFIG_PCIEPORTBUS=y
88CONFIG_SMP=y 102CONFIG_SMP=y
89CONFIG_NR_CPUS=8 103CONFIG_NR_CPUS=8
@@ -130,6 +144,7 @@ CONFIG_DEVTMPFS_MOUNT=y
130CONFIG_DMA_CMA=y 144CONFIG_DMA_CMA=y
131CONFIG_CMA_SIZE_MBYTES=64 145CONFIG_CMA_SIZE_MBYTES=64
132CONFIG_OMAP_OCP2SCP=y 146CONFIG_OMAP_OCP2SCP=y
147CONFIG_SIMPLE_PM_BUS=y
133CONFIG_MTD=y 148CONFIG_MTD=y
134CONFIG_MTD_CMDLINE_PARTS=y 149CONFIG_MTD_CMDLINE_PARTS=y
135CONFIG_MTD_BLOCK=y 150CONFIG_MTD_BLOCK=y
@@ -157,6 +172,7 @@ CONFIG_AHCI_SUNXI=y
157CONFIG_AHCI_TEGRA=y 172CONFIG_AHCI_TEGRA=y
158CONFIG_SATA_HIGHBANK=y 173CONFIG_SATA_HIGHBANK=y
159CONFIG_SATA_MV=y 174CONFIG_SATA_MV=y
175CONFIG_SATA_RCAR=y
160CONFIG_NETDEVICES=y 176CONFIG_NETDEVICES=y
161CONFIG_HIX5HD2_GMAC=y 177CONFIG_HIX5HD2_GMAC=y
162CONFIG_SUN4I_EMAC=y 178CONFIG_SUN4I_EMAC=y
@@ -167,14 +183,17 @@ CONFIG_MV643XX_ETH=y
167CONFIG_MVNETA=y 183CONFIG_MVNETA=y
168CONFIG_KS8851=y 184CONFIG_KS8851=y
169CONFIG_R8169=y 185CONFIG_R8169=y
186CONFIG_SH_ETH=y
170CONFIG_SMSC911X=y 187CONFIG_SMSC911X=y
171CONFIG_STMMAC_ETH=y 188CONFIG_STMMAC_ETH=y
172CONFIG_TI_CPSW=y 189CONFIG_TI_CPSW=y
173CONFIG_XILINX_EMACLITE=y 190CONFIG_XILINX_EMACLITE=y
174CONFIG_AT803X_PHY=y 191CONFIG_AT803X_PHY=y
175CONFIG_MARVELL_PHY=y 192CONFIG_MARVELL_PHY=y
193CONFIG_SMSC_PHY=y
176CONFIG_BROADCOM_PHY=y 194CONFIG_BROADCOM_PHY=y
177CONFIG_ICPLUS_PHY=y 195CONFIG_ICPLUS_PHY=y
196CONFIG_MICREL_PHY=y
178CONFIG_USB_PEGASUS=y 197CONFIG_USB_PEGASUS=y
179CONFIG_USB_USBNET=y 198CONFIG_USB_USBNET=y
180CONFIG_USB_NET_SMSC75XX=y 199CONFIG_USB_NET_SMSC75XX=y
@@ -192,15 +211,18 @@ CONFIG_KEYBOARD_CROS_EC=y
192CONFIG_MOUSE_PS2_ELANTECH=y 211CONFIG_MOUSE_PS2_ELANTECH=y
193CONFIG_INPUT_TOUCHSCREEN=y 212CONFIG_INPUT_TOUCHSCREEN=y
194CONFIG_TOUCHSCREEN_ATMEL_MXT=y 213CONFIG_TOUCHSCREEN_ATMEL_MXT=y
214CONFIG_TOUCHSCREEN_ST1232=m
195CONFIG_TOUCHSCREEN_STMPE=y 215CONFIG_TOUCHSCREEN_STMPE=y
196CONFIG_TOUCHSCREEN_SUN4I=y 216CONFIG_TOUCHSCREEN_SUN4I=y
197CONFIG_INPUT_MISC=y 217CONFIG_INPUT_MISC=y
198CONFIG_INPUT_MPU3050=y 218CONFIG_INPUT_MPU3050=y
199CONFIG_INPUT_AXP20X_PEK=y 219CONFIG_INPUT_AXP20X_PEK=y
220CONFIG_INPUT_ADXL34X=m
200CONFIG_SERIO_AMBAKMI=y 221CONFIG_SERIO_AMBAKMI=y
201CONFIG_SERIAL_8250=y 222CONFIG_SERIAL_8250=y
202CONFIG_SERIAL_8250_CONSOLE=y 223CONFIG_SERIAL_8250_CONSOLE=y
203CONFIG_SERIAL_8250_DW=y 224CONFIG_SERIAL_8250_DW=y
225CONFIG_SERIAL_8250_EM=y
204CONFIG_SERIAL_8250_MT6577=y 226CONFIG_SERIAL_8250_MT6577=y
205CONFIG_SERIAL_AMBA_PL011=y 227CONFIG_SERIAL_AMBA_PL011=y
206CONFIG_SERIAL_AMBA_PL011_CONSOLE=y 228CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
@@ -213,6 +235,9 @@ CONFIG_SERIAL_SIRFSOC_CONSOLE=y
213CONFIG_SERIAL_TEGRA=y 235CONFIG_SERIAL_TEGRA=y
214CONFIG_SERIAL_IMX=y 236CONFIG_SERIAL_IMX=y
215CONFIG_SERIAL_IMX_CONSOLE=y 237CONFIG_SERIAL_IMX_CONSOLE=y
238CONFIG_SERIAL_SH_SCI=y
239CONFIG_SERIAL_SH_SCI_NR_UARTS=20
240CONFIG_SERIAL_SH_SCI_CONSOLE=y
216CONFIG_SERIAL_MSM=y 241CONFIG_SERIAL_MSM=y
217CONFIG_SERIAL_MSM_CONSOLE=y 242CONFIG_SERIAL_MSM_CONSOLE=y
218CONFIG_SERIAL_VT8500=y 243CONFIG_SERIAL_VT8500=y
@@ -233,19 +258,26 @@ CONFIG_I2C_MUX_PCA954x=y
233CONFIG_I2C_MUX_PINCTRL=y 258CONFIG_I2C_MUX_PINCTRL=y
234CONFIG_I2C_CADENCE=y 259CONFIG_I2C_CADENCE=y
235CONFIG_I2C_DESIGNWARE_PLATFORM=y 260CONFIG_I2C_DESIGNWARE_PLATFORM=y
261CONFIG_I2C_GPIO=m
236CONFIG_I2C_EXYNOS5=y 262CONFIG_I2C_EXYNOS5=y
237CONFIG_I2C_MV64XXX=y 263CONFIG_I2C_MV64XXX=y
264CONFIG_I2C_RIIC=y
238CONFIG_I2C_S3C2410=y 265CONFIG_I2C_S3C2410=y
266CONFIG_I2C_SH_MOBILE=y
239CONFIG_I2C_SIRF=y 267CONFIG_I2C_SIRF=y
240CONFIG_I2C_TEGRA=y
241CONFIG_I2C_ST=y 268CONFIG_I2C_ST=y
242CONFIG_SPI=y 269CONFIG_I2C_TEGRA=y
243CONFIG_I2C_XILINX=y 270CONFIG_I2C_XILINX=y
244CONFIG_SPI_DAVINCI=y 271CONFIG_I2C_RCAR=y
272CONFIG_SPI=y
245CONFIG_SPI_CADENCE=y 273CONFIG_SPI_CADENCE=y
274CONFIG_SPI_DAVINCI=y
246CONFIG_SPI_OMAP24XX=y 275CONFIG_SPI_OMAP24XX=y
247CONFIG_SPI_ORION=y 276CONFIG_SPI_ORION=y
248CONFIG_SPI_PL022=y 277CONFIG_SPI_PL022=y
278CONFIG_SPI_RSPI=y
279CONFIG_SPI_SH_MSIOF=m
280CONFIG_SPI_SH_HSPI=y
249CONFIG_SPI_SIRF=y 281CONFIG_SPI_SIRF=y
250CONFIG_SPI_SUN4I=y 282CONFIG_SPI_SUN4I=y
251CONFIG_SPI_SUN6I=y 283CONFIG_SPI_SUN6I=y
@@ -259,12 +291,15 @@ CONFIG_PINCTRL_PALMAS=y
259CONFIG_PINCTRL_APQ8084=y 291CONFIG_PINCTRL_APQ8084=y
260CONFIG_GPIO_SYSFS=y 292CONFIG_GPIO_SYSFS=y
261CONFIG_GPIO_GENERIC_PLATFORM=y 293CONFIG_GPIO_GENERIC_PLATFORM=y
262CONFIG_GPIO_DWAPB=y
263CONFIG_GPIO_DAVINCI=y 294CONFIG_GPIO_DAVINCI=y
295CONFIG_GPIO_DWAPB=y
296CONFIG_GPIO_EM=y
297CONFIG_GPIO_RCAR=y
264CONFIG_GPIO_XILINX=y 298CONFIG_GPIO_XILINX=y
265CONFIG_GPIO_ZYNQ=y 299CONFIG_GPIO_ZYNQ=y
266CONFIG_GPIO_PCA953X=y 300CONFIG_GPIO_PCA953X=y
267CONFIG_GPIO_PCA953X_IRQ=y 301CONFIG_GPIO_PCA953X_IRQ=y
302CONFIG_GPIO_PCF857X=y
268CONFIG_GPIO_TWL4030=y 303CONFIG_GPIO_TWL4030=y
269CONFIG_GPIO_PALMAS=y 304CONFIG_GPIO_PALMAS=y
270CONFIG_GPIO_SYSCON=y 305CONFIG_GPIO_SYSCON=y
@@ -276,10 +311,12 @@ CONFIG_POWER_RESET_AS3722=y
276CONFIG_POWER_RESET_GPIO=y 311CONFIG_POWER_RESET_GPIO=y
277CONFIG_POWER_RESET_KEYSTONE=y 312CONFIG_POWER_RESET_KEYSTONE=y
278CONFIG_POWER_RESET_SUN6I=y 313CONFIG_POWER_RESET_SUN6I=y
314CONFIG_POWER_RESET_RMOBILE=y
279CONFIG_SENSORS_LM90=y 315CONFIG_SENSORS_LM90=y
280CONFIG_SENSORS_LM95245=y 316CONFIG_SENSORS_LM95245=y
281CONFIG_THERMAL=y 317CONFIG_THERMAL=y
282CONFIG_CPU_THERMAL=y 318CONFIG_CPU_THERMAL=y
319CONFIG_RCAR_THERMAL=y
283CONFIG_ARMADA_THERMAL=y 320CONFIG_ARMADA_THERMAL=y
284CONFIG_DAVINCI_WATCHDOG 321CONFIG_DAVINCI_WATCHDOG
285CONFIG_ST_THERMAL_SYSCFG=y 322CONFIG_ST_THERMAL_SYSCFG=y
@@ -290,6 +327,7 @@ CONFIG_ARM_SP805_WATCHDOG=y
290CONFIG_ORION_WATCHDOG=y 327CONFIG_ORION_WATCHDOG=y
291CONFIG_SUNXI_WATCHDOG=y 328CONFIG_SUNXI_WATCHDOG=y
292CONFIG_MESON_WATCHDOG=y 329CONFIG_MESON_WATCHDOG=y
330CONFIG_MFD_AS3711=y
293CONFIG_MFD_AS3722=y 331CONFIG_MFD_AS3722=y
294CONFIG_MFD_BCM590XX=y 332CONFIG_MFD_BCM590XX=y
295CONFIG_MFD_AXP20X=y 333CONFIG_MFD_AXP20X=y
@@ -304,13 +342,16 @@ CONFIG_MFD_TPS65090=y
304CONFIG_MFD_TPS6586X=y 342CONFIG_MFD_TPS6586X=y
305CONFIG_MFD_TPS65910=y 343CONFIG_MFD_TPS65910=y
306CONFIG_REGULATOR_AB8500=y 344CONFIG_REGULATOR_AB8500=y
345CONFIG_REGULATOR_AS3711=y
307CONFIG_REGULATOR_AS3722=y 346CONFIG_REGULATOR_AS3722=y
308CONFIG_REGULATOR_AXP20X=y 347CONFIG_REGULATOR_AXP20X=y
309CONFIG_REGULATOR_BCM590XX=y 348CONFIG_REGULATOR_BCM590XX=y
349CONFIG_REGULATOR_DA9210=y
310CONFIG_REGULATOR_GPIO=y 350CONFIG_REGULATOR_GPIO=y
311CONFIG_MFD_SYSCON=y 351CONFIG_MFD_SYSCON=y
312CONFIG_POWER_RESET_SYSCON=y 352CONFIG_POWER_RESET_SYSCON=y
313CONFIG_REGULATOR_MAX8907=y 353CONFIG_REGULATOR_MAX8907=y
354CONFIG_REGULATOR_MAX8973=y
314CONFIG_REGULATOR_MAX77686=y 355CONFIG_REGULATOR_MAX77686=y
315CONFIG_REGULATOR_PALMAS=y 356CONFIG_REGULATOR_PALMAS=y
316CONFIG_REGULATOR_S2MPS11=y 357CONFIG_REGULATOR_S2MPS11=y
@@ -324,18 +365,32 @@ CONFIG_REGULATOR_TWL4030=y
324CONFIG_REGULATOR_VEXPRESS=y 365CONFIG_REGULATOR_VEXPRESS=y
325CONFIG_MEDIA_SUPPORT=y 366CONFIG_MEDIA_SUPPORT=y
326CONFIG_MEDIA_CAMERA_SUPPORT=y 367CONFIG_MEDIA_CAMERA_SUPPORT=y
368CONFIG_MEDIA_CONTROLLER=y
369CONFIG_VIDEO_V4L2_SUBDEV_API=y
327CONFIG_MEDIA_USB_SUPPORT=y 370CONFIG_MEDIA_USB_SUPPORT=y
328CONFIG_USB_VIDEO_CLASS=y 371CONFIG_USB_VIDEO_CLASS=y
329CONFIG_USB_GSPCA=y 372CONFIG_USB_GSPCA=y
373CONFIG_V4L_PLATFORM_DRIVERS=y
374CONFIG_SOC_CAMERA=m
375CONFIG_SOC_CAMERA_PLATFORM=m
376CONFIG_VIDEO_RCAR_VIN=m
377CONFIG_V4L_MEM2MEM_DRIVERS=y
378CONFIG_VIDEO_RENESAS_VSP1=m
379# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
380CONFIG_VIDEO_ADV7180=m
330CONFIG_DRM=y 381CONFIG_DRM=y
382CONFIG_DRM_RCAR_DU=m
331CONFIG_DRM_TEGRA=y 383CONFIG_DRM_TEGRA=y
332CONFIG_DRM_PANEL_SIMPLE=y 384CONFIG_DRM_PANEL_SIMPLE=y
333CONFIG_FB_ARMCLCD=y 385CONFIG_FB_ARMCLCD=y
334CONFIG_FB_WM8505=y 386CONFIG_FB_WM8505=y
387CONFIG_FB_SH_MOBILE_LCDC=y
335CONFIG_FB_SIMPLE=y 388CONFIG_FB_SIMPLE=y
389CONFIG_FB_SH_MOBILE_MERAM=y
336CONFIG_BACKLIGHT_LCD_SUPPORT=y 390CONFIG_BACKLIGHT_LCD_SUPPORT=y
337CONFIG_BACKLIGHT_CLASS_DEVICE=y 391CONFIG_BACKLIGHT_CLASS_DEVICE=y
338CONFIG_BACKLIGHT_PWM=y 392CONFIG_BACKLIGHT_PWM=y
393CONFIG_BACKLIGHT_AS3711=y
339CONFIG_FRAMEBUFFER_CONSOLE=y 394CONFIG_FRAMEBUFFER_CONSOLE=y
340CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y 395CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
341CONFIG_SOUND=y 396CONFIG_SOUND=y
@@ -343,6 +398,8 @@ CONFIG_SND=y
343CONFIG_SND_DYNAMIC_MINORS=y 398CONFIG_SND_DYNAMIC_MINORS=y
344CONFIG_SND_USB_AUDIO=y 399CONFIG_SND_USB_AUDIO=y
345CONFIG_SND_SOC=y 400CONFIG_SND_SOC=y
401CONFIG_SND_SOC_SH4_FSI=m
402CONFIG_SND_SOC_RCAR=m
346CONFIG_SND_SOC_TEGRA=y 403CONFIG_SND_SOC_TEGRA=y
347CONFIG_SND_SOC_TEGRA_RT5640=y 404CONFIG_SND_SOC_TEGRA_RT5640=y
348CONFIG_SND_SOC_TEGRA_WM8753=y 405CONFIG_SND_SOC_TEGRA_WM8753=y
@@ -350,6 +407,8 @@ CONFIG_SND_SOC_TEGRA_WM8903=y
350CONFIG_SND_SOC_TEGRA_TRIMSLICE=y 407CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
351CONFIG_SND_SOC_TEGRA_ALC5632=y 408CONFIG_SND_SOC_TEGRA_ALC5632=y
352CONFIG_SND_SOC_TEGRA_MAX98090=y 409CONFIG_SND_SOC_TEGRA_MAX98090=y
410CONFIG_SND_SOC_AK4642=m
411CONFIG_SND_SOC_WM8978=m
353CONFIG_USB=y 412CONFIG_USB=y
354CONFIG_USB_XHCI_HCD=y 413CONFIG_USB_XHCI_HCD=y
355CONFIG_USB_XHCI_MVEBU=y 414CONFIG_USB_XHCI_MVEBU=y
@@ -362,6 +421,8 @@ CONFIG_USB_ISP1760_HCD=y
362CONFIG_USB_OHCI_HCD=y 421CONFIG_USB_OHCI_HCD=y
363CONFIG_USB_OHCI_HCD_STI=y 422CONFIG_USB_OHCI_HCD_STI=y
364CONFIG_USB_OHCI_HCD_PLATFORM=y 423CONFIG_USB_OHCI_HCD_PLATFORM=y
424CONFIG_USB_R8A66597_HCD=m
425CONFIG_USB_RENESAS_USBHS=m
365CONFIG_USB_STORAGE=y 426CONFIG_USB_STORAGE=y
366CONFIG_USB_DWC3=y 427CONFIG_USB_DWC3=y
367CONFIG_USB_CHIPIDEA=y 428CONFIG_USB_CHIPIDEA=y
@@ -374,6 +435,10 @@ CONFIG_SAMSUNG_USB3PHY=y
374CONFIG_USB_GPIO_VBUS=y 435CONFIG_USB_GPIO_VBUS=y
375CONFIG_USB_ISP1301=y 436CONFIG_USB_ISP1301=y
376CONFIG_USB_MXS_PHY=y 437CONFIG_USB_MXS_PHY=y
438CONFIG_USB_RCAR_PHY=m
439CONFIG_USB_RCAR_GEN2_PHY=m
440CONFIG_USB_GADGET=y
441CONFIG_USB_RENESAS_USBHS_UDC=m
377CONFIG_MMC=y 442CONFIG_MMC=y
378CONFIG_MMC_BLOCK_MINORS=16 443CONFIG_MMC_BLOCK_MINORS=16
379CONFIG_MMC_ARMMMCI=y 444CONFIG_MMC_ARMMMCI=y
@@ -392,12 +457,14 @@ CONFIG_MMC_SDHCI_ST=y
392CONFIG_MMC_OMAP=y 457CONFIG_MMC_OMAP=y
393CONFIG_MMC_OMAP_HS=y 458CONFIG_MMC_OMAP_HS=y
394CONFIG_MMC_MVSDIO=y 459CONFIG_MMC_MVSDIO=y
395CONFIG_MMC_SUNXI=y 460CONFIG_MMC_SDHI=y
396CONFIG_MMC_DW=y 461CONFIG_MMC_DW=y
397CONFIG_MMC_DW_IDMAC=y 462CONFIG_MMC_DW_IDMAC=y
398CONFIG_MMC_DW_PLTFM=y 463CONFIG_MMC_DW_PLTFM=y
399CONFIG_MMC_DW_EXYNOS=y 464CONFIG_MMC_DW_EXYNOS=y
400CONFIG_MMC_DW_ROCKCHIP=y 465CONFIG_MMC_DW_ROCKCHIP=y
466CONFIG_MMC_SH_MMCIF=y
467CONFIG_MMC_SUNXI=y
401CONFIG_NEW_LEDS=y 468CONFIG_NEW_LEDS=y
402CONFIG_LEDS_CLASS=y 469CONFIG_LEDS_CLASS=y
403CONFIG_LEDS_GPIO=y 470CONFIG_LEDS_GPIO=y
@@ -421,10 +488,12 @@ CONFIG_RTC_DRV_AS3722=y
421CONFIG_RTC_DRV_DS1307=y 488CONFIG_RTC_DRV_DS1307=y
422CONFIG_RTC_DRV_MAX8907=y 489CONFIG_RTC_DRV_MAX8907=y
423CONFIG_RTC_DRV_MAX77686=y 490CONFIG_RTC_DRV_MAX77686=y
491CONFIG_RTC_DRV_RS5C372=m
424CONFIG_RTC_DRV_PALMAS=y 492CONFIG_RTC_DRV_PALMAS=y
425CONFIG_RTC_DRV_TWL4030=y 493CONFIG_RTC_DRV_TWL4030=y
426CONFIG_RTC_DRV_TPS6586X=y 494CONFIG_RTC_DRV_TPS6586X=y
427CONFIG_RTC_DRV_TPS65910=y 495CONFIG_RTC_DRV_TPS65910=y
496CONFIG_RTC_DRV_S35390A=m
428CONFIG_RTC_DRV_EM3027=y 497CONFIG_RTC_DRV_EM3027=y
429CONFIG_RTC_DRV_PL031=y 498CONFIG_RTC_DRV_PL031=y
430CONFIG_RTC_DRV_VT8500=y 499CONFIG_RTC_DRV_VT8500=y
@@ -436,6 +505,8 @@ CONFIG_DMADEVICES=y
436CONFIG_DW_DMAC=y 505CONFIG_DW_DMAC=y
437CONFIG_MV_XOR=y 506CONFIG_MV_XOR=y
438CONFIG_TEGRA20_APB_DMA=y 507CONFIG_TEGRA20_APB_DMA=y
508CONFIG_SH_DMAE=y
509CONFIG_RCAR_DMAC=y
439CONFIG_STE_DMA40=y 510CONFIG_STE_DMA40=y
440CONFIG_SIRF_DMA=y 511CONFIG_SIRF_DMA=y
441CONFIG_TI_EDMA=y 512CONFIG_TI_EDMA=y
@@ -468,6 +539,7 @@ CONFIG_IIO=y
468CONFIG_XILINX_XADC=y 539CONFIG_XILINX_XADC=y
469CONFIG_AK8975=y 540CONFIG_AK8975=y
470CONFIG_PWM=y 541CONFIG_PWM=y
542CONFIG_PWM_RENESAS_TPU=y
471CONFIG_PWM_TEGRA=y 543CONFIG_PWM_TEGRA=y
472CONFIG_PWM_VT8500=y 544CONFIG_PWM_VT8500=y
473CONFIG_PHY_HIX5HD2_SATA=y 545CONFIG_PHY_HIX5HD2_SATA=y
@@ -478,6 +550,7 @@ CONFIG_PHY_MIPHY365X=y
478CONFIG_PHY_STIH41X_USB=y 550CONFIG_PHY_STIH41X_USB=y
479CONFIG_PHY_STIH407_USB=y 551CONFIG_PHY_STIH407_USB=y
480CONFIG_PHY_SUN4I_USB=y 552CONFIG_PHY_SUN4I_USB=y
553CONFIG_PHY_SUN9I_USB=y
481CONFIG_EXT4_FS=y 554CONFIG_EXT4_FS=y
482CONFIG_AUTOFS4_FS=y 555CONFIG_AUTOFS4_FS=y
483CONFIG_MSDOS_FS=y 556CONFIG_MSDOS_FS=y
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index 73673e95f23c..cacc9f4055a7 100644
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -5,6 +5,7 @@ CONFIG_HIGH_RES_TIMERS=y
5CONFIG_LOG_BUF_SHIFT=14 5CONFIG_LOG_BUF_SHIFT=14
6CONFIG_BLK_DEV_INITRD=y 6CONFIG_BLK_DEV_INITRD=y
7CONFIG_EXPERT=y 7CONFIG_EXPERT=y
8CONFIG_PERF_EVENTS=y
8CONFIG_SLAB=y 9CONFIG_SLAB=y
9CONFIG_MODULES=y 10CONFIG_MODULES=y
10CONFIG_MODULE_UNLOAD=y 11CONFIG_MODULE_UNLOAD=y
@@ -12,6 +13,7 @@ CONFIG_ARCH_MVEBU=y
12CONFIG_MACH_ARMADA_370=y 13CONFIG_MACH_ARMADA_370=y
13CONFIG_MACH_ARMADA_375=y 14CONFIG_MACH_ARMADA_375=y
14CONFIG_MACH_ARMADA_38X=y 15CONFIG_MACH_ARMADA_38X=y
16CONFIG_MACH_ARMADA_39X=y
15CONFIG_MACH_ARMADA_XP=y 17CONFIG_MACH_ARMADA_XP=y
16CONFIG_MACH_DOVE=y 18CONFIG_MACH_DOVE=y
17CONFIG_PCI=y 19CONFIG_PCI=y
diff --git a/arch/arm/configs/omap1_defconfig b/arch/arm/configs/omap1_defconfig
index a7dce674f1be..0c8a78734536 100644
--- a/arch/arm/configs/omap1_defconfig
+++ b/arch/arm/configs/omap1_defconfig
@@ -1,4 +1,3 @@
1CONFIG_EXPERIMENTAL=y
2# CONFIG_SWAP is not set 1# CONFIG_SWAP is not set
3CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
4CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
@@ -34,7 +33,6 @@ CONFIG_ARCH_OMAP16XX=y
34CONFIG_MACH_OMAP_INNOVATOR=y 33CONFIG_MACH_OMAP_INNOVATOR=y
35CONFIG_MACH_OMAP_H2=y 34CONFIG_MACH_OMAP_H2=y
36CONFIG_MACH_OMAP_H3=y 35CONFIG_MACH_OMAP_H3=y
37CONFIG_MACH_OMAP_HTCWIZARD=y
38CONFIG_MACH_HERALD=y 36CONFIG_MACH_HERALD=y
39CONFIG_MACH_OMAP_OSK=y 37CONFIG_MACH_OMAP_OSK=y
40CONFIG_MACH_OMAP_PERSEUS2=y 38CONFIG_MACH_OMAP_PERSEUS2=y
@@ -55,7 +53,6 @@ CONFIG_HIGH_RES_TIMERS=y
55CONFIG_PREEMPT=y 53CONFIG_PREEMPT=y
56CONFIG_AEABI=y 54CONFIG_AEABI=y
57CONFIG_LEDS=y 55CONFIG_LEDS=y
58CONFIG_LEDS_CPU=y
59CONFIG_ZBOOT_ROM_TEXT=0x0 56CONFIG_ZBOOT_ROM_TEXT=0x0
60CONFIG_ZBOOT_ROM_BSS=0x0 57CONFIG_ZBOOT_ROM_BSS=0x0
61CONFIG_CMDLINE="root=1f03 rootfstype=jffs2" 58CONFIG_CMDLINE="root=1f03 rootfstype=jffs2"
@@ -80,8 +77,6 @@ CONFIG_IP_PNP_BOOTP=y
80CONFIG_IPV6=y 77CONFIG_IPV6=y
81CONFIG_NETFILTER=y 78CONFIG_NETFILTER=y
82CONFIG_BT=y 79CONFIG_BT=y
83CONFIG_BT_L2CAP=y
84CONFIG_BT_SCO=y
85CONFIG_BT_RFCOMM=y 80CONFIG_BT_RFCOMM=y
86CONFIG_BT_RFCOMM_TTY=y 81CONFIG_BT_RFCOMM_TTY=y
87CONFIG_BT_BNEP=y 82CONFIG_BT_BNEP=y
@@ -92,11 +87,7 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
92CONFIG_CONNECTOR=y 87CONFIG_CONNECTOR=y
93# CONFIG_PROC_EVENTS is not set 88# CONFIG_PROC_EVENTS is not set
94CONFIG_MTD=y 89CONFIG_MTD=y
95CONFIG_MTD_DEBUG=y
96CONFIG_MTD_DEBUG_VERBOSE=3
97CONFIG_MTD_PARTITIONS=y
98CONFIG_MTD_CMDLINE_PARTS=y 90CONFIG_MTD_CMDLINE_PARTS=y
99CONFIG_MTD_CHAR=y
100CONFIG_MTD_BLOCK=y 91CONFIG_MTD_BLOCK=y
101CONFIG_MTD_CFI=y 92CONFIG_MTD_CFI=y
102CONFIG_MTD_CFI_INTELEXT=y 93CONFIG_MTD_CFI_INTELEXT=y
@@ -113,11 +104,9 @@ CONFIG_BLK_DEV_SD=y
113CONFIG_CHR_DEV_ST=y 104CONFIG_CHR_DEV_ST=y
114CONFIG_BLK_DEV_SR=y 105CONFIG_BLK_DEV_SR=y
115CONFIG_CHR_DEV_SG=y 106CONFIG_CHR_DEV_SG=y
116CONFIG_SCSI_MULTI_LUN=y
117CONFIG_NETDEVICES=y 107CONFIG_NETDEVICES=y
118CONFIG_TUN=y 108CONFIG_TUN=y
119CONFIG_PHYLIB=y 109CONFIG_PHYLIB=y
120CONFIG_NET_ETHERNET=y
121CONFIG_SMC91X=y 110CONFIG_SMC91X=y
122CONFIG_USB_CATC=y 111CONFIG_USB_CATC=y
123CONFIG_USB_KAWETH=y 112CONFIG_USB_KAWETH=y
@@ -158,7 +147,6 @@ CONFIG_SPI_OMAP_UWIRE=y
158CONFIG_WATCHDOG=y 147CONFIG_WATCHDOG=y
159CONFIG_WATCHDOG_NOWAYOUT=y 148CONFIG_WATCHDOG_NOWAYOUT=y
160CONFIG_OMAP_WATCHDOG=y 149CONFIG_OMAP_WATCHDOG=y
161CONFIG_VIDEO_OUTPUT_CONTROL=y
162CONFIG_FB=y 150CONFIG_FB=y
163CONFIG_FIRMWARE_EDID=y 151CONFIG_FIRMWARE_EDID=y
164CONFIG_FB_MODE_HELPERS=y 152CONFIG_FB_MODE_HELPERS=y
@@ -168,7 +156,6 @@ CONFIG_FB_OMAP_LCDC_EXTERNAL=y
168CONFIG_FB_OMAP_LCDC_HWA742=y 156CONFIG_FB_OMAP_LCDC_HWA742=y
169CONFIG_FB_OMAP_MANUAL_UPDATE=y 157CONFIG_FB_OMAP_MANUAL_UPDATE=y
170CONFIG_FB_OMAP_LCD_MIPID=y 158CONFIG_FB_OMAP_LCD_MIPID=y
171CONFIG_FB_OMAP_BOOTLOADER_INIT=y
172CONFIG_BACKLIGHT_LCD_SUPPORT=y 159CONFIG_BACKLIGHT_LCD_SUPPORT=y
173CONFIG_LCD_CLASS_DEVICE=y 160CONFIG_LCD_CLASS_DEVICE=y
174CONFIG_FRAMEBUFFER_CONSOLE=y 161CONFIG_FRAMEBUFFER_CONSOLE=y
@@ -194,7 +181,6 @@ CONFIG_SND_OMAP_SOC=y
194# CONFIG_USB_HID is not set 181# CONFIG_USB_HID is not set
195CONFIG_USB=y 182CONFIG_USB=y
196CONFIG_USB_PHY=y 183CONFIG_USB_PHY=y
197# CONFIG_USB_DEVICE_CLASS is not set
198CONFIG_USB_MON=y 184CONFIG_USB_MON=y
199CONFIG_USB_OHCI_HCD=y 185CONFIG_USB_OHCI_HCD=y
200CONFIG_USB_STORAGE=y 186CONFIG_USB_STORAGE=y
@@ -261,9 +247,7 @@ CONFIG_DEBUG_SPINLOCK=y
261CONFIG_DEBUG_MUTEXES=y 247CONFIG_DEBUG_MUTEXES=y
262# CONFIG_DEBUG_BUGVERBOSE is not set 248# CONFIG_DEBUG_BUGVERBOSE is not set
263CONFIG_DEBUG_INFO=y 249CONFIG_DEBUG_INFO=y
264# CONFIG_RCU_CPU_STALL_DETECTOR is not set
265CONFIG_DEBUG_USER=y 250CONFIG_DEBUG_USER=y
266CONFIG_DEBUG_ERRORS=y
267CONFIG_SECURITY=y 251CONFIG_SECURITY=y
268CONFIG_CRYPTO_ECB=y 252CONFIG_CRYPTO_ECB=y
269CONFIG_CRYPTO_PCBC=y 253CONFIG_CRYPTO_PCBC=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index b7386524c356..f18be4fbd048 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -1,3 +1,4 @@
1CONFIG_KERNEL_LZMA=y
1CONFIG_SYSVIPC=y 2CONFIG_SYSVIPC=y
2CONFIG_POSIX_MQUEUE=y 3CONFIG_POSIX_MQUEUE=y
3CONFIG_FHANDLE=y 4CONFIG_FHANDLE=y
@@ -86,17 +87,33 @@ CONFIG_IP_PNP_BOOTP=y
86CONFIG_IP_PNP_RARP=y 87CONFIG_IP_PNP_RARP=y
87# CONFIG_INET_LRO is not set 88# CONFIG_INET_LRO is not set
88CONFIG_NETFILTER=y 89CONFIG_NETFILTER=y
90CONFIG_PHONET=m
89CONFIG_CAN=m 91CONFIG_CAN=m
90CONFIG_CAN_C_CAN=m 92CONFIG_CAN_C_CAN=m
91CONFIG_CAN_C_CAN_PLATFORM=m 93CONFIG_CAN_C_CAN_PLATFORM=m
92CONFIG_BT=m 94CONFIG_BT=m
95CONFIG_BT_RFCOMM=m
96CONFIG_BT_RFCOMM_TTY=y
97CONFIG_BT_BNEP=m
98CONFIG_BT_BNEP_MC_FILTER=y
99CONFIG_BT_BNEP_PROTO_FILTER=y
100CONFIG_BT_HIDP=m
101CONFIG_BT_HCIBTUSB=m
102CONFIG_BT_HCIBTSDIO=m
93CONFIG_BT_HCIUART=m 103CONFIG_BT_HCIUART=m
94CONFIG_BT_HCIUART_H4=y 104CONFIG_BT_HCIUART_H4=y
95CONFIG_BT_HCIUART_BCSP=y 105CONFIG_BT_HCIUART_BCSP=y
96CONFIG_BT_HCIUART_LL=y 106CONFIG_BT_HCIUART_LL=y
107CONFIG_BT_HCIUART_3WIRE=y
97CONFIG_BT_HCIBCM203X=m 108CONFIG_BT_HCIBCM203X=m
98CONFIG_BT_HCIBPA10X=m 109CONFIG_BT_HCIBPA10X=m
99CONFIG_CFG80211=m 110CONFIG_CFG80211=m
111CONFIG_BT_HCIBFUSB=m
112CONFIG_BT_HCIVHCI=m
113CONFIG_BT_MRVL=m
114CONFIG_BT_MRVL_SDIO=m
115CONFIG_AF_RXRPC=m
116CONFIG_RXKAD=m
100CONFIG_MAC80211=m 117CONFIG_MAC80211=m
101CONFIG_DEVTMPFS=y 118CONFIG_DEVTMPFS=y
102CONFIG_DEVTMPFS_MOUNT=y 119CONFIG_DEVTMPFS_MOUNT=y
@@ -114,6 +131,7 @@ CONFIG_MTD_PHYSMAP_OF=y
114CONFIG_MTD_NAND=y 131CONFIG_MTD_NAND=y
115CONFIG_MTD_NAND_ECC_BCH=y 132CONFIG_MTD_NAND_ECC_BCH=y
116CONFIG_MTD_NAND_OMAP2=y 133CONFIG_MTD_NAND_OMAP2=y
134CONFIG_MTD_NAND_OMAP_BCH=y
117CONFIG_MTD_ONENAND=y 135CONFIG_MTD_ONENAND=y
118CONFIG_MTD_ONENAND_VERIFY_WRITE=y 136CONFIG_MTD_ONENAND_VERIFY_WRITE=y
119CONFIG_MTD_ONENAND_OMAP2=y 137CONFIG_MTD_ONENAND_OMAP2=y
@@ -162,6 +180,7 @@ CONFIG_USB_EPSON2888=y
162CONFIG_USB_EHCI_HCD=m 180CONFIG_USB_EHCI_HCD=m
163CONFIG_USB_OHCI_HCD=m 181CONFIG_USB_OHCI_HCD=m
164CONFIG_USB_KC2190=y 182CONFIG_USB_KC2190=y
183CONFIG_USB_CDC_PHONET=m
165CONFIG_LIBERTAS=m 184CONFIG_LIBERTAS=m
166CONFIG_LIBERTAS_USB=m 185CONFIG_LIBERTAS_USB=m
167CONFIG_LIBERTAS_SDIO=m 186CONFIG_LIBERTAS_SDIO=m
@@ -208,6 +227,10 @@ CONFIG_I2C_CHARDEV=y
208CONFIG_SPI=y 227CONFIG_SPI=y
209CONFIG_SPI_OMAP24XX=y 228CONFIG_SPI_OMAP24XX=y
210CONFIG_SPI_TI_QSPI=m 229CONFIG_SPI_TI_QSPI=m
230CONFIG_HSI=m
231CONFIG_OMAP_SSI=m
232CONFIG_NOKIA_MODEM=m
233CONFIG_SSI_PROTOCOL=m
211CONFIG_PINCTRL_SINGLE=y 234CONFIG_PINCTRL_SINGLE=y
212CONFIG_DEBUG_GPIO=y 235CONFIG_DEBUG_GPIO=y
213CONFIG_GPIO_SYSFS=y 236CONFIG_GPIO_SYSFS=y
@@ -248,6 +271,7 @@ CONFIG_TWL6040_CORE=y
248CONFIG_REGULATOR_PALMAS=y 271CONFIG_REGULATOR_PALMAS=y
249CONFIG_REGULATOR_PBIAS=y 272CONFIG_REGULATOR_PBIAS=y
250CONFIG_REGULATOR_TI_ABB=y 273CONFIG_REGULATOR_TI_ABB=y
274CONFIG_REGULATOR_TPS62360=m
251CONFIG_REGULATOR_TPS65023=y 275CONFIG_REGULATOR_TPS65023=y
252CONFIG_REGULATOR_TPS6507X=y 276CONFIG_REGULATOR_TPS6507X=y
253CONFIG_REGULATOR_TPS65217=y 277CONFIG_REGULATOR_TPS65217=y
@@ -332,6 +356,7 @@ CONFIG_USB_CONFIGFS_ECM=y
332CONFIG_USB_CONFIGFS_ECM_SUBSET=y 356CONFIG_USB_CONFIGFS_ECM_SUBSET=y
333CONFIG_USB_CONFIGFS_RNDIS=y 357CONFIG_USB_CONFIGFS_RNDIS=y
334CONFIG_USB_CONFIGFS_EEM=y 358CONFIG_USB_CONFIGFS_EEM=y
359CONFIG_USB_CONFIGFS_PHONET=y
335CONFIG_USB_CONFIGFS_MASS_STORAGE=y 360CONFIG_USB_CONFIGFS_MASS_STORAGE=y
336CONFIG_USB_CONFIGFS_F_LB_SS=y 361CONFIG_USB_CONFIGFS_F_LB_SS=y
337CONFIG_USB_CONFIGFS_F_FS=y 362CONFIG_USB_CONFIGFS_F_FS=y
@@ -340,6 +365,7 @@ CONFIG_USB_CONFIGFS_F_UAC2=y
340CONFIG_USB_CONFIGFS_F_MIDI=y 365CONFIG_USB_CONFIGFS_F_MIDI=y
341CONFIG_USB_CONFIGFS_F_HID=y 366CONFIG_USB_CONFIGFS_F_HID=y
342CONFIG_USB_ZERO=m 367CONFIG_USB_ZERO=m
368CONFIG_USB_G_NOKIA=m
343CONFIG_MMC=y 369CONFIG_MMC=y
344CONFIG_SDIO_UART=y 370CONFIG_SDIO_UART=y
345CONFIG_MMC_OMAP=y 371CONFIG_MMC_OMAP=y
@@ -347,6 +373,7 @@ CONFIG_MMC_OMAP_HS=y
347CONFIG_NEW_LEDS=y 373CONFIG_NEW_LEDS=y
348CONFIG_LEDS_CLASS=m 374CONFIG_LEDS_CLASS=m
349CONFIG_LEDS_GPIO=m 375CONFIG_LEDS_GPIO=m
376CONFIG_LEDS_PWM=m
350CONFIG_LEDS_TRIGGERS=y 377CONFIG_LEDS_TRIGGERS=y
351CONFIG_LEDS_TRIGGER_TIMER=m 378CONFIG_LEDS_TRIGGER_TIMER=m
352CONFIG_LEDS_TRIGGER_ONESHOT=m 379CONFIG_LEDS_TRIGGER_ONESHOT=m
@@ -366,6 +393,7 @@ CONFIG_TI_EDMA=y
366CONFIG_DMA_OMAP=y 393CONFIG_DMA_OMAP=y
367# CONFIG_IOMMU_SUPPORT is not set 394# CONFIG_IOMMU_SUPPORT is not set
368CONFIG_EXTCON=m 395CONFIG_EXTCON=m
396CONFIG_EXTCON_GPIO=m
369CONFIG_EXTCON_PALMAS=m 397CONFIG_EXTCON_PALMAS=m
370CONFIG_TI_EMIF=m 398CONFIG_TI_EMIF=m
371CONFIG_PWM=y 399CONFIG_PWM=y
@@ -374,7 +402,7 @@ CONFIG_PWM_TIEHRPWM=m
374CONFIG_PWM_TWL=m 402CONFIG_PWM_TWL=m
375CONFIG_PWM_TWL_LED=m 403CONFIG_PWM_TWL_LED=m
376CONFIG_OMAP_USB2=m 404CONFIG_OMAP_USB2=m
377CONFIG_TI_PIPE3=m 405CONFIG_TI_PIPE3=y
378CONFIG_EXT2_FS=y 406CONFIG_EXT2_FS=y
379CONFIG_EXT3_FS=y 407CONFIG_EXT3_FS=y
380# CONFIG_EXT3_FS_XATTR is not set 408# CONFIG_EXT3_FS_XATTR is not set
@@ -387,6 +415,7 @@ CONFIG_MSDOS_FS=y
387CONFIG_VFAT_FS=y 415CONFIG_VFAT_FS=y
388CONFIG_TMPFS=y 416CONFIG_TMPFS=y
389CONFIG_TMPFS_POSIX_ACL=y 417CONFIG_TMPFS_POSIX_ACL=y
418CONFIG_CONFIGFS_FS=y
390CONFIG_JFFS2_FS=y 419CONFIG_JFFS2_FS=y
391CONFIG_JFFS2_SUMMARY=y 420CONFIG_JFFS2_SUMMARY=y
392CONFIG_JFFS2_FS_XATTR=y 421CONFIG_JFFS2_FS_XATTR=y
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index b17036088726..b58618e2d13c 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -12,7 +12,9 @@ CONFIG_SLAB=y
12CONFIG_ARCH_SHMOBILE_MULTI=y 12CONFIG_ARCH_SHMOBILE_MULTI=y
13CONFIG_ARCH_EMEV2=y 13CONFIG_ARCH_EMEV2=y
14CONFIG_ARCH_R7S72100=y 14CONFIG_ARCH_R7S72100=y
15CONFIG_ARCH_R8A73A4=y
15CONFIG_ARCH_R8A7740=y 16CONFIG_ARCH_R8A7740=y
17CONFIG_ARCH_R8A7778=y
16CONFIG_ARCH_R8A7779=y 18CONFIG_ARCH_R8A7779=y
17CONFIG_ARCH_R8A7790=y 19CONFIG_ARCH_R8A7790=y
18CONFIG_ARCH_R8A7791=y 20CONFIG_ARCH_R8A7791=y
@@ -92,7 +94,6 @@ CONFIG_INPUT_ADXL34X=y
92# CONFIG_LEGACY_PTYS is not set 94# CONFIG_LEGACY_PTYS is not set
93CONFIG_SERIAL_8250=y 95CONFIG_SERIAL_8250=y
94CONFIG_SERIAL_8250_CONSOLE=y 96CONFIG_SERIAL_8250_CONSOLE=y
95CONFIG_SERIAL_8250_EXTENDED=y
96CONFIG_SERIAL_8250_EM=y 97CONFIG_SERIAL_8250_EM=y
97CONFIG_SERIAL_SH_SCI=y 98CONFIG_SERIAL_SH_SCI=y
98CONFIG_SERIAL_SH_SCI_NR_UARTS=20 99CONFIG_SERIAL_SH_SCI_NR_UARTS=20
@@ -109,6 +110,9 @@ CONFIG_SPI_SH_HSPI=y
109CONFIG_GPIO_EM=y 110CONFIG_GPIO_EM=y
110CONFIG_GPIO_RCAR=y 111CONFIG_GPIO_RCAR=y
111CONFIG_GPIO_PCF857X=y 112CONFIG_GPIO_PCF857X=y
113CONFIG_POWER_SUPPLY=y
114CONFIG_POWER_RESET=y
115CONFIG_POWER_RESET_RMOBILE=y
112# CONFIG_HWMON is not set 116# CONFIG_HWMON is not set
113CONFIG_THERMAL=y 117CONFIG_THERMAL=y
114CONFIG_CPU_THERMAL=y 118CONFIG_CPU_THERMAL=y
@@ -121,6 +125,7 @@ CONFIG_REGULATOR=y
121CONFIG_REGULATOR_AS3711=y 125CONFIG_REGULATOR_AS3711=y
122CONFIG_REGULATOR_DA9210=y 126CONFIG_REGULATOR_DA9210=y
123CONFIG_REGULATOR_GPIO=y 127CONFIG_REGULATOR_GPIO=y
128CONFIG_REGULATOR_MAX8973=y
124CONFIG_MEDIA_SUPPORT=y 129CONFIG_MEDIA_SUPPORT=y
125CONFIG_MEDIA_CAMERA_SUPPORT=y 130CONFIG_MEDIA_CAMERA_SUPPORT=y
126CONFIG_MEDIA_CONTROLLER=y 131CONFIG_MEDIA_CONTROLLER=y
@@ -133,6 +138,7 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y
133CONFIG_VIDEO_RENESAS_VSP1=y 138CONFIG_VIDEO_RENESAS_VSP1=y
134# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set 139# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
135CONFIG_VIDEO_ADV7180=y 140CONFIG_VIDEO_ADV7180=y
141CONFIG_VIDEO_ML86V7667=y
136CONFIG_DRM=y 142CONFIG_DRM=y
137CONFIG_DRM_RCAR_DU=y 143CONFIG_DRM_RCAR_DU=y
138CONFIG_FB_SH_MOBILE_LCDC=y 144CONFIG_FB_SH_MOBILE_LCDC=y
@@ -167,6 +173,7 @@ CONFIG_LEDS_GPIO=y
167CONFIG_RTC_CLASS=y 173CONFIG_RTC_CLASS=y
168CONFIG_RTC_DRV_RS5C372=y 174CONFIG_RTC_DRV_RS5C372=y
169CONFIG_RTC_DRV_S35390A=y 175CONFIG_RTC_DRV_S35390A=y
176CONFIG_RTC_DRV_RX8581=y
170CONFIG_DMADEVICES=y 177CONFIG_DMADEVICES=y
171CONFIG_SH_DMAE=y 178CONFIG_SH_DMAE=y
172CONFIG_RCAR_DMAC=y 179CONFIG_RCAR_DMAC=y
diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig
index 38840a812924..8ecba00dcd83 100644
--- a/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@ -4,6 +4,7 @@ CONFIG_BLK_DEV_INITRD=y
4CONFIG_PERF_EVENTS=y 4CONFIG_PERF_EVENTS=y
5CONFIG_ARCH_SUNXI=y 5CONFIG_ARCH_SUNXI=y
6CONFIG_SMP=y 6CONFIG_SMP=y
7CONFIG_NR_CPUS=8
7CONFIG_AEABI=y 8CONFIG_AEABI=y
8CONFIG_HIGHMEM=y 9CONFIG_HIGHMEM=y
9CONFIG_HIGHPTE=y 10CONFIG_HIGHPTE=y
@@ -106,6 +107,7 @@ CONFIG_RTC_DRV_SUN6I=y
106CONFIG_RTC_DRV_SUNXI=y 107CONFIG_RTC_DRV_SUNXI=y
107# CONFIG_IOMMU_SUPPORT is not set 108# CONFIG_IOMMU_SUPPORT is not set
108CONFIG_PHY_SUN4I_USB=y 109CONFIG_PHY_SUN4I_USB=y
110CONFIG_PHY_SUN9I_USB=y
109CONFIG_EXT4_FS=y 111CONFIG_EXT4_FS=y
110CONFIG_VFAT_FS=y 112CONFIG_VFAT_FS=y
111CONFIG_TMPFS=y 113CONFIG_TMPFS=y
diff --git a/arch/arm/mach-asm9260/Kconfig b/arch/arm/mach-asm9260/Kconfig
index 8423be76080e..52241207a82a 100644
--- a/arch/arm/mach-asm9260/Kconfig
+++ b/arch/arm/mach-asm9260/Kconfig
@@ -2,5 +2,7 @@ config MACH_ASM9260
2 bool "Alphascale ASM9260" 2 bool "Alphascale ASM9260"
3 depends on ARCH_MULTI_V5 3 depends on ARCH_MULTI_V5
4 select CPU_ARM926T 4 select CPU_ARM926T
5 select ASM9260_TIMER
6 select GENERIC_CLOCKEVENTS
5 help 7 help
6 Support for Alphascale ASM9260 based platform. 8 Support for Alphascale ASM9260 based platform.
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-17 04:53:54 -0500