From: maxime.ripard@free-electrons.com (Maxime Ripard)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Allwinner H5 DT changes for 4.12
Date: Wed, 19 Apr 2017 16:11:51 +0200 [thread overview]
Message-ID: <20170419141151.abshl2iynsxqh76q@lukather> (raw)
In-Reply-To: <20170419124552.GT17004@localhost>
Hi Olof,
On Wed, Apr 19, 2017 at 05:45:52AM -0700, Olof Johansson wrote:
> On Thu, Apr 06, 2017 at 11:37:48AM +0200, Maxime Ripard wrote:
> > Hi Arnd, Olof,
> >
> > Here is a serie of patches a bit unusual for the next merge window.
> >
> > Allwinner released a new SoC, the H5, that is basically an H3 with
> > arm64 CPU cores (A53 instead of A7).
> >
> > In order to support it properly, we've created a common DTSI, and
> > built on top. Since that DTSI is spread across arm and arm64, it took
> > a bit of rework (all the patches in that PR until commit da89e1d5cbaf
> > ("ARM: sunxi: h3/h5: add usb_otg and OHCI/EHCI for usbc0 on H3/H5"))
> > that is shared with the PR I just sent with the H3-only patches.
> >
> > The patches on top of that commit are H5-specific commits (new boards,
> > new features) and should be merged through your arm64 DT branch.
> >
> > Thanks,
> > Maxime
> >
> > The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:
> >
> > Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)
> >
> > are available in the git repository at:
> >
> > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git tags/sunxi-dt-h5-for-4.12
> >
> > for you to fetch changes up to d7bb5b966174fee6e4b0085124b75787a5d81b8a:
> >
> > ARM: sunxi: h3/h5: switch apb0-related clocks to r_ccu (2017-04-04 17:45:24 +0200)
> >
> > ----------------------------------------------------------------
> > Allwinner H5 DT changes for 4.12
> >
> > H5 patches for 4.12, which are mostly related to reworking the H3 DTSI to
> > be usable on the arm64 H5 DTSI, that shares almost everything with the H3
> > but the CPU cores.
> >
> > We then have patches to support the H5 boards on top.
> >
> > ----------------------------------------------------------------
> > Andre Przywara (3):
> > arm: sun8i: h3: split Allwinner H3 .dtsi
> > arm64: allwinner: h5: add Allwinner H5 .dtsi
> > arm64: allwinner: h5: add support for the Orange Pi PC 2 board
> >
> > Icenowy Zheng (6):
> > arm: sun8i: h3: drop skeleton.dtsi inclusion in H3 DTSI
> > arm: sun8i: h3: drop pinctrl-a10.h inclusion for H3 DTSI
> > arm: sun8i: h3: correct the GIC compatible in H3 to gic-400
> > ARM: sunxi: h3/h5: add usb_otg and OHCI/EHCI for usbc0 on H3/H5
> > arm64: allwinner: h5: enable USB OTG on Orange Pi PC 2 board
> > ARM: sunxi: h3/h5: switch apb0-related clocks to r_ccu
> >
> > arch/arm/boot/dts/sun8i-h3.dtsi | 602 ++-------------------
> > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 601 ++++++++++++++++++++
> > arch/arm64/boot/dts/allwinner/Makefile | 1 +
> > .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 188 +++++++
> > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 124 +++++
> > arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi | 1 +
> > 6 files changed, 955 insertions(+), 562 deletions(-)
> > create mode 100644 arch/arm/boot/dts/sunxi-h3-h5.dtsi
> > create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
> > create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi
> > create mode 120000 arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi
>
> So, I really don't like these symlinks. We had some discussions here:
>
> https://marc.info/?m=147547436324674&w=2
>
> Given my lack of attention on this, it's obviously way late in the release
> cycle to ask you to respin so I'll merge this branch as-is right now.
>
> What I'll do though, is that I'll apply that patch that sets up those
> symlinks here, and may I ask that you revisit right after -rc1 with
> a pull request that moves over to that model? I.e. the arm64 dts
> would then include <arm/sunxi-h3-h5.dtsi> instead.
I'll do it.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170419/3a31b68b/attachment.sig>
prev parent reply other threads:[~2017-04-19 14:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 9:37 [GIT PULL] Allwinner H5 DT changes for 4.12 Maxime Ripard
2017-04-19 12:45 ` Olof Johansson
2017-04-19 14:11 ` Maxime Ripard [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170419141151.abshl2iynsxqh76q@lukather \
--to=maxime.ripard@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).