Hi, Am 20.10.2015 um 18:24 schrieb Tony Lindgren <[email protected]>:
> Hi, > > * H. Nikolaus Schaller <[email protected]> [151016 05:58]: >> Signed-off-by: H. Nikolaus Schaller <[email protected]> >> --- >> arch/arm/boot/dts/omap5-uevm.dts | 10 ++++++++++ >> 1 file changed, 10 insertions(+) >> >> diff --git a/arch/arm/boot/dts/omap5-uevm.dts >> b/arch/arm/boot/dts/omap5-uevm.dts >> index 0e8128b..63f81bb 100644 >> --- a/arch/arm/boot/dts/omap5-uevm.dts >> +++ b/arch/arm/boot/dts/omap5-uevm.dts >> @@ -342,6 +342,16 @@ >> >> ti,ldo6-vibrator; >> >> + gpadc { >> + compatible = "ti,palmas-gpadc"; >> + interrupts = <18 0 >> + 16 0 >> + 17 0>; >> + #io-channel-cells = <1>; >> + ti,channel0-current-microamp = <5>; >> + ti,channel3-current-microamp = <10>; >> + }; >> + >> regulators { >> smps123_reg: smps123 { >> /* VDD_OPP_MPU */ > > FYI, please send this one separately once the binding and driver is > merged. > > This need to be updated arch/arm/boot/dts/omap5-board-common.dts, so > this will cause merge conflicts if applied with the driver. Ok! We have our own OMAP5 board in the pipeline and there it will help as well to rebase it using arch/arm/boot/dts/omap5-board-common.dts BR, Nikolaus -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
