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

Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

Merge "First batch of AT91 DT material for 3.15" from Nicolas Ferre:

- activate DMA for NAND flash controller
- some binding documentation update for usba and ADC (iio) drivers
- removal of some deprecated ADC (iio) properties

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
ARM: at91/dt: at91-cosino: remove useless adc properties
ARM: at91/dt: sama5d3: remove useless adc properties
ARM: at91/dt: at91sam9x5: remove useless adc properties
ARM: at91/dt: at91sam9g45: remove useless adc properties
ARM: at91/dt: at91sam9260: remove useless adc properties
ARM: at91/dt: at91-ariag25: remove useless adc properties
Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt
Documentation: dt: iio: improve atmel-adc documentation
ARM: at91: sama5d3: get rid of atmel_tsadcc driver
ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaning
ARM: at91/DT: add NAND + DMA property

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 542798cd 0f4d5641

+52 -60
+17 -16
Documentation/devicetree/bindings/arm/atmel-adc.txt Documentation/devicetree/bindings/iio/adc/at91_adc.txt
··· 5 5 <chip> can be "at91sam9260", "at91sam9g45" or "at91sam9x5" 6 6 - reg: Should contain ADC registers location and length 7 7 - interrupts: Should contain the IRQ line for the ADC 8 - - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this 8 + - atmel,adc-channels-used: Bitmask of the channels muxed and enabled for this 9 9 device 10 10 - atmel,adc-startup-time: Startup Time of the ADC in microseconds as 11 11 defined in the datasheet 12 12 - atmel,adc-vref: Reference voltage in millivolts for the conversions 13 - - atmel,adc-res: List of resolution in bits supported by the ADC. List size 13 + - atmel,adc-res: List of resolutions in bits supported by the ADC. List size 14 14 must be two at least. 15 15 - atmel,adc-res-names: Contains one identifier string for each resolution 16 16 in atmel,adc-res property. "lowres" and "highres" 17 17 identifiers are required. 18 18 19 19 Optional properties: 20 - - atmel,adc-use-external: Boolean to enable of external triggers 20 + - atmel,adc-use-external-triggers: Boolean to enable the external triggers 21 21 - atmel,adc-use-res: String corresponding to an identifier from 22 22 atmel,adc-res-names property. If not specified, the highest 23 23 resolution will be used. 24 24 - atmel,adc-sleep-mode: Boolean to enable sleep mode when no conversion 25 25 - atmel,adc-sample-hold-time: Sample and Hold Time in microseconds 26 - - atmel,adc-ts-wires: Number of touch screen wires. Should be 4 or 5. If this 27 - value is set, then adc driver will enable touch screen 26 + - atmel,adc-ts-wires: Number of touchscreen wires. Should be 4 or 5. If this 27 + value is set, then the adc driver will enable touchscreen 28 28 support. 29 - NOTE: when adc touch screen enabled, the adc hardware trigger will be 30 - disabled. Since touch screen will occupied the trigger register. 29 + NOTE: when adc touchscreen is enabled, the adc hardware trigger will be 30 + disabled. Since touchscreen will occupy the trigger register. 31 31 - atmel,adc-ts-pressure-threshold: a pressure threshold for touchscreen. It 32 - make touch detect more precision. 33 - 32 + makes touch detection more precise. 33 + 34 34 Optional trigger Nodes: 35 35 - Required properties: 36 36 * trigger-name: Name of the trigger exposed to the user ··· 41 41 42 42 Examples: 43 43 adc0: adc@fffb0000 { 44 + #address-cells = <1>; 45 + #size-cells = <0>; 44 46 compatible = "atmel,at91sam9260-adc"; 45 47 reg = <0xfffb0000 0x100>; 46 - interrupts = <20 4>; 47 - atmel,adc-channel-base = <0x30>; 48 + interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; 48 49 atmel,adc-channels-used = <0xff>; 49 - atmel,adc-drdy-mask = <0x10000>; 50 - atmel,adc-num-channels = <8>; 51 50 atmel,adc-startup-time = <40>; 52 - atmel,adc-status-register = <0x1c>; 53 - atmel,adc-trigger-register = <0x08>; 54 - atmel,adc-use-external; 51 + atmel,adc-use-external-triggers; 55 52 atmel,adc-vref = <3300>; 56 53 atmel,adc-res = <8 10>; 57 54 atmel,adc-res-names = "lowres", "highres"; 58 55 atmel,adc-use-res = "lowres"; 59 56 60 57 trigger@0 { 58 + reg = <0>; 61 59 trigger-name = "external-rising"; 62 60 trigger-value = <0x1>; 63 61 trigger-external; 64 62 }; 65 63 trigger@1 { 64 + reg = <1>; 66 65 trigger-name = "external-falling"; 67 66 trigger-value = <0x2>; 68 67 trigger-external; 69 68 }; 70 69 71 70 trigger@2 { 71 + reg = <2>; 72 72 trigger-name = "external-any"; 73 73 trigger-value = <0x3>; 74 74 trigger-external; 75 75 }; 76 76 77 77 trigger@3 { 78 + reg = <3>; 78 79 trigger-name = "continuous"; 79 80 trigger-value = <0x6>; 80 81 };
+2 -2
Documentation/devicetree/bindings/usb/atmel-usb.txt
··· 57 57 - ep childnode: To specify the number of endpoints and their properties. 58 58 59 59 Optional properties: 60 - - atmel,vbus-gpio: If present, specifies a gpio that needs to be 61 - activated for the bus to be powered. 60 + - atmel,vbus-gpio: If present, specifies a gpio that allows to detect whether 61 + vbus is present (USB is connected). 62 62 63 63 Required child node properties: 64 64 - name: Name of the endpoint.
-1
arch/arm/boot/dts/at91-ariag25.dts
··· 129 129 adc0: adc@f804c000 { 130 130 status = "okay"; 131 131 atmel,adc-channels-used = <0xf>; 132 - atmel,adc-num-channels = <4>; 133 132 }; 134 133 135 134 dbgu: serial@fffff200 {
-1
arch/arm/boot/dts/at91-cosino.dtsi
··· 64 64 }; 65 65 66 66 adc0: adc@f804c000 { 67 - atmel,adc-clock-rate = <1000000>; 68 67 atmel,adc-ts-wires = <4>; 69 68 atmel,adc-ts-pressure-threshold = <10000>; 70 69 status = "okay";
-1
arch/arm/boot/dts/at91-cosino_mega2560.dts
··· 27 27 }; 28 28 29 29 adc0: adc@f804c000 { 30 - atmel,adc-clock-rate = <1000000>; 31 30 atmel,adc-ts-wires = <4>; 32 31 atmel,adc-ts-pressure-threshold = <10000>; 33 32 status = "okay";
+6 -5
arch/arm/boot/dts/at91sam9260.dtsi
··· 608 608 }; 609 609 610 610 adc0: adc@fffe0000 { 611 + #address-cells = <1>; 612 + #size-cells = <0>; 611 613 compatible = "atmel,at91sam9260-adc"; 612 614 reg = <0xfffe0000 0x100>; 613 615 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>; 614 616 atmel,adc-use-external-triggers; 615 617 atmel,adc-channels-used = <0xf>; 616 618 atmel,adc-vref = <3300>; 617 - atmel,adc-num-channels = <4>; 618 619 atmel,adc-startup-time = <15>; 619 - atmel,adc-channel-base = <0x30>; 620 - atmel,adc-drdy-mask = <0x10000>; 621 - atmel,adc-status-register = <0x1c>; 622 - atmel,adc-trigger-register = <0x04>; 623 620 atmel,adc-res = <8 10>; 624 621 atmel,adc-res-names = "lowres", "highres"; 625 622 atmel,adc-use-res = "highres"; 626 623 627 624 trigger@0 { 625 + reg = <0>; 628 626 trigger-name = "timer-counter-0"; 629 627 trigger-value = <0x1>; 630 628 }; 631 629 trigger@1 { 630 + reg = <1>; 632 631 trigger-name = "timer-counter-1"; 633 632 trigger-value = <0x3>; 634 633 }; 635 634 636 635 trigger@2 { 636 + reg = <2>; 637 637 trigger-name = "timer-counter-2"; 638 638 trigger-value = <0x5>; 639 639 }; 640 640 641 641 trigger@3 { 642 + reg = <3>; 642 643 trigger-name = "external"; 643 644 trigger-value = <0x13>; 644 645 trigger-external;
+7 -5
arch/arm/boot/dts/at91sam9g45.dtsi
··· 632 632 }; 633 633 634 634 adc0: adc@fffb0000 { 635 + #address-cells = <1>; 636 + #size-cells = <0>; 635 637 compatible = "atmel,at91sam9260-adc"; 636 638 reg = <0xfffb0000 0x100>; 637 639 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; 638 640 atmel,adc-use-external-triggers; 639 641 atmel,adc-channels-used = <0xff>; 640 642 atmel,adc-vref = <3300>; 641 - atmel,adc-num-channels = <8>; 642 643 atmel,adc-startup-time = <40>; 643 - atmel,adc-channel-base = <0x30>; 644 - atmel,adc-drdy-mask = <0x10000>; 645 - atmel,adc-status-register = <0x1c>; 646 - atmel,adc-trigger-register = <0x08>; 647 644 atmel,adc-res = <8 10>; 648 645 atmel,adc-res-names = "lowres", "highres"; 649 646 atmel,adc-use-res = "highres"; 650 647 651 648 trigger@0 { 649 + reg = <0>; 652 650 trigger-name = "external-rising"; 653 651 trigger-value = <0x1>; 654 652 trigger-external; 655 653 }; 656 654 trigger@1 { 655 + reg = <1>; 657 656 trigger-name = "external-falling"; 658 657 trigger-value = <0x2>; 659 658 trigger-external; 660 659 }; 661 660 662 661 trigger@2 { 662 + reg = <2>; 663 663 trigger-name = "external-any"; 664 664 trigger-value = <0x3>; 665 665 trigger-external; 666 666 }; 667 667 668 668 trigger@3 { 669 + reg = <3>; 669 670 trigger-name = "continuous"; 670 671 trigger-value = <0x6>; 671 672 }; ··· 818 817 >; 819 818 atmel,nand-addr-offset = <21>; 820 819 atmel,nand-cmd-offset = <22>; 820 + atmel,nand-has-dma; 821 821 pinctrl-names = "default"; 822 822 pinctrl-0 = <&pinctrl_nand>; 823 823 gpios = <&pioC 8 GPIO_ACTIVE_HIGH
+1
arch/arm/boot/dts/at91sam9n12.dtsi
··· 570 570 atmel,pmecc-lookup-table-offset = <0x0 0x8000>; 571 571 atmel,nand-addr-offset = <21>; 572 572 atmel,nand-cmd-offset = <22>; 573 + atmel,nand-has-dma; 573 574 pinctrl-names = "default"; 574 575 pinctrl-0 = <&pinctrl_nand>; 575 576 gpios = <&pioD 5 GPIO_ACTIVE_HIGH
+8 -6
arch/arm/boot/dts/at91sam9x5.dtsi
··· 621 621 }; 622 622 623 623 adc0: adc@f804c000 { 624 + #address-cells = <1>; 625 + #size-cells = <0>; 624 626 compatible = "atmel,at91sam9260-adc"; 625 627 reg = <0xf804c000 0x100>; 626 628 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>; 627 - atmel,adc-use-external; 629 + atmel,adc-use-external-triggers; 628 630 atmel,adc-channels-used = <0xffff>; 629 631 atmel,adc-vref = <3300>; 630 - atmel,adc-num-channels = <12>; 631 632 atmel,adc-startup-time = <40>; 632 - atmel,adc-channel-base = <0x50>; 633 - atmel,adc-drdy-mask = <0x1000000>; 634 - atmel,adc-status-register = <0x30>; 635 - atmel,adc-trigger-register = <0xc0>; 636 633 atmel,adc-res = <8 10>; 637 634 atmel,adc-res-names = "lowres", "highres"; 638 635 atmel,adc-use-res = "highres"; 639 636 640 637 trigger@0 { 638 + reg = <0>; 641 639 trigger-name = "external-rising"; 642 640 trigger-value = <0x1>; 643 641 trigger-external; 644 642 }; 645 643 646 644 trigger@1 { 645 + reg = <1>; 647 646 trigger-name = "external-falling"; 648 647 trigger-value = <0x2>; 649 648 trigger-external; 650 649 }; 651 650 652 651 trigger@2 { 652 + reg = <2>; 653 653 trigger-name = "external-any"; 654 654 trigger-value = <0x3>; 655 655 trigger-external; 656 656 }; 657 657 658 658 trigger@3 { 659 + reg = <3>; 659 660 trigger-name = "continuous"; 660 661 trigger-value = <0x6>; 661 662 }; ··· 791 790 atmel,pmecc-lookup-table-offset = <0x0 0x8000>; 792 791 atmel,nand-addr-offset = <21>; 793 792 atmel,nand-cmd-offset = <22>; 793 + atmel,nand-has-dma; 794 794 pinctrl-names = "default"; 795 795 pinctrl-0 = <&pinctrl_nand>; 796 796 gpios = <&pioD 5 GPIO_ACTIVE_HIGH
+9 -19
arch/arm/boot/dts/sama5d3.dtsi
··· 239 239 }; 240 240 241 241 adc0: adc@f8018000 { 242 - compatible = "atmel,at91sam9260-adc"; 242 + #address-cells = <1>; 243 + #size-cells = <0>; 244 + compatible = "atmel,at91sam9x5-adc"; 243 245 reg = <0xf8018000 0x100>; 244 246 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; 245 247 pinctrl-names = "default"; ··· 263 261 clocks = <&adc_clk>, 264 262 <&adc_op_clk>; 265 263 clock-names = "adc_clk", "adc_op_clk"; 266 - atmel,adc-channel-base = <0x50>; 267 264 atmel,adc-channels-used = <0xfff>; 268 - atmel,adc-drdy-mask = <0x1000000>; 269 - atmel,adc-num-channels = <12>; 270 265 atmel,adc-startup-time = <40>; 271 - atmel,adc-status-register = <0x30>; 272 - atmel,adc-trigger-register = <0xc0>; 273 - atmel,adc-use-external; 266 + atmel,adc-use-external-triggers; 274 267 atmel,adc-vref = <3000>; 275 268 atmel,adc-res = <10 12>; 276 269 atmel,adc-res-names = "lowres", "highres"; 277 270 status = "disabled"; 278 271 279 272 trigger@0 { 273 + reg = <0>; 280 274 trigger-name = "external-rising"; 281 275 trigger-value = <0x1>; 282 276 trigger-external; 283 277 }; 284 278 trigger@1 { 279 + reg = <1>; 285 280 trigger-name = "external-falling"; 286 281 trigger-value = <0x2>; 287 282 trigger-external; 288 283 }; 289 284 trigger@2 { 285 + reg = <2>; 290 286 trigger-name = "external-any"; 291 287 trigger-value = <0x3>; 292 288 trigger-external; 293 289 }; 294 290 trigger@3 { 291 + reg = <3>; 295 292 trigger-name = "continuous"; 296 293 trigger-value = <0x6>; 297 294 }; 298 - }; 299 - 300 - tsadcc: tsadcc@f8018000 { 301 - compatible = "atmel,at91sam9x5-tsadcc"; 302 - reg = <0xf8018000 0x4000>; 303 - interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>; 304 - atmel,tsadcc_clock = <300000>; 305 - atmel,filtering_average = <0x03>; 306 - atmel,pendet_debounce = <0x08>; 307 - atmel,pendet_sensitivity = <0x02>; 308 - atmel,ts_sample_hold_time = <0x0a>; 309 - status = "disabled"; 310 295 }; 311 296 312 297 i2c2: i2c@f801c000 { ··· 1245 1256 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>; 1246 1257 atmel,nand-addr-offset = <21>; 1247 1258 atmel,nand-cmd-offset = <22>; 1259 + atmel,nand-has-dma; 1248 1260 pinctrl-names = "default"; 1249 1261 pinctrl-0 = <&pinctrl_nand0_ale_cle>; 1250 1262 atmel,pmecc-lookup-table-offset = <0x0 0x8000>;
+2 -4
arch/arm/boot/dts/sama5d3xdm.dtsi
··· 23 23 }; 24 24 25 25 adc0: adc@f8018000 { 26 - status = "disabled"; 27 - }; 28 - 29 - tsadcc: tsadcc@f8018000 { 26 + atmel,adc-ts-wires = <4>; 27 + atmel,adc-ts-pressure-threshold = <10000>; 30 28 status = "okay"; 31 29 }; 32 30