[GIT PULL 1/3] DaVinci soc support updates for v4.9

[GIT PULL 1/3] DaVinci soc support updates for v4.9

[Sekhar Nori]

The following changes since commit 29b4817d4018df78086157ea3a55c1d9424a7cfc:

  Linux 4.8-rc1 (2016-08-07 18:18:00 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v4.9/soc

for you to fetch changes up to 8f899b4ed6918ee4f7b87654f772bdaa0d580124:

  ARM: davinci: da850: Add ti-aemif lookup for clock matching (2016-08-23 20:20:33 +0530)

----------------------------------------------------------------
DA850 SoC support update for making it possible
to use TI AEMIF driver in drivers/memory on DA850.

----------------------------------------------------------------
Karl Beldan (1):
      ARM: davinci: da850: Add ti-aemif lookup for clock matching

 arch/arm/mach-davinci/da850.c    | 1 +
 arch/arm/mach-davinci/da8xx-dt.c | 1 +
 2 files changed, 2 insertions(+)

[GIT PULL 2/3] DaVinci dts updates for v4.9

[Sekhar Nori]

The following changes since commit 29b4817d4018df78086157ea3a55c1d9424a7cfc:

  Linux 4.8-rc1 (2016-08-07 18:18:00 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v4.9/dts

for you to fetch changes up to 9d05b389846312751108b16f3f8fccd51fa92715:

  ARM: dts: da850-lcdk: Audio support via simple-card (2016-08-19 17:51:27 +0530)

----------------------------------------------------------------
DaVinci DA850 device-tree enhancements include:

- Support for new board OMAP-L138 LCDK
- Add AEMIF node on DA850 EVM and use it for NAND
- Audio support for LCDK
- Cleanups for PWM and UART

----------------------------------------------------------------
Cooper Jr., Franklin (1):
      ARM: dts: da850: Add new ECAP and EPWM bindings

Karl Beldan (4):
      ARM: dts: da850: Add missing pin muxing for the UARTs
      ARM: dts: da850: Add basic DTS for the LCDK
      ARM: dts: da850,da850-evm: Add an aemif node and use it for the NAND
      ARM: dts: da850-lcdk: Audio support via simple-card

 Documentation/devicetree/bindings/arm/davinci.txt |   4 +
 arch/arm/boot/dts/Makefile                        |   1 +
 arch/arm/boot/dts/da850-evm.dts                   |  49 +++++++-
 arch/arm/boot/dts/da850-lcdk.dts                  | 138 ++++++++++++++++++++++
 arch/arm/boot/dts/da850.dtsi                      |  80 ++++++++-----
 arch/arm/mach-davinci/da8xx-dt.c                  |   1 +
 6 files changed, 239 insertions(+), 34 deletions(-)
 create mode 100644 arch/arm/boot/dts/da850-lcdk.dts

[GIT PULL 3/3] DaVinci defconfig updates for v4.9

[Sekhar Nori]

The following changes since commit 29b4817d4018df78086157ea3a55c1d9424a7cfc:

  Linux 4.8-rc1 (2016-08-07 18:18:00 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v4.9/defconfig

for you to fetch changes up to c6144fb8ec5328110ca7bf4682167a95590fd7ec:

  ARM: davinci_all_defconfig: Enable some UBI modules (2016-08-23 16:22:19 +0530)

----------------------------------------------------------------
DaVinci defconfig updates include cleanup using
savedefconfig and enabling various commonly used
drivers as modules.

----------------------------------------------------------------
Karl Beldan (4):
      ARM: davinci_all_defconfig: enable RTC driver as module
      ARM: davinci_all_defconfig: enable SMSC ethernet PHY
      ARM: davinci_all_defconfig: Enable AEMIF as a module
      ARM: davinci_all_defconfig: Enable some UBI modules

Kevin Hilman (2):
      ARM: davinci_all_defconfig: cleanup with savedefconfig
      ARM: davinci_all_defconfig: enable DA850 audio as modules

 arch/arm/configs/davinci_all_defconfig | 66 +++++++++++++---------------------
 1 file changed, 25 insertions(+), 41 deletions(-)

[GIT PULL 3/3] DaVinci defconfig updates for v4.9

[Arnd Bergmann]

On Wednesday, August 24, 2016 4:30:06 PM CEST Sekhar Nori wrote:
> DaVinci defconfig updates include cleanup using
> savedefconfig and enabling various commonly used
> drivers as modules.
> 
> 

Merged into next/defconfig, thanks!

	Arnd

[GIT PULL 1/3] DaVinci soc support updates for v4.9

[Arnd Bergmann]

On Wednesday, August 24, 2016 4:30:04 PM CEST Sekhar Nori wrote:
> DA850 SoC support update for making it possible
> to use TI AEMIF driver in drivers/memory on DA850.
> 

Pulled into next/soc, thanks!

	Arnd

[GIT PULL 2/3] DaVinci dts updates for v4.9

[Arnd Bergmann]

On Wednesday, August 24, 2016 4:30:05 PM CEST Sekhar Nori wrote:
> DaVinci DA850 device-tree enhancements include:
> 
> - Support for new board OMAP-L138 LCDK
> - Add AEMIF node on DA850 EVM and use it for NAND
> - Audio support for LCDK
> - Cleanups for PWM and UART
> 
> 

This one fails to build:


ERROR (phandle_references): Reference to non-existent node or label "nand_cs3_pins"

ERROR: Input tree has errors, aborting (use -f to force output)
  DTC     arch/arm/boot/dts/bcm47081-asus-rt-n18u.dtb


Can you send a fixed version please?

	Arnd

[GIT PULL 2/3] DaVinci dts updates for v4.9

[Sekhar Nori]

Hi Arnd,

On Wednesday 14 September 2016 09:23 PM, Arnd Bergmann wrote:
> On Wednesday, August 24, 2016 4:30:05 PM CEST Sekhar Nori wrote:
>> DaVinci DA850 device-tree enhancements include:
>>
>> - Support for new board OMAP-L138 LCDK
>> - Add AEMIF node on DA850 EVM and use it for NAND
>> - Audio support for LCDK
>> - Cleanups for PWM and UART
>>
>>
> 
> This one fails to build:
> 
> 
> ERROR (phandle_references): Reference to non-existent node or label "nand_cs3_pins"
> 
> ERROR: Input tree has errors, aborting (use -f to force output)
>   DTC     arch/arm/boot/dts/bcm47081-asus-rt-n18u.dtb
> 
> 
> Can you send a fixed version please?

Did the merge happen cleanly? There should be no nand_cs3_pins if the
merge was clean. It should be removed with 31e3a8817b66 ("ARM: dts:
da850,da850-evm: Add an aemif node and use it for the NAND").

If the merge was clean, can you please push the offending tree to some
place I can fetch and take a look. I dont have "nand_cs3_pins" in my
tree anymore nor I can reproduce the build break.

Thanks,
Sekhar

[GIT PULL 2/3] DaVinci dts updates for v4.9

[Arnd Bergmann]

On Thursday, September 15, 2016 2:11:03 PM CEST Sekhar Nori wrote:
> On Wednesday 14 September 2016 09:23 PM, Arnd Bergmann wrote:
> > On Wednesday, August 24, 2016 4:30:05 PM CEST Sekhar Nori wrote:
> > Can you send a fixed version please?
> 
> Did the merge happen cleanly? There should be no nand_cs3_pins if the
> merge was clean. It should be removed with 31e3a8817b66 ("ARM: dts:
> da850,da850-evm: Add an aemif node and use it for the NAND").
> 
> If the merge was clean, can you please push the offending tree to some
> place I can fetch and take a look. I dont have "nand_cs3_pins" in my
> tree anymore nor I can reproduce the build break.
> 
> 

I must have made a mistake, it now all works, sorry for the confusion.
I don't have the error in my scrollback buffer any more, but I suspect
that the file that caused the problem was not actually the .dts file
but the .dts.orig file from resolving the conflict.

Pulled it into next/dt now.

	Arnd