[PATCH 0/6] N900 DTS additions for 3.14

[PATCH 0/6] N900 DTS additions for 3.14

[Sebastian Reichel]

Hi Benoit,

Here are a couple of additions for the Nokia N900 Device Tree Source file. All
related drivers changes are queued for 3.14 (except for the tpa6130a2, which
got merged into 3.13).

I may have some more additions if the driver changes for the accelerometer, the
touchscreen or the wireless lan chip will be queued up.

-- Sebastian

Sebastian Reichel (6):
  DTS: ARM: TWL4030: Add keypad node
  DTS: ARM: OMAP3-N900: Add TWL4030 Keypad Matrix
  DTS: ARM: OMAP3-N900: Add support for tsl2563
  DTS: ARM: OMAP3-N900: Add tpa6130a2 support
  DTS: ARM: OMAP3-N900: Add isp1704 support
  DTS: ARM: OMAP3-N900: Add bq24150a support

 arch/arm/boot/dts/omap3-n900.dts | 90 ++++++++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/twl4030.dtsi   |  7 ++++
 2 files changed, 97 insertions(+)

-- 
1.8.5.2

[PATCH 1/6] DTS: ARM: TWL4030: Add keypad node

[Sebastian Reichel]

Add keypad node to twl4030, so that board DTS
files can just add the keymap.

Signed-off-by: Sebastian Reichel <sre@debian.org>
---
 arch/arm/boot/dts/twl4030.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 4217096..86cfc7d 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -145,4 +145,11 @@
 		compatible = "ti,twl4030-pwrbutton";
 		interrupts = <8>;
 	};
+
+	twl_keypad: keypad {
+		compatible = "ti,twl4030-keypad";
+		interrupts = <1>;
+		keypad,num-rows = <8>;
+		keypad,num-columns = <8>;
+	};
 };
-- 
1.8.5.2

[PATCH 2/6] DTS: ARM: OMAP3-N900: Add TWL4030 Keypad Matrix

[Sebastian Reichel]

Add Keyboard Matrix information to N900's DTS file.
This patch maps the keys exactly as the original
board code.

Signed-off-by: Sebastian Reichel <sre@debian.org>
---
 arch/arm/boot/dts/omap3-n900.dts | 55 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 6fc85f9..40473cb 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -254,6 +254,61 @@
 	};
 };
 
+&twl_keypad {
+	linux,keymap = < 0x00000010 /* KEY_Q */
+			 0x00010018 /* KEY_O */
+			 0x00020019 /* KEY_P */
+			 0x00030033 /* KEY_COMMA */
+			 0x0004000e /* KEY_BACKSPACE */
+			 0x0006001e /* KEY_A */
+			 0x0007001f /* KEY_S */
+
+			 0x01000011 /* KEY_W */
+			 0x01010020 /* KEY_D */
+			 0x01020021 /* KEY_F */
+			 0x01030022 /* KEY_G */
+			 0x01040023 /* KEY_H */
+			 0x01050024 /* KEY_J */
+			 0x01060025 /* KEY_K */
+			 0x01070026 /* KEY_L */
+
+			 0x02000012 /* KEY_E */
+			 0x02010034 /* KEY_DOT */
+			 0x02020067 /* KEY_UP */
+			 0x0203001c /* KEY_ENTER */
+			 0x0205002c /* KEY_Z */
+			 0x0206002d /* KEY_X */
+			 0x0207002e /* KEY_C */
+			 0x02080043 /* KEY_F9 */
+
+			 0x03000013 /* KEY_R */
+			 0x0301002f /* KEY_V */
+			 0x03020030 /* KEY_B */
+			 0x03030031 /* KEY_N */
+			 0x03040032 /* KEY_M */
+			 0x03050039 /* KEY_SPACE */
+			 0x03060039 /* KEY_SPACE */
+			 0x03070069 /* KEY_LEFT */
+
+			 0x04000014 /* KEY_T */
+			 0x0401006c /* KEY_DOWN */
+			 0x0402006a /* KEY_RIGHT */
+			 0x0404001d /* KEY_LEFTCTRL */
+			 0x04050064 /* KEY_RIGHTALT */
+			 0x0406002a /* KEY_LEFTSHIFT */
+			 0x04080044 /* KEY_F10 */
+
+			 0x05000015 /* KEY_Y */
+			 0x05080057 /* KEY_F11 */
+
+			 0x06000016 /* KEY_U */
+
+			 0x07000017 /* KEY_I */
+			 0x07010041 /* KEY_F7 */
+			 0x07020042 /* KEY_F8 */
+			 >;
+};
+
 &twl_gpio {
 	ti,pullups	= <0x0>;
 	ti,pulldowns	= <0x03ff3f>; /* BIT(0..5) | BIT(8..17) */
-- 
1.8.5.2

[PATCH 3/6] DTS: ARM: OMAP3-N900: Add support for tsl2563

[Sebastian Reichel]

Add support for tsl2563 light sensor to the Nokia N900.

Signed-off-by: Sebastian Reichel <sre@debian.org>
---
 arch/arm/boot/dts/omap3-n900.dts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 40473cb..79c1881 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -346,6 +346,13 @@
 		DVDD-supply = <&vio>;
 	};
 
