Browse Source

Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core', 'asoc/fix/dapm', 'asoc/fix/mtk' and 'asoc/fix/stm' into asoc-next

Mark Brown 7 years ago
100 changed files with 680 additions and 264 deletions
  1. 1 0
      .mailmap
  2. 16 0
      Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32
  3. 1 0
      Documentation/admin-guide/kernel-parameters.rst
  4. 15 3
      Documentation/admin-guide/kernel-parameters.txt
  5. 1 1
      Documentation/admin-guide/thunderbolt.rst
  6. 1 0
      Documentation/arm64/silicon-errata.txt
  7. 7 0
      Documentation/cgroup-v2.txt
  8. 8 8
      Documentation/core-api/genericirq.rst
  9. 1 1
      Documentation/devicetree/bindings/arm/ccn.txt
  10. 1 1
      Documentation/devicetree/bindings/arm/omap/crossbar.txt
  11. 1 1
      Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt
  12. 1 1
      Documentation/devicetree/bindings/clock/axi-clkgen.txt
  13. 1 1
      Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt
  14. 1 1
      Documentation/devicetree/bindings/clock/exynos4-clock.txt
  15. 1 1
      Documentation/devicetree/bindings/clock/exynos5250-clock.txt
  16. 1 1
      Documentation/devicetree/bindings/clock/exynos5410-clock.txt
  17. 1 1
      Documentation/devicetree/bindings/clock/exynos5420-clock.txt
  18. 1 1
      Documentation/devicetree/bindings/clock/exynos5440-clock.txt
  19. 1 1
      Documentation/devicetree/bindings/clock/ti-keystone-pllctrl.txt
  20. 2 2
      Documentation/devicetree/bindings/clock/zx296702-clk.txt
  21. 2 2
      Documentation/devicetree/bindings/crypto/fsl-sec4.txt
  22. 1 1
      Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt
  23. 2 2
      Documentation/devicetree/bindings/display/atmel,lcdc.txt
  24. 2 2
      Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt
  25. 1 1
      Documentation/devicetree/bindings/dma/zxdma.txt
  26. 9 4
      Documentation/devicetree/bindings/eeprom/at25.txt
  27. 1 1
      Documentation/devicetree/bindings/gpio/gpio-altera.txt
  28. 1 1
      Documentation/devicetree/bindings/gpio/gpio-pca953x.txt
  29. 4 0
      Documentation/devicetree/bindings/hwmon/jc42.txt
  30. 1 1
      Documentation/devicetree/bindings/i2c/i2c-jz4780.txt
  31. 13 0
      Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt
  32. 128 0
      Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt
  33. 1 1
      Documentation/devicetree/bindings/iio/pressure/hp03.txt
  34. 1 1
      Documentation/devicetree/bindings/input/touchscreen/bu21013.txt
  35. 2 2
      Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt
  36. 1 1
      Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt
  37. 1 1
      Documentation/devicetree/bindings/interrupt-controller/img,pdc-intc.txt
  38. 1 1
      Documentation/devicetree/bindings/interrupt-controller/st,spear3xx-shirq.txt
  39. 3 3
      Documentation/devicetree/bindings/mailbox/altera-mailbox.txt
  40. 1 1
      Documentation/devicetree/bindings/mailbox/brcm,iproc-pdc-mbox.txt
  41. 1 1
      Documentation/devicetree/bindings/media/exynos5-gsc.txt
  42. 1 1
      Documentation/devicetree/bindings/media/mediatek-vcodec.txt
  43. 1 1
      Documentation/devicetree/bindings/media/rcar_vin.txt
  44. 1 1
      Documentation/devicetree/bindings/media/samsung-fimc.txt
  45. 1 1
      Documentation/devicetree/bindings/media/sh_mobile_ceu.txt
  46. 5 5
      Documentation/devicetree/bindings/media/video-interfaces.txt
  47. 1 1
      Documentation/devicetree/bindings/memory-controllers/ti/emif.txt
  48. 1 1
      Documentation/devicetree/bindings/mfd/ti-keystone-devctrl.txt
  49. 1 1
      Documentation/devicetree/bindings/misc/brcm,kona-smc.txt
  50. 1 1
      Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt
  51. 1 1
      Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt
  52. 2 2
      Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt
  53. 3 3
      Documentation/devicetree/bindings/mtd/gpmc-nor.txt
  54. 0 2
      Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt
  55. 1 1
      Documentation/devicetree/bindings/mtd/mtk-nand.txt
  56. 2 2
      Documentation/devicetree/bindings/net/altera_tse.txt
  57. 1 1
      Documentation/devicetree/bindings/net/mdio.txt
  58. 1 1
      Documentation/devicetree/bindings/net/socfpga-dwmac.txt
  59. 1 1
      Documentation/devicetree/bindings/nios2/nios2.txt
  60. 1 1
      Documentation/devicetree/bindings/pci/altera-pcie.txt
  61. 1 1
      Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt
  62. 1 1
      Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  63. 1 1
      Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
  64. 1 1
      Documentation/devicetree/bindings/pinctrl/brcm,cygnus-pinmux.txt
  65. 2 2
      Documentation/devicetree/bindings/pinctrl/pinctrl-atlas7.txt
  66. 1 1
      Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt
  67. 2 2
      Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt
  68. 1 1
      Documentation/devicetree/bindings/regulator/regulator.txt
  69. 1 1
      Documentation/devicetree/bindings/serial/efm32-uart.txt
  70. 1 1
      Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt
  71. 1 1
      Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt
  72. 1 1
      Documentation/devicetree/bindings/sound/adi,axi-i2s.txt
  73. 1 1
      Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt
  74. 1 1
      Documentation/devicetree/bindings/sound/ak4613.txt
  75. 1 1
      Documentation/devicetree/bindings/sound/ak4642.txt
  76. 1 1
      Documentation/devicetree/bindings/sound/da7218.txt
  77. 1 1
      Documentation/devicetree/bindings/sound/da7219.txt
  78. 2 0
      Documentation/devicetree/bindings/sound/dmic.txt
  79. 1 1
      Documentation/devicetree/bindings/sound/max98371.txt
  80. 40 0
      Documentation/devicetree/bindings/sound/max98373.txt
  81. 1 1
      Documentation/devicetree/bindings/sound/max9867.txt
  82. 128 138
      Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt
  83. 2 2
      Documentation/devicetree/bindings/sound/nau8825.txt
  84. 42 0
      Documentation/devicetree/bindings/sound/pcm186x.txt
  85. 1 1
      Documentation/devicetree/bindings/sound/renesas,fsi.txt
  86. 11 4
      Documentation/devicetree/bindings/sound/renesas,rsnd.txt
  87. 1 1
      Documentation/devicetree/bindings/sound/rockchip-spdif.txt
  88. 3 0
      Documentation/devicetree/bindings/sound/simple-card.txt
  89. 4 4
      Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt
  90. 63 0
      Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt
  91. 7 5
      Documentation/devicetree/bindings/sound/st,stm32-sai.txt
  92. 2 0
      Documentation/devicetree/bindings/sound/sun4i-i2s.txt
  93. 3 1
      Documentation/devicetree/bindings/sound/tas5720.txt
  94. 4 4
      Documentation/devicetree/bindings/sound/tfa9879.txt
  95. 20 0
      Documentation/devicetree/bindings/sound/ti,tas6424.txt
  96. 8 1
      Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
  97. 9 1
      Documentation/devicetree/bindings/sound/tlv320aic3x.txt
  98. 16 0
      Documentation/devicetree/bindings/sound/tscs42xx.txt
  99. 26 0
      Documentation/devicetree/bindings/sound/uniphier,evea.txt
  100. 1 1
      Documentation/devicetree/bindings/spi/efm32-spi.txt

+ 1 - 0
.mailmap

@@ -107,6 +107,7 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
 Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
 Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
 Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
 Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
 Mark Brown <broonie@sirena.org.uk>
 Mark Brown <broonie@sirena.org.uk>
+Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
 Matthieu CASTET <castet.matthieu@free.fr>
 Matthieu CASTET <castet.matthieu@free.fr>

+ 16 - 0
Documentation/ABI/testing/sysfs-bus-iio-dfsdm-adc-stm32

@@ -0,0 +1,16 @@
+What:		/sys/bus/iio/devices/iio:deviceX/in_voltage_spi_clk_freq
+KernelVersion:	4.14
+Contact:	arnaud.pouliquen@st.com
+Description:
+		For audio purpose only.
+		Used by audio driver to set/get the spi input frequency.
+		This is mandatory if DFSDM is slave on SPI bus, to
+		provide information on the SPI clock frequency during runtime
+		Notice that the SPI frequency should be a multiple of sample
+		frequency to ensure the precision.
+		if DFSDM input is SPI master
+			Reading  SPI clkout frequency,
+			error on writing
+		If DFSDM input is SPI Slave:
+			Reading returns value previously set.
+			Writing value before starting conversions.

+ 1 - 0
Documentation/admin-guide/kernel-parameters.rst

@@ -109,6 +109,7 @@ parameter is applicable::
 	IPV6	IPv6 support is enabled.
 	IPV6	IPv6 support is enabled.
 	ISAPNP	ISA PnP code is enabled.
 	ISAPNP	ISA PnP code is enabled.
 	ISDN	Appropriate ISDN support is enabled.
 	ISDN	Appropriate ISDN support is enabled.
+	ISOL	CPU Isolation is enabled.
 	JOY	Appropriate joystick support is enabled.
 	JOY	Appropriate joystick support is enabled.
 	KGDB	Kernel debugger support is enabled.
 	KGDB	Kernel debugger support is enabled.
 	KVM	Kernel Virtual Machine support is enabled.
 	KVM	Kernel Virtual Machine support is enabled.

+ 15 - 3
Documentation/admin-guide/kernel-parameters.txt

@@ -328,11 +328,15 @@
 			not play well with APC CPU idle - disable it if you have
 			not play well with APC CPU idle - disable it if you have
 			APC and your system crashes randomly.
 			APC and your system crashes randomly.
 
 
-	apic=		[APIC,X86-32] Advanced Programmable Interrupt Controller
+	apic=		[APIC,X86] Advanced Programmable Interrupt Controller
 			Change the output verbosity whilst booting
 			Change the output verbosity whilst booting
 			Format: { quiet (default) | verbose | debug }
 			Format: { quiet (default) | verbose | debug }
 			Change the amount of debugging information output
 			Change the amount of debugging information output
 			when initialising the APIC and IO-APIC components.
 			when initialising the APIC and IO-APIC components.
+			For X86-32, this can also be used to specify an APIC
+			driver name.
+			Format: apic=driver_name
+			Examples: apic=bigsmp
 
 
 	apic_extnmi=	[APIC,X86] External NMI delivery setting
 	apic_extnmi=	[APIC,X86] External NMI delivery setting
 			Format: { bsp (default) | all | none }
 			Format: { bsp (default) | all | none }
@@ -1737,7 +1741,7 @@
 	isapnp=		[ISAPNP]
 	isapnp=		[ISAPNP]
 			Format: <RDP>,<reset>,<pci_scan>,<verbosity>
 			Format: <RDP>,<reset>,<pci_scan>,<verbosity>
 
 
-	isolcpus=	[KNL,SMP] Isolate a given set of CPUs from disturbance.
+	isolcpus=	[KNL,SMP,ISOL] Isolate a given set of CPUs from disturbance.
 			[Deprecated - use cpusets instead]
 			[Deprecated - use cpusets instead]
 			Format: [flag-list,]<cpu-list>
 			Format: [flag-list,]<cpu-list>
 
 
@@ -2662,7 +2666,7 @@
 			Valid arguments: on, off
 			Valid arguments: on, off
 			Default: on
 			Default: on
 
 
-	nohz_full=	[KNL,BOOT]
+	nohz_full=	[KNL,BOOT,SMP,ISOL]
 			The argument is a cpu list, as described above.
 			The argument is a cpu list, as described above.
 			In kernels built with CONFIG_NO_HZ_FULL=y, set
 			In kernels built with CONFIG_NO_HZ_FULL=y, set
 			the specified list of CPUs whose tick will be stopped
 			the specified list of CPUs whose tick will be stopped
@@ -2708,6 +2712,8 @@
 			steal time is computed, but won't influence scheduler
 			steal time is computed, but won't influence scheduler
 			behaviour
 			behaviour
 
 
+	nopti		[X86-64] Disable kernel page table isolation
+
 	nolapic		[X86-32,APIC] Do not enable or use the local APIC.
 	nolapic		[X86-32,APIC] Do not enable or use the local APIC.
 
 
 	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.
 	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.
@@ -3282,6 +3288,12 @@
 	pt.		[PARIDE]
 	pt.		[PARIDE]
 			See Documentation/blockdev/paride.txt.
 			See Documentation/blockdev/paride.txt.
 
 
+	pti=		[X86_64]
+			Control user/kernel address space isolation:
+			on - enable
+			off - disable
+			auto - default setting
+
 	pty.legacy_count=
 	pty.legacy_count=
 			[KNL] Number of legacy pty's. Overwrites compiled-in
 			[KNL] Number of legacy pty's. Overwrites compiled-in
 			default number.
 			default number.

+ 1 - 1
Documentation/admin-guide/thunderbolt.rst

@@ -230,7 +230,7 @@ If supported by your machine this will be exposed by the WMI bus with
 a sysfs attribute called "force_power".
 a sysfs attribute called "force_power".
 
 
 For example the intel-wmi-thunderbolt driver exposes this attribute in:
 For example the intel-wmi-thunderbolt driver exposes this attribute in:
-  /sys/devices/platform/PNP0C14:00/wmi_bus/wmi_bus-PNP0C14:00/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power
+  /sys/bus/wmi/devices/86CCFD48-205E-4A77-9C48-2021CBEDE341/force_power
 
 
   To force the power to on, write 1 to this attribute file.
   To force the power to on, write 1 to this attribute file.
   To disable force power, write 0 to this attribute file.
   To disable force power, write 0 to this attribute file.

+ 1 - 0
Documentation/arm64/silicon-errata.txt

@@ -75,3 +75,4 @@ stable kernels.
 | Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |
 | Qualcomm Tech. | Falkor v1       | E1003           | QCOM_FALKOR_ERRATUM_1003    |
 | Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |
 | Qualcomm Tech. | Falkor v1       | E1009           | QCOM_FALKOR_ERRATUM_1009    |
 | Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |
 | Qualcomm Tech. | QDF2400 ITS     | E0065           | QCOM_QDF2400_ERRATUM_0065   |
