[PATCH 1/4] ARM: dts: sun4i: Add backlight node to iNet1 tablet

[PATCH 1/4] ARM: dts: sun4i: Add backlight node to iNet1 tablet

[Hans de Goede]

Add a node describing the lcd panel backlight on the iNet1 tablet.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun4i-a10-inet1.dts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/arch/arm/boot/dts/sun4i-a10-inet1.dts b/arch/arm/boot/dts/sun4i-a10-inet1.dts
index 703d756..df1be08 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet1.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet1.dts
@@ -47,6 +47,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
+#include <dt-bindings/pwm/pwm.h>
 
 / {
 	model = "iNet-1";
@@ -56,6 +57,16 @@
 		serial0 = &uart0;
 	};
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		pinctrl-names = "default";
+		pinctrl-0 = <&bl_en_pin_inet>;
+		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
+		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
+		default-brightness-level = <8>;
+		enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
@@ -164,6 +175,13 @@
 };
 
 &pio {
+	bl_en_pin_inet: bl_en_pin at 0 {
+		allwinner,pins = "PH7";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+
 	touchscreen_wake_pin: touchscreen_wake_pin at 0 {
 		allwinner,pins = "PB13";
 		allwinner,function = "gpio_out";
@@ -186,6 +204,12 @@
 	};
 };
 
+&pwm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm0_pins_a>;
+	status = "okay";
+};
+
 &reg_dcdc2 {
 	regulator-always-on;
 	regulator-min-microvolt = <1000000>;
-- 
2.5.0

[PATCH 2/4] ARM: dts: sun5i: Add backlight node to UTOO P66 tablet

[Hans de Goede]

Add a node describing the lcd panel backlight on the UTOO P66 tablet.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
index eb793d5..5236c1e 100644
--- a/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
+++ b/arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
@@ -47,11 +47,21 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
+#include <dt-bindings/pwm/pwm.h>
 
 / {
 	model = "Utoo P66";
 	compatible = "utoo,p66", "allwinner,sun5i-a13";
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
+		/* Note levels of 10 / 20% result in backlight off */
+		brightness-levels = <0 30 40 50 60 70 80 90 100>;
+		default-brightness-level = <6>;
+		/* TODO: backlight uses axp gpio1 as enable pin */
+	};
+
 	i2c_lcd: i2c at 0 {
 		/* The lcd panel i2c interface is hooked up via gpios */
 		compatible = "i2c-gpio";
@@ -201,6 +211,12 @@
 	};
 };
 
+&pwm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm0_pins>;
+	status = "okay";
+};
+
 &reg_dcdc2 {
 	regulator-always-on;
 	regulator-min-microvolt = <1000000>;
-- 
2.5.0

[PATCH 3/4] ARM: dts: sun4i: Add backlight node to pov protab2 ips9 tablet

[Hans de Goede]

Add a node describing the lcd panel backlight on the pov protab2 ips9
tablet.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
index 0e5124f..1f92ec7 100644
--- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
@@ -47,6 +47,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
+#include <dt-bindings/pwm/pwm.h>
 
 / {
 	model = "Point of View Protab2-IPS9";
@@ -56,6 +57,16 @@
 		serial0 = &uart0;
 	};
 
+	backlight: backlight {
+		compatible = "pwm-backlight";
+		pinctrl-names = "default";
+		pinctrl-0 = <&bl_en_pin_protab>;
+		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
+		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
+		default-brightness-level = <8>;
+		enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
+	};
+
 	chosen {
 		stdout-path = "serial0:115200n8";
 	};
@@ -145,6 +156,13 @@
 };
 
 &pio {
+	bl_en_pin_protab: bl_en_pin at 0 {
+		allwinner,pins = "PH7";
+		allwinner,function = "gpio_out";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+	};
+
 	touchscreen_pins: touchscreen_pins at 0 {
 		allwinner,pins = "PA5", "PB13";
 		allwinner,function = "gpio_out";
@@ -167,6 +185,12 @@
 	};
 };
 
+&pwm {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pwm0_pins_a>;
+	status = "okay";
+};
+
 &reg_dcdc2 {
 	regulator-always-on;
 	regulator-min-microvolt = <1000000>;
-- 
2.5.0

[PATCH 4/4] ARM: dts: sun5i: Add i2c axp152 pmic support for Auxtek T004 boards

[Hans de Goede]

From: Michael van Slingerland <michael@deviousops.nl>

Add a node describing the AXP152 pmic used on Auxtek T004 boards.

Signed-off-by: Michael van Slingerland <michael@deviousops.nl>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
index 2b3511e..a790ec8 100644
--- a/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
@@ -86,6 +86,20 @@
 	status = "okay";
 };
 
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins_a>;
+	status = "okay";
+
+	axp152: pmic at 30 {
+		compatible = "x-powers,axp152";
+		reg = <0x30>;
+		interrupts = <0>;
+		interrupt-controller;
+		#interrupt-cells = <1>;
+	};
+};
+
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>;
-- 
2.5.0

[PATCH 3/4] ARM: dts: sun4i: Add backlight node to pov protab2 ips9 tablet

[Chen-Yu Tsai]

On Fri, Nov 20, 2015 at 9:59 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> Add a node describing the lcd panel backlight on the pov protab2 ips9
> tablet.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Chen-Yu Tsai <wens@csie.org>

[PATCH 4/4] ARM: dts: sun5i: Add i2c axp152 pmic support for Auxtek T004 boards

[Chen-Yu Tsai]