+	tsl2563: tsl2563@29 {
+		compatible = "amstaos,tsl2563";
+		reg = <0x29>;
+
+		amstaos,cover-comp-gain = <16>;
+	};
+
 	lp5523: lp5523@32 {
 		compatible = "national,lp5523";
 		reg = <0x32>;
-- 
1.8.5.2

[PATCH 4/6] DTS: ARM: OMAP3-N900: Add tpa6130a2 support

[Sebastian Reichel]

This adds support for the N900's headphone
amplifier to the N900 DTS file.

Signed-off-by: Sebastian Reichel <sre@debian.org>
---
 arch/arm/boot/dts/omap3-n900.dts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 79c1881..0ceacad 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -418,6 +418,15 @@
 		compatible = "ti,bq27200";
 		reg = <0x55>;
 	};
+
+	tpa6130a2: tpa6130a2@60 {
+		compatible = "ti,tpa6130a2";
+		reg = <0x60>;
+
+		Vdd-supply = <&vmmc2>;
+
+		power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* 98 */
+	};
 };
 
 &i2c3 {
-- 
1.8.5.2

[PATCH 5/6] DTS: ARM: OMAP3-N900: Add isp1704 support

[Sebastian Reichel]

This adds support for the isp1704 chip to the Nokia N900
DTS file.

Signed-off-by: Sebastian Reichel <sre@debian.org>
---
 arch/arm/boot/dts/omap3-n900.dts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 0ceacad..86cceaf 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -74,6 +74,11 @@
 		};
 	};
 
+	isp1704: isp1704 {
+		compatible = "nxp,isp1704";
+		nxp,enable-gpio = <&gpio3 3 GPIO_ACTIVE_HIGH>;
+		usb-phy = <&usb2_phy>;
+	};
 };
 
 &omap3_pmx_core {
-- 
1.8.5.2

[PATCH 6/6] DTS: ARM: OMAP3-N900: Add bq24150a support

[Sebastian Reichel]

This adds support for the bq24150a chip to the
Nokia N900 DTS file.

Signed-off-by: Sebastian Reichel <sre@debian.org>
---
 arch/arm/boot/dts/omap3-n900.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index 86cceaf..64aa416 100644
--- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -432,6 +432,20 @@
 
 		power-gpio = <&gpio4 2 GPIO_ACTIVE_HIGH>; /* 98 */
 	};
+
+	bq24150a: bq24150a@6b {
+		compatible = "ti,bq24150a";
+		reg = <0x6b>;
+
+		ti,current-limit = <100>;
+		ti,weak-battery-voltage = <3400>;
+		ti,battery-regulation-voltage = <4200>;
+		ti,charge-current = <650>;
+		ti,termination-current = <100>;
+		ti,resistor-sense = <68>;
+
+		ti,usb-charger-detection = <&isp1704>;
+	};
 };
 
 &i2c3 {
-- 
1.8.5.2

Re: [PATCH 0/6] N900 DTS additions for 3.14

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 579 bytes --]

