Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

From Linus Walleij:
Device tree patches for ux500, basically trees and auxdata:
- Fix for the thermal node to be contained in the PRCMU node
- Add the DTS and auxdata needed to boot the U8540 platform
- Various regulators added and renamed
- Rename base SoC node
- A bunch of DMA patches adding channels for DT boots
- A bunch of crypto+hash patches adding config for DT boots
- A bunch of patches fixing the ALSA SoC support to work
- Register the LP5521 LEDs
- Fix a number of typos and naming errors

* tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (39 commits)
ARM: ux500: drop any 0x prefix from I2C DT devices
ARM: ux500: Allocate correct amount of memory for the u8540 in DT
ARM: ux500: Provide auxdata to ux500 ASoC driver
ARM: ux500: Add DT regulators for ab8500-codec
ARM: ux500: Correct anamic2 typo in DT files
ARM: ux500: Fix trivial typo in v-anamic1 comment
ARM: ux500: Reduce PRCMU reg-names to shorter form for u8540 DT
ARM: ux500: Add an auxdata entry for MUSB for clock-name look-up
ARM: ux500: cut chip-select GPIOs from SSP device
ARM: ux500: use symbolic names for interrupt flags
ARM: ux500: use #include syntax to include *.dtsi.
ARM: ux500: bump MMC/SD max frequency for DT boots
ARM: ux500: Apply other compatible name to the u8540 DTS file
pinctrl/nomadik: Standardise Pinctrl compat string for DBx5x based platforms
ARM: ux500: Standardise Pinctrl compatible string for DBx5x based platforms
ARM: ux500: Standardise DBx5x0 based Pinctrl compat string in the DTS
crypto: ux500/hash - Enable DT probing of the driver
crypto: ux500/cryp - Enable DT probing of the driver
ARM: ux500: enable the crypto and hash on all dbx500
ARM: ux500: Provide an AUXDATA entry for ux500-hash
...

Signed-off-by: Olof Johansson <olof@lixom.net>

