[PATCH v2 0/4] More small davinci device tree fixes

[PATCH v2 0/4] More small davinci device tree fixes

[David Lechner]

Split "ARM: davinci: add spi0 to da850 device tree" into two patches and added
pinmux device tree nodes.

David Lechner (4):
  ARM: DTS: da850: add spi0 to device tree
  ARM: davinci: Add spi0 lookup to da8xx-dt for clock matching
  ARM: davinci: disable mdio and eth0 in da850.dtsi
  ARM: davinci: da850: There are 101 interrupts.

 arch/arm/boot/dts/da850-enbw-cmc.dts |  6 ++++++
 arch/arm/boot/dts/da850.dtsi         | 28 ++++++++++++++++++++++++++--
 arch/arm/mach-davinci/da8xx-dt.c     |  1 +
 3 files changed, 33 insertions(+), 2 deletions(-)

-- 
1.9.1

[PATCH v2 1/4] ARM: DTS: da850: add spi0 to device tree

[David Lechner]

Add device node and pinmux for SoC spi0.

Signed-off-by: David Lechner <david@lechnology.com>
---

Device tree portion of previous "ARM: davinci: add spi0 to da850 device tree"
patch.

Added pinmux definitions.


 arch/arm/boot/dts/da850.dtsi | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index c9bf27d..8880d57 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -120,7 +120,19 @@
 					0x4 0x00000004 0x0000000f
 				>;
 			};
-			spi1_pins: pinmux_spi_pins {
+			spi0_pins: pinmux_spi0_pins {
+				pinctrl-single,bits = <
+					/* SIMO, SOMI, CLK */
+					0xc 0x00001101 0x0000ff0f
+				>;
+			};
+			spi0_cs0_pin: pinmux_spi0_cs0 {
+				pinctrl-single,bits = <
+					/* CS0 */
+					0x10 0x00000010 0x000000f0
+				>;
+			};
+			spi1_pins: pinmux_spi1_pins {
 				pinctrl-single,bits = <
 					/* SIMO, SOMI, CLK */
 					0x14 0x00110100 0x00ff0f00
@@ -291,6 +303,16 @@
 			reg = <0x308000 0x80>;
 			status = "disabled";
 		};
+		spi0: spi at 41000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "ti,da830-spi";
+			reg = <0x41000 0x1000>;
+			num-cs = <6>;
+			ti,davinci-spi-intr-line = <1>;
+			interrupts = <20>;
+			status = "disabled";
+		};
 		spi1: spi at 30e000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
-- 
1.9.1

[PATCH v2 2/4] ARM: davinci: Add spi0 lookup to da8xx-dt for clock matching

[David Lechner]

This is needed to match the device-tree node for spi0 to the
non-device-tree clock.

Signed-off-by: David Lechner <david@lechnology.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
---

code portion of previous "ARM: davinci: add spi0 to da850 device tree" patch.

no change.

 arch/arm/mach-davinci/da8xx-dt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 64f3887..754f478 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -28,6 +28,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f06000, "ecap", NULL),
 	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f07000, "ecap", NULL),
 	OF_DEV_AUXDATA("ti,da850-ecap", 0x01f08000, "ecap", NULL),
+	OF_DEV_AUXDATA("ti,da830-spi", 0x01c41000, "spi_davinci.0", NULL),
 	OF_DEV_AUXDATA("ti,da830-spi", 0x01f0e000, "spi_davinci.1", NULL),
 	OF_DEV_AUXDATA("ns16550a", 0x01c42000, "serial8250.0", NULL),
 	OF_DEV_AUXDATA("ns16550a", 0x01d0c000, "serial8250.1", NULL),
-- 
1.9.1

[PATCH v2 3/4] ARM: davinci: disable mdio and eth0 in da850.dtsi

[David Lechner]

All other devices are disabled by default and not all boards will use
these devices, so these should be disabled too..

da850-evm.dtb already had status = "okay" for these devices.
da850-enbw-cmc.dts did not, so they were added.

Signed-off-by: David Lechner <david@lechnology.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
---

no change

 arch/arm/boot/dts/da850-enbw-cmc.dts | 6 ++++++
 arch/arm/boot/dts/da850.dtsi         | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/da850-enbw-cmc.dts b/arch/arm/boot/dts/da850-enbw-cmc.dts
index 101d1a1..14dff3e 100644
--- a/arch/arm/boot/dts/da850-enbw-cmc.dts
+++ b/arch/arm/boot/dts/da850-enbw-cmc.dts
@@ -26,6 +26,12 @@
 		serial2: serial at 10d000 {
 			status = "okay";
 		};
