| Message ID | 20190125103824.9803-2-wens@csie.org |
|---|---|
| State | Changes Requested |
| Delegated to: | Jagannadha Sutradharudu Teki |
| Headers | show |
| Series | sunxi: Sync Bananapi M2+ dts files and add H5 variant | expand |
On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > device tree for the Bananapi M2+ has been split into a common dtsi file, > and an SoC-specific board device tree file that includes both the shared > dtsi file and the soc dtsi file. This was done to support both the H3 > and H5 variants of the same board. This is similar to what was doen for s/doen/done > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > out common board design for ALL-H3-CC device tree"). > > The newly split files are directly synced from Linux tag v5.0-rc1. Better sync all dts(i) files on this relevant SoC, this would help to track and use for rest of SoC's are inline to the same version later.
On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > and an SoC-specific board device tree file that includes both the shared > > dtsi file and the soc dtsi file. This was done to support both the H3 > > and H5 variants of the same board. This is similar to what was doen for > > s/doen/done Good catch. > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > out common board design for ALL-H3-CC device tree"). > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > Better sync all dts(i) files on this relevant SoC, this would help to > track and use for rest of SoC's are inline to the same version later. Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs for the next release have been sent out. ChenYu
On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > and an SoC-specific board device tree file that includes both the shared > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > and H5 variants of the same board. This is similar to what was doen for > > > > s/doen/done > > Good catch. > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > out common board design for ALL-H3-CC device tree"). > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > track and use for rest of SoC's are inline to the same version later. > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > for the next release have been sent out. Yes, better we can pick relevant version on during next MW.
On Tue, 12 Feb 2019 17:30:44 +0530 Jagan Teki <jagan@amarulasolutions.com> wrote: > On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > > and an SoC-specific board device tree file that includes both the shared > > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > > and H5 variants of the same board. This is similar to what was doen for > > > > > > s/doen/done > > > > Good catch. > > > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > > out common board design for ALL-H3-CC device tree"). > > > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > > track and use for rest of SoC's are inline to the same version later. > > > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > > for the next release have been sent out. > > Yes, better we can pick relevant version on during next MW. I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository: https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1 https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1 There should be no need to wait for the Linux MW to close. Given that the U-Boot release is scheduled to happen after that, we should start now and possibly fix things later. Cheers, Andre.
On Tue, Feb 12, 2019 at 5:38 PM Andre Przywara <andre.przywara@arm.com> wrote: > > On Tue, 12 Feb 2019 17:30:44 +0530 > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > > > and an SoC-specific board device tree file that includes both the shared > > > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > > > and H5 variants of the same board. This is similar to what was doen for > > > > > > > > s/doen/done > > > > > > Good catch. > > > > > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > > > out common board design for ALL-H3-CC device tree"). > > > > > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > > > track and use for rest of SoC's are inline to the same version later. > > > > > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > > > for the next release have been sent out. > > > > Yes, better we can pick relevant version on during next MW. > > I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository: > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1 > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1 > > There should be no need to wait for the Linux MW to close. Not for Linux, I'm referring here about u-boot MW.
On Tue, 12 Feb 2019 17:39:35 +0530 Jagan Teki <jagan@amarulasolutions.com> wrote: > On Tue, Feb 12, 2019 at 5:38 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > On Tue, 12 Feb 2019 17:30:44 +0530 > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > > > > and an SoC-specific board device tree file that includes both the shared > > > > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > > > > and H5 variants of the same board. This is similar to what was doen for > > > > > > > > > > s/doen/done > > > > > > > > Good catch. > > > > > > > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > > > > out common board design for ALL-H3-CC device tree"). > > > > > > > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > > > > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > > > > track and use for rest of SoC's are inline to the same version later. > > > > > > > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > > > > for the next release have been sent out. > > > > > > Yes, better we can pick relevant version on during next MW. > > > > I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository: > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1 > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1 > > > > There should be no need to wait for the Linux MW to close. > > Not for Linux, I'm referring here about u-boot MW. Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs. Cheers, Andre.
On Tue, Feb 12, 2019 at 5:46 PM Andre Przywara <andre.przywara@arm.com> wrote: > > On Tue, 12 Feb 2019 17:39:35 +0530 > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > On Tue, Feb 12, 2019 at 5:38 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > > > On Tue, 12 Feb 2019 17:30:44 +0530 > > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > > > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > > > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > > > > > and an SoC-specific board device tree file that includes both the shared > > > > > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > > > > > and H5 variants of the same board. This is similar to what was doen for > > > > > > > > > > > > s/doen/done > > > > > > > > > > Good catch. > > > > > > > > > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > > > > > out common board design for ALL-H3-CC device tree"). > > > > > > > > > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > > > > > > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > > > > > track and use for rest of SoC's are inline to the same version later. > > > > > > > > > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > > > > > for the next release have been sent out. > > > > > > > > Yes, better we can pick relevant version on during next MW. > > > > > > I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository: > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1 > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1 > > > > > > There should be no need to wait for the Linux MW to close. > > > > Not for Linux, I'm referring here about u-boot MW. > > Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. > This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs. I knew this degree of risk with dts changes and I have no specific reason for this except to follow U-Boot release cycle[1] not to take new features in 'release candidate phase' which was missed. [1] https://www.denx.de/wiki/U-Boot/ReleaseCycle
On Tue, Feb 12, 2019 at 8:22 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > On Tue, Feb 12, 2019 at 5:46 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > On Tue, 12 Feb 2019 17:39:35 +0530 > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > On Tue, Feb 12, 2019 at 5:38 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > > > > > On Tue, 12 Feb 2019 17:30:44 +0530 > > > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > > > > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > > > > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > > > > > > and an SoC-specific board device tree file that includes both the shared > > > > > > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > > > > > > and H5 variants of the same board. This is similar to what was doen for > > > > > > > > > > > > > > s/doen/done > > > > > > > > > > > > Good catch. > > > > > > > > > > > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > > > > > > out common board design for ALL-H3-CC device tree"). > > > > > > > > > > > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > > > > > > > > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > > > > > > track and use for rest of SoC's are inline to the same version later. > > > > > > > > > > > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > > > > > > for the next release have been sent out. > > > > > > > > > > Yes, better we can pick relevant version on during next MW. > > > > > > > > I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1 > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1 > > > > > > > > There should be no need to wait for the Linux MW to close. > > > > > > Not for Linux, I'm referring here about u-boot MW. > > > > Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. > > This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs. > > I knew this degree of risk with dts changes and I have no specific > reason for this except to follow U-Boot release cycle[1] not to take > new features in 'release candidate phase' which was missed. > > [1] https://www.denx.de/wiki/U-Boot/ReleaseCycle Or you can merge these patches as is for now, and sync up all the device tree files once the next merge window opens. These patches were sent a full two weeks before the merge window closed. AFAIK they are eligible [1] for the pending release. [1] https://www.denx.de/wiki/U-Boot/DevelopmentProcess ChenYu
Hi Chen-Yu, On Tue, Feb 12, 2019 at 5:59 PM Chen-Yu Tsai <wens@csie.org> wrote: > > On Tue, Feb 12, 2019 at 8:22 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > On Tue, Feb 12, 2019 at 5:46 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > > > On Tue, 12 Feb 2019 17:39:35 +0530 > > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > On Tue, Feb 12, 2019 at 5:38 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > > > > > > > On Tue, 12 Feb 2019 17:30:44 +0530 > > > > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > > > > > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > > > > > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > > > > > > > and an SoC-specific board device tree file that includes both the shared > > > > > > > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > > > > > > > and H5 variants of the same board. This is similar to what was doen for > > > > > > > > > > > > > > > > s/doen/done > > > > > > > > > > > > > > Good catch. > > > > > > > > > > > > > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > > > > > > > out common board design for ALL-H3-CC device tree"). > > > > > > > > > > > > > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > > > > > > > > > > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > > > > > > > track and use for rest of SoC's are inline to the same version later. > > > > > > > > > > > > > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > > > > > > > for the next release have been sent out. > > > > > > > > > > > > Yes, better we can pick relevant version on during next MW. > > > > > > > > > > I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository: > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1 > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1 > > > > > > > > > > There should be no need to wait for the Linux MW to close. > > > > > > > > Not for Linux, I'm referring here about u-boot MW. > > > > > > Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. > > > This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs. > > > > I knew this degree of risk with dts changes and I have no specific > > reason for this except to follow U-Boot release cycle[1] not to take > > new features in 'release candidate phase' which was missed. > > > > [1] https://www.denx.de/wiki/U-Boot/ReleaseCycle > > Or you can merge these patches as is for now, and sync up all the > device tree files Can't you wait till all get in? any urgency? idea is to grab all sync changes in one commit. > once the next merge window opens. These patches were sent a full two > weeks before > the merge window closed. AFAIK they are eligible [1] for the pending release. To be clear I knew this and same mentioned above, I missed it during last MW.
On Tue, Feb 12, 2019 at 9:02 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > Hi Chen-Yu, > > On Tue, Feb 12, 2019 at 5:59 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > On Tue, Feb 12, 2019 at 8:22 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > On Tue, Feb 12, 2019 at 5:46 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > > > > > On Tue, 12 Feb 2019 17:39:35 +0530 > > > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > On Tue, Feb 12, 2019 at 5:38 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > > > > > > > > > On Tue, 12 Feb 2019 17:30:44 +0530 > > > > > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > > > > > > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > > > > > > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > > > > > > > > and an SoC-specific board device tree file that includes both the shared > > > > > > > > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > > > > > > > > and H5 variants of the same board. This is similar to what was doen for > > > > > > > > > > > > > > > > > > s/doen/done > > > > > > > > > > > > > > > > Good catch. > > > > > > > > > > > > > > > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > > > > > > > > out common board design for ALL-H3-CC device tree"). > > > > > > > > > > > > > > > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > > > > > > > > > > > > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > > > > > > > > track and use for rest of SoC's are inline to the same version later. > > > > > > > > > > > > > > > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > > > > > > > > for the next release have been sent out. > > > > > > > > > > > > > > Yes, better we can pick relevant version on during next MW. > > > > > > > > > > > > I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1 > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1 > > > > > > > > > > > > There should be no need to wait for the Linux MW to close. > > > > > > > > > > Not for Linux, I'm referring here about u-boot MW. > > > > > > > > Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. > > > > This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs. > > > > > > I knew this degree of risk with dts changes and I have no specific > > > reason for this except to follow U-Boot release cycle[1] not to take > > > new features in 'release candidate phase' which was missed. > > > > > > [1] https://www.denx.de/wiki/U-Boot/ReleaseCycle > > > > Or you can merge these patches as is for now, and sync up all the > > device tree files > > Can't you wait till all get in? any urgency? idea is to grab all sync > changes in one commit. It's not urgent at all. It's more likely that I completely forget about this in two months. And it will still be two commits either way you cut it: 1 for the sync, the other for the defconfig and MAINTAINERS entry. > > once the next merge window opens. These patches were sent a full two > > weeks before > > the merge window closed. AFAIK they are eligible [1] for the pending release. > > To be clear I knew this and same mentioned above, I missed it during last MW. OK. ChenYu
On Tue, Feb 12, 2019 at 6:37 PM Chen-Yu Tsai <wens@csie.org> wrote: > > On Tue, Feb 12, 2019 at 9:02 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > Hi Chen-Yu, > > > > On Tue, Feb 12, 2019 at 5:59 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > On Tue, Feb 12, 2019 at 8:22 PM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > On Tue, Feb 12, 2019 at 5:46 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > > > > > > > On Tue, 12 Feb 2019 17:39:35 +0530 > > > > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > On Tue, Feb 12, 2019 at 5:38 PM Andre Przywara <andre.przywara@arm.com> wrote: > > > > > > > > > > > > > > On Tue, 12 Feb 2019 17:30:44 +0530 > > > > > > > Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > > On Mon, Feb 11, 2019 at 8:26 AM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > > > > > On Sun, Feb 10, 2019 at 1:38 AM Jagan Teki <jagan@amarulasolutions.com> wrote: > > > > > > > > > > > > > > > > > > > > On Fri, Jan 25, 2019 at 4:08 PM Chen-Yu Tsai <wens@csie.org> wrote: > > > > > > > > > > > > > > > > > > > > > > As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out > > > > > > > > > > > non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the > > > > > > > > > > > device tree for the Bananapi M2+ has been split into a common dtsi file, > > > > > > > > > > > and an SoC-specific board device tree file that includes both the shared > > > > > > > > > > > dtsi file and the soc dtsi file. This was done to support both the H3 > > > > > > > > > > > and H5 variants of the same board. This is similar to what was doen for > > > > > > > > > > > > > > > > > > > > s/doen/done > > > > > > > > > > > > > > > > > > Good catch. > > > > > > > > > > > > > > > > > > > > the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split > > > > > > > > > > > out common board design for ALL-H3-CC device tree"). > > > > > > > > > > > > > > > > > > > > > > The newly split files are directly synced from Linux tag v5.0-rc1. > > > > > > > > > > > > > > > > > > > > Better sync all dts(i) files on this relevant SoC, this would help to > > > > > > > > > > track and use for rest of SoC's are inline to the same version later. > > > > > > > > > > > > > > > > > > Ok. Would syncing with linux-next (5.1) work for you? FYI all the PRs > > > > > > > > > for the next release have been sent out. > > > > > > > > > > > > > > > > Yes, better we can pick relevant version on during next MW. > > > > > > > > > > > > > > I think what Chen-Yu wanted to hint at is that you can this already, by picking the patches from the currently existing branches of the linux-sunxi repository: > > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt64-for-5.1 > > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git/log/?h=sunxi/dt-for-5.1 > > > > > > > > > > > > > > There should be no need to wait for the Linux MW to close. > > > > > > > > > > > > Not for Linux, I'm referring here about u-boot MW. > > > > > > > > > > Why do we have to wait for so long? The next U-Boot MW is about two months away from now. And with U-Boot's usage of the DT we can surely minimise the risk of breaking something, by just reviewing that the DT changes do not touch or interfere with any devices that U-Boot cares about. > > > > > This way we can get up-to-date DTs now (which UEFI boot benefits from), so that users don't have to provide "their own" DTs. > > > > > > > > I knew this degree of risk with dts changes and I have no specific > > > > reason for this except to follow U-Boot release cycle[1] not to take > > > > new features in 'release candidate phase' which was missed. > > > > > > > > [1] https://www.denx.de/wiki/U-Boot/ReleaseCycle > > > > > > Or you can merge these patches as is for now, and sync up all the > > > device tree files > > > > Can't you wait till all get in? any urgency? idea is to grab all sync > > changes in one commit. > > It's not urgent at all. It's more likely that I completely forget about > this in two months. > > And it will still be two commits either way you cut it: 1 for the sync, > the other for the defconfig and MAINTAINERS entry. OK, will look at the rest and pick accordingly. thanks!
diff --git a/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts index 30540dc8e0c5..195a75da13f1 100644 --- a/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts +++ b/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts @@ -42,195 +42,9 @@ /dts-v1/; #include "sun8i-h3.dtsi" -#include "sunxi-common-regulators.dtsi" - -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> +#include "sunxi-bananapi-m2-plus.dtsi" / { - model = "Banana Pi BPI-M2-Plus"; + model = "Banana Pi BPI-M2-Plus H3"; compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3"; - - aliases { - ethernet0 = &emac; - serial0 = &uart0; - serial1 = &uart1; - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - connector { - compatible = "hdmi-connector"; - type = "a"; - - port { - hdmi_con_in: endpoint { - remote-endpoint = <&hdmi_out_con>; - }; - }; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - - pwr_led { - label = "bananapi-m2-plus:red:pwr"; - gpios = <&r_pio 0 10 GPIO_ACTIVE_HIGH>; /* PL10 */ - default-state = "on"; - }; - }; - - gpio_keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - - sw4 { - label = "power"; - linux,code = <BTN_0>; - gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; - }; - }; - - reg_gmac_3v3: gmac-3v3 { - compatible = "regulator-fixed"; - regulator-name = "gmac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - startup-delay-us = <100000>; - enable-active-high; - gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; - }; - - wifi_pwrseq: wifi_pwrseq { - compatible = "mmc-pwrseq-simple"; - pinctrl-names = "default"; - reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ - }; -}; - -&de { - status = "okay"; -}; - -&ehci0 { - status = "okay"; -}; - -&ehci1 { - status = "okay"; -}; - -&ehci2 { - status = "okay"; -}; - -&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-supply = <®_gmac_3v3>; - phy-handle = <&ext_rgmii_phy>; - phy-mode = "rgmii"; - - status = "okay"; -}; - -&external_mdio { - ext_rgmii_phy: ethernet-phy@1 { - compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; - }; -}; - -&hdmi { - status = "okay"; -}; - -&hdmi_out { - hdmi_out_con: endpoint { - remote-endpoint = <&hdmi_con_in>; - }; -}; - -&ir { - pinctrl-names = "default"; - pinctrl-0 = <&ir_pins_a>; - status = "okay"; -}; - -&mmc0 { - vmmc-supply = <®_vcc3v3>; - bus-width = <4>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */ - status = "okay"; -}; - -&mmc1 { - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - mmc-pwrseq = <&wifi_pwrseq>; - bus-width = <4>; - non-removable; - status = "okay"; - - brcmf: wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - interrupt-parent = <&pio>; - interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 / EINT10 */ - interrupt-names = "host-wake"; - }; -}; - -&mmc2 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc2_8bit_pins>; - vmmc-supply = <®_vcc3v3>; - vqmmc-supply = <®_vcc3v3>; - bus-width = <8>; - non-removable; - status = "okay"; -}; - -&ohci0 { - status = "okay"; -}; - -&ohci1 { - status = "okay"; -}; - -&ohci2 { - status = "okay"; -}; - -®_usb0_vbus { - gpio = <&pio 3 11 GPIO_ACTIVE_HIGH>; /* PD11 */ - status = "okay"; -}; - -&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; - status = "okay"; -}; - -&uart1 { - pinctrl-names = "default"; - pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; - status = "okay"; -}; - -&usb_otg { - dr_mode = "otg"; - status = "okay"; -}; - -&usbphy { - usb0_id_det-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */ - usb0_vbus-supply = <®_usb0_vbus>; - /* USB host VBUS is on as long as VCC-IO is on */ - status = "okay"; }; diff --git a/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi similarity index 92% copy from arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts copy to arch/arm/dts/sunxi-bananapi-m2-plus.dtsi index 30540dc8e0c5..3bed375b9c03 100644 --- a/arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts +++ b/arch/arm/dts/sunxi-bananapi-m2-plus.dtsi @@ -40,17 +40,12 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -/dts-v1/; -#include "sun8i-h3.dtsi" #include "sunxi-common-regulators.dtsi" #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> / { - model = "Banana Pi BPI-M2-Plus"; - compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3"; - aliases { ethernet0 = &emac; serial0 = &uart0; @@ -108,6 +103,8 @@ compatible = "mmc-pwrseq-simple"; pinctrl-names = "default"; reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ + clocks = <&rtc 1>; + clock-names = "ext_clock"; }; }; @@ -140,7 +137,7 @@ &external_mdio { ext_rgmii_phy: ethernet-phy@1 { compatible = "ethernet-phy-ieee802.3-c22"; - reg = <0>; + reg = <1>; }; }; @@ -220,7 +217,19 @@ &uart1 { pinctrl-names = "default"; pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>; - status = "okay"; + uart-has-rtscts; + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rtc 1>; + clock-names = "lpo"; + vbat-supply = <®_vcc3v3>; + vddio-supply = <®_vcc3v3>; + device-wakeup-gpios = <&pio 6 13 GPIO_ACTIVE_HIGH>; /* PG13 */ + host-wakeup-gpios = <&pio 6 11 GPIO_ACTIVE_HIGH>; /* PG11 */ + shutdown-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ + }; }; &usb_otg {
As of commit aa8fee415f46 ("ARM: dts: sun8i: h3: Split out non-SoC-specific parts of Bananapi M2 Plus") in the Linux kernel, the device tree for the Bananapi M2+ has been split into a common dtsi file, and an SoC-specific board device tree file that includes both the shared dtsi file and the soc dtsi file. This was done to support both the H3 and H5 variants of the same board. This is similar to what was doen for the Libre Computer ALL-H3-CC in U-boot commit d7b17f1c24af ("sunxi: Split out common board design for ALL-H3-CC device tree"). The newly split files are directly synced from Linux tag v5.0-rc1. Signed-off-by: Chen-Yu Tsai <wens@csie.org> --- arch/arm/dts/sun8i-h3-bananapi-m2-plus.dts | 190 +----------------- ...2-plus.dts => sunxi-bananapi-m2-plus.dtsi} | 23 ++- 2 files changed, 18 insertions(+), 195 deletions(-) copy arch/arm/dts/{sun8i-h3-bananapi-m2-plus.dts => sunxi-bananapi-m2-plus.dtsi} (92%)