diff options
| -rw-r--r-- | arch/arm/boot/dts/am335x-bone-common.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am437x-idk-evm.dts | 25 | ||||
| -rw-r--r-- | arch/arm/boot/dts/am57xx-beagle-x15.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dm8168-evm.dts | 25 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dm816x.dtsi | 34 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra7-evm.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra72-evm.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap2.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap4.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 8 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 82 | ||||
| -rw-r--r-- | arch/arm/configs/omap2plus_defconfig | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/arm/foundation-v8.dts | 8 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/arm/juno.dts | 14 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 8 |
18 files changed, 190 insertions, 72 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 = <ðernet_pins>; | 717 | pinctrl-0 = <ðernet_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..b7e6b6fba5e0 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
| @@ -62,6 +62,17 @@ CONFIG_MACH_SPEAR1340=y | |||
| 62 | CONFIG_ARCH_STI=y | 62 | CONFIG_ARCH_STI=y |
| 63 | CONFIG_ARCH_EXYNOS=y | 63 | CONFIG_ARCH_EXYNOS=y |
| 64 | CONFIG_EXYNOS5420_MCPM=y | 64 | CONFIG_EXYNOS5420_MCPM=y |
| 65 | CONFIG_ARCH_SHMOBILE_MULTI=y | ||
| 66 | CONFIG_ARCH_EMEV2=y | ||
| 67 | CONFIG_ARCH_R7S72100=y | ||
| 68 | CONFIG_ARCH_R8A73A4=y | ||
| 69 | CONFIG_ARCH_R8A7740=y | ||
| 70 | CONFIG_ARCH_R8A7779=y | ||
| 71 | CONFIG_ARCH_R8A7790=y | ||
| 72 | CONFIG_ARCH_R8A7791=y | ||
| 73 | CONFIG_ARCH_R8A7794=y | ||
| 74 | CONFIG_ARCH_SH73A0=y | ||
| 75 | CONFIG_MACH_MARZEN=y | ||
| 65 | CONFIG_ARCH_SUNXI=y | 76 | CONFIG_ARCH_SUNXI=y |
| 66 | CONFIG_ARCH_SIRF=y | 77 | CONFIG_ARCH_SIRF=y |
| 67 | CONFIG_ARCH_TEGRA=y | 78 | CONFIG_ARCH_TEGRA=y |
| @@ -84,6 +95,8 @@ CONFIG_PCI_KEYSTONE=y | |||
| 84 | CONFIG_PCI_MSI=y | 95 | CONFIG_PCI_MSI=y |
| 85 | CONFIG_PCI_MVEBU=y | 96 | CONFIG_PCI_MVEBU=y |
| 86 | CONFIG_PCI_TEGRA=y | 97 | CONFIG_PCI_TEGRA=y |
| 98 | CONFIG_PCI_RCAR_GEN2=y | ||
| 99 | CONFIG_PCI_RCAR_GEN2_PCIE=y | ||
| 87 | CONFIG_PCIEPORTBUS=y | 100 | CONFIG_PCIEPORTBUS=y |
| 88 | CONFIG_SMP=y | 101 | CONFIG_SMP=y |
| 89 | CONFIG_NR_CPUS=8 | 102 | CONFIG_NR_CPUS=8 |
| @@ -130,6 +143,7 @@ CONFIG_DEVTMPFS_MOUNT=y | |||
| 130 | CONFIG_DMA_CMA=y | 143 | CONFIG_DMA_CMA=y |
| 131 | CONFIG_CMA_SIZE_MBYTES=64 | 144 | CONFIG_CMA_SIZE_MBYTES=64 |
| 132 | CONFIG_OMAP_OCP2SCP=y | 145 | CONFIG_OMAP_OCP2SCP=y |
| 146 | CONFIG_SIMPLE_PM_BUS=y | ||
| 133 | CONFIG_MTD=y | 147 | CONFIG_MTD=y |
| 134 | CONFIG_MTD_CMDLINE_PARTS=y | 148 | CONFIG_MTD_CMDLINE_PARTS=y |
| 135 | CONFIG_MTD_BLOCK=y | 149 | CONFIG_MTD_BLOCK=y |
| @@ -157,6 +171,7 @@ CONFIG_AHCI_SUNXI=y | |||
| 157 | CONFIG_AHCI_TEGRA=y | 171 | CONFIG_AHCI_TEGRA=y |
| 158 | CONFIG_SATA_HIGHBANK=y | 172 | CONFIG_SATA_HIGHBANK=y |
| 159 | CONFIG_SATA_MV=y | 173 | CONFIG_SATA_MV=y |
| 174 | CONFIG_SATA_RCAR=y | ||
| 160 | CONFIG_NETDEVICES=y | 175 | CONFIG_NETDEVICES=y |
| 161 | CONFIG_HIX5HD2_GMAC=y | 176 | CONFIG_HIX5HD2_GMAC=y |
| 162 | CONFIG_SUN4I_EMAC=y | 177 | CONFIG_SUN4I_EMAC=y |
| @@ -167,14 +182,17 @@ CONFIG_MV643XX_ETH=y | |||
| 167 | CONFIG_MVNETA=y | 182 | CONFIG_MVNETA=y |
| 168 | CONFIG_KS8851=y | 183 | CONFIG_KS8851=y |
| 169 | CONFIG_R8169=y | 184 | CONFIG_R8169=y |
| 185 | CONFIG_SH_ETH=y | ||
| 170 | CONFIG_SMSC911X=y | 186 | CONFIG_SMSC911X=y |
| 171 | CONFIG_STMMAC_ETH=y | 187 | CONFIG_STMMAC_ETH=y |
| 172 | CONFIG_TI_CPSW=y | 188 | CONFIG_TI_CPSW=y |
| 173 | CONFIG_XILINX_EMACLITE=y | 189 | CONFIG_XILINX_EMACLITE=y |
| 174 | CONFIG_AT803X_PHY=y | 190 | CONFIG_AT803X_PHY=y |
| 175 | CONFIG_MARVELL_PHY=y | 191 | CONFIG_MARVELL_PHY=y |
| 192 | CONFIG_SMSC_PHY=y | ||
| 176 | CONFIG_BROADCOM_PHY=y | 193 | CONFIG_BROADCOM_PHY=y |
| 177 | CONFIG_ICPLUS_PHY=y | 194 | CONFIG_ICPLUS_PHY=y |
| 195 | CONFIG_MICREL_PHY=y | ||
| 178 | CONFIG_USB_PEGASUS=y | 196 | CONFIG_USB_PEGASUS=y |
| 179 | CONFIG_USB_USBNET=y | 197 | CONFIG_USB_USBNET=y |
| 180 | CONFIG_USB_NET_SMSC75XX=y | 198 | CONFIG_USB_NET_SMSC75XX=y |
| @@ -192,15 +210,18 @@ CONFIG_KEYBOARD_CROS_EC=y | |||
| 192 | CONFIG_MOUSE_PS2_ELANTECH=y | 210 | CONFIG_MOUSE_PS2_ELANTECH=y |
| 193 | CONFIG_INPUT_TOUCHSCREEN=y | 211 | CONFIG_INPUT_TOUCHSCREEN=y |
| 194 | CONFIG_TOUCHSCREEN_ATMEL_MXT=y | 212 | CONFIG_TOUCHSCREEN_ATMEL_MXT=y |
| 213 | CONFIG_TOUCHSCREEN_ST1232=m | ||
| 195 | CONFIG_TOUCHSCREEN_STMPE=y | 214 | CONFIG_TOUCHSCREEN_STMPE=y |
| 196 | CONFIG_TOUCHSCREEN_SUN4I=y | 215 | CONFIG_TOUCHSCREEN_SUN4I=y |
| 197 | CONFIG_INPUT_MISC=y | 216 | CONFIG_INPUT_MISC=y |
| 198 | CONFIG_INPUT_MPU3050=y | 217 | CONFIG_INPUT_MPU3050=y |
| 199 | CONFIG_INPUT_AXP20X_PEK=y | 218 | CONFIG_INPUT_AXP20X_PEK=y |
| 219 | CONFIG_INPUT_ADXL34X=m | ||
| 200 | CONFIG_SERIO_AMBAKMI=y | 220 | CONFIG_SERIO_AMBAKMI=y |
| 201 | CONFIG_SERIAL_8250=y | 221 | CONFIG_SERIAL_8250=y |
| 202 | CONFIG_SERIAL_8250_CONSOLE=y | 222 | CONFIG_SERIAL_8250_CONSOLE=y |
| 203 | CONFIG_SERIAL_8250_DW=y | 223 | CONFIG_SERIAL_8250_DW=y |
| 224 | CONFIG_SERIAL_8250_EM=y | ||
| 204 | CONFIG_SERIAL_8250_MT6577=y | 225 | CONFIG_SERIAL_8250_MT6577=y |
| 205 | CONFIG_SERIAL_AMBA_PL011=y | 226 | CONFIG_SERIAL_AMBA_PL011=y |
| 206 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y | 227 | CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |
| @@ -213,6 +234,9 @@ CONFIG_SERIAL_SIRFSOC_CONSOLE=y | |||
| 213 | CONFIG_SERIAL_TEGRA=y | 234 | CONFIG_SERIAL_TEGRA=y |
| 214 | CONFIG_SERIAL_IMX=y | 235 | CONFIG_SERIAL_IMX=y |
| 215 | CONFIG_SERIAL_IMX_CONSOLE=y | 236 | CONFIG_SERIAL_IMX_CONSOLE=y |
| 237 | CONFIG_SERIAL_SH_SCI=y | ||
| 238 | CONFIG_SERIAL_SH_SCI_NR_UARTS=20 | ||
| 239 | CONFIG_SERIAL_SH_SCI_CONSOLE=y | ||
| 216 | CONFIG_SERIAL_MSM=y | 240 | CONFIG_SERIAL_MSM=y |
| 217 | CONFIG_SERIAL_MSM_CONSOLE=y | 241 | CONFIG_SERIAL_MSM_CONSOLE=y |
| 218 | CONFIG_SERIAL_VT8500=y | 242 | CONFIG_SERIAL_VT8500=y |
| @@ -233,19 +257,26 @@ CONFIG_I2C_MUX_PCA954x=y | |||
| 233 | CONFIG_I2C_MUX_PINCTRL=y | 257 | CONFIG_I2C_MUX_PINCTRL=y |
| 234 | CONFIG_I2C_CADENCE=y | 258 | CONFIG_I2C_CADENCE=y |
| 235 | CONFIG_I2C_DESIGNWARE_PLATFORM=y | 259 | CONFIG_I2C_DESIGNWARE_PLATFORM=y |
| 260 | CONFIG_I2C_GPIO=m | ||
| 236 | CONFIG_I2C_EXYNOS5=y | 261 | CONFIG_I2C_EXYNOS5=y |
| 237 | CONFIG_I2C_MV64XXX=y | 262 | CONFIG_I2C_MV64XXX=y |
| 263 | CONFIG_I2C_RIIC=y | ||
| 238 | CONFIG_I2C_S3C2410=y | 264 | CONFIG_I2C_S3C2410=y |
| 265 | CONFIG_I2C_SH_MOBILE=y | ||
| 239 | CONFIG_I2C_SIRF=y | 266 | CONFIG_I2C_SIRF=y |
| 240 | CONFIG_I2C_TEGRA=y | ||
| 241 | CONFIG_I2C_ST=y | 267 | CONFIG_I2C_ST=y |
| 242 | CONFIG_SPI=y | 268 | CONFIG_I2C_TEGRA=y |
| 243 | CONFIG_I2C_XILINX=y | 269 | CONFIG_I2C_XILINX=y |
| 244 | CONFIG_SPI_DAVINCI=y | 270 | CONFIG_I2C_RCAR=y |
| 271 | CONFIG_SPI=y | ||
| 245 | CONFIG_SPI_CADENCE=y | 272 | CONFIG_SPI_CADENCE=y |
| 273 | CONFIG_SPI_DAVINCI=y | ||
| 246 | CONFIG_SPI_OMAP24XX=y | 274 | CONFIG_SPI_OMAP24XX=y |
| 247 | CONFIG_SPI_ORION=y | 275 | CONFIG_SPI_ORION=y |
| 248 | CONFIG_SPI_PL022=y | 276 | CONFIG_SPI_PL022=y |
| 277 | CONFIG_SPI_RSPI=y | ||
| 278 | CONFIG_SPI_SH_MSIOF=m | ||
| 279 | CONFIG_SPI_SH_HSPI=y | ||
| 249 | CONFIG_SPI_SIRF=y | 280 | CONFIG_SPI_SIRF=y |
| 250 | CONFIG_SPI_SUN4I=y | 281 | CONFIG_SPI_SUN4I=y |
| 251 | CONFIG_SPI_SUN6I=y | 282 | CONFIG_SPI_SUN6I=y |
| @@ -259,12 +290,15 @@ CONFIG_PINCTRL_PALMAS=y | |||
| 259 | CONFIG_PINCTRL_APQ8084=y | 290 | CONFIG_PINCTRL_APQ8084=y |
| 260 | CONFIG_GPIO_SYSFS=y | 291 | CONFIG_GPIO_SYSFS=y |
| 261 | CONFIG_GPIO_GENERIC_PLATFORM=y | 292 | CONFIG_GPIO_GENERIC_PLATFORM=y |
| 262 | CONFIG_GPIO_DWAPB=y | ||
| 263 | CONFIG_GPIO_DAVINCI=y | 293 | CONFIG_GPIO_DAVINCI=y |
| 294 | CONFIG_GPIO_DWAPB=y | ||
| 295 | CONFIG_GPIO_EM=y | ||
| 296 | CONFIG_GPIO_RCAR=y | ||
| 264 | CONFIG_GPIO_XILINX=y | 297 | CONFIG_GPIO_XILINX=y |
| 265 | CONFIG_GPIO_ZYNQ=y | 298 | CONFIG_GPIO_ZYNQ=y |
| 266 | CONFIG_GPIO_PCA953X=y | 299 | CONFIG_GPIO_PCA953X=y |
| 267 | CONFIG_GPIO_PCA953X_IRQ=y | 300 | CONFIG_GPIO_PCA953X_IRQ=y |
| 301 | CONFIG_GPIO_PCF857X=y | ||
| 268 | CONFIG_GPIO_TWL4030=y | 302 | CONFIG_GPIO_TWL4030=y |
| 269 | CONFIG_GPIO_PALMAS=y | 303 | CONFIG_GPIO_PALMAS=y |
| 270 | CONFIG_GPIO_SYSCON=y | 304 | CONFIG_GPIO_SYSCON=y |
| @@ -276,10 +310,12 @@ CONFIG_POWER_RESET_AS3722=y | |||
| 276 | CONFIG_POWER_RESET_GPIO=y | 310 | CONFIG_POWER_RESET_GPIO=y |
| 277 | CONFIG_POWER_RESET_KEYSTONE=y | 311 | CONFIG_POWER_RESET_KEYSTONE=y |
| 278 | CONFIG_POWER_RESET_SUN6I=y | 312 | CONFIG_POWER_RESET_SUN6I=y |
| 313 | CONFIG_POWER_RESET_RMOBILE=y | ||
| 279 | CONFIG_SENSORS_LM90=y | 314 | CONFIG_SENSORS_LM90=y |
| 280 | CONFIG_SENSORS_LM95245=y | 315 | CONFIG_SENSORS_LM95245=y |
| 281 | CONFIG_THERMAL=y | 316 | CONFIG_THERMAL=y |
| 282 | CONFIG_CPU_THERMAL=y | 317 | CONFIG_CPU_THERMAL=y |
| 318 | CONFIG_RCAR_THERMAL=y | ||
| 283 | CONFIG_ARMADA_THERMAL=y | 319 | CONFIG_ARMADA_THERMAL=y |
| 284 | CONFIG_DAVINCI_WATCHDOG | 320 | CONFIG_DAVINCI_WATCHDOG |
| 285 | CONFIG_ST_THERMAL_SYSCFG=y | 321 | CONFIG_ST_THERMAL_SYSCFG=y |
| @@ -290,6 +326,7 @@ CONFIG_ARM_SP805_WATCHDOG=y | |||
| 290 | CONFIG_ORION_WATCHDOG=y | 326 | CONFIG_ORION_WATCHDOG=y |
| 291 | CONFIG_SUNXI_WATCHDOG=y | 327 | CONFIG_SUNXI_WATCHDOG=y |
| 292 | CONFIG_MESON_WATCHDOG=y | 328 | CONFIG_MESON_WATCHDOG=y |
| 329 | CONFIG_MFD_AS3711=y | ||
| 293 | CONFIG_MFD_AS3722=y | 330 | CONFIG_MFD_AS3722=y |
| 294 | CONFIG_MFD_BCM590XX=y | 331 | CONFIG_MFD_BCM590XX=y |
| 295 | CONFIG_MFD_AXP20X=y | 332 | CONFIG_MFD_AXP20X=y |
| @@ -304,13 +341,16 @@ CONFIG_MFD_TPS65090=y | |||
| 304 | CONFIG_MFD_TPS6586X=y | 341 | CONFIG_MFD_TPS6586X=y |
| 305 | CONFIG_MFD_TPS65910=y | 342 | CONFIG_MFD_TPS65910=y |
| 306 | CONFIG_REGULATOR_AB8500=y | 343 | CONFIG_REGULATOR_AB8500=y |
| 344 | CONFIG_REGULATOR_AS3711=y | ||
| 307 | CONFIG_REGULATOR_AS3722=y | 345 | CONFIG_REGULATOR_AS3722=y |
| 308 | CONFIG_REGULATOR_AXP20X=y | 346 | CONFIG_REGULATOR_AXP20X=y |
| 309 | CONFIG_REGULATOR_BCM590XX=y | 347 | CONFIG_REGULATOR_BCM590XX=y |
| 348 | CONFIG_REGULATOR_DA9210=y | ||
| 310 | CONFIG_REGULATOR_GPIO=y | 349 | CONFIG_REGULATOR_GPIO=y |
| 311 | CONFIG_MFD_SYSCON=y | 350 | CONFIG_MFD_SYSCON=y |
| 312 | CONFIG_POWER_RESET_SYSCON=y | 351 | CONFIG_POWER_RESET_SYSCON=y |
| 313 | CONFIG_REGULATOR_MAX8907=y | 352 | CONFIG_REGULATOR_MAX8907=y |
| 353 | CONFIG_REGULATOR_MAX8973=y | ||
| 314 | CONFIG_REGULATOR_MAX77686=y | 354 | CONFIG_REGULATOR_MAX77686=y |
| 315 | CONFIG_REGULATOR_PALMAS=y | 355 | CONFIG_REGULATOR_PALMAS=y |
| 316 | CONFIG_REGULATOR_S2MPS11=y | 356 | CONFIG_REGULATOR_S2MPS11=y |
| @@ -324,18 +364,32 @@ CONFIG_REGULATOR_TWL4030=y | |||
| 324 | CONFIG_REGULATOR_VEXPRESS=y | 364 | CONFIG_REGULATOR_VEXPRESS=y |
| 325 | CONFIG_MEDIA_SUPPORT=y | 365 | CONFIG_MEDIA_SUPPORT=y |
| 326 | CONFIG_MEDIA_CAMERA_SUPPORT=y | 366 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
| 367 | CONFIG_MEDIA_CONTROLLER=y | ||
| 368 | CONFIG_VIDEO_V4L2_SUBDEV_API=y | ||
| 327 | CONFIG_MEDIA_USB_SUPPORT=y | 369 | CONFIG_MEDIA_USB_SUPPORT=y |
| 328 | CONFIG_USB_VIDEO_CLASS=y | 370 | CONFIG_USB_VIDEO_CLASS=y |
| 329 | CONFIG_USB_GSPCA=y | 371 | CONFIG_USB_GSPCA=y |
| 372 | CONFIG_V4L_PLATFORM_DRIVERS=y | ||
| 373 | CONFIG_SOC_CAMERA=m | ||
| 374 | CONFIG_SOC_CAMERA_PLATFORM=m | ||
| 375 | CONFIG_VIDEO_RCAR_VIN=m | ||
| 376 | CONFIG_V4L_MEM2MEM_DRIVERS=y | ||
| 377 | CONFIG_VIDEO_RENESAS_VSP1=m | ||
| 378 | # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set | ||
| 379 | CONFIG_VIDEO_ADV7180=m | ||
| 330 | CONFIG_DRM=y | 380 | CONFIG_DRM=y |
| 381 | CONFIG_DRM_RCAR_DU=m | ||
| 331 | CONFIG_DRM_TEGRA=y | 382 | CONFIG_DRM_TEGRA=y |
| 332 | CONFIG_DRM_PANEL_SIMPLE=y | 383 | CONFIG_DRM_PANEL_SIMPLE=y |
| 333 | CONFIG_FB_ARMCLCD=y | 384 | CONFIG_FB_ARMCLCD=y |
| 334 | CONFIG_FB_WM8505=y | 385 | CONFIG_FB_WM8505=y |
| 386 | CONFIG_FB_SH_MOBILE_LCDC=y | ||
| 335 | CONFIG_FB_SIMPLE=y | 387 | CONFIG_FB_SIMPLE=y |
| 388 | CONFIG_FB_SH_MOBILE_MERAM=y | ||
| 336 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 389 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
| 337 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 390 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
| 338 | CONFIG_BACKLIGHT_PWM=y | 391 | CONFIG_BACKLIGHT_PWM=y |
| 392 | CONFIG_BACKLIGHT_AS3711=y | ||
| 339 | CONFIG_FRAMEBUFFER_CONSOLE=y | 393 | CONFIG_FRAMEBUFFER_CONSOLE=y |
| 340 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | 394 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y |
| 341 | CONFIG_SOUND=y | 395 | CONFIG_SOUND=y |
| @@ -343,6 +397,8 @@ CONFIG_SND=y | |||
| 343 | CONFIG_SND_DYNAMIC_MINORS=y | 397 | CONFIG_SND_DYNAMIC_MINORS=y |
| 344 | CONFIG_SND_USB_AUDIO=y | 398 | CONFIG_SND_USB_AUDIO=y |
| 345 | CONFIG_SND_SOC=y | 399 | CONFIG_SND_SOC=y |
| 400 | CONFIG_SND_SOC_SH4_FSI=m | ||
| 401 | CONFIG_SND_SOC_RCAR=m | ||
| 346 | CONFIG_SND_SOC_TEGRA=y | 402 | CONFIG_SND_SOC_TEGRA=y |
| 347 | CONFIG_SND_SOC_TEGRA_RT5640=y | 403 | CONFIG_SND_SOC_TEGRA_RT5640=y |
| 348 | CONFIG_SND_SOC_TEGRA_WM8753=y | 404 | CONFIG_SND_SOC_TEGRA_WM8753=y |
| @@ -350,6 +406,8 @@ CONFIG_SND_SOC_TEGRA_WM8903=y | |||
| 350 | CONFIG_SND_SOC_TEGRA_TRIMSLICE=y | 406 | CONFIG_SND_SOC_TEGRA_TRIMSLICE=y |
| 351 | CONFIG_SND_SOC_TEGRA_ALC5632=y | 407 | CONFIG_SND_SOC_TEGRA_ALC5632=y |
| 352 | CONFIG_SND_SOC_TEGRA_MAX98090=y | 408 | CONFIG_SND_SOC_TEGRA_MAX98090=y |
| 409 | CONFIG_SND_SOC_AK4642=m | ||
| 410 | CONFIG_SND_SOC_WM8978=m | ||
| 353 | CONFIG_USB=y | 411 | CONFIG_USB=y |
| 354 | CONFIG_USB_XHCI_HCD=y | 412 | CONFIG_USB_XHCI_HCD=y |
| 355 | CONFIG_USB_XHCI_MVEBU=y | 413 | CONFIG_USB_XHCI_MVEBU=y |
| @@ -362,6 +420,8 @@ CONFIG_USB_ISP1760_HCD=y | |||
| 362 | CONFIG_USB_OHCI_HCD=y | 420 | CONFIG_USB_OHCI_HCD=y |
| 363 | CONFIG_USB_OHCI_HCD_STI=y | 421 | CONFIG_USB_OHCI_HCD_STI=y |
| 364 | CONFIG_USB_OHCI_HCD_PLATFORM=y | 422 | CONFIG_USB_OHCI_HCD_PLATFORM=y |
| 423 | CONFIG_USB_R8A66597_HCD=m | ||
| 424 | CONFIG_USB_RENESAS_USBHS=m | ||
| 365 | CONFIG_USB_STORAGE=y | 425 | CONFIG_USB_STORAGE=y |
| 366 | CONFIG_USB_DWC3=y | 426 | CONFIG_USB_DWC3=y |
| 367 | CONFIG_USB_CHIPIDEA=y | 427 | CONFIG_USB_CHIPIDEA=y |
| @@ -374,6 +434,10 @@ CONFIG_SAMSUNG_USB3PHY=y | |||
| 374 | CONFIG_USB_GPIO_VBUS=y | 434 | CONFIG_USB_GPIO_VBUS=y |
| 375 | CONFIG_USB_ISP1301=y | 435 | CONFIG_USB_ISP1301=y |
| 376 | CONFIG_USB_MXS_PHY=y | 436 | CONFIG_USB_MXS_PHY=y |
| 437 | CONFIG_USB_RCAR_PHY=m | ||
| 438 | CONFIG_USB_RCAR_GEN2_PHY=m | ||
| 439 | CONFIG_USB_GADGET=y | ||
| 440 | CONFIG_USB_RENESAS_USBHS_UDC=m | ||
| 377 | CONFIG_MMC=y | 441 | CONFIG_MMC=y |
| 378 | CONFIG_MMC_BLOCK_MINORS=16 | 442 | CONFIG_MMC_BLOCK_MINORS=16 |
| 379 | CONFIG_MMC_ARMMMCI=y | 443 | CONFIG_MMC_ARMMMCI=y |
| @@ -392,12 +456,14 @@ CONFIG_MMC_SDHCI_ST=y | |||
| 392 | CONFIG_MMC_OMAP=y | 456 | CONFIG_MMC_OMAP=y |
| 393 | CONFIG_MMC_OMAP_HS=y | 457 | CONFIG_MMC_OMAP_HS=y |
| 394 | CONFIG_MMC_MVSDIO=y | 458 | CONFIG_MMC_MVSDIO=y |
| 395 | CONFIG_MMC_SUNXI=y | 459 | CONFIG_MMC_SDHI=y |
| 396 | CONFIG_MMC_DW=y | 460 | CONFIG_MMC_DW=y |
| 397 | CONFIG_MMC_DW_IDMAC=y | 461 | CONFIG_MMC_DW_IDMAC=y |
| 398 | CONFIG_MMC_DW_PLTFM=y | 462 | CONFIG_MMC_DW_PLTFM=y |
| 399 | CONFIG_MMC_DW_EXYNOS=y | 463 | CONFIG_MMC_DW_EXYNOS=y |
| 400 | CONFIG_MMC_DW_ROCKCHIP=y | 464 | CONFIG_MMC_DW_ROCKCHIP=y |
| 465 | CONFIG_MMC_SH_MMCIF=y | ||
| 466 | CONFIG_MMC_SUNXI=y | ||
| 401 | CONFIG_NEW_LEDS=y | 467 | CONFIG_NEW_LEDS=y |
| 402 | CONFIG_LEDS_CLASS=y | 468 | CONFIG_LEDS_CLASS=y |
| 403 | CONFIG_LEDS_GPIO=y | 469 | CONFIG_LEDS_GPIO=y |
| @@ -421,10 +487,12 @@ CONFIG_RTC_DRV_AS3722=y | |||
| 421 | CONFIG_RTC_DRV_DS1307=y | 487 | CONFIG_RTC_DRV_DS1307=y |
| 422 | CONFIG_RTC_DRV_MAX8907=y | 488 | CONFIG_RTC_DRV_MAX8907=y |
| 423 | CONFIG_RTC_DRV_MAX77686=y | 489 | CONFIG_RTC_DRV_MAX77686=y |
| 490 | CONFIG_RTC_DRV_RS5C372=m | ||
| 424 | CONFIG_RTC_DRV_PALMAS=y | 491 | CONFIG_RTC_DRV_PALMAS=y |
| 425 | CONFIG_RTC_DRV_TWL4030=y | 492 | CONFIG_RTC_DRV_TWL4030=y |
| 426 | CONFIG_RTC_DRV_TPS6586X=y | 493 | CONFIG_RTC_DRV_TPS6586X=y |
| 427 | CONFIG_RTC_DRV_TPS65910=y | 494 | CONFIG_RTC_DRV_TPS65910=y |
| 495 | CONFIG_RTC_DRV_S35390A=m | ||
| 428 | CONFIG_RTC_DRV_EM3027=y | 496 | CONFIG_RTC_DRV_EM3027=y |
| 429 | CONFIG_RTC_DRV_PL031=y | 497 | CONFIG_RTC_DRV_PL031=y |
| 430 | CONFIG_RTC_DRV_VT8500=y | 498 | CONFIG_RTC_DRV_VT8500=y |
| @@ -436,6 +504,9 @@ CONFIG_DMADEVICES=y | |||
| 436 | CONFIG_DW_DMAC=y | 504 | CONFIG_DW_DMAC=y |
| 437 | CONFIG_MV_XOR=y | 505 | CONFIG_MV_XOR=y |
| 438 | CONFIG_TEGRA20_APB_DMA=y | 506 | CONFIG_TEGRA20_APB_DMA=y |
| 507 | CONFIG_SH_DMAE=y | ||
| 508 | CONFIG_RCAR_AUDMAC_PP=m | ||
| 509 | CONFIG_RCAR_DMAC=y | ||
| 439 | CONFIG_STE_DMA40=y | 510 | CONFIG_STE_DMA40=y |
| 440 | CONFIG_SIRF_DMA=y | 511 | CONFIG_SIRF_DMA=y |
| 441 | CONFIG_TI_EDMA=y | 512 | CONFIG_TI_EDMA=y |
| @@ -468,6 +539,7 @@ CONFIG_IIO=y | |||
| 468 | CONFIG_XILINX_XADC=y | 539 | CONFIG_XILINX_XADC=y |
| 469 | CONFIG_AK8975=y | 540 | CONFIG_AK8975=y |
| 470 | CONFIG_PWM=y | 541 | CONFIG_PWM=y |
| 542 | CONFIG_PWM_RENESAS_TPU=y | ||
| 471 | CONFIG_PWM_TEGRA=y | 543 | CONFIG_PWM_TEGRA=y |
| 472 | CONFIG_PWM_VT8500=y | 544 | CONFIG_PWM_VT8500=y |
| 473 | CONFIG_PHY_HIX5HD2_SATA=y | 545 | CONFIG_PHY_HIX5HD2_SATA=y |
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig index b7386524c356..a097cffa1231 100644 --- a/arch/arm/configs/omap2plus_defconfig +++ b/arch/arm/configs/omap2plus_defconfig | |||
| @@ -114,6 +114,7 @@ CONFIG_MTD_PHYSMAP_OF=y | |||
| 114 | CONFIG_MTD_NAND=y | 114 | CONFIG_MTD_NAND=y |
| 115 | CONFIG_MTD_NAND_ECC_BCH=y | 115 | CONFIG_MTD_NAND_ECC_BCH=y |
| 116 | CONFIG_MTD_NAND_OMAP2=y | 116 | CONFIG_MTD_NAND_OMAP2=y |
| 117 | CONFIG_MTD_NAND_OMAP_BCH=y | ||
| 117 | CONFIG_MTD_ONENAND=y | 118 | CONFIG_MTD_ONENAND=y |
| 118 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y | 119 | CONFIG_MTD_ONENAND_VERIFY_WRITE=y |
| 119 | CONFIG_MTD_ONENAND_OMAP2=y | 120 | CONFIG_MTD_ONENAND_OMAP2=y |
| @@ -248,6 +249,7 @@ CONFIG_TWL6040_CORE=y | |||
| 248 | CONFIG_REGULATOR_PALMAS=y | 249 | CONFIG_REGULATOR_PALMAS=y |
| 249 | CONFIG_REGULATOR_PBIAS=y | 250 | CONFIG_REGULATOR_PBIAS=y |
| 250 | CONFIG_REGULATOR_TI_ABB=y | 251 | CONFIG_REGULATOR_TI_ABB=y |
| 252 | CONFIG_REGULATOR_TPS62360=m | ||
| 251 | CONFIG_REGULATOR_TPS65023=y | 253 | CONFIG_REGULATOR_TPS65023=y |
| 252 | CONFIG_REGULATOR_TPS6507X=y | 254 | CONFIG_REGULATOR_TPS6507X=y |
| 253 | CONFIG_REGULATOR_TPS65217=y | 255 | CONFIG_REGULATOR_TPS65217=y |
| @@ -374,7 +376,7 @@ CONFIG_PWM_TIEHRPWM=m | |||
| 374 | CONFIG_PWM_TWL=m | 376 | CONFIG_PWM_TWL=m |
| 375 | CONFIG_PWM_TWL_LED=m | 377 | CONFIG_PWM_TWL_LED=m |
| 376 | CONFIG_OMAP_USB2=m | 378 | CONFIG_OMAP_USB2=m |
| 377 | CONFIG_TI_PIPE3=m | 379 | CONFIG_TI_PIPE3=y |
| 378 | CONFIG_EXT2_FS=y | 380 | CONFIG_EXT2_FS=y |
| 379 | CONFIG_EXT3_FS=y | 381 | CONFIG_EXT3_FS=y |
| 380 | # CONFIG_EXT3_FS_XATTR is not set | 382 | # CONFIG_EXT3_FS_XATTR is not set |
diff --git a/arch/arm64/boot/dts/arm/foundation-v8.dts b/arch/arm64/boot/dts/arm/foundation-v8.dts index 27f32962e55c..4eac8dcea423 100644 --- a/arch/arm64/boot/dts/arm/foundation-v8.dts +++ b/arch/arm64/boot/dts/arm/foundation-v8.dts | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | reg = <0x0 0x0>; | 34 | reg = <0x0 0x0>; |
| 35 | enable-method = "spin-table"; | 35 | enable-method = "spin-table"; |
| 36 | cpu-release-addr = <0x0 0x8000fff8>; | 36 | cpu-release-addr = <0x0 0x8000fff8>; |
| 37 | next-level-cache = <&L2_0>; | ||
| 37 | }; | 38 | }; |
| 38 | cpu@1 { | 39 | cpu@1 { |
| 39 | device_type = "cpu"; | 40 | device_type = "cpu"; |
| @@ -41,6 +42,7 @@ | |||
| 41 | reg = <0x0 0x1>; | 42 | reg = <0x0 0x1>; |
| 42 | enable-method = "spin-table"; | 43 | enable-method = "spin-table"; |
| 43 | cpu-release-addr = <0x0 0x8000fff8>; | 44 | cpu-release-addr = <0x0 0x8000fff8>; |
| 45 | next-level-cache = <&L2_0>; | ||
| 44 | }; | 46 | }; |
| 45 | cpu@2 { | 47 | cpu@2 { |
| 46 | device_type = "cpu"; | 48 | device_type = "cpu"; |
| @@ -48,6 +50,7 @@ | |||
| 48 | reg = <0x0 0x2>; | 50 | reg = <0x0 0x2>; |
| 49 | enable-method = "spin-table"; | 51 | enable-method = "spin-table"; |
| 50 | cpu-release-addr = <0x0 0x8000fff8>; | 52 | cpu-release-addr = <0x0 0x8000fff8>; |
| 53 | next-level-cache = <&L2_0>; | ||
| 51 | }; | 54 | }; |
| 52 | cpu@3 { | 55 | cpu@3 { |
| 53 | device_type = "cpu"; | 56 | device_type = "cpu"; |
| @@ -55,6 +58,11 @@ | |||
| 55 | reg = <0x0 0x3>; | 58 | reg = <0x0 0x3>; |
| 56 | enable-method = "spin-table"; | 59 | enable-method = "spin-table"; |
| 57 | cpu-release-addr = <0x0 0x8000fff8>; | 60 | cpu-release-addr = <0x0 0x8000fff8>; |
| 61 | next-level-cache = <&L2_0>; | ||
| 62 | }; | ||
| 63 | |||
| 64 | L2_0: l2-cache0 { | ||
| 65 | compatible = "cache"; | ||
| 58 | }; | 66 | }; |
| 59 | }; | 67 | }; |
| 60 | 68 | ||
diff --git a/arch/arm64/boot/dts/arm/juno.dts b/arch/arm64/boot/dts/arm/juno.dts index d429129ecb3d..133ee59de2d7 100644 --- a/arch/arm64/boot/dts/arm/juno.dts +++ b/arch/arm64/boot/dts/arm/juno.dts | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | reg = <0x0 0x0>; | 39 | reg = <0x0 0x0>; |
| 40 | device_type = "cpu"; | 40 | device_type = "cpu"; |
| 41 | enable-method = "psci"; | 41 | enable-method = "psci"; |
| 42 | next-level-cache = <&A57_L2>; | ||
| 42 | }; | 43 | }; |
| 43 | 44 | ||
| 44 | A57_1: cpu@1 { | 45 | A57_1: cpu@1 { |
| @@ -46,6 +47,7 @@ | |||
| 46 | reg = <0x0 0x1>; | 47 | reg = <0x0 0x1>; |
| 47 | device_type = "cpu"; | 48 | device_type = "cpu"; |
| 48 | enable-method = "psci"; | 49 | enable-method = "psci"; |
| 50 | next-level-cache = <&A57_L2>; | ||
| 49 | }; | 51 | }; |
| 50 | 52 | ||
| 51 | A53_0: cpu@100 { | 53 | A53_0: cpu@100 { |
| @@ -53,6 +55,7 @@ | |||
| 53 | reg = <0x0 0x100>; | 55 | reg = <0x0 0x100>; |
| 54 | device_type = "cpu"; | 56 | device_type = "cpu"; |
| 55 | enable-method = "psci"; | 57 | enable-method = "psci"; |
| 58 | next-level-cache = <&A53_L2>; | ||
| 56 | }; | 59 | }; |
| 57 | 60 | ||
| 58 | A53_1: cpu@101 { | 61 | A53_1: cpu@101 { |
| @@ -60,6 +63,7 @@ | |||
| 60 | reg = <0x0 0x101>; | 63 | reg = <0x0 0x101>; |
| 61 | device_type = "cpu"; | 64 | device_type = "cpu"; |
| 62 | enable-method = "psci"; | 65 | enable-method = "psci"; |
| 66 | next-level-cache = <&A53_L2>; | ||
| 63 | }; | 67 | }; |
| 64 | 68 | ||
| 65 | A53_2: cpu@102 { | 69 | A53_2: cpu@102 { |
| @@ -67,6 +71,7 @@ | |||
| 67 | reg = <0x0 0x102>; | 71 | reg = <0x0 0x102>; |
| 68 | device_type = "cpu"; | 72 | device_type = "cpu"; |
| 69 | enable-method = "psci"; | 73 | enable-method = "psci"; |
| 74 | next-level-cache = <&A53_L2>; | ||
| 70 | }; | 75 | }; |
| 71 | 76 | ||
| 72 | A53_3: cpu@103 { | 77 | A53_3: cpu@103 { |
| @@ -74,6 +79,15 @@ | |||
| 74 | reg = <0x0 0x103>; | 79 | reg = <0x0 0x103>; |
| 75 | device_type = "cpu"; | 80 | device_type = "cpu"; |
| 76 | enable-method = "psci"; | 81 | enable-method = "psci"; |
| 82 | next-level-cache = <&A53_L2>; | ||
| 83 | }; | ||
| 84 | |||
| 85 | A57_L2: l2-cache0 { | ||
| 86 | compatible = "cache"; | ||
| 87 | }; | ||
| 88 | |||
| 89 | A53_L2: l2-cache1 { | ||
| 90 | compatible = "cache"; | ||
| 77 | }; | 91 | }; |
| 78 | }; | 92 | }; |
| 79 | 93 | ||
diff --git a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts index efc59b3baf63..20addabbd127 100644 --- a/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts +++ b/arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | reg = <0x0 0x0>; | 37 | reg = <0x0 0x0>; |
| 38 | enable-method = "spin-table"; | 38 | enable-method = "spin-table"; |
| 39 | cpu-release-addr = <0x0 0x8000fff8>; | 39 | cpu-release-addr = <0x0 0x8000fff8>; |
| 40 | next-level-cache = <&L2_0>; | ||
| 40 | }; | 41 | }; |
| 41 | cpu@1 { | 42 | cpu@1 { |
| 42 | device_type = "cpu"; | 43 | device_type = "cpu"; |
| @@ -44,6 +45,7 @@ | |||
| 44 | reg = <0x0 0x1>; | 45 | reg = <0x0 0x1>; |
| 45 | enable-method = "spin-table"; | 46 | enable-method = "spin-table"; |
| 46 | cpu-release-addr = <0x0 0x8000fff8>; | 47 | cpu-release-addr = <0x0 0x8000fff8>; |
| 48 | next-level-cache = <&L2_0>; | ||
| 47 | }; | 49 | }; |
| 48 | cpu@2 { | 50 | cpu@2 { |
| 49 | device_type = "cpu"; | 51 | device_type = "cpu"; |
| @@ -51,6 +53,7 @@ | |||
| 51 | reg = <0x0 0x2>; | 53 | reg = <0x0 0x2>; |
| 52 | enable-method = "spin-table"; | 54 | enable-method = "spin-table"; |
| 53 | cpu-release-addr = <0x0 0x8000fff8>; | 55 | cpu-release-addr = <0x0 0x8000fff8>; |
| 56 | next-level-cache = <&L2_0>; | ||
| 54 | }; | 57 | }; |
| 55 | cpu@3 { | 58 | cpu@3 { |
| 56 | device_type = "cpu"; | 59 | device_type = "cpu"; |
| @@ -58,6 +61,11 @@ | |||
| 58 | reg = <0x0 0x3>; | 61 | reg = <0x0 0x3>; |
| 59 | enable-method = "spin-table"; | 62 | enable-method = "spin-table"; |
| 60 | cpu-release-addr = <0x0 0x8000fff8>; | 63 | cpu-release-addr = <0x0 0x8000fff8>; |
| 64 | next-level-cache = <&L2_0>; | ||
| 65 | }; | ||
| 66 | |||
| 67 | L2_0: l2-cache0 { | ||
| 68 | compatible = "cache"; | ||
| 61 | }; | 69 | }; |
| 62 | }; | 70 | }; |
| 63 | 71 | ||
