| Message ID | 20170718190401.14797-9-sakari.ailus@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 18, 2017 at 10:03:50PM +0300, Sakari Ailus wrote: > From: Sakari Ailus <sakari.ailus@iki.fi> > > Add the as3645a flash controller to the DT source as well as the flash > property with the as3645a device phandle to the sensor DT node. > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> > --- > arch/arm/boot/dts/omap3-n9.dts | 1 + > arch/arm/boot/dts/omap3-n950-n9.dtsi | 14 ++++++++++++++ > arch/arm/boot/dts/omap3-n950.dts | 1 + > 3 files changed, 16 insertions(+) > > diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts > index b9e58c536afd..a2944010f62f 100644 > --- a/arch/arm/boot/dts/omap3-n9.dts > +++ b/arch/arm/boot/dts/omap3-n9.dts > @@ -26,6 +26,7 @@ > clocks = <&isp 0>; > clock-frequency = <9600000>; > nokia,nvm-size = <(16 * 64)>; > + flash = <&as3645a_flash &as3645a_indicator>; > port { > smia_1_1: endpoint { > link-frequencies = /bits/ 64 <199200000 210000000 499200000>; > diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi > index df3366fa5409..e15722b83a70 100644 > --- a/arch/arm/boot/dts/omap3-n950-n9.dtsi > +++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi > @@ -265,6 +265,20 @@ > > &i2c2 { > clock-frequency = <400000>; > + > + as3645a: flash@30 { > + reg = <0x30>; > + compatible = "ams,as3645a"; > + as3645a_flash: flash { > + flash-timeout-us = <150000>; > + flash-max-microamp = <320000>; > + led-max-microamp = <60000>; > + peak-current-limit = <1750000>; > + }; > + as3645a_indicator: indicator { > + led-max-microamp = <10000>; > + }; > + }; > }; > > &i2c3 { > diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts > index 646601a3ebd8..8fca0384d2df 100644 > --- a/arch/arm/boot/dts/omap3-n950.dts > +++ b/arch/arm/boot/dts/omap3-n950.dts > @@ -60,6 +60,7 @@ > clocks = <&isp 0>; > clock-frequency = <9600000>; > nokia,nvm-size = <(16 * 64)>; > + flash = <&as3645a>; This one should have mirrored the N9 configuration; I'll fix that for the next version. > port { > smia_1_1: endpoint { > link-frequencies = /bits/ 64 <210000000 333600000 398400000>; > -- > 2.11.0 >
On Tue 2017-07-18 22:03:50, Sakari Ailus wrote: > From: Sakari Ailus <sakari.ailus@iki.fi> > > Add the as3645a flash controller to the DT source as well as the flash > property with the as3645a device phandle to the sensor DT node. > > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> > Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> Acked-by: Pavel Machek <pavel@ucw.cz>
diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts index b9e58c536afd..a2944010f62f 100644 --- a/arch/arm/boot/dts/omap3-n9.dts +++ b/arch/arm/boot/dts/omap3-n9.dts @@ -26,6 +26,7 @@ clocks = <&isp 0>; clock-frequency = <9600000>; nokia,nvm-size = <(16 * 64)>; + flash = <&as3645a_flash &as3645a_indicator>; port { smia_1_1: endpoint { link-frequencies = /bits/ 64 <199200000 210000000 499200000>; diff --git a/arch/arm/boot/dts/omap3-n950-n9.dtsi b/arch/arm/boot/dts/omap3-n950-n9.dtsi index df3366fa5409..e15722b83a70 100644 --- a/arch/arm/boot/dts/omap3-n950-n9.dtsi +++ b/arch/arm/boot/dts/omap3-n950-n9.dtsi @@ -265,6 +265,20 @@ &i2c2 { clock-frequency = <400000>; + + as3645a: flash@30 { + reg = <0x30>; + compatible = "ams,as3645a"; + as3645a_flash: flash { + flash-timeout-us = <150000>; + flash-max-microamp = <320000>; + led-max-microamp = <60000>; + peak-current-limit = <1750000>; + }; + as3645a_indicator: indicator { + led-max-microamp = <10000>; + }; + }; }; &i2c3 { diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts index 646601a3ebd8..8fca0384d2df 100644 --- a/arch/arm/boot/dts/omap3-n950.dts +++ b/arch/arm/boot/dts/omap3-n950.dts @@ -60,6 +60,7 @@ clocks = <&isp 0>; clock-frequency = <9600000>; nokia,nvm-size = <(16 * 64)>; + flash = <&as3645a>; port { smia_1_1: endpoint { link-frequencies = /bits/ 64 <210000000 333600000 398400000>;