+| Qualcomm Tech. | Falkor v{1,2}   | E1041           | QCOM_FALKOR_ERRATUM_1041    |

+ 7 - 0
Documentation/cgroup-v2.txt

@@ -898,6 +898,13 @@ controller implements weight and absolute bandwidth limit models for
 normal scheduling policy and absolute bandwidth allocation model for
 normal scheduling policy and absolute bandwidth allocation model for
 realtime scheduling policy.
 realtime scheduling policy.
 
 
+WARNING: cgroup2 doesn't yet support control of realtime processes and
+the cpu controller can only be enabled when all RT processes are in
+the root cgroup.  Be aware that system management software may already
+have placed RT processes into nonroot cgroups during the system boot
+process, and these processes may need to be moved to the root cgroup
+before the cpu controller can be enabled.
+
 
 
 CPU Interface Files
 CPU Interface Files
 ~~~~~~~~~~~~~~~~~~~
 ~~~~~~~~~~~~~~~~~~~

+ 8 - 8
Documentation/core-api/genericirq.rst

@@ -225,9 +225,9 @@ interrupts.
 
 
 The following control flow is implemented (simplified excerpt)::
 The following control flow is implemented (simplified excerpt)::
 
 
-    :c:func:`desc->irq_data.chip->irq_mask_ack`;
+    desc->irq_data.chip->irq_mask_ack();
     handle_irq_event(desc->action);
     handle_irq_event(desc->action);
-    :c:func:`desc->irq_data.chip->irq_unmask`;
+    desc->irq_data.chip->irq_unmask();
 
 
 
 
 Default Fast EOI IRQ flow handler
 Default Fast EOI IRQ flow handler
@@ -239,7 +239,7 @@ which only need an EOI at the end of the handler.
 The following control flow is implemented (simplified excerpt)::
 The following control flow is implemented (simplified excerpt)::
 
 
     handle_irq_event(desc->action);
     handle_irq_event(desc->action);
-    :c:func:`desc->irq_data.chip->irq_eoi`;
+    desc->irq_data.chip->irq_eoi();
 
 
 
 
 Default Edge IRQ flow handler
 Default Edge IRQ flow handler
@@ -251,15 +251,15 @@ interrupts.
 The following control flow is implemented (simplified excerpt)::
 The following control flow is implemented (simplified excerpt)::
 
 
     if (desc->status & running) {
     if (desc->status & running) {
-        :c:func:`desc->irq_data.chip->irq_mask_ack`;
+        desc->irq_data.chip->irq_mask_ack();
         desc->status |= pending | masked;
         desc->status |= pending | masked;
         return;
         return;
     }
     }
-    :c:func:`desc->irq_data.chip->irq_ack`;
+    desc->irq_data.chip->irq_ack();
     desc->status |= running;
     desc->status |= running;
     do {
     do {
         if (desc->status & masked)
         if (desc->status & masked)
-            :c:func:`desc->irq_data.chip->irq_unmask`;
+            desc->irq_data.chip->irq_unmask();
         desc->status &= ~pending;
         desc->status &= ~pending;
         handle_irq_event(desc->action);
         handle_irq_event(desc->action);
     } while (status & pending);
     } while (status & pending);
@@ -293,10 +293,10 @@ simplified version without locking.
 The following control flow is implemented (simplified excerpt)::
 The following control flow is implemented (simplified excerpt)::
 
 
     if (desc->irq_data.chip->irq_ack)
     if (desc->irq_data.chip->irq_ack)
-        :c:func:`desc->irq_data.chip->irq_ack`;
+        desc->irq_data.chip->irq_ack();
     handle_irq_event(desc->action);
     handle_irq_event(desc->action);
     if (desc->irq_data.chip->irq_eoi)
     if (desc->irq_data.chip->irq_eoi)
-            :c:func:`desc->irq_data.chip->irq_eoi`;
+        desc->irq_data.chip->irq_eoi();
 
 
 
 
 EOI Edge IRQ flow handler
 EOI Edge IRQ flow handler

+ 1 - 1
Documentation/devicetree/bindings/arm/ccn.txt

@@ -15,7 +15,7 @@ Required properties:
 
 
 Example:
 Example:
 
 