On Sat, Jan 11, 2014 at 10:16:57PM +0100, Sebastian Reichel wrote:
> Here are a couple of additions for the Nokia N900 Device Tree
> Source file. All related drivers changes are queued for 3.14
> (except for the tpa6130a2, which got merged into 3.13).
> 
> I may have some more additions if the driver changes for the
> accelerometer, the touchscreen or the wireless lan chip will be
> queued up.

ping?

Also it seems, that for_3.14/dts branch on bcousson/linux-omap-dt.git
merged some branches, which Tony no longer intends to be merged for
3.14.

-- Sebastian

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/6] N900 DTS additions for 3.14

[Benoit Cousson]

Hi Sebastian,

On 20/01/2014 16:59, Sebastian Reichel wrote:
> On Sat, Jan 11, 2014 at 10:16:57PM +0100, Sebastian Reichel wrote:
>> Here are a couple of additions for the Nokia N900 Device Tree
>> Source file. All related drivers changes are queued for 3.14
>> (except for the tpa6130a2, which got merged into 3.13).
>>
>> I may have some more additions if the driver changes for the
>> accelerometer, the touchscreen or the wireless lan chip will be
>> queued up.
>
> ping?
>
> Also it seems, that for_3.14/dts branch on bcousson/linux-omap-dt.git
> merged some branches, which Tony no longer intends to be merged for
> 3.14.

Yeah, I will have to sync with Tony to understand what will be in 3.14-rc1.

Do you have strong dep with the series Tony has done?

Regards,
Benoit

-- 
Benoît Cousson
BayLibre
Embedded Linux Technology Lab
www.baylibre.com
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/6] N900 DTS additions for 3.14

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 994 bytes --]

On Tue, Jan 21, 2014 at 12:59:42PM +0100, Benoit Cousson wrote:
> On 20/01/2014 16:59, Sebastian Reichel wrote:
> >On Sat, Jan 11, 2014 at 10:16:57PM +0100, Sebastian Reichel wrote:
> >>Here are a couple of additions for the Nokia N900 Device Tree
> >>Source file. All related drivers changes are queued for 3.14
> >>(except for the tpa6130a2, which got merged into 3.13).
> >>
> >>I may have some more additions if the driver changes for the
> >>accelerometer, the touchscreen or the wireless lan chip will be
> >>queued up.
> >
> >ping?
> >
> >Also it seems, that for_3.14/dts branch on bcousson/linux-omap-dt.git
> >merged some branches, which Tony no longer intends to be merged for
> >3.14.
> 
> Yeah, I will have to sync with Tony to understand what will be in
> 3.14-rc1. Do you have strong dep with the series Tony has done?

No. There is no dependency at all as far as i know. I just noticed
it when I checked if you already merged this patchset.

-- Sebastian

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/6] N900 DTS additions for 3.14

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 652 bytes --]

Hi,

On Sat, Jan 11, 2014 at 10:16:57PM +0100, Sebastian Reichel wrote:
>Here are a couple of additions for the Nokia N900 Device Tree
>Source file. All related drivers changes are queued for 3.14
>(except for the tpa6130a2, which got merged into 3.13).
>
>I may have some more additions if the driver changes for the
>accelerometer, the touchscreen or the wireless lan chip will be
>queued up.

Ping. If I'm not mistaken the merge window will probably be closed
at the weekend (2014-01-19 + 2 weeks = 2014-02-02).

P.S.: Accelerometer, Touchscreen and WLAN driver changes haven't
made it into 3.14, so the patchset I mailed is complete.

-- Sebastian

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/6] N900 DTS additions for 3.14

[Nishanth Menon]

