Skip to contentSkip to conversation

ARM: dts: sun4i: gemei-g9: Devicetree improvements

PATCH Superseded Priit Laes 3 participants 9 messages Sep 23, 2015 – Sep 25, 2015

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Priit Laes

author
#0 lore raw

v2 cover ARM: dts: sun4i: gemei-g9: Devicetree improvements

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(-)
Signature · 1 line
2.5.3
author
#1 lore raw

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

Add IRQ configuration for bma250 accelerometer.

---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +4 -7
index 570754d..3f0aeb8 100644
@@ -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 */
 	};
 };
 
Signature · 1 line
2.5.3
#2 lore raw

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

Quoted 3 lines · Priit Laes

Add IRQ configuration for bma250 accelerometer.

Applied, thanks!

Maxime

Signature · 10 lines
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>
author
#3 lore raw

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

In reply to Priit Laes

Add regulator nodes for axp209 by including the axp209 dtsi.

Changes in v2:
- Add the ohci0 node.

---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 39 ++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +35 -4
index 3f0aeb8..155b11a 100644
@@ -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";
 };
Signature · 1 line
2.5.3
#4 lore raw

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

Hi Priit,

Quoted 4 lines · Priit Laes

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,

Signature · 4 lines
Julian Calaby

Email: julian.calaby at gmail.com
Profile: http://www.google.com/profiles/julian.calaby/
#5 lore raw

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

Quoted 11 lines · Julian Calaby

Hi Priit,

Quoted 4 lines · Priit Laes

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

Signature · 10 lines
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>
author
#6 lore raw

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

In reply to Priit Laes

ADC seems to be using ldo2 for reference voltage.

---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +1 -1
index 155b11a..b7cab72 100644
@@ -112,7 +112,7 @@
 };
 
 &lradc {
-	vref-supply = <&reg_vcc3v0>;
+	vref-supply = <&reg_ldo2>;
 
 	status = "okay";
 
Signature · 1 line
2.5.3
author
#7 lore raw

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

In reply to 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.

---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +8 -1
index b7cab72..2db75c4 100644
@@ -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>;
Signature · 1 line
2.5.3
#8 lore raw

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

Quoted 21 lines · 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.

---
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +1 -1
index b7cab72..2db75c4 100644
@@ -65,12 +65,19 @@
 /*
  * TODO:
  *   2x cameras via CSI
- *   audio
+ *   audio input
  *   AXP battery management
  *   NAND

arch/arm/boot/dts/sun4i-a10-gemei-g9.dts line 80

Quoted 10 lines
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts +7 -0
  *   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

Signature · 10 lines
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>