+		mdio: mdio at 224000 {
+			status = "okay";
+		};
+		eth0: ethernet at 220000 {
+			status = "okay";
+		};
 	};
 };
 
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 8880d57..26fc0812 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -330,6 +330,7 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 			reg = <0x224000 0x1000>;
+			status = "disabled";
 		};
 		eth0: ethernet at 220000 {
 			compatible = "ti,davinci-dm6467-emac";
@@ -344,6 +345,7 @@
 					35
 					36
 					>;
+			status = "disabled";
 		};
 		gpio: gpio at 226000 {
 			compatible = "ti,dm6441-gpio";
-- 
1.9.1

[PATCH v2 3/4] ARM: davinci: disable mdio and eth0 in da850.dtsi

[Sekhar Nori]

Hi David,

On Saturday 16 April 2016 10:30 PM, David Lechner wrote:
> All other devices are disabled by default and not all boards will use
> these devices, so these should be disabled too..
> 
> da850-evm.dtb already had status = "okay" for these devices.
> da850-enbw-cmc.dts did not, so they were added.
> 
> Signed-off-by: David Lechner <david@lechnology.com>
> Tested-by: Kevin Hilman <khilman@baylibre.com>

I applied this and other patches in this series. One nit-pick though.
The commit description should be independently readable and not only as
continuation of the headline. Even if this means repeating portion of
the headline. I fixed this for most of the patches in this series. For
example, for this patch, I have:

    ARM: dts: da850: disable mdio and eth0 in da850.dtsi

    Disable mdio and eth0 in da850.dtsi file. All other
    devices are disabled by default and not all boards
    will use these devices, so these should be disabled too.

    da850-evm.dtb already had status = "okay" for these devices.
    da850-enbw-cmc.dts did not, so they were added.

    Signed-off-by: David Lechner <david@lechnology.com>
    Tested-by: Kevin Hilman <khilman@baylibre.com>
    [nsekhar at ti.com: commit description updates]
    Signed-off-by: Sekhar Nori <nsekhar@ti.com>

Its a minor change and I wont reply to all the patches with the changes
I made. But I pushed the updated v4.7/dt branch in my tree. Do take a
look at the commit description there.

Thanks,
Sekhar

[PATCH v2 3/4] ARM: davinci: disable mdio and eth0 in da850.dtsi

[David Lechner]

On 04/25/2016 08:30 AM, Sekhar Nori wrote:
> Hi David,
>
> On Saturday 16 April 2016 10:30 PM, David Lechner wrote:
>> All other devices are disabled by default and not all boards will use
>> these devices, so these should be disabled too..
>>
>> da850-evm.dtb already had status = "okay" for these devices.
>> da850-enbw-cmc.dts did not, so they were added.
>>
>> Signed-off-by: David Lechner <david@lechnology.com>
>> Tested-by: Kevin Hilman <khilman@baylibre.com>
>
> I applied this and other patches in this series. One nit-pick though.
> The commit description should be independently readable and not only as
> continuation of the headline. Even if this means repeating portion of
> the headline. I fixed this for most of the patches in this series. For
> example, for this patch, I have:
>
>      ARM: dts: da850: disable mdio and eth0 in da850.dtsi
>
>      Disable mdio and eth0 in da850.dtsi file. All other
>      devices are disabled by default and not all boards
>      will use these devices, so these should be disabled too.
>
>      da850-evm.dtb already had status = "okay" for these devices.
>      da850-enbw-cmc.dts did not, so they were added.
>
>      Signed-off-by: David Lechner <david@lechnology.com>
>      Tested-by: Kevin Hilman <khilman@baylibre.com>
>      [nsekhar at ti.com: commit description updates]
>      Signed-off-by: Sekhar Nori <nsekhar@ti.com>
>
> Its a minor change and I wont reply to all the patches with the changes
> I made. But I pushed the updated v4.7/dt branch in my tree. Do take a
> look at the commit description there.
>
> Thanks,
> Sekhar
>
>


I had a look at the commits. I'll be sure to follow that advice in the 
future.

[PATCH v2 4/4] ARM: davinci: da850: There are 101 interrupts.

[David Lechner]

Fix off by one error in da850 device tree.

Signed-off-by: David Lechner <david@lechnology.com>
Tested-by: Kevin Hilman <khilman@baylibre.com>
---

no change

 arch/arm/boot/dts/da850.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 26fc0812..cf1aad8 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -19,7 +19,7 @@
 			compatible = "ti,cp-intc";
 			interrupt-controller;
 			#interrupt-cells = <1>;
-			ti,intc-size = <100>;
+			ti,intc-size = <101>;
 			reg = <0xfffee000 0x2000>;
 		};
 	};
-- 
1.9.1