| Message ID | 20190614155419.14260-1-GNUtoo@cyberdimension.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: exynos: add flash support to galaxy-s3 boards | expand |
Hi, Le vendredi 14 juin 2019 à 17:54 +0200, Denis 'GNUtoo' Carikli a écrit : > From: Simon Shields <simon@lineageos.org> > > The galaxy s3 boards use an aat1290 to control the flash LED. > This patch adds the relevant device tree configuration to use it. Looks good to me: Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Cheers, Paul > Signed-off-by: Simon Shields <simon@lineageos.org> > Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> [rebase] > --- > arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 32 +++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > index 30eee5942eff..375aeca09882 100644 > --- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > +++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > @@ -15,6 +15,24 @@ > i2c10 = &i2c_cm36651; > }; > > + aat1290 { > + compatible = "skyworks,aat1290"; > + flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>; > + enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>; > + > + pinctrl-names = "default", "host", "isp"; > + pinctrl-0 = <&camera_flash_host>; > + pinctrl-1 = <&camera_flash_host>; > + pinctrl-2 = <&camera_flash_isp>; > + > + flash-led { > + label = "flash"; > + led-max-microamp = <520833>; > + flash-max-microamp = <1012500>; > + flash-max-timeout-us = <1940000>; > + }; > + }; > + > lcd_vdd3_reg: voltage-regulator-6 { > compatible = "regulator-fixed"; > regulator-name = "LCD_VDD_2.2V"; > @@ -131,6 +149,20 @@ > regulator-max-microvolt = <2800000>; > }; > > +&pinctrl_0 { > + camera_flash_host: camera-flash-host { > + samsung,pins = "gpj1-0"; > + samsung,pin-function = <1>; > + samsung,pin-val = <0>; > + }; > + > + camera_flash_isp: camera-flash-isp { > + samsung,pins = "gpj1-0"; > + samsung,pin-function = <1>; > + samsung,pin-val = <1>; > + }; > +}; > + > &s5c73m3 { > standby-gpios = <&gpm0 1 GPIO_ACTIVE_LOW>; /* ISP_STANDBY */ > vdda-supply = <&ldo17_reg>;
On Fri, Jun 14, 2019 at 05:54:19PM +0200, Denis 'GNUtoo' Carikli wrote: > From: Simon Shields <simon@lineageos.org> > > The galaxy s3 boards use an aat1290 to control the flash LED. > This patch adds the relevant device tree configuration to use it. > > Signed-off-by: Simon Shields <simon@lineageos.org> > Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> [rebase] > --- > arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 32 +++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > index 30eee5942eff..375aeca09882 100644 > --- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > +++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi > @@ -15,6 +15,24 @@ > i2c10 = &i2c_cm36651; > }; > > + aat1290 { > + compatible = "skyworks,aat1290"; > + flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>; > + enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>; > + > + pinctrl-names = "default", "host", "isp"; > + pinctrl-0 = <&camera_flash_host>; > + pinctrl-1 = <&camera_flash_host>; > + pinctrl-2 = <&camera_flash_isp>; > + > + flash-led { > + label = "flash"; > + led-max-microamp = <520833>; > + flash-max-microamp = <1012500>; > + flash-max-timeout-us = <1940000>; > + }; > + }; > + > lcd_vdd3_reg: voltage-regulator-6 { > compatible = "regulator-fixed"; > regulator-name = "LCD_VDD_2.2V"; > @@ -131,6 +149,20 @@ > regulator-max-microvolt = <2800000>; > }; > > +&pinctrl_0 { > + camera_flash_host: camera-flash-host { > + samsung,pins = "gpj1-0"; > + samsung,pin-function = <1>; > + samsung,pin-val = <0>; Please use the pin macros from: include/dt-bindings/pinctrl/samsung.h Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi index 30eee5942eff..375aeca09882 100644 --- a/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi +++ b/arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi @@ -15,6 +15,24 @@ i2c10 = &i2c_cm36651; }; + aat1290 { + compatible = "skyworks,aat1290"; + flen-gpios = <&gpj1 1 GPIO_ACTIVE_HIGH>; + enset-gpios = <&gpj1 2 GPIO_ACTIVE_HIGH>; + + pinctrl-names = "default", "host", "isp"; + pinctrl-0 = <&camera_flash_host>; + pinctrl-1 = <&camera_flash_host>; + pinctrl-2 = <&camera_flash_isp>; + + flash-led { + label = "flash"; + led-max-microamp = <520833>; + flash-max-microamp = <1012500>; + flash-max-timeout-us = <1940000>; + }; + }; + lcd_vdd3_reg: voltage-regulator-6 { compatible = "regulator-fixed"; regulator-name = "LCD_VDD_2.2V"; @@ -131,6 +149,20 @@ regulator-max-microvolt = <2800000>; }; +&pinctrl_0 { + camera_flash_host: camera-flash-host { + samsung,pins = "gpj1-0"; + samsung,pin-function = <1>; + samsung,pin-val = <0>; + }; + + camera_flash_isp: camera-flash-isp { + samsung,pins = "gpj1-0"; + samsung,pin-function = <1>; + samsung,pin-val = <1>; + }; +}; + &s5c73m3 { standby-gpios = <&gpm0 1 GPIO_ACTIVE_LOW>; /* ISP_STANDBY */ vdda-supply = <&ldo17_reg>;