[PATCH v2 0/4] ARM: dts: sun4i: gemei-g9: Devicetree improvements

[PATCH v2 0/4] ARM: dts: sun4i: gemei-g9: Devicetree improvements

[Priit Laes]

Improvements to devicetree setup:
 - Added IRQ configuration for bma250 accelerometer
 - Converted to use axp209 regulator nodes
 - Fix invalid regulator for LRADC keys
 - Enabled audio codec

Changes since v1:
 - Dropped NAND patch because driver is not yet ready
 - Dropped applied KEYBOARD_SUN4I_LRADC patch
 - Added sun4i audio codec patch

Priit Laes (4):
  ARM: dts: sun4i: gemei-g9: Add accelerometer (bma250) IRQ
  ARM: dts: sun4i: gemei-g9: Convert to use axp209 regulator nodes
  ARM: dts: sun4i: gemei-g9: Use reg_ldo2 instead of reg_vcc3v0
  ARM: dts: sun4i: gemei-g9: Enable sun4i audio codec support

 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 59 +++++++++++++++++++++++++-------
 1 file changed, 47 insertions(+), 12 deletions(-)

-- 
2.5.3

[PATCH v2 1/4] ARM: dts: sun4i: gemei-g9: Add accelerometer (bma250) IRQ

[Priit Laes]

Add IRQ configuration for bma250 accelerometer.

Signed-off-by: Priit Laes <plaes@plaes.org>
---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
index 570754d..3f0aeb8 100644
--- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
@@ -47,6 +47,7 @@
 #include "sunxi-common-regulators.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
 	model = "Gemei G9 Tablet";
@@ -64,7 +65,7 @@
 /*
  * TODO:
  *   2x cameras via CSI
- *   bma250 IRQs
+ *   audio
  *   AXP battery management
  *   NAND
  *   OTG
@@ -103,12 +104,8 @@
 	bma250 at 18 {
 		compatible = "bosch,bma250";
 		reg = <0x18>;
-
-		/*
-		 * TODO: interrupt pins:
-		 * int1 - PH00
-		 * int2 - PI10
-		 */
+		interrupt-parent = <&pio>;
+		interrupts = <7 0 IRQ_TYPE_EDGE_RISING>; /* PH00 / EINT0 */
 	};
 };
 
-- 
2.5.3

[PATCH v2 2/4] ARM: dts: sun4i: gemei-g9: Convert to use axp209 regulator nodes

[Priit Laes]

Add regulator nodes for axp209 by including the axp209 dtsi.

Changes in v2:
 - Add the ohci0 node.

Signed-off-by: Priit Laes <plaes@plaes.org>
---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 39 ++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
index 3f0aeb8..155b11a 100644
--- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
@@ -72,6 +72,10 @@
  *   Touchscreen - gt801_2plus1 @ i2c adapter 2 @ 0x48
  */
 
+&cpu0 {
+	cpu-supply = <&reg_dcdc2>;
+};
+
 &ehci0 {
 	status = "okay";
 };
@@ -86,15 +90,13 @@
 	status = "okay";
 
 	axp209: pmic at 34 {
-		compatible = "x-powers,axp209";
 		reg = <0x34>;
 		interrupts = <0>;
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
 	};
 };
 
+#include "axp209.dtsi"
+
 &i2c1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins_a>;
@@ -146,6 +148,35 @@
 	status = "okay";
 };
 
+&ohci0 {
+	status = "okay";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <1250000>;
+	regulator-max-microvolt = <1250000>;
+	regulator-name = "vdd-int-dll";
+};
+
+&reg_ldo1 {
+	regulator-name = "vdd-rtc";
+};
+
+&reg_ldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "avcc";
+};
+
 &reg_usb1_vbus {
 	status = "okay";
 };
-- 
2.5.3

[PATCH v2 3/4] ARM: dts: sun4i: gemei-g9: Use reg_ldo2 instead of reg_vcc3v0

[Priit Laes]

ADC seems to be using ldo2 for reference voltage.

