diff options
author | Marc Zyngier | 2017-11-02 16:53:54 +0100 |
---|---|---|
committer | Marc Zyngier | 2017-11-02 16:54:58 +0100 |
commit | 05f3647359f8bf44e000122cee6a848f5129e2e3 (patch) | |
tree | 072631bead382da3152ffa5b7c5767f683ddca16 /arch/arm | |
parent | irqchip/aspeed-i2c-ic: Fix return value check in aspeed_i2c_ic_of_init() (diff) | |
parent | Linux 4.14-rc3 (diff) | |
download | kernel-qcow2-linux-05f3647359f8bf44e000122cee6a848f5129e2e3.tar.gz kernel-qcow2-linux-05f3647359f8bf44e000122cee6a848f5129e2e3.tar.xz kernel-qcow2-linux-05f3647359f8bf44e000122cee6a848f5129e2e3.zip |
Merge tag 'v4.14-rc3' into irq/irqchip-4.15
Required merge to get mainline irqchip updates.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boot/dts/omap3-n950-n9.dtsi | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi index cb47ae79a5f9..1b0bd72945f2 100644 --- a/arch/arm/boot/dts/omap3-n950-n9.dtsi +++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi @@ -267,15 +267,19 @@ clock-frequency = <400000>; as3645a@30 { + #address-cells = <1>; + #size-cells = <0>; reg = <0x30>; compatible = "ams,as3645a"; - flash { + flash@0 { + reg = <0x0>; flash-timeout-us = <150000>; flash-max-microamp = <320000>; led-max-microamp = <60000>; - peak-current-limit = <1750000>; + ams,input-max-microamp = <1750000>; }; - indicator { + indicator@1 { + reg = <0x1>; led-max-microamp = <10000>; }; }; |