On 01/29/2014 09:03 AM, Sebastian Reichel wrote:
> Hi,
> 
> On Sat, Jan 11, 2014 at 10:16:57PM +0100, Sebastian Reichel wrote:
>> Here are a couple of additions for the Nokia N900 Device Tree
>> Source file. All related drivers changes are queued for 3.14
>> (except for the tpa6130a2, which got merged into 3.13).
>>
>> I may have some more additions if the driver changes for the
>> accelerometer, the touchscreen or the wireless lan chip will be
>> queued up.
> 
> Ping. If I'm not mistaken the merge window will probably be closed
> at the weekend (2014-01-19 + 2 weeks = 2014-02-02).
> 
> P.S.: Accelerometer, Touchscreen and WLAN driver changes haven't
> made it into 3.14, so the patchset I mailed is complete.
> 
> -- Sebastian
> 

It is usually suggested for dts patches to be cced with devicetree and
linux-arm-kernel lists as well..

-- 
Regards,
Nishanth Menon

Re: [PATCH 0/6] N900 DTS additions for 3.14

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]

Hi Nishanth,

On Wed, Jan 29, 2014 at 09:04:46AM -0600, Nishanth Menon wrote:
> On 01/29/2014 09:03 AM, Sebastian Reichel wrote:
> > On Sat, Jan 11, 2014 at 10:16:57PM +0100, Sebastian Reichel wrote:
> >> Here are a couple of additions for the Nokia N900 Device Tree
> >> Source file. All related drivers changes are queued for 3.14
> >> (except for the tpa6130a2, which got merged into 3.13).
> >>
> >> I may have some more additions if the driver changes for the
> >> accelerometer, the touchscreen or the wireless lan chip will be
> >> queued up.
> > 
> > Ping. If I'm not mistaken the merge window will probably be closed
> > at the weekend (2014-01-19 + 2 weeks = 2014-02-02).
> > 
> > P.S.: Accelerometer, Touchscreen and WLAN driver changes haven't
> > made it into 3.14, so the patchset I mailed is complete.
> > 
> > -- Sebastian
> > 
> 
> It is usually suggested for dts patches to be cced with devicetree and
> linux-arm-kernel lists as well..

Well I CC'd them for the patches adding the binding documentation
and updating the drivers. I think its not so common for the dts
entries to reduce the workload of the DT binding maintainers?

Of course I can add them for future patchsets.

-- Sebastian

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/6] N900 DTS additions for 3.14

[Benoit Cousson]

Hi Sebastian,

On 29/01/2014 16:03, Sebastian Reichel wrote:
> Hi,
>
> On Sat, Jan 11, 2014 at 10:16:57PM +0100, Sebastian Reichel wrote:
>> Here are a couple of additions for the Nokia N900 Device Tree
>> Source file. All related drivers changes are queued for 3.14
>> (except for the tpa6130a2, which got merged into 3.13).
>>
>> I may have some more additions if the driver changes for the
>> accelerometer, the touchscreen or the wireless lan chip will be
>> queued up.
>
> Ping. If I'm not mistaken the merge window will probably be closed
> at the weekend (2014-01-19 + 2 weeks = 2014-02-02).
>
> P.S.: Accelerometer, Touchscreen and WLAN driver changes haven't
> made it into 3.14, so the patchset I mailed is complete.


Sorry for the delay, I've just applied them for 3.15.

BTW, do you have any other pending DTS patches?

Thanks,
Benoit

-- 
Benoît Cousson
BayLibre
Embedded Linux Technology Lab
www.baylibre.com
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 0/6] N900 DTS additions for 3.14

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 549 bytes --]

Hi Benoit,

On Fri, Feb 21, 2014 at 03:26:27PM +0100, Benoit Cousson wrote:
> Sorry for the delay, I've just applied them for 3.15.

Thanks.

> BTW, do you have any other pending DTS patches?

Not yet. I hope that the following drivers will have DT support
added in 3.15:

* Sent to Mainters, waiting for feedback
 * WLAN (Patches sent to John W. Linville, no feedback yet, not merged yet)
 * Accelerometer (Sent quite some time ago, no feedback yet, not merged yet)
* Updated patches will be sent at the weekend
 * Touchscreen
 * SSI

-- Sebastian

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]