On Fri, Nov 20, 2015 at 9:59 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> From: Michael van Slingerland <michael@deviousops.nl>
>
> Add a node describing the AXP152 pmic used on Auxtek T004 boards.
>
> Signed-off-by: Michael van Slingerland <michael@deviousops.nl>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Chen-Yu Tsai <wens@csie.org>

[PATCH 2/4] ARM: dts: sun5i: Add backlight node to UTOO P66 tablet

[Chen-Yu Tsai]

On Fri, Nov 20, 2015 at 9:59 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> Add a node describing the lcd panel backlight on the UTOO P66 tablet.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Chen-Yu Tsai <wens@csie.org>

[linux-sunxi] [PATCH 1/4] ARM: dts: sun4i: Add backlight node to iNet1 tablet

[Chen-Yu Tsai]

On Fri, Nov 20, 2015 at 9:59 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> Add a node describing the lcd panel backlight on the iNet1 tablet.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Acked-by: Chen-Yu Tsai <wens@csie.org>

[PATCH 1/4] ARM: dts: sun4i: Add backlight node to iNet1 tablet

[Maxime Ripard]

On Fri, Nov 20, 2015 at 02:59:07PM +0100, Hans de Goede wrote:
> Add a node describing the lcd panel backlight on the iNet1 tablet.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Applied. This patch was not applying. Please either mention the
dependency between your patch sets or base them on top of linus' rc's
or my branches.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151120/f2363890/attachment.sig>

[PATCH 2/4] ARM: dts: sun5i: Add backlight node to UTOO P66 tablet

[Maxime Ripard]

On Fri, Nov 20, 2015 at 02:59:08PM +0100, Hans de Goede wrote:
> Add a node describing the lcd panel backlight on the UTOO P66 tablet.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Applied, thanks!
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151120/a463637e/attachment.sig>

[PATCH 3/4] ARM: dts: sun4i: Add backlight node to pov protab2 ips9 tablet

[Maxime Ripard]

On Fri, Nov 20, 2015 at 02:59:09PM +0100, Hans de Goede wrote:
> Add a node describing the lcd panel backlight on the pov protab2 ips9
> tablet.
> 
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Fixed the conflict and applied. Thanks,

Maxime

> ---
>  arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 24 ++++++++++++++++++++++++
>  1 file changed, 24 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
> index 0e5124f..1f92ec7 100644
> --- a/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
> +++ b/arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
> @@ -47,6 +47,7 @@
>  #include <dt-bindings/input/input.h>
>  #include <dt-bindings/interrupt-controller/irq.h>
>  #include <dt-bindings/pinctrl/sun4i-a10.h>
> +#include <dt-bindings/pwm/pwm.h>
>  
>  / {
>  	model = "Point of View Protab2-IPS9";
> @@ -56,6 +57,16 @@
>  		serial0 = &uart0;
>  	};
>  
> +	backlight: backlight {
> +		compatible = "pwm-backlight";
> +		pinctrl-names = "default";
> +		pinctrl-0 = <&bl_en_pin_protab>;
> +		pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
> +		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
> +		default-brightness-level = <8>;
> +		enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
> +	};
> +
>  	chosen {
>  		stdout-path = "serial0:115200n8";
>  	};
> @@ -145,6 +156,13 @@
>  };
>  
>  &pio {
> +	bl_en_pin_protab: bl_en_pin at 0 {
> +		allwinner,pins = "PH7";
> +		allwinner,function = "gpio_out";
> +		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
> +		allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
> +	};
> +
>  	touchscreen_pins: touchscreen_pins at 0 {
>  		allwinner,pins = "PA5", "PB13";
>  		allwinner,function = "gpio_out";
> @@ -167,6 +185,12 @@
>  	};
>  };
>  
> +&pwm {
> +	pinctrl-names = "default";
> +	pinctrl-0 = <&pwm0_pins_a>;
> +	status = "okay";
> +};
> +
>  &reg_dcdc2 {
>  	regulator-always-on;
>  	regulator-min-microvolt = <1000000>;
> -- 
> 2.5.0
> 

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151120/838307c1/attachment-0001.sig>

[PATCH 4/4] ARM: dts: sun5i: Add i2c axp152 pmic support for Auxtek T004 boards

[Maxime Ripard]

On Fri, Nov 20, 2015 at 02:59:10PM +0100, Hans de Goede wrote:
> From: Michael van Slingerland <michael@deviousops.nl>
> 
> Add a node describing the AXP152 pmic used on Auxtek T004 boards.
> 
> Signed-off-by: Michael van Slingerland <michael@deviousops.nl>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>

I don't really get why this patch is in the same set as the other
patches, but I just applied it. Thanks!

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20151120/03946551/attachment-0001.sig>

[linux-sunxi] Re: [PATCH 4/4] ARM: dts: sun5i: Add i2c axp152 pmic support for Auxtek T004 boards

[Hans de Goede]

Hi,

On 20-11-15 17:42, Maxime Ripard wrote:
> On Fri, Nov 20, 2015 at 02:59:10PM +0100, Hans de Goede wrote:
>> From: Michael van Slingerland <michael@deviousops.nl>
>>
>> Add a node describing the AXP152 pmic used on Auxtek T004 boards.
>>
>> Signed-off-by: Michael van Slingerland <michael@deviousops.nl>
>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>
> I don't really get why this patch is in the same set as the other
> patches, but I just applied it. Thanks!

The theme of the set was dts patches which do not depend on anything
else :)

And sorry about the conflicts, I had the touchscreen patches in my
tree before this set.

Regards,

Hans