Signed-off-by: Priit Laes <plaes@plaes.org>
---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
index 155b11a..b7cab72 100644
--- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
@@ -112,7 +112,7 @@
 };
 
 &lradc {
-	vref-supply = <&reg_vcc3v0>;
+	vref-supply = <&reg_ldo2>;
 
 	status = "okay";
 
-- 
2.5.3

[PATCH v2 4/4] ARM: dts: sun4i: gemei-g9: Enable sun4i audio codec support

[Priit Laes]

Gemei G9 has internal speakers and headphone jack. Audio switching
from internal speakers to headphones is automatically handled by
extra FT2012Q audio amplifier chip that works out of the box.

Signed-off-by: Priit Laes <plaes@plaes.org>
---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
index b7cab72..2db75c4 100644
--- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
+++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
@@ -65,12 +65,19 @@
 /*
  * TODO:
  *   2x cameras via CSI
- *   audio
+ *   audio input
  *   AXP battery management
  *   NAND
  *   OTG
  *   Touchscreen - gt801_2plus1 @ i2c adapter 2 @ 0x48
  */
+&codec {
+	routing =
+		"Headphone Jack", "HP Left",
+		"Headphone Jack", "HP Right";
+		/* TODO: input configuration */
+	status = "okay";
+};
 
 &cpu0 {
 	cpu-supply = <&reg_dcdc2>;
-- 
2.5.3

[linux-sunxi] [PATCH v2 2/4] ARM: dts: sun4i: gemei-g9: Convert to use axp209 regulator nodes

[Julian Calaby]

Hi Priit,

On Wed, Sep 23, 2015 at 5:38 PM, Priit Laes <plaes@plaes.org> wrote:
> Add regulator nodes for axp209 by including the axp209 dtsi.
>
> Changes in v2:
>  - Add the ohci0 node.

Firstly, changelog stuff like this should be below the --- under your SOB.

Also, shouldn't enabling the ohci0 node be a separate patch?

Thanks,

-- 
Julian Calaby

Email: julian.calaby at gmail.com
Profile: http://www.google.com/profiles/julian.calaby/

[PATCH v2 1/4] ARM: dts: sun4i: gemei-g9: Add accelerometer (bma250) IRQ

[Maxime Ripard]

On Wed, Sep 23, 2015 at 10:38:31AM +0300, Priit Laes wrote:
> Add IRQ configuration for bma250 accelerometer.
> 
> Signed-off-by: Priit Laes <plaes@plaes.org>

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/20150925/16f3831e/attachment.sig>

[linux-sunxi] [PATCH v2 2/4] ARM: dts: sun4i: gemei-g9: Convert to use axp209 regulator nodes

[Maxime Ripard]

On Thu, Sep 24, 2015 at 09:42:33AM +1000, Julian Calaby wrote:
> Hi Priit,
> 
> On Wed, Sep 23, 2015 at 5:38 PM, Priit Laes <plaes@plaes.org> wrote:
> > Add regulator nodes for axp209 by including the axp209 dtsi.
> >
> > Changes in v2:
> >  - Add the ohci0 node.
> 
> Firstly, changelog stuff like this should be below the --- under your SOB.
> 
> Also, shouldn't enabling the ohci0 node be a separate patch?

It should.

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/20150925/7f56394c/attachment.sig>

[PATCH v2 4/4] ARM: dts: sun4i: gemei-g9: Enable sun4i audio codec support

[Maxime Ripard]

On Wed, Sep 23, 2015 at 10:38:34AM +0300, Priit Laes wrote:
> Gemei G9 has internal speakers and headphone jack. Audio switching
> from internal speakers to headphones is automatically handled by
> extra FT2012Q audio amplifier chip that works out of the box.
> 
> Signed-off-by: Priit Laes <plaes@plaes.org>
> ---
>  arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
> index b7cab72..2db75c4 100644
> --- a/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
> +++ b/arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
> @@ -65,12 +65,19 @@
>  /*
>   * TODO:
>   *   2x cameras via CSI
> - *   audio
> + *   audio input
>   *   AXP battery management
>   *   NAND
>   *   OTG
>   *   Touchscreen - gt801_2plus1 @ i2c adapter 2 @ 0x48
>   */
> +&codec {
> +	routing =
> +		"Headphone Jack", "HP Left",
> +		"Headphone Jack", "HP Right";
> +		/* TODO: input configuration */
> +	status = "okay";
> +};

This doesn't compile, the codec node doesn't exist.

Please always base your patches on top of sunxi/for-next, linux-next
or some earlier rc, or mention the dependency in your cover letter.

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/20150925/061988d9/attachment.sig>