diff --git a/[refs] b/[refs] index 6857dc3313ff..156b70d24e62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7fd975fabe65ee8cc1d53811c9aa607e95def406 +refs/heads/master: 4eda912908935946ba64e71cb3f5909843a1a566 diff --git a/trunk/arch/arm/boot/dts/db8500.dtsi b/trunk/arch/arm/boot/dts/db8500.dtsi index 4ad5160018cb..84032d17ea23 100644 --- a/trunk/arch/arm/boot/dts/db8500.dtsi +++ b/trunk/arch/arm/boot/dts/db8500.dtsi @@ -313,6 +313,14 @@ reg = <5>; /* mailbox 5 is i2c */ interrupts = <0 40 0x4>; + ab8500-gpadc { + compatible = "stericsson,ab8500-gpadc"; + interrupts = <0 32 0x4 + 0 39 0x4>; + interrupt-names = "HW_CONV_END", "SW_CONV_END"; + vddadc-supply = <&ab8500_ldo_tvout_reg>; + }; + ab8500-regulators { compatible = "stericsson,ab8500-regulator";