[linux-sunxi] Re: [PATCH] ARM: dts: sun8i: Base Orange Pi Plus dts on the Orange Pi 2 dts

Hi,

On Thu, Mar 24, 2016 at 12:15:52PM +0100, Hans de Goede wrote:

Hi Maxime,

On 24-03-16 08:59, Maxime Ripard wrote:

quoted

Hi,

On Wed, Mar 23, 2016 at 11:14:16PM +0100, Hans de Goede wrote:

quoted

The Orange Pi Plus really is an Orange Pi 2 extended with:
1) A sata <-> usb bridge connected to ehci3
2) An eMMC on mmc2
3) An external gigabit ethernet phy instead of the integrated 100Mbit phy

This commit changes the dts to reflect this by making it include
the Orange Pi 2 dts and then adding the extra bits.

Note that the difference in ethernet phy is not taken into account
because we do not have an ethernet driver for the H3 yet.

Signed-off-by: Hans de Goede <redacted>

Unfortunately, the patch doesn't apply anymore, and the merge doesn't
seem trivial.

I pushed my branch on my kernel.org repo, can you rebase your patch on
top and resend it?

The problem is that you forgot to apply:
"ARM: dts: sun8i: Orangepi plus gpio keys fixes and improvements"

With that applied this one should apply unchanged too.

Damn, you're right... Sorry for the noise. I applied both.

Thanks!
Maxime

-- 
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/20160324/39e5a90e/attachment.sig>