+357 -162
+1 -1
Documentation/devicetree/bindings/mfd/ab8500.txt
··· 120 120 "USB_LINK_STATUS", 121 121 "USB_ADP_PROBE_PLUG", 122 122 "USB_ADP_PROBE_UNPLUG"; 123 - vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; 123 + vddulpivio18-supply = <&ab8500_ldo_intcore_reg>; 124 124 v-ape-supply = <&db8500_vape_reg>; 125 125 musb_1v8-supply = <&db8500_vsmps2_reg>; 126 126 };
+1
arch/arm/boot/dts/Makefile
··· 162 162 dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ 163 163 hrefprev60.dtb \ 164 164 hrefv60plus.dtb \ 165 + ccu8540.dtb \ 165 166 ccu9540.dtb 166 167 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb 167 168 dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
+41
arch/arm/boot/dts/ccu8540.dts
··· 1 + /* 2 + * Copyright 2013 ST-Ericsson AB 3 + * 4 + * The code contained herein is licensed under the GNU General Public 5 + * License. You may obtain a copy of the GNU General Public License 6 + * Version 2 or later at the following locations: 7 + * 8 + * http://www.opensource.org/licenses/gpl-license.html 9 + * http://www.gnu.org/copyleft/gpl.html 10 + */ 11 + 12 + /dts-v1/; 13 + #include "dbx5x0.dtsi" 14 + 15 + / { 16 + model = "ST-Ericsson U8540 platform with Device Tree"; 17 + compatible = "st-ericsson,ccu8540", "st-ericsson,u8540"; 18 + 19 + memory@0 { 20 + reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>; 21 + }; 22 + 23 + soc { 24 + prcmu@80157000 { 25 + reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>; 26 + reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm"; 27 + }; 28 + 29 + uart@80120000 { 30 + status = "okay"; 31 + }; 32 + 33 + uart@80121000 { 34 + status = "okay"; 35 + }; 36 + 37 + uart@80007000 { 38 + status = "okay"; 39 + }; 40 + }; 41 + };
+3 -3
arch/arm/boot/dts/ccu9540.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "dbx5x0.dtsi" 13 + #include "dbx5x0.dtsi" 14 14 15 15 / { 16 16 model = "ST-Ericsson CCU9540 platform with Device Tree"; ··· 20 20 reg = <0x00000000 0x20000000>; 21 21 }; 22 22 23 - soc-u9500 { 23 + soc { 24 24 uart@80120000 { 25 25 status = "okay"; 26 26 }; ··· 52 52 // WLAN SDIO channel 53 53 sdi1_per2@80118000 { 54 54 arm,primecell-periphid = <0x10480180>; 55 - max-frequency = <50000000>; 55 + max-frequency = <100000000>; 56 56 bus-width = <4>; 57 57 58 58 status = "okay";
+154 -68
arch/arm/boot/dts/dbx5x0.dtsi
··· 9 9 * http://www.gnu.org/copyleft/gpl.html 10 10 */ 11 11 12 - /include/ "skeleton.dtsi" 12 + #include <dt-bindings/interrupt-controller/irq.h> 13 + #include "skeleton.dtsi" 13 14 14 15 / { 15 - soc-u9500 { 16 + soc { 16 17 #address-cells = <1>; 17 18 #size-cells = <1>; 18 19 compatible = "stericsson,db8500"; ··· 32 31 L2: l2-cache { 33 32 compatible = "arm,pl310-cache"; 34 33 reg = <0xa0412000 0x1000>; 35 - interrupts = <0 13 4>; 34 + interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>; 36 35 cache-unified; 37 36 cache-level = <2>; 38 37 }; 39 38 40 39 pmu { 41 40 compatible = "arm,cortex-a9-pmu"; 42 - interrupts = <0 7 0x4>; 41 + interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>; 43 42 }; 44 43 45 44 timer@a0410600 { 46 45 compatible = "arm,cortex-a9-twd-timer"; 47 46 reg = <0xa0410600 0x20>; 48 - interrupts = <1 13 0x304>; 47 + interrupts = <1 13 0x304>; /* IRQ level high per-CPU */ 49 48 }; 50 49 51 50 rtc@80154000 { 52 51 compatible = "arm,rtc-pl031", "arm,primecell"; 53 52 reg = <0x80154000 0x1000>; 54 - interrupts = <0 18 0x4>; 53 + interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>; 55 54 }; 56 55 57 56 gpio0: gpio@8012e000 { 58 57 compatible = "stericsson,db8500-gpio", 59 58 "st,nomadik-gpio"; 60 59 reg = <0x8012e000 0x80>; 61 - interrupts = <0 119 0x4>; 60 + interrupts = <0 119 IRQ_TYPE_LEVEL_HIGH>; 62 61 interrupt-controller; 63 62 #interrupt-cells = <2>; 64 63 st,supports-sleepmode; ··· 71 70 compatible = "stericsson,db8500-gpio", 72 71 "st,nomadik-gpio"; 73 72 reg = <0x8012e080 0x80>; 74 - interrupts = <0 120 0x4>; 73 + interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>; 75 74 interrupt-controller; 76 75 #interrupt-cells = <2>; 77 76 st,supports-sleepmode; ··· 84 83 compatible = "stericsson,db8500-gpio", 85 84 "st,nomadik-gpio"; 86 85 reg = <0x8000e000 0x80>; 87 - interrupts = <0 121 0x4>; 86 + interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH>; 88 87 interrupt-controller; 89 88 #interrupt-cells = <2>; 90 89 st,supports-sleepmode; ··· 97 96 compatible = "stericsson,db8500-gpio", 98 97 "st,nomadik-gpio"; 99 98 reg = <0x8000e080 0x80>; 100 - interrupts = <0 122 0x4>; 99 + interrupts = <0 122 IRQ_TYPE_LEVEL_HIGH>; 101 100 interrupt-controller; 102 101 #interrupt-cells = <2>; 103 102 st,supports-sleepmode; ··· 110 109 compatible = "stericsson,db8500-gpio", 111 110 "st,nomadik-gpio"; 112 111 reg = <0x8000e100 0x80>; 113 - interrupts = <0 123 0x4>; 112 + interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>; 114 113 interrupt-controller; 115 114 #interrupt-cells = <2>; 116 115 st,supports-sleepmode; ··· 123 122 compatible = "stericsson,db8500-gpio", 124 123 "st,nomadik-gpio"; 125 124 reg = <0x8000e180 0x80>; 126 - interrupts = <0 124 0x4>; 125 + interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>; 127 126 interrupt-controller; 128 127 #interrupt-cells = <2>; 129 128 st,supports-sleepmode; ··· 136 135 compatible = "stericsson,db8500-gpio", 137 136 "st,nomadik-gpio"; 138 137 reg = <0x8011e000 0x80>; 139 - interrupts = <0 125 0x4>; 138 + interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>; 140 139 interrupt-controller; 141 140 #interrupt-cells = <2>; 142 141 st,supports-sleepmode; ··· 149 148 compatible = "stericsson,db8500-gpio", 150 149 "st,nomadik-gpio"; 151 150 reg = <0x8011e080 0x80>; 152 - interrupts = <0 126 0x4>; 151 + interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>; 153 152 interrupt-controller; 154 153 #interrupt-cells = <2>; 155 154 st,supports-sleepmode; ··· 162 161 compatible = "stericsson,db8500-gpio", 163 162 "st,nomadik-gpio"; 164 163 reg = <0xa03fe000 0x80>; 165 - interrupts = <0 127 0x4>; 164 + interrupts = <0 127 IRQ_TYPE_LEVEL_HIGH>; 166 165 interrupt-controller; 167 166 #interrupt-cells = <2>; 168 167 st,supports-sleepmode; ··· 172 171 }; 173 172 174 173 pinctrl { 175 - compatible = "stericsson,nmk-pinctrl"; 174 + compatible = "stericsson,db8500-pinctrl"; 176 175 prcm = <&prcmu>; 177 176 }; 178 177 179 - usb@a03e0000 { 178 + usb_per5@a03e0000 { 180 179 compatible = "stericsson,db8500-musb", 181 180 "mentor,musb"; 182 181 reg = <0xa03e0000 0x10000>; 183 - interrupts = <0 23 0x4>; 182 + interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>; 183 + interrupt-names = "mc"; 184 + 185 + dr_mode = "otg"; 186 + 187 + dmas = <&dma 38 0 0x2>, /* Logical - DevToMem */ 188 + <&dma 38 0 0x0>, /* Logical - MemToDev */ 189 + <&dma 37 0 0x2>, /* Logical - DevToMem */ 190 + <&dma 37 0 0x0>, /* Logical - MemToDev */ 191 + <&dma 36 0 0x2>, /* Logical - DevToMem */ 192 + <&dma 36 0 0x0>, /* Logical - MemToDev */ 193 + <&dma 19 0 0x2>, /* Logical - DevToMem */ 194 + <&dma 19 0 0x0>, /* Logical - MemToDev */ 195 + <&dma 18 0 0x2>, /* Logical - DevToMem */ 196 + <&dma 18 0 0x0>, /* Logical - MemToDev */ 197 + <&dma 17 0 0x2>, /* Logical - DevToMem */ 198 + <&dma 17 0 0x0>, /* Logical - MemToDev */ 199 + <&dma 16 0 0x2>, /* Logical - DevToMem */ 200 + <&dma 16 0 0x0>, /* Logical - MemToDev */ 201 + <&dma 39 0 0x2>, /* Logical - DevToMem */ 202 + <&dma 39 0 0x0>; /* Logical - MemToDev */ 203 + 204 + dma-names = "iep_1_9", "oep_1_9", 205 + "iep_2_10", "oep_2_10", 206 + "iep_3_11", "oep_3_11", 207 + "iep_4_12", "oep_4_12", 208 + "iep_5_13", "oep_5_13", 209 + "iep_6_14", "oep_6_14", 210 + "iep_7_15", "oep_7_15", 211 + "iep_8", "oep_8"; 184 212 }; 185 213 186 - dma-controller@801C0000 { 187 - compatible = "stericsson,db8500-dma40", 188 - "stericsson,dma40"; 214 + dma: dma-controller@801C0000 { 215 + compatible = "stericsson,db8500-dma40", "stericsson,dma40"; 189 216 reg = <0x801C0000 0x1000 0x40010000 0x800>; 190 - interrupts = <0 25 0x4>; 217 + reg-names = "base", "lcpa"; 218 + interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>; 219 + 220 + #dma-cells = <3>; 221 + memcpy-channels = <56 57 58 59 60>; 191 222 }; 192 223 193 224 prcmu: prcmu@80157000 { 194 225 compatible = "stericsson,db8500-prcmu"; 195 226 reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>; 196 227 reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm"; 197 - interrupts = <0 47 0x4>; 228 + interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>; 198 229 #address-cells = <1>; 199 230 #size-cells = <1>; 200 231 interrupt-controller; ··· 241 208 thermal@801573c0 { 242 209 compatible = "stericsson,db8500-thermal"; 243 210 reg = <0x801573c0 0x40>; 244 - interrupts = <21 0x4>, <22 0x4>; 211 + interrupts = <21 IRQ_TYPE_LEVEL_HIGH>, 212 + <22 IRQ_TYPE_LEVEL_HIGH>; 245 213 interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; 246 214 status = "disabled"; 247 215 }; ··· 356 322 ab8500 { 357 323 compatible = "stericsson,ab8500"; 358 324 interrupt-parent = <&intc>; 359 - interrupts = <0 40 0x4>; 325 + interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>; 360 326 interrupt-controller; 361 327 #interrupt-cells = <2>; 362 328 363 329 ab8500-rtc { 364 330 compatible = "stericsson,ab8500-rtc"; 365 - interrupts = <17 0x4 366 - 18 0x4>; 331 + interrupts = <17 IRQ_TYPE_LEVEL_HIGH 332 + 18 IRQ_TYPE_LEVEL_HIGH>; 367 333 interrupt-names = "60S", "ALARM"; 368 334 }; 369 335 370 336 ab8500-gpadc { 371 337 compatible = "stericsson,ab8500-gpadc"; 372 - interrupts = <32 0x4 373 - 39 0x4>; 338 + interrupts = <32 IRQ_TYPE_LEVEL_HIGH 339 + 39 IRQ_TYPE_LEVEL_HIGH>; 374 340 interrupt-names = "HW_CONV_END", "SW_CONV_END"; 375 341 vddadc-supply = <&ab8500_ldo_tvout_reg>; 376 342 }; ··· 403 369 404 370 ab8500_usb { 405 371 compatible = "stericsson,ab8500-usb"; 406 - interrupts = < 90 0x4 407 - 96 0x4 408 - 14 0x4 409 - 15 0x4 410 - 79 0x4 411 - 74 0x4 412 - 75 0x4>; 372 + interrupts = < 90 IRQ_TYPE_LEVEL_HIGH 373 + 96 IRQ_TYPE_LEVEL_HIGH 374 + 14 IRQ_TYPE_LEVEL_HIGH 375 + 15 IRQ_TYPE_LEVEL_HIGH 376 + 79 IRQ_TYPE_LEVEL_HIGH 377 + 74 IRQ_TYPE_LEVEL_HIGH 378 + 75 IRQ_TYPE_LEVEL_HIGH>; 413 379 interrupt-names = "ID_WAKEUP_R", 414 380 "ID_WAKEUP_F", 415 381 "VBUS_DET_F", ··· 417 383 "USB_LINK_STATUS", 418 384 "USB_ADP_PROBE_PLUG", 419 385 "USB_ADP_PROBE_UNPLUG"; 420 - vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; 386 + vddulpivio18-supply = <&ab8500_ldo_intcore_reg>; 421 387 v-ape-supply = <&db8500_vape_reg>; 422 388 musb_1v8-supply = <&db8500_vsmps2_reg>; 423 389 }; 424 390 425 391 ab8500-ponkey { 426 392 compatible = "stericsson,ab8500-poweron-key"; 427 - interrupts = <6 0x4 428 - 7 0x4>; 393 + interrupts = <6 IRQ_TYPE_LEVEL_HIGH 394 + 7 IRQ_TYPE_LEVEL_HIGH>; 429 395 interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; 430 396 }; 431 397 ··· 443 409 444 410 codec: ab8500-codec { 445 411 compatible = "stericsson,ab8500-codec"; 412 + 413 + V-AUD-supply = <&ab8500_ldo_audio_reg>; 414 + V-AMIC1-supply = <&ab8500_ldo_anamic1_reg>; 415 + V-AMIC2-supply = <&ab8500_ldo_anamic2_reg>; 416 + V-DMIC-supply = <&ab8500_ldo_dmic_reg>; 446 417 447 418 stericsson,earpeice-cmv = <950>; /* Units in mV. */ 448 419 }; ··· 480 441 }; 481 442 482 443 // supply for v-intcore12; VINTCORE12 LDO 483 - ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 484 - regulator-compatible = "ab8500_ldo_initcore"; 444 + ab8500_ldo_intcore_reg: ab8500_ldo_intcore { 445 + regulator-compatible = "ab8500_ldo_intcore"; 485 446 }; 486 447 487 448 // supply for tvout; gpadc; TVOUT LDO ··· 499 460 regulator-compatible = "ab8500_ldo_audio"; 500 461 }; 501 462 502 - // supply for v-anamic1 VAMic1-LDO 463 + // supply for v-anamic1 VAMIC1 LDO 503 464 ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { 504 465 regulator-compatible = "ab8500_ldo_anamic1"; 505 466 }; 506 467 507 468 // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1 508 - ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { 509 - regulator-compatible = "ab8500_ldo_amamic2"; 469 + ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 { 470 + regulator-compatible = "ab8500_ldo_anamic2"; 510 471 }; 511 472 512 473 // supply for v-dmic; VDMIC LDO ··· 525 486 i2c@80004000 { 526 487 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 527 488 reg = <0x80004000 0x1000>; 528 - interrupts = <0 21 0x4>; 489 + interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>; 529 490 arm,primecell-periphid = <0x180024>; 530 491 531 492 #address-cells = <1>; ··· 538 499 i2c@80122000 { 539 500 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 540 501 reg = <0x80122000 0x1000>; 541 - interrupts = <0 22 0x4>; 502 + interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>; 542 503 arm,primecell-periphid = <0x180024>; 543 504 544 505 #address-cells = <1>; ··· 551 512 i2c@80128000 { 552 513 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 553 514 reg = <0x80128000 0x1000>; 554 - interrupts = <0 55 0x4>; 515 + interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>; 555 516 arm,primecell-periphid = <0x180024>; 556 517 557 518 #address-cells = <1>; ··· 564 525 i2c@80110000 { 565 526 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 566 527 reg = <0x80110000 0x1000>; 567 - interrupts = <0 12 0x4>; 528 + interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>; 568 529 arm,primecell-periphid = <0x180024>; 569 530 570 531 #address-cells = <1>; ··· 577 538 i2c@8012a000 { 578 539 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 579 540 reg = <0x8012a000 0x1000>; 580 - interrupts = <0 51 0x4>; 541 + interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>; 581 542 arm,primecell-periphid = <0x180024>; 582 543 583 544 #address-cells = <1>; ··· 590 551 ssp@80002000 { 591 552 compatible = "arm,pl022", "arm,primecell"; 592 553 reg = <0x80002000 0x1000>; 593 - interrupts = <0 14 0x4>; 554 + interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>; 594 555 #address-cells = <1>; 595 556 #size-cells = <0>; 596 557 status = "disabled"; 597 - 598 - // Add one of these for each child device 599 - cs-gpios = <&gpio0 31 0x4 &gpio4 14 0x4 &gpio4 16 0x4 600 - &gpio6 22 0x4 &gpio7 0 0x4>; 601 - 602 558 }; 603 559 604 560 uart@80120000 { 605 561 compatible = "arm,pl011", "arm,primecell"; 606 562 reg = <0x80120000 0x1000>; 607 - interrupts = <0 11 0x4>; 563 + interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>; 564 + 565 + dmas = <&dma 13 0 0x2>, /* Logical - DevToMem */ 566 + <&dma 13 0 0x0>; /* Logical - MemToDev */ 567 + dma-names = "rx", "tx"; 568 + 608 569 status = "disabled"; 609 570 }; 571 + 610 572 uart@80121000 { 611 573 compatible = "arm,pl011", "arm,primecell"; 612 574 reg = <0x80121000 0x1000>; 613 - interrupts = <0 19 0x4>; 575 + interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>; 576 + 577 + dmas = <&dma 12 0 0x2>, /* Logical - DevToMem */ 578 + <&dma 12 0 0x0>; /* Logical - MemToDev */ 579 + dma-names = "rx", "tx"; 580 + 614 581 status = "disabled"; 615 582 }; 583 + 616 584 uart@80007000 { 617 585 compatible = "arm,pl011", "arm,primecell"; 618 586 reg = <0x80007000 0x1000>; 619 - interrupts = <0 26 0x4>; 587 + interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>; 588 + 589 + dmas = <&dma 11 0 0x2>, /* Logical - DevToMem */ 590 + <&dma 11 0 0x0>; /* Logical - MemToDev */ 591 + dma-names = "rx", "tx"; 592 + 620 593 status = "disabled"; 621 594 }; 622 595 623 596 sdi0_per1@80126000 { 624 597 compatible = "arm,pl18x", "arm,primecell"; 625 598 reg = <0x80126000 0x1000>; 626 - interrupts = <0 60 0x4>; 599 + interrupts = <0 60 IRQ_TYPE_LEVEL_HIGH>; 600 + 601 + dmas = <&dma 29 0 0x2>, /* Logical - DevToMem */ 602 + <&dma 29 0 0x0>; /* Logical - MemToDev */ 603 + dma-names = "rx", "tx"; 604 + 627 605 status = "disabled"; 628 606 }; 629 607 630 608 sdi1_per2@80118000 { 631 609 compatible = "arm,pl18x", "arm,primecell"; 632 610 reg = <0x80118000 0x1000>; 633 - interrupts = <0 50 0x4>; 611 + interrupts = <0 50 IRQ_TYPE_LEVEL_HIGH>; 612 + 613 + dmas = <&dma 32 0 0x2>, /* Logical - DevToMem */ 614 + <&dma 32 0 0x0>; /* Logical - MemToDev */ 615 + dma-names = "rx", "tx"; 616 + 634 617 status = "disabled"; 635 618 }; 636 619 637 620 sdi2_per3@80005000 { 638 621 compatible = "arm,pl18x", "arm,primecell"; 639 622 reg = <0x80005000 0x1000>; 640 - interrupts = <0 41 0x4>; 623 + interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>; 624 + 625 + dmas = <&dma 28 0 0x2>, /* Logical - DevToMem */ 626 + <&dma 28 0 0x0>; /* Logical - MemToDev */ 627 + dma-names = "rx", "tx"; 628 + 641 629 status = "disabled"; 642 630 }; 643 631 644 632 sdi3_per2@80119000 { 645 633 compatible = "arm,pl18x", "arm,primecell"; 646 634 reg = <0x80119000 0x1000>; 647 - interrupts = <0 59 0x4>; 635 + interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>; 648 636 status = "disabled"; 649 637 }; 650 638 651 639 sdi4_per2@80114000 { 652 640 compatible = "arm,pl18x", "arm,primecell"; 653 641 reg = <0x80114000 0x1000>; 654 - interrupts = <0 99 0x4>; 642 + interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>; 643 + 644 + dmas = <&dma 42 0 0x2>, /* Logical - DevToMem */ 645 + <&dma 42 0 0x0>; /* Logical - MemToDev */ 646 + dma-names = "rx", "tx"; 647 + 655 648 status = "disabled"; 656 649 }; 657 650 658 651 sdi5_per3@80008000 { 659 652 compatible = "arm,pl18x", "arm,primecell"; 660 653 reg = <0x80008000 0x1000>; 661 - interrupts = <0 100 0x4>; 654 + interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>; 662 655 status = "disabled"; 663 656 }; 664 657 665 658 msp0: msp@80123000 { 666 659 compatible = "stericsson,ux500-msp-i2s"; 667 660 reg = <0x80123000 0x1000>; 668 - interrupts = <0 31 0x4>; 661 + interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>; 669 662 v-ape-supply = <&db8500_vape_reg>; 670 663 status = "disabled"; 671 664 }; ··· 705 634 msp1: msp@80124000 { 706 635 compatible = "stericsson,ux500-msp-i2s"; 707 636 reg = <0x80124000 0x1000>; 708 - interrupts = <0 62 0x4>; 637 + interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>; 709 638 v-ape-supply = <&db8500_vape_reg>; 710 639 status = "disabled"; 711 640 }; ··· 714 643 msp2: msp@80117000 { 715 644 compatible = "stericsson,ux500-msp-i2s"; 716 645 reg = <0x80117000 0x1000>; 717 - interrupts = <0 98 0x4>; 646 + interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>; 718 647 v-ape-supply = <&db8500_vape_reg>; 719 648 status = "disabled"; 720 649 }; ··· 722 651 msp3: msp@80125000 { 723 652 compatible = "stericsson,ux500-msp-i2s"; 724 653 reg = <0x80125000 0x1000>; 725 - interrupts = <0 62 0x4>; 654 + interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>; 726 655 v-ape-supply = <&db8500_vape_reg>; 727 656 status = "disabled"; 728 657 }; ··· 756 685 2900000 0x0>; 757 686 758 687 status = "disabled"; 688 + }; 689 + 690 + cryp@a03cb000 { 691 + compatible = "stericsson,ux500-cryp"; 692 + reg = <0xa03cb000 0x1000>; 693 + interrupts = <0 15 IRQ_TYPE_LEVEL_HIGH>; 694 + 695 + v-ape-supply = <&db8500_vape_reg>; 696 + }; 697 + 698 + hash@a03c2000 { 699 + compatible = "stericsson,ux500-hash"; 700 + reg = <0xa03c2000 0x1000>; 701 + 702 + v-ape-supply = <&db8500_vape_reg>; 759 703 }; 760 704 }; 761 705 };
+44 -17
arch/arm/boot/dts/href.dtsi
··· 9 9 * http://www.gnu.org/copyleft/gpl.html 10 10 */ 11 11 12 - /include/ "dbx5x0.dtsi" 12 + #include <dt-bindings/interrupt-controller/irq.h> 13 + #include "dbx5x0.dtsi" 13 14 14 15 / { 15 16 memory { ··· 28 27 }; 29 28 }; 30 29 31 - soc-u9500 { 30 + soc { 32 31 uart@80120000 { 33 32 status = "okay"; 34 33 }; ··· 46 45 compatible = "tc3589x"; 47 46 reg = <0x42>; 48 47 interrupt-parent = <&gpio6>; 49 - interrupts = <25 0x1>; 48 + interrupts = <25 IRQ_TYPE_EDGE_RISING>; 50 49 51 50 interrupt-controller; 52 51 #interrupt-cells = <2>; 53 52 54 53 tc3589x_gpio: tc3589x_gpio { 55 54 compatible = "tc3589x-gpio"; 56 - interrupts = <0 0x1>; 55 + interrupts = <0 IRQ_TYPE_EDGE_RISING>; 57 56 58 57 interrupt-controller; 59 58 #interrupt-cells = <2>; ··· 64 63 }; 65 64 66 65 i2c@80128000 { 67 - lp5521@0x33 { 68 - compatible = "lp5521"; 66 + lp5521@33 { 67 + compatible = "national,lp5521"; 69 68 reg = <0x33>; 69 + label = "lp5521_pri"; 70 + clock-mode = /bits/ 8 <2>; 71 + chan0 { 72 + led-cur = /bits/ 8 <0x2f>; 73 + max-cur = /bits/ 8 <0x5f>; 74 + }; 75 + chan1 { 76 + led-cur = /bits/ 8 <0x2f>; 77 + max-cur = /bits/ 8 <0x5f>; 78 + }; 79 + chan2 { 80 + led-cur = /bits/ 8 <0x2f>; 81 + max-cur = /bits/ 8 <0x5f>; 82 + }; 70 83 }; 71 - 72 - lp5521@0x34 { 73 - compatible = "lp5521"; 84 + lp5521@34 { 85 + compatible = "national,lp5521"; 74 86 reg = <0x34>; 87 + label = "lp5521_sec"; 88 + clock-mode = /bits/ 8 <2>; 89 + chan0 { 90 + led-cur = /bits/ 8 <0x2f>; 91 + max-cur = /bits/ 8 <0x5f>; 92 + }; 93 + chan1 { 94 + led-cur = /bits/ 8 <0x2f>; 95 + max-cur = /bits/ 8 <0x5f>; 96 + }; 97 + chan2 { 98 + led-cur = /bits/ 8 <0x2f>; 99 + max-cur = /bits/ 8 <0x5f>; 100 + }; 75 101 }; 76 - 77 - bh1780@0x29 { 102 + bh1780@29 { 78 103 compatible = "rohm,bh1780gli"; 79 104 reg = <0x33>; 80 105 }; ··· 109 82 // External Micro SD slot 110 83 sdi0_per1@80126000 { 111 84 arm,primecell-periphid = <0x10480180>; 112 - max-frequency = <50000000>; 85 + max-frequency = <100000000>; 113 86 bus-width = <4>; 114 87 mmc-cap-sd-highspeed; 115 88 mmc-cap-mmc-highspeed; ··· 124 97 // WLAN SDIO channel 125 98 sdi1_per2@80118000 { 126 99 arm,primecell-periphid = <0x10480180>; 127 - max-frequency = <50000000>; 100 + max-frequency = <100000000>; 128 101 bus-width = <4>; 129 102 130 103 status = "okay"; ··· 133 106 // PoP:ed eMMC 134 107 sdi2_per3@80005000 { 135 108 arm,primecell-periphid = <0x10480180>; 136 - max-frequency = <50000000>; 109 + max-frequency = <100000000>; 137 110 bus-width = <8>; 138 111 mmc-cap-mmc-highspeed; 139 112 ··· 143 116 // On-board eMMC 144 117 sdi4_per2@80114000 { 145 118 arm,primecell-periphid = <0x10480180>; 146 - max-frequency = <50000000>; 119 + max-frequency = <100000000>; 147 120 bus-width = <8>; 148 121 mmc-cap-mmc-highspeed; 149 122 vmmc-supply = <&ab8500_ldo_aux2_reg>; ··· 263 236 regulator-name = "V-MMC-SD"; 264 237 }; 265 238 266 - ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 239 + ab8500_ldo_intcore_reg: ab8500_ldo_intcore { 267 240 regulator-name = "V-INTCORE"; 268 241 }; 269 242 ··· 283 256 regulator-name = "V-AMIC1"; 284 257 }; 285 258 286 - ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { 259 + ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 { 287 260 regulator-name = "V-AMIC2"; 288 261 }; 289 262
+5 -5
arch/arm/boot/dts/hrefprev60.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "dbx5x0.dtsi" 14 - /include/ "href.dtsi" 15 - /include/ "stuib.dtsi" 13 + #include "dbx5x0.dtsi" 14 + #include "href.dtsi" 15 + #include "stuib.dtsi" 16 16 17 17 / { 18 18 model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; ··· 24 24 }; 25 25 }; 26 26 27 - soc-u9500 { 27 + soc { 28 28 prcmu@80157000 { 29 29 ab8500@5 { 30 30 ab8500-gpio { ··· 41 41 }; 42 42 43 43 i2c@80110000 { 44 - bu21013_tp@0x5c { 44 + bu21013_tp@5c { 45 45 reset-gpio = <&tc3589x_gpio 13 0x4>; 46 46 }; 47 47 };
+10 -10
arch/arm/boot/dts/hrefv60plus.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "dbx5x0.dtsi" 14 - /include/ "href.dtsi" 15 - /include/ "stuib.dtsi" 13 + #include "dbx5x0.dtsi" 14 + #include "href.dtsi" 15 + #include "stuib.dtsi" 16 16 17 17 / { 18 18 model = "ST-Ericsson HREF (v60+) platform with Device Tree"; ··· 24 24 }; 25 25 }; 26 26 27 - soc-u9500 { 27 + soc { 28 28 i2c@80110000 { 29 29 bu21013_tp@0x5c { 30 30 reset-gpio = <&gpio4 15 0x4>; ··· 34 34 // External Micro SD slot 35 35 sdi0_per1@80126000 { 36 36 arm,primecell-periphid = <0x10480180>; 37 - max-frequency = <50000000>; 37 + max-frequency = <100000000>; 38 38 bus-width = <4>; 39 39 mmc-cap-sd-highspeed; 40 40 mmc-cap-mmc-highspeed; ··· 48 48 // WLAN SDIO channel 49 49 sdi1_per2@80118000 { 50 50 arm,primecell-periphid = <0x10480180>; 51 - max-frequency = <50000000>; 51 + max-frequency = <100000000>; 52 52 bus-width = <4>; 53 53 54 54 status = "okay"; ··· 57 57 // PoP:ed eMMC 58 58 sdi2_per3@80005000 { 59 59 arm,primecell-periphid = <0x10480180>; 60 - max-frequency = <50000000>; 60 + max-frequency = <100000000>; 61 61 bus-width = <8>; 62 62 mmc-cap-mmc-highspeed; 63 63 ··· 67 67 // On-board eMMC 68 68 sdi4_per2@80114000 { 69 69 arm,primecell-periphid = <0x10480180>; 70 - max-frequency = <50000000>; 70 + max-frequency = <100000000>; 71 71 bus-width = <8>; 72 72 mmc-cap-mmc-highspeed; 73 73 vmmc-supply = <&ab8500_ldo_aux2_reg>; ··· 172 172 regulator-name = "V-MMC-SD"; 173 173 }; 174 174 175 - ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 175 + ab8500_ldo_intcore_reg: ab8500_ldo_intcore { 176 176 regulator-name = "V-INTCORE"; 177 177 }; 178 178 ··· 192 192 regulator-name = "V-AMIC1"; 193 193 }; 194 194 195 - ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { 195 + ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 { 196 196 regulator-name = "V-AMIC2"; 197 197 }; 198 198
+43 -37
arch/arm/boot/dts/snowball.dts
··· 10 10 */ 11 11 12 12 /dts-v1/; 13 - /include/ "dbx5x0.dtsi" 13 + #include "dbx5x0.dtsi" 14 14 15 15 / { 16 16 model = "Calao Systems Snowball platform with device tree"; ··· 82 82 }; 83 83 }; 84 84 85 - soc-u9500 { 85 + soc { 86 86 87 87 sound { 88 88 compatible = "stericsson,snd-soc-mop500"; ··· 99 99 status = "okay"; 100 100 }; 101 101 102 - prcmu@80157000 { 103 - thermal@801573c0 { 104 - num-trips = <4>; 105 - 106 - trip0-temp = <70000>; 107 - trip0-type = "active"; 108 - trip0-cdev-num = <1>; 109 - trip0-cdev-name0 = "thermal-cpufreq-0"; 110 - 111 - trip1-temp = <75000>; 112 - trip1-type = "active"; 113 - trip1-cdev-num = <1>; 114 - trip1-cdev-name0 = "thermal-cpufreq-0"; 115 - 116 - trip2-temp = <80000>; 117 - trip2-type = "active"; 118 - trip2-cdev-num = <1>; 119 - trip2-cdev-name0 = "thermal-cpufreq-0"; 120 - 121 - trip3-temp = <85000>; 122 - trip3-type = "critical"; 123 - trip3-cdev-num = <0>; 124 - 125 - status = "okay"; 126 - }; 127 - }; 128 - 129 102 external-bus@50000000 { 130 103 status = "okay"; 131 104 132 105 ethernet@0 { 133 106 compatible = "smsc,lan9115"; 134 107 reg = <0 0x10000>; 135 - interrupts = <12 0x1>; 108 + interrupts = <12 IRQ_TYPE_EDGE_RISING>; 136 109 interrupt-parent = <&gpio4>; 137 110 vdd33a-supply = <&en_3v3_reg>; 138 111 vddvario-supply = <&db8500_vape_reg>; ··· 119 146 }; 120 147 }; 121 148 149 + vmmci: regulator-gpio { 150 + gpios = <&gpio6 25 0x4>; 151 + enable-gpio = <&gpio7 4 0x4>; 152 + 153 + status = "okay"; 154 + }; 155 + 122 156 // External Micro SD slot 123 157 sdi0_per1@80126000 { 124 158 arm,primecell-periphid = <0x10480180>; 125 - max-frequency = <50000000>; 159 + max-frequency = <100000000>; 126 160 bus-width = <4>; 127 161 mmc-cap-mmc-highspeed; 128 162 vmmc-supply = <&ab8500_ldo_aux3_reg>; 163 + vqmmc-supply = <&vmmci>; 129 164 130 165 cd-gpios = <&gpio6 26 0x4>; // 218 131 166 cd-inverted; ··· 144 163 // On-board eMMC 145 164 sdi4_per2@80114000 { 146 165 arm,primecell-periphid = <0x10480180>; 147 - max-frequency = <50000000>; 166 + max-frequency = <100000000>; 148 167 bus-width = <8>; 149 168 mmc-cap-mmc-highspeed; 150 169 vmmc-supply = <&ab8500_ldo_aux2_reg>; ··· 178 197 }; 179 198 180 199 i2c@80128000 { 181 - lp5521@0x33 { 200 + lp5521@33 { 182 201 // compatible = "lp5521"; 183 202 reg = <0x33>; 184 203 }; 185 - lp5521@0x34 { 204 + lp5521@34 { 186 205 // compatible = "lp5521"; 187 206 reg = <0x34>; 188 207 }; 189 - bh1780@0x29 { 208 + bh1780@29 { 190 209 // compatible = "rohm,bh1780gli"; 191 210 reg = <0x33>; 192 211 }; ··· 279 298 }; 280 299 }; 281 300 301 + thermal@801573c0 { 302 + num-trips = <4>; 303 + 304 + trip0-temp = <70000>; 305 + trip0-type = "active"; 306 + trip0-cdev-num = <1>; 307 + trip0-cdev-name0 = "thermal-cpufreq-0"; 308 + 309 + trip1-temp = <75000>; 310 + trip1-type = "active"; 311 + trip1-cdev-num = <1>; 312 + trip1-cdev-name0 = "thermal-cpufreq-0"; 313 + 314 + trip2-temp = <80000>; 315 + trip2-type = "active"; 316 + trip2-cdev-num = <1>; 317 + trip2-cdev-name0 = "thermal-cpufreq-0"; 318 + 319 + trip3-temp = <85000>; 320 + trip3-type = "critical"; 321 + trip3-cdev-num = <0>; 322 + 323 + status = "okay"; 324 + }; 325 + 282 326 ab8500 { 283 327 ab8500-gpio { 284 328 compatible = "stericsson,ab8500-gpio"; ··· 322 316 regulator-name = "V-MMC-SD"; 323 317 }; 324 318 325 - ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 319 + ab8500_ldo_intcore_reg: ab8500_ldo_intcore { 326 320 regulator-name = "V-INTCORE"; 327 321 }; 328 322 ··· 342 336 regulator-name = "V-AMIC1"; 343 337 }; 344 338 345 - ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { 339 + ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 { 346 340 regulator-name = "V-AMIC2"; 347 341 }; 348 342
+14 -12
arch/arm/boot/dts/stuib.dtsi
··· 9 9 * http://www.gnu.org/copyleft/gpl.html 10 10 */ 11 11 12 + #include <dt-bindings/interrupt-controller/irq.h> 13 + 12 14 / { 13 - soc-u9500 { 15 + soc { 14 16 i2c@80004000 { 15 17 stmpe1601: stmpe1601@40 { 16 18 compatible = "st,stmpe1601"; 17 19 reg = <0x40>; 18 - interrupts = <26 0x2>; 20 + interrupts = <26 IRQ_TYPE_EDGE_FALLING>; 19 21 interrupt-parent = <&gpio6>; 20 22 interrupt-controller; 21 23 ··· 54 52 }; 55 53 56 54 i2c@80110000 { 57 - bu21013_tp@0x5c { 58 - compatible = "rhom,bu21013_tp"; 55 + bu21013_tp@5c { 56 + compatible = "rohm,bu21013_tp"; 59 57 reg = <0x5c>; 60 58 touch-gpio = <&gpio2 20 0x4>; 61 59 avdd-supply = <&ab8500_ldo_aux1_reg>; 62 60 63 - rhom,touch-max-x = <384>; 64 - rhom,touch-max-y = <704>; 65 - rhom,flip-y; 61 + rohm,touch-max-x = <384>; 62 + rohm,touch-max-y = <704>; 63 + rohm,flip-y; 66 64 }; 67 65 68 - bu21013_tp@0x5d { 69 - compatible = "rhom,bu21013_tp"; 66 + bu21013_tp@5d { 67 + compatible = "rohm,bu21013_tp"; 70 68 reg = <0x5d>; 71 69 touch-gpio = <&gpio2 20 0x4>; 72 70 avdd-supply = <&ab8500_ldo_aux1_reg>; 73 71 74 - rhom,touch-max-x = <384>; 75 - rhom,touch-max-y = <704>; 76 - rhom,flip-y; 72 + rohm,touch-max-x = <384>; 73 + rohm,touch-max-y = <704>; 74 + rohm,flip-y; 77 75 }; 78 76 }; 79 77 };
+23 -3
arch/arm/mach-ux500/cpu-db8500.c
··· 274 274 OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL), 275 275 OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), 276 276 OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), 277 + OF_DEV_AUXDATA("stericsson,db8500-musb", 0xa03e0000, "musb-ux500.0", NULL), 277 278 OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", 278 279 &db8500_prcmu_pdata), 279 280 OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL), 281 + OF_DEV_AUXDATA("stericsson,ux500-cryp", 0xa03cb000, "cryp1", NULL), 282 + OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL), 283 + OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0", 284 + NULL), 280 285 /* Requires device name bindings. */ 281 - OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE, 286 + OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE, 282 287 "pinctrl-db8500", NULL), 283 288 /* Requires clock name and DMA bindings. */ 284 289 OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, ··· 294 289 "ux500-msp-i2s.2", &msp2_platform_data), 295 290 OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, 296 291 "ux500-msp-i2s.3", &msp3_platform_data), 292 + {}, 293 + }; 294 + 295 + static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = { 296 + /* Requires DMA bindings. */ 297 + OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", NULL), 298 + OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL), 299 + OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL), 300 + OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", 301 + &db8500_prcmu_pdata), 297 302 {}, 298 303 }; 299 304 ··· 333 318 /* TODO: Export SoC, USB, cpu-freq and DMA40 */ 334 319 parent = u8500_of_init_devices(); 335 320 336 - /* automatically probe child nodes of db8500 device */ 337 - of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); 321 + /* automatically probe child nodes of dbx5x0 devices */ 322 + if (of_machine_is_compatible("st-ericsson,u8540")) 323 + of_platform_populate(NULL, u8500_local_bus_nodes, 324 + u8540_auxdata_lookup, parent); 325 + else 326 + of_platform_populate(NULL, u8500_local_bus_nodes, 327 + u8500_auxdata_lookup, parent); 338 328 } 339 329 340 330 static const char * stericsson_dt_platform_compat[] = {
+6
drivers/crypto/ux500/cryp/cryp_core.c
··· 1743 1743 1744 1744 static SIMPLE_DEV_PM_OPS(ux500_cryp_pm, ux500_cryp_suspend, ux500_cryp_resume); 1745 1745 1746 + static const struct of_device_id ux500_cryp_match[] = { 1747 + { .compatible = "stericsson,ux500-cryp" }, 1748 + { }, 1749 + }; 1750 + 1746 1751 static struct platform_driver cryp_driver = { 1747 1752 .probe = ux500_cryp_probe, 1748 1753 .remove = ux500_cryp_remove, ··· 1755 1750 .driver = { 1756 1751 .owner = THIS_MODULE, 1757 1752 .name = "cryp1", 1753 + .of_match_table = ux500_cryp_match, 1758 1754 .pm = &ux500_cryp_pm, 1759 1755 } 1760 1756 };
+6
drivers/crypto/ux500/hash/hash_core.c
··· 1961 1961 1962 1962 static SIMPLE_DEV_PM_OPS(ux500_hash_pm, ux500_hash_suspend, ux500_hash_resume); 1963 1963 1964 + static const struct of_device_id ux500_hash_match[] = { 1965 + { .compatible = "stericsson,ux500-hash" }, 1966 + { }, 1967 + }; 1968 + 1964 1969 static struct platform_driver hash_driver = { 1965 1970 .probe = ux500_hash_probe, 1966 1971 .remove = ux500_hash_remove, ··· 1973 1968 .driver = { 1974 1969 .owner = THIS_MODULE, 1975 1970 .name = "hash1", 1971 + .of_match_table = ux500_hash_match, 1976 1972 .pm = &ux500_hash_pm, 1977 1973 } 1978 1974 };
+2 -2
drivers/pinctrl/pinctrl-nomadik.c
··· 2108 2108 .data = (void *)PINCTRL_NMK_STN8815, 2109 2109 }, 2110 2110 { 2111 - .compatible = "stericsson,nmk-pinctrl", 2111 + .compatible = "stericsson,db8500-pinctrl", 2112 2112 .data = (void *)PINCTRL_NMK_DB8500, 2113 2113 }, 2114 2114 { 2115 - .compatible = "stericsson,nmk-pinctrl-db8540", 2115 + .compatible = "stericsson,db8540-pinctrl", 2116 2116 .data = (void *)PINCTRL_NMK_DB8540, 2117 2117 }, 2118 2118 {},
+4 -4
drivers/regulator/ab8500.c
··· 2901 2901 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, }, 2902 2902 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, }, 2903 2903 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, 2904 - { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, 2904 + { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, 2905 2905 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, }, 2906 2906 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, }, 2907 2907 }; ··· 2917 2917 { .name = "ab8500_ldo_adc", .driver_data = (void *) AB8505_LDO_ADC, }, 2918 2918 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8505_LDO_AUDIO, }, 2919 2919 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8505_LDO_ANAMIC1, }, 2920 - { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8505_LDO_ANAMIC2, }, 2920 + { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8505_LDO_ANAMIC2, }, 2921 2921 { .name = "ab8500_ldo_aux8", .driver_data = (void *) AB8505_LDO_AUX8, }, 2922 2922 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8505_LDO_ANA, }, 2923 2923 }; ··· 2933 2933 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8540_LDO_TVOUT, }, 2934 2934 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8540_LDO_AUDIO, }, 2935 2935 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8540_LDO_ANAMIC1, }, 2936 - { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8540_LDO_ANAMIC2, }, 2936 + { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8540_LDO_ANAMIC2, }, 2937 2937 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8540_LDO_DMIC, }, 2938 2938 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8540_LDO_ANA, }, 2939 2939 { .name = "ab8500_ldo_sdio", .driver_data = (void *) AB8540_LDO_SDIO, }, ··· 2948 2948 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB9540_LDO_TVOUT, }, 2949 2949 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB9540_LDO_AUDIO, }, 2950 2950 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB9540_LDO_ANAMIC1, }, 2951 - { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB9540_LDO_ANAMIC2, }, 2951 + { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB9540_LDO_ANAMIC2, }, 2952 2952 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB9540_LDO_DMIC, }, 2953 2953 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB9540_LDO_ANA, }, 2954 2954 };