diff options
author | Mark Brown <broonie@kernel.org> | 2015-11-10 20:01:58 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-11-10 20:01:58 +0100 |
commit | 2a148b6f2726ced30f796435f61d6e915c979784 (patch) | |
tree | 48d233fa5639677b16b10a3442029f3a2e40ef92 /arch/arm/boot/dts/omap5.dtsi | |
parent | ASoC: rsnd: fixup SCU_SYS_INT_EN1 address (diff) | |
parent | Merge remote-tracking branches 'asoc/topic/wm8904', 'asoc/topic/wm8955' and '... (diff) | |
download | linux-2a148b6f2726ced30f796435f61d6e915c979784.tar.xz linux-2a148b6f2726ced30f796435f61d6e915c979784.zip |
Merge tag 'asoc-v4.3-rc6' into asoc-fix-rcar
ASoC: Updates for v4.4
Not much core work here, a few small tweaks to interfaces but mainly the
changes here are driver ones. Highlights include:
- Updates to the topology userspace interface
- Big updates to the Renesas support from Morimoto-san
- Most of the support for Intel Sky Lake systems.
- New drivers for Asahi Kasei Microdevices AK4613, Allwinnner A10,
Cirrus Logic WM8998, Dialog DA7219, Nuvoton NAU8825 and Rockchip
S/PDIF.
Diffstat (limited to 'arch/arm/boot/dts/omap5.dtsi')
-rw-r--r-- | arch/arm/boot/dts/omap5.dtsi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi index 4205a8ac9ddb..4c04389dab32 100644 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/omap5.dtsi @@ -185,9 +185,10 @@ reg = <0x5a0 0xec>; #address-cells = <1>; #size-cells = <1>; + ranges = <0 0x5a0 0xec>; pbias_regulator: pbias_regulator { - compatible = "ti,pbias-omap"; + compatible = "ti,pbias-omap5", "ti,pbias-omap"; reg = <0x60 0x4>; syscon = <&omap5_padconf_global>; pbias_mmc_reg: pbias_mmc_omap5 { |