-	ccn@0x2000000000 {
+	ccn@2000000000 {
 		compatible = "arm,ccn-504";
 		compatible = "arm,ccn-504";
 		reg = <0x20 0x00000000 0 0x1000000>;
 		reg = <0x20 0x00000000 0 0x1000000>;
 		interrupts = <0 181 4>;
 		interrupts = <0 181 4>;

+ 1 - 1
Documentation/devicetree/bindings/arm/omap/crossbar.txt

@@ -49,7 +49,7 @@ An interrupt consumer on an SoC using crossbar will use:
 	interrupts = <GIC_SPI request_number interrupt_level>
 	interrupts = <GIC_SPI request_number interrupt_level>
 
 
 Example:
 Example:
-	device_x@0x4a023000 {
+	device_x@4a023000 {
 		/* Crossbar 8 used */
 		/* Crossbar 8 used */
 		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
 		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
 		...
 		...

+ 1 - 1
Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-mc.txt

@@ -8,7 +8,7 @@ Required properties:
 - interrupts : Should contain MC General interrupt.
 - interrupts : Should contain MC General interrupt.
 
 
 Example:
 Example:
-	memory-controller@0x7000f000 {
+	memory-controller@7000f000 {
 		compatible = "nvidia,tegra20-mc";
 		compatible = "nvidia,tegra20-mc";
 		reg = <0x7000f000 0x024
 		reg = <0x7000f000 0x024
 		       0x7000f03c 0x3c4>;
 		       0x7000f03c 0x3c4>;

+ 1 - 1
Documentation/devicetree/bindings/clock/axi-clkgen.txt

@@ -17,7 +17,7 @@ Optional properties:
 - clock-output-names : From common clock binding.
 - clock-output-names : From common clock binding.
 
 
 Example:
 Example:
-	clock@0xff000000 {
+	clock@ff000000 {
 		compatible = "adi,axi-clkgen";
 		compatible = "adi,axi-clkgen";
 		#clock-cells = <0>;
 		#clock-cells = <0>;
 		reg = <0xff000000 0x1000>;
 		reg = <0xff000000 0x1000>;

+ 1 - 1
Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt

@@ -23,7 +23,7 @@ Example:
 		clocks = <&clk_osc>;
 		clocks = <&clk_osc>;
 	};
 	};
 
 
-	aux: aux@0x7e215004 {
+	aux: aux@7e215004 {
 		compatible = "brcm,bcm2835-aux";
 		compatible = "brcm,bcm2835-aux";
 		#clock-cells = <1>;
 		#clock-cells = <1>;
 		reg = <0x7e215000 0x8>;
 		reg = <0x7e215000 0x8>;

+ 1 - 1
Documentation/devicetree/bindings/clock/exynos4-clock.txt

@@ -24,7 +24,7 @@ tree sources.
 
 
 Example 1: An example of a clock controller node is listed below.
 Example 1: An example of a clock controller node is listed below.
 
 
-	clock: clock-controller@0x10030000 {
+	clock: clock-controller@10030000 {
 		compatible = "samsung,exynos4210-clock";
 		compatible = "samsung,exynos4210-clock";
 		reg = <0x10030000 0x20000>;
 		reg = <0x10030000 0x20000>;
 		#clock-cells = <1>;
 		#clock-cells = <1>;

+ 1 - 1
Documentation/devicetree/bindings/clock/exynos5250-clock.txt

@@ -22,7 +22,7 @@ tree sources.
 
 
 Example 1: An example of a clock controller node is listed below.
 Example 1: An example of a clock controller node is listed below.
 
 
-	clock: clock-controller@0x10010000 {
+	clock: clock-controller@10010000 {
 		compatible = "samsung,exynos5250-clock";
 		compatible = "samsung,exynos5250-clock";
 		reg = <0x10010000 0x30000>;
 		reg = <0x10010000 0x30000>;
 		#clock-cells = <1>;
 		#clock-cells = <1>;

+ 1 - 1
Documentation/devicetree/bindings/clock/exynos5410-clock.txt

@@ -30,7 +30,7 @@ Example 1: An example of a clock controller node is listed below.
 		#clock-cells = <0>;
 		#clock-cells = <0>;
 	};
 	};
 
 
-	clock: clock-controller@0x10010000 {
+	clock: clock-controller@10010000 {
 		compatible = "samsung,exynos5410-clock";
 		compatible = "samsung,exynos5410-clock";
 		reg = <0x10010000 0x30000>;
 		reg = <0x10010000 0x30000>;
 		#clock-cells = <1>;
 		#clock-cells = <1>;

+ 1 - 1
Documentation/devicetree/bindings/clock/exynos5420-clock.txt

@@ -23,7 +23,7 @@ tree sources.
 
 
 Example 1: An example of a clock controller node is listed below.
 Example 1: An example of a clock controller node is listed below.
 
 
-	clock: clock-controller@0x10010000 {
+	clock: clock-controller@10010000 {
 		compatible = "samsung,exynos5420-clock";
 		compatible = "samsung,exynos5420-clock";
 		reg = <0x10010000 0x30000>;
 		reg = <0x10010000 0x30000>;
 		#clock-cells = <1>;
 		#clock-cells = <1>;

+ 1 - 1
Documentation/devicetree/bindings/clock/exynos5440-clock.txt

@@ -21,7 +21,7 @@ tree sources.
 
 
 Example: An example of a clock controller node is listed below.
 Example: An example of a clock controller node is listed below.
 
 
-	clock: clock-controller@0x10010000 {
+	clock: clock-controller@10010000 {
 		compatible = "samsung,exynos5440-clock";
 		compatible = "samsung,exynos5440-clock";
 		reg = <0x160000 0x10000>;
 		reg = <0x160000 0x10000>;
 		#clock-cells = <1>;
 		#clock-cells = <1>;

+ 1 - 1
Documentation/devicetree/bindings/clock/ti-keystone-pllctrl.txt

@@ -14,7 +14,7 @@ Required properties:
 
 
 Example:
 Example:
 
 
-pllctrl: pll-controller@0x02310000 {
+pllctrl: pll-controller@02310000 {
 	compatible = "ti,keystone-pllctrl", "syscon";
 	compatible = "ti,keystone-pllctrl", "syscon";
 	reg = <0x02310000 0x200>;
 	reg = <0x02310000 0x200>;
 };
 };

+ 2 - 2
Documentation/devicetree/bindings/clock/zx296702-clk.txt

@@ -20,13 +20,13 @@ ID in its "clocks" phandle cell. See include/dt-bindings/clock/zx296702-clock.h
 for the full list of zx296702 clock IDs.
 for the full list of zx296702 clock IDs.
 
 
 
 
-topclk: topcrm@0x09800000 {
+topclk: topcrm@09800000 {
         compatible = "zte,zx296702-topcrm-clk";
         compatible = "zte,zx296702-topcrm-clk";
         reg = <0x09800000 0x1000>;
         reg = <0x09800000 0x1000>;
         #clock-cells = <1>;
         #clock-cells = <1>;
 };
 };
 
 
-uart0: serial@0x09405000 {
+uart0: serial@09405000 {
         compatible = "zte,zx296702-uart";
         compatible = "zte,zx296702-uart";
         reg = <0x09405000 0x1000>;
         reg = <0x09405000 0x1000>;
         interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
         interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

+ 2 - 2
Documentation/devicetree/bindings/crypto/fsl-sec4.txt

@@ -456,7 +456,7 @@ System ON/OFF key driver
       Definition: this is phandle to the register map node.
       Definition: this is phandle to the register map node.
 
 
 EXAMPLE:
 EXAMPLE:
-	snvs-pwrkey@0x020cc000 {
+	snvs-pwrkey@020cc000 {
 		compatible = "fsl,sec-v4.0-pwrkey";
 		compatible = "fsl,sec-v4.0-pwrkey";
 		regmap = <&snvs>;
 		regmap = <&snvs>;
 		interrupts = <0 4 0x4>
 		interrupts = <0 4 0x4>
@@ -545,7 +545,7 @@ FULL EXAMPLE
 			interrupts = <93 2>;
 			interrupts = <93 2>;
 		};
 		};
 
 
-		snvs-pwrkey@0x020cc000 {
+		snvs-pwrkey@020cc000 {
 			compatible = "fsl,sec-v4.0-pwrkey";
 			compatible = "fsl,sec-v4.0-pwrkey";
 			regmap = <&sec_mon>;
 			regmap = <&sec_mon>;
 			interrupts = <0 4 0x4>;
 			interrupts = <0 4 0x4>;

+ 1 - 1
Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt

@@ -9,7 +9,7 @@ Required properties:
 - clock-names : the name of clock used by the DFI, must be "pclk_ddr_mon";
 - clock-names : the name of clock used by the DFI, must be "pclk_ddr_mon";
 
 
 Example:
 Example:
-	dfi: dfi@0xff630000 {
+	dfi: dfi@ff630000 {
 		compatible = "rockchip,rk3399-dfi";
 		compatible = "rockchip,rk3399-dfi";
 		reg = <0x00 0xff630000 0x00 0x4000>;
 		reg = <0x00 0xff630000 0x00 0x4000>;
 		rockchip,pmu = <&pmugrf>;
 		rockchip,pmu = <&pmugrf>;

+ 2 - 2
Documentation/devicetree/bindings/display/atmel,lcdc.txt

@@ -27,7 +27,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-	fb0: fb@0x00500000 {
+	fb0: fb@00500000 {
 		compatible = "atmel,at91sam9g45-lcdc";
 		compatible = "atmel,at91sam9g45-lcdc";
 		reg = <0x00500000 0x1000>;
 		reg = <0x00500000 0x1000>;
 		interrupts = <23 3 0>;
 		interrupts = <23 3 0>;
@@ -41,7 +41,7 @@ Example:
 
 
 Example for fixed framebuffer memory:
 Example for fixed framebuffer memory:
 
 
-	fb0: fb@0x00500000 {
+	fb0: fb@00500000 {
 		compatible = "atmel,at91sam9263-lcdc";
 		compatible = "atmel,at91sam9263-lcdc";
 		reg = <0x00700000 0x1000 0x70000000 0x200000>;
 		reg = <0x00700000 0x1000 0x70000000 0x200000>;
 		[...]
 		[...]

+ 2 - 2
Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt

@@ -73,7 +73,7 @@ Hypervisor OS configuration:
 		max-read-transactions = <31>;
 		max-read-transactions = <31>;
 		channel-reset-timeout-cycles = <0x500>;
 		channel-reset-timeout-cycles = <0x500>;
 
 
-		hidma_24: dma-controller@0x5c050000 {
+		hidma_24: dma-controller@5c050000 {
 			compatible = "qcom,hidma-1.0";
 			compatible = "qcom,hidma-1.0";
 			reg = <0 0x5c050000 0x0 0x1000>,
 			reg = <0 0x5c050000 0x0 0x1000>,
 			      <0 0x5c0b0000 0x0 0x1000>;
 			      <0 0x5c0b0000 0x0 0x1000>;
@@ -85,7 +85,7 @@ Hypervisor OS configuration:
 
 
 Guest OS configuration:
 Guest OS configuration:
 
 
-	hidma_24: dma-controller@0x5c050000 {
+	hidma_24: dma-controller@5c050000 {
 		compatible = "qcom,hidma-1.0";
 		compatible = "qcom,hidma-1.0";
 		reg = <0 0x5c050000 0x0 0x1000>,
 		reg = <0 0x5c050000 0x0 0x1000>,
 		      <0 0x5c0b0000 0x0 0x1000>;
 		      <0 0x5c0b0000 0x0 0x1000>;

+ 1 - 1
Documentation/devicetree/bindings/dma/zxdma.txt

@@ -13,7 +13,7 @@ Required properties:
 Example:
 Example:
 
 
 Controller:
 Controller:
-	dma: dma-controller@0x09c00000{
+	dma: dma-controller@09c00000{
 		compatible = "zte,zx296702-dma";
 		compatible = "zte,zx296702-dma";
 		reg = <0x09c00000 0x1000>;
 		reg = <0x09c00000 0x1000>;
 		clocks = <&topclk ZX296702_DMA_ACLK>;
 		clocks = <&topclk ZX296702_DMA_ACLK>;

+ 9 - 4
Documentation/devicetree/bindings/eeprom/at25.txt

@@ -1,7 +1,12 @@
 EEPROMs (SPI) compatible with Atmel at25.
 EEPROMs (SPI) compatible with Atmel at25.
 
 
 Required properties:
 Required properties:
-- compatible : "atmel,at25".
+- compatible : Should be "<vendor>,<type>", and generic value "atmel,at25".
+  Example "<vendor>,<type>" values:
+    "microchip,25lc040"
+    "st,m95m02"
+    "st,m95256"
+
 - reg : chip select number
 - reg : chip select number
 - spi-max-frequency : max spi frequency to use
 - spi-max-frequency : max spi frequency to use
 - pagesize : size of the eeprom page
 - pagesize : size of the eeprom page
@@ -13,7 +18,7 @@ Optional properties:
 - spi-cpol : SPI inverse clock polarity, as per spi-bus bindings.
 - spi-cpol : SPI inverse clock polarity, as per spi-bus bindings.
 - read-only : this parameter-less property disables writes to the eeprom
 - read-only : this parameter-less property disables writes to the eeprom
 
 
-Obsolete legacy properties are can be used in place of "size", "pagesize",
+Obsolete legacy properties can be used in place of "size", "pagesize",
 "address-width", and "read-only":
 "address-width", and "read-only":
 - at25,byte-len : total eeprom size in bytes
 - at25,byte-len : total eeprom size in bytes
 - at25,addr-mode : addr-mode flags, as defined in include/linux/spi/eeprom.h
 - at25,addr-mode : addr-mode flags, as defined in include/linux/spi/eeprom.h
@@ -22,8 +27,8 @@ Obsolete legacy properties are can be used in place of "size", "pagesize",
 Additional compatible properties are also allowed.
 Additional compatible properties are also allowed.
 
 
 Example:
 Example:
-	at25@0 {
-		compatible = "atmel,at25", "st,m95256";
+	eeprom@0 {
+		compatible = "st,m95256", "atmel,at25";
 		reg = <0>
 		reg = <0>
 		spi-max-frequency = <5000000>;
 		spi-max-frequency = <5000000>;
 		spi-cpha;
 		spi-cpha;

+ 1 - 1
Documentation/devicetree/bindings/gpio/gpio-altera.txt

@@ -30,7 +30,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-gpio_altr: gpio@0xff200000 {
+gpio_altr: gpio@ff200000 {
 	compatible = "altr,pio-1.0";
 	compatible = "altr,pio-1.0";
 	reg = <0xff200000 0x10>;
 	reg = <0xff200000 0x10>;
 	interrupts = <0 45 4>;
 	interrupts = <0 45 4>;

+ 1 - 1
Documentation/devicetree/bindings/gpio/gpio-pca953x.txt

@@ -27,7 +27,7 @@ Required properties:
 	ti,tca6424
 	ti,tca6424
 	ti,tca9539
 	ti,tca9539
 	ti,tca9554
 	ti,tca9554
-	onsemi,pca9654
+	onnn,pca9654
 	exar,xra1202
 	exar,xra1202
 
 
 Optional properties:
 Optional properties:

+ 4 - 0
Documentation/devicetree/bindings/hwmon/jc42.txt

@@ -34,6 +34,10 @@ Required properties:
 
 
 - reg: I2C address
 - reg: I2C address
 
 
+Optional properties:
+- smbus-timeout-disable: When set, the smbus timeout function will be disabled.
+			 This is not supported on all chips.
+
 Example:
 Example:
 
 
 temp-sensor@1a {
 temp-sensor@1a {

+ 1 - 1
Documentation/devicetree/bindings/i2c/i2c-jz4780.txt

@@ -18,7 +18,7 @@ Optional properties:
 Example
 Example
 
 
 / {
 / {
-	i2c4: i2c4@0x10054000 {
+	i2c4: i2c4@10054000 {
 		compatible = "ingenic,jz4780-i2c";
 		compatible = "ingenic,jz4780-i2c";
 		reg = <0x10054000 0x1000>;
 		reg = <0x10054000 0x1000>;
 
 

+ 13 - 0
Documentation/devicetree/bindings/iio/adc/sigma-delta-modulator.txt

@@ -0,0 +1,13 @@
+Device-Tree bindings for sigma delta modulator
+
+Required properties:
+- compatible: should be "ads1201", "sd-modulator". "sd-modulator" can be use
+	as a generic SD modulator if modulator not specified in compatible list.
+- #io-channel-cells = <1>: See the IIO bindings section "IIO consumers".
+
+Example node:
+
+	ads1202: adc@0 {
+		compatible = "sd-modulator";
+		#io-channel-cells = <1>;
+	};

+ 128 - 0
Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt

@@ -0,0 +1,128 @@
+STMicroelectronics STM32 DFSDM ADC device driver
+
+
+STM32 DFSDM ADC is a sigma delta analog-to-digital converter dedicated to
+interface external sigma delta modulators to STM32 micro controllers.
+It is mainly targeted for:
+- Sigma delta modulators (motor control, metering...)
+- PDM microphones (audio digital microphone)
+
+It features up to 8 serial digital interfaces (SPI or Manchester) and
+up to 4 filters on stm32h7.
+
+Each child node match with a filter instance.
+
+Contents of a STM32 DFSDM root node:
+------------------------------------
+Required properties:
+- compatible: Should be "st,stm32h7-dfsdm".
+- reg: Offset and length of the DFSDM block register set.
+- clocks: IP and serial interfaces clocking. Should be set according
+		to rcc clock ID and "clock-names".
+- clock-names: Input clock name "dfsdm" must be defined,
+		"audio" is optional. If defined CLKOUT is based on the audio
+		clock, else "dfsdm" is used.
+- #interrupt-cells = <1>;
+- #address-cells = <1>;
+- #size-cells = <0>;
+
+Optional properties:
+- spi-max-frequency: Requested only for SPI master mode.
+		  SPI clock OUT frequency (Hz). This clock must be set according
+		  to "clock" property. Frequency must be a multiple of the rcc
+		  clock frequency. If not, SPI CLKOUT frequency will not be
+		  accurate.
+
+Contents of a STM32 DFSDM child nodes:
+--------------------------------------
+
+Required properties:
+- compatible: Must be:
+	"st,stm32-dfsdm-adc" for sigma delta ADCs
+	"st,stm32-dfsdm-dmic" for audio digital microphone.
+- reg: Specifies the DFSDM filter instance used.
+- interrupts: IRQ lines connected to each DFSDM filter instance.
+- st,adc-channels:	List of single-ended channels muxed for this ADC.
+			valid values:
+				"st,stm32h7-dfsdm" compatibility: 0 to 7.
+- st,adc-channel-names:	List of single-ended channel names.
+- st,filter-order:  SinC filter order from 0 to 5.
+			0: FastSinC
+			[1-5]: order 1 to 5.
+			For audio purpose it is recommended to use order 3 to 5.
+- #io-channel-cells = <1>: See the IIO bindings section "IIO consumers".
+
+Required properties for "st,stm32-dfsdm-adc" compatibility:
+- io-channels: From common IIO binding. Used to pipe external sigma delta
+		modulator or internal ADC output to DFSDM channel.
+		This is not required for "st,stm32-dfsdm-pdm" compatibility as
+		PDM microphone is binded in Audio DT node.
+
+Required properties for "st,stm32-dfsdm-pdm" compatibility:
+- #sound-dai-cells: Must be set to 0.
+- dma: DMA controller phandle and DMA request line associated to the
+		filter instance (specified by the field "reg")
+- dma-names: Must be "rx"
+
+Optional properties:
+- st,adc-channel-types:	Single-ended channel input type.
+			- "SPI_R": SPI with data on rising edge (default)
+			- "SPI_F": SPI with data on falling edge
+			- "MANCH_R": manchester codec, rising edge = logic 0
+			- "MANCH_F": manchester codec, falling edge = logic 1
+- st,adc-channel-clk-src: Conversion clock source.
+			  - "CLKIN": external SPI clock (CLKIN x)
+			  - "CLKOUT": internal SPI clock (CLKOUT) (default)
+			  - "CLKOUT_F": internal SPI clock divided by 2 (falling edge).
+			  - "CLKOUT_R": internal SPI clock divided by 2 (rising edge).
+
+- st,adc-alt-channel: Must be defined if two sigma delta modulator are
+			  connected on same SPI input.
+			  If not set, channel n is connected to SPI input n.
+			  If set, channel n is connected to SPI input n + 1.
+
+- st,filter0-sync: Set to 1 to synchronize with DFSDM filter instance 0.
+		   Used for multi microphones synchronization.
+
+Example of a sigma delta adc connected on DFSDM SPI port 0
+and a pdm microphone connected on DFSDM SPI port 1:
+
+	ads1202: simple_sd_adc@0 {
+		compatible = "ads1202";
+		#io-channel-cells = <1>;
+	};
+
+	dfsdm: dfsdm@40017000 {
+		compatible = "st,stm32h7-dfsdm";
+		reg = <0x40017000 0x400>;
+		clocks = <&rcc DFSDM1_CK>;
+		clock-names = "dfsdm";
+		#interrupt-cells = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		dfsdm_adc0: filter@0 {
+			compatible = "st,stm32-dfsdm-adc";
+			#io-channel-cells = <1>;
+			reg = <0>;
+			interrupts = <110>;
+			st,adc-channels = <0>;
+			st,adc-channel-names = "sd_adc0";
+			st,adc-channel-types = "SPI_F";
+			st,adc-channel-clk-src = "CLKOUT";
+			io-channels = <&ads1202 0>;
+			st,filter-order = <3>;
+		};
+		dfsdm_pdm1: filter@1 {
+			compatible = "st,stm32-dfsdm-dmic";
+			reg = <1>;
+			interrupts = <111>;
+			dmas = <&dmamux1 102 0x400 0x00>;
+			dma-names = "rx";
+			st,adc-channels = <1>;
+			st,adc-channel-names = "dmic1";
+			st,adc-channel-types = "SPI_R";
+			st,adc-channel-clk-src = "CLKOUT";
+			st,filter-order = <5>;
+		};
+	}

+ 1 - 1
Documentation/devicetree/bindings/iio/pressure/hp03.txt

@@ -10,7 +10,7 @@ Required properties:
 
 
 Example:
 Example:
 
 
-hp03@0x77 {
+hp03@77 {
 	compatible = "hoperf,hp03";
 	compatible = "hoperf,hp03";
 	reg = <0x77>;
 	reg = <0x77>;
 	xclr-gpio = <&portc 0 0x0>;
 	xclr-gpio = <&portc 0 0x0>;

+ 1 - 1
Documentation/devicetree/bindings/input/touchscreen/bu21013.txt

@@ -15,7 +15,7 @@ Optional properties:
 Example:
 Example:
 
 
 	i2c@80110000 {
 	i2c@80110000 {
-		bu21013_tp@0x5c {
+		bu21013_tp@5c {
 			compatible = "rohm,bu21013_tp";
 			compatible = "rohm,bu21013_tp";
 			reg = <0x5c>;
 			reg = <0x5c>;
 			touch-gpio = <&gpio2 20 0x4>;
 			touch-gpio = <&gpio2 20 0x4>;

+ 2 - 2
Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt

@@ -155,7 +155,7 @@ Example:
 		      <0x0 0xe112f000 0 0x02000>,
 		      <0x0 0xe112f000 0 0x02000>,
 		      <0x0 0xe1140000 0 0x10000>,
 		      <0x0 0xe1140000 0 0x10000>,
 		      <0x0 0xe1160000 0 0x10000>;
 		      <0x0 0xe1160000 0 0x10000>;
-		v2m0: v2m@0x8000 {
+		v2m0: v2m@8000 {
 			compatible = "arm,gic-v2m-frame";
 			compatible = "arm,gic-v2m-frame";
 			msi-controller;
 			msi-controller;
 			reg = <0x0 0x80000 0 0x1000>;
 			reg = <0x0 0x80000 0 0x1000>;
@@ -163,7 +163,7 @@ Example:
 
 
 		....
 		....
 
 
-		v2mN: v2m@0x9000 {
+		v2mN: v2m@9000 {
 			compatible = "arm,gic-v2m-frame";
 			compatible = "arm,gic-v2m-frame";
 			msi-controller;
 			msi-controller;
 			reg = <0x0 0x90000 0 0x1000>;
 			reg = <0x0 0x90000 0 0x1000>;

+ 1 - 1
Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt

@@ -71,7 +71,7 @@ Example 2:
 	 * An interrupt generating device that is wired to a Meta external
 	 * An interrupt generating device that is wired to a Meta external
 	 * trigger block.
 	 * trigger block.
 	 */
 	 */
-	uart1: uart@0x02004c00 {
+	uart1: uart@02004c00 {
 		// Interrupt source '5' that is level-sensitive.
 		// Interrupt source '5' that is level-sensitive.
 		// Note that there are only two cells as specified in the
 		// Note that there are only two cells as specified in the
 		// interrupt parent's '#interrupt-cells' property.
 		// interrupt parent's '#interrupt-cells' property.

+ 1 - 1
Documentation/devicetree/bindings/interrupt-controller/img,pdc-intc.txt

@@ -51,7 +51,7 @@ Example 1:
 	/*
 	/*
 	 * TZ1090 PDC block
 	 * TZ1090 PDC block
 	 */
 	 */
-	pdc: pdc@0x02006000 {
+	pdc: pdc@02006000 {
 		// This is an interrupt controller node.
 		// This is an interrupt controller node.
 		interrupt-controller;
 		interrupt-controller;
 
 

+ 1 - 1
Documentation/devicetree/bindings/interrupt-controller/st,spear3xx-shirq.txt

@@ -39,7 +39,7 @@ Example:
 
 
 The following is an example from the SPEAr320 SoC dtsi file.
 The following is an example from the SPEAr320 SoC dtsi file.
 
 
-shirq: interrupt-controller@0xb3000000 {
+shirq: interrupt-controller@b3000000 {
 	compatible = "st,spear320-shirq";
 	compatible = "st,spear320-shirq";
 	reg = <0xb3000000 0x1000>;
 	reg = <0xb3000000 0x1000>;
 	interrupts = <28 29 30 1>;
 	interrupts = <28 29 30 1>;

+ 3 - 3
Documentation/devicetree/bindings/mailbox/altera-mailbox.txt

@@ -14,7 +14,7 @@ Optional properties:
 			depends on the interrupt controller parent.
 			depends on the interrupt controller parent.
 
 
 Example:
 Example:
-	mbox_tx: mailbox@0x100 {
+	mbox_tx: mailbox@100 {
 		compatible = "altr,mailbox-1.0";
 		compatible = "altr,mailbox-1.0";
 		reg = <0x100 0x8>;
 		reg = <0x100 0x8>;
 		interrupt-parent = < &gic_0 >;
 		interrupt-parent = < &gic_0 >;
@@ -22,7 +22,7 @@ Example:
 		#mbox-cells = <1>;
 		#mbox-cells = <1>;
 	};
 	};
 
 
-	mbox_rx: mailbox@0x200 {
+	mbox_rx: mailbox@200 {
 		compatible = "altr,mailbox-1.0";
 		compatible = "altr,mailbox-1.0";
 		reg = <0x200 0x8>;
 		reg = <0x200 0x8>;
 		interrupt-parent = < &gic_0 >;
 		interrupt-parent = < &gic_0 >;
@@ -40,7 +40,7 @@ support only one channel).The equivalent "mbox-names" property value can be
 used to give a name to the communication channel to be used by the client user.
 used to give a name to the communication channel to be used by the client user.
 
 
 Example:
 Example:
-	mclient0: mclient0@0x400 {
+	mclient0: mclient0@400 {
 		compatible = "client-1.0";
 		compatible = "client-1.0";
 		reg = <0x400 0x10>;
 		reg = <0x400 0x10>;
 		mbox-names = "mbox-tx", "mbox-rx";
 		mbox-names = "mbox-tx", "mbox-rx";

+ 1 - 1
Documentation/devicetree/bindings/mailbox/brcm,iproc-pdc-mbox.txt

@@ -15,7 +15,7 @@ Optional properties:
 - brcm,use-bcm-hdr:  present if a BCM header precedes each frame.
 - brcm,use-bcm-hdr:  present if a BCM header precedes each frame.
 
 
 Example:
 Example:
-	pdc0: iproc-pdc0@0x612c0000 {
+	pdc0: iproc-pdc0@612c0000 {
 		compatible = "brcm,iproc-pdc-mbox";
 		compatible = "brcm,iproc-pdc-mbox";
 		reg = <0 0x612c0000 0 0x445>;  /* PDC FS0 regs */
 		reg = <0 0x612c0000 0 0x445>;  /* PDC FS0 regs */
 		interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;
 		interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>;

+ 1 - 1
Documentation/devicetree/bindings/media/exynos5-gsc.txt

@@ -17,7 +17,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-gsc_0:  gsc@0x13e00000 {
+gsc_0:  gsc@13e00000 {
 	compatible = "samsung,exynos5250-gsc";
 	compatible = "samsung,exynos5250-gsc";
 	reg = <0x13e00000 0x1000>;
 	reg = <0x13e00000 0x1000>;
 	interrupts = <0 85 0>;
 	interrupts = <0 85 0>;

+ 1 - 1
Documentation/devicetree/bindings/media/mediatek-vcodec.txt

@@ -68,7 +68,7 @@ vcodec_dec: vcodec@16000000 {
                   "vdec_bus_clk_src";
                   "vdec_bus_clk_src";
   };
   };
 
 
-  vcodec_enc: vcodec@0x18002000 {
+  vcodec_enc: vcodec@18002000 {
     compatible = "mediatek,mt8173-vcodec-enc";
     compatible = "mediatek,mt8173-vcodec-enc";
     reg = <0 0x18002000 0 0x1000>,    /*VENC_SYS*/
     reg = <0 0x18002000 0 0x1000>,    /*VENC_SYS*/
           <0 0x19002000 0 0x1000>;    /*VENC_LT_SYS*/
           <0 0x19002000 0 0x1000>;    /*VENC_LT_SYS*/

+ 1 - 1
Documentation/devicetree/bindings/media/rcar_vin.txt

@@ -44,7 +44,7 @@ Device node example
 	       vin0 = &vin0;
 	       vin0 = &vin0;
 	};
 	};
 
 
-        vin0: vin@0xe6ef0000 {
+        vin0: vin@e6ef0000 {
                 compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
                 compatible = "renesas,vin-r8a7790", "renesas,rcar-gen2-vin";
                 clocks = <&mstp8_clks R8A7790_CLK_VIN0>;
                 clocks = <&mstp8_clks R8A7790_CLK_VIN0>;
                 reg = <0 0xe6ef0000 0 0x1000>;
                 reg = <0 0xe6ef0000 0 0x1000>;

+ 1 - 1
Documentation/devicetree/bindings/media/samsung-fimc.txt

@@ -138,7 +138,7 @@ Example:
 		};
 		};
 
 
 		/* MIPI CSI-2 bus IF sensor */
 		/* MIPI CSI-2 bus IF sensor */
-		s5c73m3: sensor@0x1a {
+		s5c73m3: sensor@1a {
 			compatible = "samsung,s5c73m3";
 			compatible = "samsung,s5c73m3";
 			reg = <0x1a>;
 			reg = <0x1a>;
 			vddio-supply = <...>;
 			vddio-supply = <...>;

+ 1 - 1
Documentation/devicetree/bindings/media/sh_mobile_ceu.txt

@@ -8,7 +8,7 @@ Bindings, specific for the sh_mobile_ceu_camera.c driver:
 
 
 Example:
 Example:
 
 
-ceu0: ceu@0xfe910000 {
+ceu0: ceu@fe910000 {
 	compatible = "renesas,sh-mobile-ceu";
 	compatible = "renesas,sh-mobile-ceu";
 	reg = <0xfe910000 0xa0>;
 	reg = <0xfe910000 0xa0>;
 	interrupt-parent = <&intcs>;
 	interrupt-parent = <&intcs>;

+ 5 - 5
Documentation/devicetree/bindings/media/video-interfaces.txt

@@ -154,7 +154,7 @@ imx074 is linked to ceu0 through the MIPI CSI-2 receiver (csi2). ceu0 has a
 'port' node which may indicate that at any time only one of the following data
 'port' node which may indicate that at any time only one of the following data
 pipelines can be active: ov772x -> ceu0 or imx074 -> csi2 -> ceu0.
 pipelines can be active: ov772x -> ceu0 or imx074 -> csi2 -> ceu0.
 
 
-	ceu0: ceu@0xfe910000 {
+	ceu0: ceu@fe910000 {
 		compatible = "renesas,sh-mobile-ceu";
 		compatible = "renesas,sh-mobile-ceu";
 		reg = <0xfe910000 0xa0>;
 		reg = <0xfe910000 0xa0>;
 		interrupts = <0x880>;
 		interrupts = <0x880>;
@@ -193,9 +193,9 @@ pipelines can be active: ov772x -> ceu0 or imx074 -> csi2 -> ceu0.
 		};
 		};
 	};
 	};
 
 
-	i2c0: i2c@0xfff20000 {
+	i2c0: i2c@fff20000 {
 		...
 		...
-		ov772x_1: camera@0x21 {
+		ov772x_1: camera@21 {
 			compatible = "ovti,ov772x";
 			compatible = "ovti,ov772x";
 			reg = <0x21>;
 			reg = <0x21>;
 			vddio-supply = <&regulator1>;
 			vddio-supply = <&regulator1>;
@@ -219,7 +219,7 @@ pipelines can be active: ov772x -> ceu0 or imx074 -> csi2 -> ceu0.
 			};
 			};
 		};
 		};
 
 
-		imx074: camera@0x1a {
+		imx074: camera@1a {
 			compatible = "sony,imx074";
 			compatible = "sony,imx074";
 			reg = <0x1a>;
 			reg = <0x1a>;
 			vddio-supply = <&regulator1>;
 			vddio-supply = <&regulator1>;
@@ -239,7 +239,7 @@ pipelines can be active: ov772x -> ceu0 or imx074 -> csi2 -> ceu0.
 		};
 		};
 	};
 	};
 
 
-	csi2: csi2@0xffc90000 {
+	csi2: csi2@ffc90000 {
 		compatible = "renesas,sh-mobile-csi2";
 		compatible = "renesas,sh-mobile-csi2";
 		reg = <0xffc90000 0x1000>;
 		reg = <0xffc90000 0x1000>;
 		interrupts = <0x17a0>;
 		interrupts = <0x17a0>;

+ 1 - 1
Documentation/devicetree/bindings/memory-controllers/ti/emif.txt

@@ -46,7 +46,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-emif1: emif@0x4c000000 {
+emif1: emif@4c000000 {
 	compatible	= "ti,emif-4d";
 	compatible	= "ti,emif-4d";
 	ti,hwmods	= "emif2";
 	ti,hwmods	= "emif2";
 	phy-type	= <1>;
 	phy-type	= <1>;

+ 1 - 1
Documentation/devicetree/bindings/mfd/ti-keystone-devctrl.txt

@@ -13,7 +13,7 @@ Required properties:
 
 
 Example:
 Example:
 
 
-devctrl: device-state-control@0x02620000 {
+devctrl: device-state-control@02620000 {
 	compatible = "ti,keystone-devctrl", "syscon";
 	compatible = "ti,keystone-devctrl", "syscon";
 	reg = <0x02620000 0x1000>;
 	reg = <0x02620000 0x1000>;
 };
 };

+ 1 - 1
Documentation/devicetree/bindings/misc/brcm,kona-smc.txt

@@ -9,7 +9,7 @@ Required properties:
 - reg : Location and size of bounce buffer
 - reg : Location and size of bounce buffer
 
 
 Example:
 Example:
-	smc@0x3404c000 {
+	smc@3404c000 {
 		compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
 		compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
 		reg = <0x3404c000 0x400>; //1 KiB in SRAM
 		reg = <0x3404c000 0x400>; //1 KiB in SRAM
 	};
 	};

+ 1 - 1
Documentation/devicetree/bindings/mmc/brcm,kona-sdhci.txt

@@ -12,7 +12,7 @@ Refer to clocks/clock-bindings.txt for generic clock consumer properties.
 
 
 Example:
 Example:
 
 
-sdio2: sdio@0x3f1a0000 {
+sdio2: sdio@3f1a0000 {
 	compatible = "brcm,kona-sdhci";
 	compatible = "brcm,kona-sdhci";
 	reg = <0x3f1a0000 0x10000>;
 	reg = <0x3f1a0000 0x10000>;
 	clocks = <&sdio3_clk>;
 	clocks = <&sdio3_clk>;

+ 1 - 1
Documentation/devicetree/bindings/mmc/brcm,sdhci-iproc.txt

@@ -24,7 +24,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-sdhci0: sdhci@0x18041000 {
+sdhci0: sdhci@18041000 {
 	compatible = "brcm,sdhci-iproc-cygnus";
 	compatible = "brcm,sdhci-iproc-cygnus";
 	reg = <0x18041000 0x100>;
 	reg = <0x18041000 0x100>;
 	interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
 	interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

+ 2 - 2
Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt

@@ -55,7 +55,7 @@ Examples:
 
 
 [hwmod populated DMA resources]
 [hwmod populated DMA resources]
 
 
-	mmc1: mmc@0x4809c000 {
+	mmc1: mmc@4809c000 {
 		compatible = "ti,omap4-hsmmc";
 		compatible = "ti,omap4-hsmmc";
 		reg = <0x4809c000 0x400>;
 		reg = <0x4809c000 0x400>;
 		ti,hwmods = "mmc1";
 		ti,hwmods = "mmc1";
@@ -67,7 +67,7 @@ Examples:
 
 
 [generic DMA request binding]
 [generic DMA request binding]
 
 
-	mmc1: mmc@0x4809c000 {
+	mmc1: mmc@4809c000 {
 		compatible = "ti,omap4-hsmmc";
 		compatible = "ti,omap4-hsmmc";
 		reg = <0x4809c000 0x400>;
 		reg = <0x4809c000 0x400>;
 		ti,hwmods = "mmc1";
 		ti,hwmods = "mmc1";

+ 3 - 3
Documentation/devicetree/bindings/mtd/gpmc-nor.txt

@@ -82,15 +82,15 @@ gpmc: gpmc@6e000000 {
 			label = "bootloader-nor";
 			label = "bootloader-nor";
 			reg = <0 0x40000>;
 			reg = <0 0x40000>;
 		};
 		};
-		partition@0x40000 {
+		partition@40000 {
 			label = "params-nor";
 			label = "params-nor";
 			reg = <0x40000 0x40000>;
 			reg = <0x40000 0x40000>;
 		};
 		};
-		partition@0x80000 {
+		partition@80000 {
 			label = "kernel-nor";
 			label = "kernel-nor";
 			reg = <0x80000 0x200000>;
 			reg = <0x80000 0x200000>;
 		};
 		};
-		partition@0x280000 {
+		partition@280000 {
 			label = "filesystem-nor";
 			label = "filesystem-nor";
 			reg = <0x240000 0x7d80000>;
 			reg = <0x240000 0x7d80000>;
 		};
 		};

+ 0 - 2
Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt

@@ -13,7 +13,6 @@ Required properties:
                  at25df321a
                  at25df321a
                  at25df641
                  at25df641
                  at26df081a
                  at26df081a
-                 en25s64
                  mr25h128
                  mr25h128
                  mr25h256
                  mr25h256
                  mr25h10
                  mr25h10
@@ -33,7 +32,6 @@ Required properties:
                  s25fl008k
                  s25fl008k
                  s25fl064k
                  s25fl064k
                  sst25vf040b
                  sst25vf040b
-                 sst25wf040b
                  m25p40
                  m25p40
                  m25p80
                  m25p80
                  m25p16
                  m25p16

+ 1 - 1
Documentation/devicetree/bindings/mtd/mtk-nand.txt

@@ -131,7 +131,7 @@ Example:
 				read-only;
 				read-only;
 				reg = <0x00000000 0x00400000>;
 				reg = <0x00000000 0x00400000>;
 			};
 			};
-			android@0x00400000 {
+			android@00400000 {
 				label = "android";
 				label = "android";
 				reg = <0x00400000 0x12c00000>;
 				reg = <0x00400000 0x12c00000>;
 			};
 			};

+ 2 - 2
Documentation/devicetree/bindings/net/altera_tse.txt

@@ -52,7 +52,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-	tse_sub_0_eth_tse_0: ethernet@0x1,00000000 {
+	tse_sub_0_eth_tse_0: ethernet@1,00000000 {
 		compatible = "altr,tse-msgdma-1.0";
 		compatible = "altr,tse-msgdma-1.0";
 		reg =	<0x00000001 0x00000000 0x00000400>,
 		reg =	<0x00000001 0x00000000 0x00000400>,
 			<0x00000001 0x00000460 0x00000020>,
 			<0x00000001 0x00000460 0x00000020>,
@@ -90,7 +90,7 @@ Example:
 		};
 		};
 	};
 	};
 
 
-	tse_sub_1_eth_tse_0: ethernet@0x1,00001000 {
+	tse_sub_1_eth_tse_0: ethernet@1,00001000 {
 		compatible = "altr,tse-msgdma-1.0";
 		compatible = "altr,tse-msgdma-1.0";
 		reg = 	<0x00000001 0x00001000 0x00000400>,
 		reg = 	<0x00000001 0x00001000 0x00000400>,
 			<0x00000001 0x00001460 0x00000020>,
 			<0x00000001 0x00001460 0x00000020>,

+ 1 - 1
Documentation/devicetree/bindings/net/mdio.txt

@@ -18,7 +18,7 @@ Example :
 This example shows these optional properties, plus other properties
 This example shows these optional properties, plus other properties
 required for the TI Davinci MDIO driver.
 required for the TI Davinci MDIO driver.
 
 
-	davinci_mdio: ethernet@0x5c030000 {
+	davinci_mdio: ethernet@5c030000 {
 		compatible = "ti,davinci_mdio";
 		compatible = "ti,davinci_mdio";
 		reg = <0x5c030000 0x1000>;
 		reg = <0x5c030000 0x1000>;
 		#address-cells = <1>;
 		#address-cells = <1>;

+ 1 - 1
Documentation/devicetree/bindings/net/socfpga-dwmac.txt

@@ -28,7 +28,7 @@ Required properties:
 
 
 Example:
 Example:
 
 
-gmii_to_sgmii_converter: phy@0x100000240 {
+gmii_to_sgmii_converter: phy@100000240 {
 	compatible = "altr,gmii-to-sgmii-2.0";
 	compatible = "altr,gmii-to-sgmii-2.0";
 	reg = <0x00000001 0x00000240 0x00000008>,
 	reg = <0x00000001 0x00000240 0x00000008>,
 		<0x00000001 0x00000200 0x00000040>;
 		<0x00000001 0x00000200 0x00000040>;

+ 1 - 1
Documentation/devicetree/bindings/nios2/nios2.txt

@@ -36,7 +36,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-cpu@0x0 {
+cpu@0 {
 	device_type = "cpu";
 	device_type = "cpu";
 	compatible = "altr,nios2-1.0";
 	compatible = "altr,nios2-1.0";
 	reg = <0>;
 	reg = <0>;

+ 1 - 1
Documentation/devicetree/bindings/pci/altera-pcie.txt

@@ -25,7 +25,7 @@ Optional properties:
 - bus-range:	PCI bus numbers covered
 - bus-range:	PCI bus numbers covered
 
 
 Example
 Example
-	pcie_0: pcie@0xc00000000 {
+	pcie_0: pcie@c00000000 {
 		compatible = "altr,pcie-root-port-1.0";
 		compatible = "altr,pcie-root-port-1.0";
 		reg = <0xc0000000 0x20000000>,
 		reg = <0xc0000000 0x20000000>,
 			<0xff220000 0x00004000>;
 			<0xff220000 0x00004000>;

+ 1 - 1
Documentation/devicetree/bindings/pci/fsl,imx6q-pcie.txt

@@ -52,7 +52,7 @@ Additional required properties for imx7d-pcie:
 
 
 Example:
 Example:
 
 
-	pcie@0x01000000 {
+	pcie@01000000 {
 		compatible = "fsl,imx6q-pcie", "snps,dw-pcie";
 		compatible = "fsl,imx6q-pcie", "snps,dw-pcie";
 		reg = <0x01ffc000 0x04000>,
 		reg = <0x01ffc000 0x04000>,
 		      <0x01f00000 0x80000>;
 		      <0x01f00000 0x80000>;

+ 1 - 1
Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

@@ -21,7 +21,7 @@ Optional properties:
 - dma-coherent: Present if DMA operations are coherent.
 - dma-coherent: Present if DMA operations are coherent.
 
 
 Hip05 Example (note that Hip06 is the same except compatible):
 Hip05 Example (note that Hip06 is the same except compatible):
-	pcie@0xb0080000 {
+	pcie@b0080000 {
 		compatible = "hisilicon,hip05-pcie", "snps,dw-pcie";
 		compatible = "hisilicon,hip05-pcie", "snps,dw-pcie";
 		reg = <0 0xb0080000 0 0x10000>, <0x220 0x00000000 0 0x2000>;
 		reg = <0 0xb0080000 0 0x10000>, <0x220 0x00000000 0 0x2000>;
 		reg-names = "rc_dbi", "config";
 		reg-names = "rc_dbi", "config";

+ 1 - 1
Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt

@@ -45,7 +45,7 @@ Optional properties:
 - usb3_vbus-supply : regulator phandle for controller usb3 vbus
 - usb3_vbus-supply : regulator phandle for controller usb3 vbus
 
 
 Example:
 Example:
-	usbphy: phy@0x01c13400 {
+	usbphy: phy@01c13400 {
 		#phy-cells = <1>;
 		#phy-cells = <1>;
 		compatible = "allwinner,sun4i-a10-usb-phy";
 		compatible = "allwinner,sun4i-a10-usb-phy";
 		/* phy base regs, phy1 pmu reg, phy2 pmu reg */
 		/* phy base regs, phy1 pmu reg, phy2 pmu reg */

+ 1 - 1
Documentation/devicetree/bindings/pinctrl/brcm,cygnus-pinmux.txt

@@ -25,7 +25,7 @@ Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt
 
 
 For example:
 For example:
 
 
-	pinmux: pinmux@0x0301d0c8 {
+	pinmux: pinmux@0301d0c8 {
 		compatible = "brcm,cygnus-pinmux";
 		compatible = "brcm,cygnus-pinmux";
 		reg = <0x0301d0c8 0x1b0>;
 		reg = <0x0301d0c8 0x1b0>;
 
 

+ 2 - 2
Documentation/devicetree/bindings/pinctrl/pinctrl-atlas7.txt

@@ -96,14 +96,14 @@ For example, pinctrl might have subnodes like the following:
 
 
 For a specific board, if it wants to use sd1,
 For a specific board, if it wants to use sd1,
 it can add the following to its board-specific .dts file.
 it can add the following to its board-specific .dts file.
-sd1: sd@0x12340000 {
+sd1: sd@12340000 {
 	pinctrl-names = "default";
 	pinctrl-names = "default";
 	pinctrl-0 = <&sd1_pmx0>;
 	pinctrl-0 = <&sd1_pmx0>;
 }
 }
 
 
 or
 or
 
 
-sd1: sd@0x12340000 {
+sd1: sd@12340000 {
 	pinctrl-names = "default";
 	pinctrl-names = "default";
 	pinctrl-0 = <&sd1_pmx1>;
 	pinctrl-0 = <&sd1_pmx1>;
 }
 }

+ 1 - 1
Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt

@@ -41,7 +41,7 @@ For example, pinctrl might have subnodes like the following:
 
 
 For a specific board, if it wants to use uart2 without hardware flow control,
 For a specific board, if it wants to use uart2 without hardware flow control,
 it can add the following to its board-specific .dts file.
 it can add the following to its board-specific .dts file.
-uart2: uart@0xb0070000 {
+uart2: uart@b0070000 {
 	pinctrl-names = "default";
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart2_noflow_pins_a>;
 	pinctrl-0 = <&uart2_noflow_pins_a>;
 }
 }

+ 2 - 2
Documentation/devicetree/bindings/pinctrl/rockchip,pinctrl.txt

@@ -136,7 +136,7 @@ Example for rk3188:
 		#size-cells = <1>;
 		#size-cells = <1>;
 		ranges;
 		ranges;
 
 
-		gpio0: gpio0@0x2000a000 {
+		gpio0: gpio0@2000a000 {
 			compatible = "rockchip,rk3188-gpio-bank0";
 			compatible = "rockchip,rk3188-gpio-bank0";
 			reg = <0x2000a000 0x100>;
 			reg = <0x2000a000 0x100>;
 			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
 			interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
@@ -149,7 +149,7 @@ Example for rk3188:
 			#interrupt-cells = <2>;
 			#interrupt-cells = <2>;
 		};
 		};
 
 
-		gpio1: gpio1@0x2003c000 {
+		gpio1: gpio1@2003c000 {
 			compatible = "rockchip,gpio-bank";
 			compatible = "rockchip,gpio-bank";
 			reg = <0x2003c000 0x100>;
 			reg = <0x2003c000 0x100>;
 			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
 			interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;

+ 1 - 1
Documentation/devicetree/bindings/regulator/regulator.txt

@@ -107,7 +107,7 @@ regulators (twl_reg1 and twl_reg2),
 		...
 		...
 	};
 	};
 
 
-	mmc: mmc@0x0 {
+	mmc: mmc@0 {
 		...
 		...
 		...
 		...
 		vmmc-supply = <&twl_reg1>;
 		vmmc-supply = <&twl_reg1>;

+ 1 - 1
Documentation/devicetree/bindings/serial/efm32-uart.txt

@@ -12,7 +12,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-uart@0x4000c400 {
+uart@4000c400 {
 	compatible = "energymicro,efm32-uart";
 	compatible = "energymicro,efm32-uart";
 	reg = <0x4000c400 0x400>;
 	reg = <0x4000c400 0x400>;
 	interrupts = <15>;
 	interrupts = <15>;

+ 1 - 1
Documentation/devicetree/bindings/serio/allwinner,sun4i-ps2.txt

@@ -14,7 +14,7 @@ Required properties:
 
 
 
 
 Example:
 Example:
-	ps20: ps2@0x01c2a000 {
+	ps20: ps2@01c2a000 {
 		compatible = "allwinner,sun4i-a10-ps2";
 		compatible = "allwinner,sun4i-a10-ps2";
 		reg = <0x01c2a000 0x400>;
 		reg = <0x01c2a000 0x400>;
 		interrupts = <0 62 4>;
 		interrupts = <0 62 4>;

+ 1 - 1
Documentation/devicetree/bindings/soc/ti/keystone-navigator-qmss.txt

@@ -220,7 +220,7 @@ qmss: qmss@2a40000 {
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#size-cells = <1>;
 		ranges;
 		ranges;
-		pdsp0@0x2a10000 {
+		pdsp0@2a10000 {
 			reg = <0x2a10000 0x1000>,
 			reg = <0x2a10000 0x1000>,
 			      <0x2a0f000 0x100>,
 			      <0x2a0f000 0x100>,
 			      <0x2a0c000 0x3c8>,
 			      <0x2a0c000 0x3c8>,

+ 1 - 1
Documentation/devicetree/bindings/sound/adi,axi-i2s.txt

@@ -21,7 +21,7 @@ please check:
 
 
 Example:
 Example:
 
 
-	i2s: i2s@0x77600000 {
+	i2s: i2s@77600000 {
 		compatible = "adi,axi-i2s-1.00.a";
 		compatible = "adi,axi-i2s-1.00.a";
 		reg = <0x77600000 0x1000>;
 		reg = <0x77600000 0x1000>;
 		clocks = <&clk 15>, <&audio_clock>;
 		clocks = <&clk 15>, <&audio_clock>;

+ 1 - 1
Documentation/devicetree/bindings/sound/adi,axi-spdif-tx.txt

@@ -20,7 +20,7 @@ please check:
 
 
 Example:
 Example:
 
 
-	spdif: spdif@0x77400000 {
+	spdif: spdif@77400000 {
 		compatible = "adi,axi-spdif-tx-1.00.a";
 		compatible = "adi,axi-spdif-tx-1.00.a";
 		reg = <0x77600000 0x1000>;
 		reg = <0x77600000 0x1000>;
 		clocks = <&clk 15>, <&audio_clock>;
 		clocks = <&clk 15>, <&audio_clock>;

+ 1 - 1
Documentation/devicetree/bindings/sound/ak4613.txt

@@ -20,7 +20,7 @@ Optional properties:
 Example:
 Example:
 
 
 &i2c {
 &i2c {
-	ak4613: ak4613@0x10 {
+	ak4613: ak4613@10 {
 		compatible = "asahi-kasei,ak4613";
 		compatible = "asahi-kasei,ak4613";
 		reg = <0x10>;
 		reg = <0x10>;
 	};
 	};

+ 1 - 1
Documentation/devicetree/bindings/sound/ak4642.txt

@@ -17,7 +17,7 @@ Optional properties:
 Example 1:
 Example 1:
 
 
 &i2c {
 &i2c {
-	ak4648: ak4648@0x12 {
+	ak4648: ak4648@12 {
 		compatible = "asahi-kasei,ak4642";
 		compatible = "asahi-kasei,ak4642";
 		reg = <0x12>;
 		reg = <0x12>;
 	};
 	};

+ 1 - 1
Documentation/devicetree/bindings/sound/da7218.txt

@@ -73,7 +73,7 @@ Example:
 		compatible = "dlg,da7218";
 		compatible = "dlg,da7218";
 		reg = <0x1a>;
 		reg = <0x1a>;
 		interrupt-parent = <&gpio6>;
 		interrupt-parent = <&gpio6>;
-		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
 		wakeup-source;
 		wakeup-source;
 
 
 		VDD-supply = <&reg_audio>;
 		VDD-supply = <&reg_audio>;

+ 1 - 1
Documentation/devicetree/bindings/sound/da7219.txt

@@ -77,7 +77,7 @@ Example:
 		reg = <0x1a>;
 		reg = <0x1a>;
 
 
 		interrupt-parent = <&gpio6>;
 		interrupt-parent = <&gpio6>;
-		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;
+		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
 
 
 		VDD-supply = <&reg_audio>;
 		VDD-supply = <&reg_audio>;
 		VDDMIC-supply = <&reg_audio>;
 		VDDMIC-supply = <&reg_audio>;

+ 2 - 0
Documentation/devicetree/bindings/sound/dmic.txt

@@ -7,10 +7,12 @@ Required properties:
 
 
 Optional properties:
 Optional properties:
 	- dmicen-gpios: GPIO specifier for dmic to control start and stop
 	- dmicen-gpios: GPIO specifier for dmic to control start and stop
+	- num-channels: Number of microphones on this DAI
 
 
 Example node:
 Example node:
 
 
 	dmic_codec: dmic@0 {
 	dmic_codec: dmic@0 {
 		compatible = "dmic-codec";
 		compatible = "dmic-codec";
 		dmicen-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
 		dmicen-gpios = <&gpio4 3 GPIO_ACTIVE_HIGH>;
+		num-channels = <1>;
 	};
 	};

+ 1 - 1
Documentation/devicetree/bindings/sound/max98371.txt

@@ -10,7 +10,7 @@ Required properties:
 Example:
 Example:
 
 
 &i2c {
 &i2c {
-	max98371: max98371@0x31 {
+	max98371: max98371@31 {
 		compatible = "maxim,max98371";
 		compatible = "maxim,max98371";
 		reg = <0x31>;
 		reg = <0x31>;
 	};
 	};

+ 40 - 0
Documentation/devicetree/bindings/sound/max98373.txt

@@ -0,0 +1,40 @@
+Maxim Integrated MAX98373 Speaker Amplifier
+
+This device supports I2C.
+
+Required properties:
+
+ - compatible : "maxim,max98373"
+
+ - reg : the I2C address of the device.
+
+Optional properties:
+
+  - maxim,vmon-slot-no : slot number used to send voltage information
+                   or in inteleave mode this will be used as
+                   interleave slot.
+                   slot range : 0 ~ 15,  Default : 0
+
+  - maxim,imon-slot-no : slot number used to send current information
+                   slot range : 0 ~ 15,  Default : 0
+
+  - maxim,spkfb-slot-no : slot number used to send speaker feedback information
+                   slot range : 0 ~ 15,  Default : 0
+
+  - maxim,interleave-mode : For cases where a single combined channel
+		   for the I/V sense data is not sufficient, the device can also be configured
+		   to share a single data output channel on alternating frames.
+		   In this configuration, the current and voltage data will be frame interleaved
+		   on a single output channel.
+                   Boolean, define to enable the interleave mode, Default : false
+
+Example:
+
+codec: max98373@31 {
+   compatible = "maxim,max98373";
+   reg = <0x31>;
+   maxim,vmon-slot-no = <0>;
+   maxim,imon-slot-no = <1>;
+   maxim,spkfb-slot-no = <2>;
+   maxim,interleave-mode;
+};

+ 1 - 1
Documentation/devicetree/bindings/sound/max9867.txt

@@ -10,7 +10,7 @@ Required properties:
 Example:
 Example:
 
 
 &i2c {
 &i2c {
-	max9867: max9867@0x18 {
+	max9867: max9867@18 {
 		compatible = "maxim,max9867";
 		compatible = "maxim,max9867";
 		reg = <0x18>;
 		reg = <0x18>;
 	};
 	};

+ 128 - 138
Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt

@@ -2,153 +2,143 @@ Mediatek AFE PCM controller for mt2701
 
 
 Required properties:
 Required properties:
 - compatible = "mediatek,mt2701-audio";
 - compatible = "mediatek,mt2701-audio";
-- reg: register location and size
 - interrupts: should contain AFE and ASYS interrupts
 - interrupts: should contain AFE and ASYS interrupts
 - interrupt-names: should be "afe" and "asys"
 - interrupt-names: should be "afe" and "asys"
 - power-domains: should define the power domain
 - power-domains: should define the power domain
+- clocks: Must contain an entry for each entry in clock-names
+  See ../clocks/clock-bindings.txt for details
 - clock-names: should have these clock names:
 - clock-names: should have these clock names:
 		"infra_sys_audio_clk",
 		"infra_sys_audio_clk",
 		"top_audio_mux1_sel",
 		"top_audio_mux1_sel",
 		"top_audio_mux2_sel",
 		"top_audio_mux2_sel",
-		"top_audio_mux1_div",
-		"top_audio_mux2_div",
-		"top_audio_48k_timing",
-		"top_audio_44k_timing",
-		"top_audpll_mux_sel",
-		"top_apll_sel",
-		"top_aud1_pll_98M",
-		"top_aud2_pll_90M",
-		"top_hadds2_pll_98M",
-		"top_hadds2_pll_294M",
-		"top_audpll",
-		"top_audpll_d4",
-		"top_audpll_d8",
-		"top_audpll_d16",
-		"top_audpll_d24",
-		"top_audintbus_sel",
-		"clk_26m",
-		"top_syspll1_d4",
-		"top_aud_k1_src_sel",
-		"top_aud_k2_src_sel",
-		"top_aud_k3_src_sel",
-		"top_aud_k4_src_sel",
-		"top_aud_k5_src_sel",
-		"top_aud_k6_src_sel",
-		"top_aud_k1_src_div",
-		"top_aud_k2_src_div",
-		"top_aud_k3_src_div",
-		"top_aud_k4_src_div",
-		"top_aud_k5_src_div",
-		"top_aud_k6_src_div",
-		"top_aud_i2s1_mclk",
-		"top_aud_i2s2_mclk",
-		"top_aud_i2s3_mclk",
-		"top_aud_i2s4_mclk",
-		"top_aud_i2s5_mclk",
-		"top_aud_i2s6_mclk",
-		"top_asm_m_sel",
-		"top_asm_h_sel",
-		"top_univpll2_d4",
-		"top_univpll2_d2",
-		"top_syspll_d5";
+		"top_audio_a1sys_hp",
+		"top_audio_a2sys_hp",
+		"i2s0_src_sel",
+		"i2s1_src_sel",
+		"i2s2_src_sel",
+		"i2s3_src_sel",
+		"i2s0_src_div",
+		"i2s1_src_div",
+		"i2s2_src_div",
+		"i2s3_src_div",
+		"i2s0_mclk_en",
+		"i2s1_mclk_en",
+		"i2s2_mclk_en",
+		"i2s3_mclk_en",
+		"i2so0_hop_ck",
+		"i2so1_hop_ck",
+		"i2so2_hop_ck",
+		"i2so3_hop_ck",
+		"i2si0_hop_ck",
+		"i2si1_hop_ck",
+		"i2si2_hop_ck",
+		"i2si3_hop_ck",
+		"asrc0_out_ck",
+		"asrc1_out_ck",
+		"asrc2_out_ck",
+		"asrc3_out_ck",
+		"audio_afe_pd",
+		"audio_afe_conn_pd",
+		"audio_a1sys_pd",
+		"audio_a2sys_pd",
+		"audio_mrgif_pd";
+- assigned-clocks: list of input clocks and dividers for the audio system.
+		   See ../clocks/clock-bindings.txt for details.
+- assigned-clocks-parents: parent of input clocks of assigned clocks.
+- assigned-clock-rates: list of clock frequencies of assigned clocks.
+
+Must be a subnode of MediaTek audsys device tree node.
+See ../arm/mediatek/mediatek,audsys.txt for details about the parent node.
 
 
 Example:
 Example:
 
 
-	afe: mt2701-afe-pcm@11220000 {
-		compatible = "mediatek,mt2701-audio";
-		reg = <0 0x11220000 0 0x2000>,
-		      <0 0x112A0000 0 0x20000>;
-		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>,
-			     <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>;
-		interrupt-names	= "afe", "asys";
-		power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
-		clocks = <&infracfg CLK_INFRA_AUDIO>,
-			 <&topckgen CLK_TOP_AUD_MUX1_SEL>,
-			 <&topckgen CLK_TOP_AUD_MUX2_SEL>,
-			 <&topckgen CLK_TOP_AUD_MUX1_DIV>,
-			 <&topckgen CLK_TOP_AUD_MUX2_DIV>,
-			 <&topckgen CLK_TOP_AUD_48K_TIMING>,
-			 <&topckgen CLK_TOP_AUD_44K_TIMING>,
-			 <&topckgen CLK_TOP_AUDPLL_MUX_SEL>,
-			 <&topckgen CLK_TOP_APLL_SEL>,
-			 <&topckgen CLK_TOP_AUD1PLL_98M>,
-			 <&topckgen CLK_TOP_AUD2PLL_90M>,
-			 <&topckgen CLK_TOP_HADDS2PLL_98M>,
-			 <&topckgen CLK_TOP_HADDS2PLL_294M>,
-			 <&topckgen CLK_TOP_AUDPLL>,
-			 <&topckgen CLK_TOP_AUDPLL_D4>,
-			 <&topckgen CLK_TOP_AUDPLL_D8>,
-			 <&topckgen CLK_TOP_AUDPLL_D16>,
-			 <&topckgen CLK_TOP_AUDPLL_D24>,
-			 <&topckgen CLK_TOP_AUDINTBUS_SEL>,
-			 <&clk26m>,
-			 <&topckgen CLK_TOP_SYSPLL1_D4>,
-			 <&topckgen CLK_TOP_AUD_K1_SRC_SEL>,
-			 <&topckgen CLK_TOP_AUD_K2_SRC_SEL>,
-			 <&topckgen CLK_TOP_AUD_K3_SRC_SEL>,
-			 <&topckgen CLK_TOP_AUD_K4_SRC_SEL>,
-			 <&topckgen CLK_TOP_AUD_K5_SRC_SEL>,
-			 <&topckgen CLK_TOP_AUD_K6_SRC_SEL>,
-			 <&topckgen CLK_TOP_AUD_K1_SRC_DIV>,
-			 <&topckgen CLK_TOP_AUD_K2_SRC_DIV>,
-			 <&topckgen CLK_TOP_AUD_K3_SRC_DIV>,
-			 <&topckgen CLK_TOP_AUD_K4_SRC_DIV>,
-			 <&topckgen CLK_TOP_AUD_K5_SRC_DIV>,
-			 <&topckgen CLK_TOP_AUD_K6_SRC_DIV>,
-			 <&topckgen CLK_TOP_AUD_I2S1_MCLK>,
-			 <&topckgen CLK_TOP_AUD_I2S2_MCLK>,
-			 <&topckgen CLK_TOP_AUD_I2S3_MCLK>,
-			 <&topckgen CLK_TOP_AUD_I2S4_MCLK>,
-			 <&topckgen CLK_TOP_AUD_I2S5_MCLK>,
-			 <&topckgen CLK_TOP_AUD_I2S6_MCLK>,
-			 <&topckgen CLK_TOP_ASM_M_SEL>,
-			 <&topckgen CLK_TOP_ASM_H_SEL>,
-			 <&topckgen CLK_TOP_UNIVPLL2_D4>,
-			 <&topckgen CLK_TOP_UNIVPLL2_D2>,
-			 <&topckgen CLK_TOP_SYSPLL_D5>;
+	audsys: audio-subsystem@11220000 {
+		compatible = "mediatek,mt2701-audsys", "syscon", "simple-mfd";
+		...
+
+		afe: audio-controller {
+			compatible = "mediatek,mt2701-audio";
+			interrupts =  <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>,
+				      <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>;
+			interrupt-names	= "afe", "asys";
+			power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;
+
+			clocks = <&infracfg CLK_INFRA_AUDIO>,
+				 <&topckgen CLK_TOP_AUD_MUX1_SEL>,
+				 <&topckgen CLK_TOP_AUD_MUX2_SEL>,
+				 <&topckgen CLK_TOP_AUD_48K_TIMING>,
+				 <&topckgen CLK_TOP_AUD_44K_TIMING>,
+				 <&topckgen CLK_TOP_AUD_K1_SRC_SEL>,
+				 <&topckgen CLK_TOP_AUD_K2_SRC_SEL>,
+				 <&topckgen CLK_TOP_AUD_K3_SRC_SEL>,
+				 <&topckgen CLK_TOP_AUD_K4_SRC_SEL>,
+				 <&topckgen CLK_TOP_AUD_K1_SRC_DIV>,
+				 <&topckgen CLK_TOP_AUD_K2_SRC_DIV>,
+				 <&topckgen CLK_TOP_AUD_K3_SRC_DIV>,
+				 <&topckgen CLK_TOP_AUD_K4_SRC_DIV>,
+				 <&topckgen CLK_TOP_AUD_I2S1_MCLK>,
+				 <&topckgen CLK_TOP_AUD_I2S2_MCLK>,
+				 <&topckgen CLK_TOP_AUD_I2S3_MCLK>,
+				 <&topckgen CLK_TOP_AUD_I2S4_MCLK>,
+				 <&audsys CLK_AUD_I2SO1>,
+				 <&audsys CLK_AUD_I2SO2>,
+				 <&audsys CLK_AUD_I2SO3>,
+				 <&audsys CLK_AUD_I2SO4>,
+				 <&audsys CLK_AUD_I2SIN1>,
+				 <&audsys CLK_AUD_I2SIN2>,
+				 <&audsys CLK_AUD_I2SIN3>,
+				 <&audsys CLK_AUD_I2SIN4>,
+				 <&audsys CLK_AUD_ASRCO1>,
+				 <&audsys CLK_AUD_ASRCO2>,
+				 <&audsys CLK_AUD_ASRCO3>,
+				 <&audsys CLK_AUD_ASRCO4>,
+				 <&audsys CLK_AUD_AFE>,
+				 <&audsys CLK_AUD_AFE_CONN>,
+				 <&audsys CLK_AUD_A1SYS>,
+				 <&audsys CLK_AUD_A2SYS>,
+				 <&audsys CLK_AUD_AFE_MRGIF>;
+
+			clock-names = "infra_sys_audio_clk",
+				      "top_audio_mux1_sel",
+				      "top_audio_mux2_sel",
+				      "top_audio_a1sys_hp",
+				      "top_audio_a2sys_hp",
+				      "i2s0_src_sel",
+				      "i2s1_src_sel",
+				      "i2s2_src_sel",
+				      "i2s3_src_sel",
+				      "i2s0_src_div",
+				      "i2s1_src_div",
+				      "i2s2_src_div",
+				      "i2s3_src_div",
+				      "i2s0_mclk_en",
+				      "i2s1_mclk_en",
+				      "i2s2_mclk_en",
+				      "i2s3_mclk_en",
+				      "i2so0_hop_ck",
+				      "i2so1_hop_ck",
+				      "i2so2_hop_ck",
+				      "i2so3_hop_ck",
+				      "i2si0_hop_ck",
+				      "i2si1_hop_ck",
+				      "i2si2_hop_ck",
+				      "i2si3_hop_ck",
+				      "asrc0_out_ck",
+				      "asrc1_out_ck",
+				      "asrc2_out_ck",
+				      "asrc3_out_ck",
+				      "audio_afe_pd",
+				      "audio_afe_conn_pd",
+				      "audio_a1sys_pd",
+				      "audio_a2sys_pd",
+				      "audio_mrgif_pd";
 
 
-		clock-names = "infra_sys_audio_clk",
-			      "top_audio_mux1_sel",
-			      "top_audio_mux2_sel",
-			      "top_audio_mux1_div",
-			      "top_audio_mux2_div",
-			      "top_audio_48k_timing",
-			      "top_audio_44k_timing",
-			      "top_audpll_mux_sel",
-			      "top_apll_sel",
-			      "top_aud1_pll_98M",
-			      "top_aud2_pll_90M",
-			      "top_hadds2_pll_98M",
-			      "top_hadds2_pll_294M",
-			      "top_audpll",
-			      "top_audpll_d4",
-			      "top_audpll_d8",
-			      "top_audpll_d16",
-			      "top_audpll_d24",
-			      "top_audintbus_sel",
-			      "clk_26m",
-			      "top_syspll1_d4",
-			      "top_aud_k1_src_sel",
-			      "top_aud_k2_src_sel",
-			      "top_aud_k3_src_sel",
-			      "top_aud_k4_src_sel",
-			      "top_aud_k5_src_sel",
-			      "top_aud_k6_src_sel",
-			      "top_aud_k1_src_div",
-			      "top_aud_k2_src_div",
-			      "top_aud_k3_src_div",
-			      "top_aud_k4_src_div",
-			      "top_aud_k5_src_div",
-			      "top_aud_k6_src_div",
-			      "top_aud_i2s1_mclk",
-			      "top_aud_i2s2_mclk",
-			      "top_aud_i2s3_mclk",
-			      "top_aud_i2s4_mclk",
-			      "top_aud_i2s5_mclk",
-			      "top_aud_i2s6_mclk",
-			      "top_asm_m_sel",
-			      "top_asm_h_sel",
-			      "top_univpll2_d4",
-			      "top_univpll2_d2",
-			      "top_syspll_d5";
+			assigned-clocks = <&topckgen CLK_TOP_AUD_MUX1_SEL>,
+					  <&topckgen CLK_TOP_AUD_MUX2_SEL>,
+					  <&topckgen CLK_TOP_AUD_MUX1_DIV>,
+					  <&topckgen CLK_TOP_AUD_MUX2_DIV>;
+			assigned-clock-parents = <&topckgen CLK_TOP_AUD1PLL_98M>,
+						 <&topckgen CLK_TOP_AUD2PLL_90M>;
+			assigned-clock-rates = <0>, <0>, <49152000>, <45158400>;
+		};
 	};
 	};

+ 2 - 2
Documentation/devicetree/bindings/sound/nau8825.txt

@@ -69,7 +69,7 @@ Optional properties:
   - nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
   - nuvoton,jack-insert-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
   - nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
   - nuvoton,jack-eject-debounce: number from 0 to 7 that sets debounce time to 2^(n+2) ms
 
 
-  - nuvoton,crosstalk-bypass: make crosstalk function bypass if set.
+  - nuvoton,crosstalk-enable: make crosstalk function enable if set.
 
 
   - clocks: list of phandle and clock specifier pairs according to common clock bindings for the
   - clocks: list of phandle and clock specifier pairs according to common clock bindings for the
       clocks described in clock-names
       clocks described in clock-names
@@ -98,7 +98,7 @@ Example:
       nuvoton,short-key-debounce = <2>;
       nuvoton,short-key-debounce = <2>;
       nuvoton,jack-insert-debounce = <7>;
       nuvoton,jack-insert-debounce = <7>;
       nuvoton,jack-eject-debounce = <7>;
       nuvoton,jack-eject-debounce = <7>;
-      nuvoton,crosstalk-bypass;
+      nuvoton,crosstalk-enable;
 
 
       clock-names = "mclk";
       clock-names = "mclk";
       clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;
       clocks = <&tegra_car TEGRA210_CLK_CLK_OUT_2>;

+ 42 - 0
Documentation/devicetree/bindings/sound/pcm186x.txt

@@ -0,0 +1,42 @@
+Texas Instruments PCM186x Universal Audio ADC
+
+These devices support both I2C and SPI (configured with pin strapping
+on the board).
+
+Required properties:
+
+ - compatible : "ti,pcm1862",
+                "ti,pcm1863",
+                "ti,pcm1864",
+                "ti,pcm1865"
+
+ - reg : The I2C address of the device for I2C, the chip select
+         number for SPI.
+
+ - avdd-supply: Analog core power supply (3.3v)
+ - dvdd-supply: Digital core power supply
+ - iovdd-supply: Digital IO power supply
+        See regulator/regulator.txt for more information
+
+CODEC input pins:
+ * VINL1
+ * VINR1
+ * VINL2
+ * VINR2
+ * VINL3
+ * VINR3
+ * VINL4
+ * VINR4
+
+The pins can be used in referring sound node's audio-routing property.
+
+Example:
+
+	pcm186x: audio-codec@4a {
+		compatible = "ti,pcm1865";
+		reg = <0x4a>;
+
+		avdd-supply = <&reg_3v3_analog>;
+		dvdd-supply = <&reg_3v3>;
+		iovdd-supply = <&reg_1v8>;
+	};

+ 1 - 1
Documentation/devicetree/bindings/sound/renesas,fsi.txt

@@ -20,7 +20,7 @@ Required properties:
 
 
 Example:
 Example:
 
 
-sh_fsi2: sh_fsi2@0xec230000 {
+sh_fsi2: sh_fsi2@ec230000 {
 	compatible = "renesas,sh_fsi2";
 	compatible = "renesas,sh_fsi2";
 	reg = <0xec230000 0x400>;
 	reg = <0xec230000 0x400>;
 	interrupts = <0 146 0x4>;
 	interrupts = <0 146 0x4>;

+ 11 - 4
Documentation/devicetree/bindings/sound/renesas,rsnd.txt

@@ -4,7 +4,7 @@ Renesas R-Car sound
 * Modules
 * Modules
 =============================================
 =============================================
 
 
-Renesas R-Car sound is constructed from below modules
+Renesas R-Car and RZ/G sound is constructed from below modules
 (for Gen2 or later)
 (for Gen2 or later)
 
 
  SCU		: Sampling Rate Converter Unit
  SCU		: Sampling Rate Converter Unit
@@ -197,12 +197,17 @@ Ex)
 	[MEM] -> [SRC2] -> [CTU03] -+
 	[MEM] -> [SRC2] -> [CTU03] -+
 
 
 	sound {
 	sound {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
 		compatible = "simple-scu-audio-card";
 		compatible = "simple-scu-audio-card";
 		...
 		...
-		simple-audio-card,cpu-0 {
+		simple-audio-card,cpu@0 {
+			reg = <0>;
 			sound-dai = <&rcar_sound 0>;
 			sound-dai = <&rcar_sound 0>;
 		};
 		};
-		simple-audio-card,cpu-1 {
+		simple-audio-card,cpu@1 {
+			reg = <1>;
 			sound-dai = <&rcar_sound 1>;
 			sound-dai = <&rcar_sound 1>;
 		};
 		};
 		simple-audio-card,codec {
 		simple-audio-card,codec {
@@ -334,9 +339,11 @@ Required properties:
 
 
 - compatible			: "renesas,rcar_sound-<soctype>", fallbacks
 - compatible			: "renesas,rcar_sound-<soctype>", fallbacks
 				  "renesas,rcar_sound-gen1" if generation1, and
 				  "renesas,rcar_sound-gen1" if generation1, and
-				  "renesas,rcar_sound-gen2" if generation2
+				  "renesas,rcar_sound-gen2" if generation2 (or RZ/G1)
 				  "renesas,rcar_sound-gen3" if generation3
 				  "renesas,rcar_sound-gen3" if generation3
 				  Examples with soctypes are:
 				  Examples with soctypes are:
+				    - "renesas,rcar_sound-r8a7743" (RZ/G1M)
+				    - "renesas,rcar_sound-r8a7745" (RZ/G1E)
 				    - "renesas,rcar_sound-r8a7778" (R-Car M1A)
 				    - "renesas,rcar_sound-r8a7778" (R-Car M1A)
 				    - "renesas,rcar_sound-r8a7779" (R-Car H1)
 				    - "renesas,rcar_sound-r8a7779" (R-Car H1)
 				    - "renesas,rcar_sound-r8a7790" (R-Car H2)
 				    - "renesas,rcar_sound-r8a7790" (R-Car H2)

+ 1 - 1
Documentation/devicetree/bindings/sound/rockchip-spdif.txt

@@ -33,7 +33,7 @@ Required properties on RK3288:
 
 
 Example for the rk3188 SPDIF controller:
 Example for the rk3188 SPDIF controller:
 
 
-spdif: spdif@0x1011e000 {
+spdif: spdif@1011e000 {
 	compatible = "rockchip,rk3188-spdif", "rockchip,rk3066-spdif";
 	compatible = "rockchip,rk3188-spdif", "rockchip,rk3066-spdif";
 	reg = <0x1011e000 0x2000>;
 	reg = <0x1011e000 0x2000>;
 	interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
 	interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;

+ 3 - 0
Documentation/devicetree/bindings/sound/simple-card.txt

@@ -140,6 +140,7 @@ sound {
 	simple-audio-card,name = "Cubox Audio";
 	simple-audio-card,name = "Cubox Audio";
 
 
 	simple-audio-card,dai-link@0 {		/* I2S - HDMI */
 	simple-audio-card,dai-link@0 {		/* I2S - HDMI */
+		reg = <0>;
 		format = "i2s";
 		format = "i2s";
 		cpu {
 		cpu {
 			sound-dai = <&audio1 0>;
 			sound-dai = <&audio1 0>;
@@ -150,6 +151,7 @@ sound {
 	};
 	};
 
 
 	simple-audio-card,dai-link@1 {		/* S/PDIF - HDMI */
 	simple-audio-card,dai-link@1 {		/* S/PDIF - HDMI */
+		reg = <1>;
 		cpu {
 		cpu {
 			sound-dai = <&audio1 1>;
 			sound-dai = <&audio1 1>;
 		};
 		};
@@ -159,6 +161,7 @@ sound {
 	};
 	};
 
 
 	simple-audio-card,dai-link@2 {		/* S/PDIF - S/PDIF */
 	simple-audio-card,dai-link@2 {		/* S/PDIF - S/PDIF */
+		reg = <2>;
 		cpu {
 		cpu {
 			sound-dai = <&audio1 1>;
 			sound-dai = <&audio1 1>;
 		};
 		};

+ 4 - 4
Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt

@@ -51,7 +51,7 @@ Optional properties:
 
 
 Example:
 Example:
 
 
-	sti_uni_player1: sti-uni-player@0x8D81000 {
+	sti_uni_player1: sti-uni-player@8D81000 {
 		compatible = "st,stih407-uni-player-hdmi";
 		compatible = "st,stih407-uni-player-hdmi";
 		#sound-dai-cells = <0>;
 		#sound-dai-cells = <0>;
 		st,syscfg = <&syscfg_core>;
 		st,syscfg = <&syscfg_core>;
@@ -63,7 +63,7 @@ Example:
 		st,tdm-mode = <1>;
 		st,tdm-mode = <1>;
 	};
 	};
 
 
-	sti_uni_player2: sti-uni-player@0x8D82000 {
+	sti_uni_player2: sti-uni-player@8D82000 {
 		compatible = "st,stih407-uni-player-pcm-out";
 		compatible = "st,stih407-uni-player-pcm-out";
 		#sound-dai-cells = <0>;
 		#sound-dai-cells = <0>;
 		st,syscfg = <&syscfg_core>;
 		st,syscfg = <&syscfg_core>;
@@ -74,7 +74,7 @@ Example:
 		dma-names = "tx";
 		dma-names = "tx";
 	};
 	};
 
 
-	sti_uni_player3: sti-uni-player@0x8D85000 {
+	sti_uni_player3: sti-uni-player@8D85000 {
 		compatible = "st,stih407-uni-player-spdif";
 		compatible = "st,stih407-uni-player-spdif";
 		#sound-dai-cells = <0>;
 		#sound-dai-cells = <0>;
 		st,syscfg = <&syscfg_core>;
 		st,syscfg = <&syscfg_core>;
@@ -85,7 +85,7 @@ Example:
 		dma-names = "tx";
 		dma-names = "tx";
 	};
 	};
 
 
-	sti_uni_reader1: sti-uni-reader@0x8D84000 {
+	sti_uni_reader1: sti-uni-reader@8D84000 {
 		compatible = "st,stih407-uni-reader-hdmi";
 		compatible = "st,stih407-uni-reader-hdmi";
 		#sound-dai-cells = <0>;
 		#sound-dai-cells = <0>;
 		st,syscfg = <&syscfg_core>;
 		st,syscfg = <&syscfg_core>;

+ 63 - 0
Documentation/devicetree/bindings/sound/st,stm32-adfsdm.txt

@@ -0,0 +1,63 @@
+STMicroelectronics Audio Digital Filter Sigma Delta modulators(DFSDM)
+
+The DFSDM allows PDM microphones capture through SPI interface. The Audio
+interface is seems as a sub block of the DFSDM device.
+For details on DFSDM bindings refer to ../iio/adc/st,stm32-dfsdm-adc.txt
+
+Required properties:
+  - compatible: "st,stm32h7-dfsdm-dai".
+
+  - #sound-dai-cells : Must be equal to 0
+
+  - io-channels : phandle to iio dfsdm instance node.
+
+Example of a sound card using audio DFSDM node.
+
+	sound_card {
+		compatible = "audio-graph-card";
+
+		dais = <&cpu_port>;
+	};
+
+	dfsdm: dfsdm@40017000 {
+		compatible = "st,stm32h7-dfsdm";
+		reg = <0x40017000 0x400>;
+		clocks = <&rcc DFSDM1_CK>;
+		clock-names = "dfsdm";
+		#interrupt-cells = <1>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		dfsdm_adc0: filter@0 {
+			compatible = "st,stm32-dfsdm-dmic";
+			reg = <0>;
+			interrupts = <110>;
+			dmas = <&dmamux1 101 0x400 0x00>;
+			dma-names = "rx";
+			st,adc-channels = <1>;
+			st,adc-channel-names = "dmic0";
+			st,adc-channel-types = "SPI_R";
+			st,adc-channel-clk-src = "CLKOUT";
+			st,filter-order = <5>;
+
+			dfsdm_dai0: dfsdm-dai {
+				compatible = "st,stm32h7-dfsdm-dai";
+				#sound-dai-cells = <0>;
+				io-channels = <&dfsdm_adc0 0>;
+				cpu_port: port {
+				dfsdm_endpoint: endpoint {
+					remote-endpoint = <&dmic0_endpoint>;
+				};
+			};
+		};
+	};
+
+	dmic0: dmic@0 {
+		compatible = "dmic-codec";
+		#sound-dai-cells = <0>;
+		port {
+			dmic0_endpoint: endpoint {
+				remote-endpoint = <&dfsdm_endpoint>;
+			};
+		};
+	};

+ 7 - 5
Documentation/devicetree/bindings/sound/st,stm32-sai.txt

@@ -20,11 +20,6 @@ Required properties:
 
 
 Optional properties:
 Optional properties:
   - resets: Reference to a reset controller asserting the SAI
   - resets: Reference to a reset controller asserting the SAI
-  - st,sync: specify synchronization mode.
-	By default SAI sub-block is in asynchronous mode.
-	This property sets SAI sub-block as slave of another SAI sub-block.
-	Must contain the phandle and index of the sai sub-block providing
-	the synchronization.
 
 
 SAI subnodes:
 SAI subnodes:
 Two subnodes corresponding to SAI sub-block instances A et B can be defined.
 Two subnodes corresponding to SAI sub-block instances A et B can be defined.
@@ -44,6 +39,13 @@ SAI subnodes required properties:
   - pinctrl-names: should contain only value "default"
   - pinctrl-names: should contain only value "default"
   - pinctrl-0: see Documentation/devicetree/bindings/pinctrl/pinctrl-stm32.txt
   - pinctrl-0: see Documentation/devicetree/bindings/pinctrl/pinctrl-stm32.txt
 
 
+SAI subnodes Optional properties:
+  - st,sync: specify synchronization mode.
+	By default SAI sub-block is in asynchronous mode.
+	This property sets SAI sub-block as slave of another SAI sub-block.
+	Must contain the phandle and index of the sai sub-block providing
+	the synchronization.
+
 The device node should contain one 'port' child node with one child 'endpoint'
 The device node should contain one 'port' child node with one child 'endpoint'
 node, according to the bindings defined in Documentation/devicetree/bindings/
 node, according to the bindings defined in Documentation/devicetree/bindings/
 graph.txt.
 graph.txt.

+ 2 - 0
Documentation/devicetree/bindings/sound/sun4i-i2s.txt

@@ -8,6 +8,7 @@ Required properties:
 - compatible: should be one of the following:
 - compatible: should be one of the following:
    - "allwinner,sun4i-a10-i2s"
    - "allwinner,sun4i-a10-i2s"
    - "allwinner,sun6i-a31-i2s"
    - "allwinner,sun6i-a31-i2s"
+   - "allwinner,sun8i-a83t-i2s"
    - "allwinner,sun8i-h3-i2s"
    - "allwinner,sun8i-h3-i2s"
 - reg: physical base address of the controller and length of memory mapped
 - reg: physical base address of the controller and length of memory mapped
   region.
   region.
@@ -23,6 +24,7 @@ Required properties:
 
 
 Required properties for the following compatibles:
 Required properties for the following compatibles:
 	- "allwinner,sun6i-a31-i2s"
 	- "allwinner,sun6i-a31-i2s"
+	- "allwinner,sun8i-a83t-i2s"
 	- "allwinner,sun8i-h3-i2s"
 	- "allwinner,sun8i-h3-i2s"
 - resets: phandle to the reset line for this codec
 - resets: phandle to the reset line for this codec
 
 

+ 3 - 1
Documentation/devicetree/bindings/sound/tas5720.txt

@@ -6,10 +6,12 @@ audio playback. For more product information please see the links below:
 
 
 http://www.ti.com/product/TAS5720L
 http://www.ti.com/product/TAS5720L
 http://www.ti.com/product/TAS5720M
 http://www.ti.com/product/TAS5720M
+http://www.ti.com/product/TAS5722L
 
 
 Required properties:
 Required properties:
 
 
-- compatible : "ti,tas5720"
+- compatible : "ti,tas5720",
+               "ti,tas5722"
 - reg : I2C slave address
 - reg : I2C slave address
 - dvdd-supply : phandle to a 3.3-V supply for the digital circuitry
 - dvdd-supply : phandle to a 3.3-V supply for the digital circuitry
 - pvdd-supply : phandle to a supply used for the Class-D amp and the analog
 - pvdd-supply : phandle to a supply used for the Class-D amp and the analog

+ 4 - 4
Documentation/devicetree/bindings/sound/tfa9879.txt

@@ -6,18 +6,18 @@ Required properties:
 
 
 - reg : the I2C address of the device
 - reg : the I2C address of the device
 
 
+- #sound-dai-cells : must be 0.
+
 Example:
 Example:
 
 
 &i2c1 {
 &i2c1 {
-	clock-frequency = <100000>;
 	pinctrl-names = "default";
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c1>;
 	pinctrl-0 = <&pinctrl_i2c1>;
-	status = "okay";
 
 
-	codec: tfa9879@6c {
+	amp: amp@6c {
 		#sound-dai-cells = <0>;
 		#sound-dai-cells = <0>;
 		compatible = "nxp,tfa9879";
 		compatible = "nxp,tfa9879";
 		reg = <0x6c>;
 		reg = <0x6c>;
-        };
+	};
 };
 };
 
 

+ 20 - 0
Documentation/devicetree/bindings/sound/ti,tas6424.txt

@@ -0,0 +1,20 @@
+Texas Instruments TAS6424 Quad-Channel Audio amplifier
+
+The TAS6424 serial control bus communicates through I2C protocols.
+
+Required properties:
+	- compatible: "ti,tas6424" - TAS6424
+	- reg: I2C slave address
+	- sound-dai-cells: must be equal to 0
+
+Example:
+
+tas6424: tas6424@6a {
+	compatible = "ti,tas6424";
+	reg = <0x6a>;
+
+	#sound-dai-cells = <0>;
+};
+
+For more product information please see the link below:
+http://www.ti.com/product/TAS6424-Q1

+ 8 - 1
Documentation/devicetree/bindings/sound/tlv320aic31xx.txt

@@ -22,7 +22,7 @@ Required properties:
 
 
 Optional properties:
 Optional properties:
 
 
-- gpio-reset - gpio pin number used for codec reset
+- reset-gpios - GPIO specification for the active low RESET input.
 - ai31xx-micbias-vg - MicBias Voltage setting
 - ai31xx-micbias-vg - MicBias Voltage setting
         1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V
         1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V
         2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V
         2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V
@@ -30,6 +30,10 @@ Optional properties:
 	If this node is not mentioned or if the value is unknown, then
 	If this node is not mentioned or if the value is unknown, then
 	micbias	is set to 2.0V.
 	micbias	is set to 2.0V.
 
 
+Deprecated properties:
+
+- gpio-reset - gpio pin number used for codec reset
+
 CODEC output pins:
 CODEC output pins:
   * HPL
   * HPL
   * HPR
   * HPR
@@ -48,6 +52,7 @@ CODEC input pins:
 The pins can be used in referring sound node's audio-routing property.
 The pins can be used in referring sound node's audio-routing property.
 
 
 Example:
 Example:
+#include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/sound/tlv320aic31xx-micbias.h>
 #include <dt-bindings/sound/tlv320aic31xx-micbias.h>
 
 
 tlv320aic31xx: tlv320aic31xx@18 {
 tlv320aic31xx: tlv320aic31xx@18 {
@@ -56,6 +61,8 @@ tlv320aic31xx: tlv320aic31xx@18 {
 
 
 	ai31xx-micbias-vg = <MICBIAS_OFF>;
 	ai31xx-micbias-vg = <MICBIAS_OFF>;
 
 
+	reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+
 	HPVDD-supply = <&regulator>;
 	HPVDD-supply = <&regulator>;
 	SPRVDD-supply = <&regulator>;
 	SPRVDD-supply = <&regulator>;
 	SPLVDD-supply = <&regulator>;
 	SPLVDD-supply = <&regulator>;

+ 9 - 1
Documentation/devicetree/bindings/sound/tlv320aic3x.txt

@@ -17,7 +17,7 @@ Required properties:
 
 
 Optional properties:
 Optional properties:
 
 
-- gpio-reset - gpio pin number used for codec reset
+- reset-gpios - GPIO specification for the active low RESET input.
 - ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality
 - ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality
 				    - Not supported on tlv320aic3104
 				    - Not supported on tlv320aic3104
 - ai3x-micbias-vg - MicBias Voltage required.
 - ai3x-micbias-vg - MicBias Voltage required.
@@ -34,6 +34,10 @@ Optional properties:
 - AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the
 - AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the
   device as covered in Documentation/devicetree/bindings/regulator/regulator.txt
   device as covered in Documentation/devicetree/bindings/regulator/regulator.txt
 
 
+Deprecated properties:
+
+- gpio-reset - gpio pin number used for codec reset
+
 CODEC output pins:
 CODEC output pins:
   * LLOUT
   * LLOUT
   * RLOUT
   * RLOUT
@@ -61,10 +65,14 @@ The pins can be used in referring sound node's audio-routing property.
 
 
 Example:
 Example:
 
 
+#include <dt-bindings/gpio/gpio.h>
+
 tlv320aic3x: tlv320aic3x@1b {
 tlv320aic3x: tlv320aic3x@1b {
 	compatible = "ti,tlv320aic3x";
 	compatible = "ti,tlv320aic3x";
 	reg = <0x1b>;
 	reg = <0x1b>;
 
 
+	reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
+
 	AVDD-supply = <&regulator>;
 	AVDD-supply = <&regulator>;
 	IOVDD-supply = <&regulator>;
 	IOVDD-supply = <&regulator>;
 	DRVDD-supply = <&regulator>;
 	DRVDD-supply = <&regulator>;

+ 16 - 0
Documentation/devicetree/bindings/sound/tscs42xx.txt

@@ -0,0 +1,16 @@
+TSCS42XX Audio CODEC
+
+Required Properties:
+
+	- compatible :	"tempo,tscs42A1" for analog mic
+			"tempo,tscs42A2" for digital mic
+
+	- reg : 	<0x71> for analog mic
+			<0x69> for digital mic
+
+Example:
+
+wookie: codec@69 {
+	compatible = "tempo,tscs42A2";
+	reg = <0x69>;
+};

+ 26 - 0
Documentation/devicetree/bindings/sound/uniphier,evea.txt

@@ -0,0 +1,26 @@
+Socionext EVEA - UniPhier SoC internal codec driver
+
+Required properties:
+- compatible      : should be "socionext,uniphier-evea".
+- reg             : offset and length of the register set for the device.
+- clock-names     : should include following entries:
+                    "evea", "exiv"
+- clocks          : a list of phandle, should contain an entry for each
+                    entries in clock-names.
+- reset-names     : should include following entries:
+                    "evea", "exiv", "adamv"
+- resets          : a list of phandle, should contain reset entries of
+                    reset-names.
+- #sound-dai-cells: should be 1.
+
+Example:
+
+	codec {
+		compatible = "socionext,uniphier-evea";
+		reg = <0x57900000 0x1000>;
+		clock-names = "evea", "exiv";
+		clocks = <&sys_clk 41>, <&sys_clk 42>;
+		reset-names = "evea", "exiv", "adamv";
+		resets = <&sys_rst 41>, <&sys_rst 42>, <&adamv_rst 0>;
+		#sound-dai-cells = <1>;
+	};

+ 1 - 1
Documentation/devicetree/bindings/spi/efm32-spi.txt

@@ -19,7 +19,7 @@ Recommended properties :
 
 
 Example:
 Example:
 
 
-spi1: spi@0x4000c400 { /* USART1 */
+spi1: spi@4000c400 { /* USART1 */
 	#address-cells = <1>;
 	#address-cells = <1>;
 	#size-cells = <0>;
 	#size-cells = <0>;
 	compatible = "energymicro,efm32-spi";
 	compatible = "energymicro,efm32-spi";

Some files were not shown because too many files changed in this diff