mbox

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

Message ID 20160824110006.1866-2-nsekhar@ti.com
State New
Headers show

Pull-request

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

Message

Sekhar Nori Aug. 24, 2016, 11 a.m. UTC
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

Comments

Arnd Bergmann Sept. 14, 2016, 3:53 p.m. UTC | #1
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
Sekhar Nori Sept. 15, 2016, 8:41 a.m. UTC | #2
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
Arnd Bergmann Sept. 15, 2016, 9:35 a.m. UTC | #3
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