Message ID | 1469572108-30956-1-git-send-email-hdegoede@redhat.com |
---|---|
State | Accepted |
Commit | 2a5adc5b3c1f532dc9ec6638e6696316c078b619 |
Delegated to: | Hans de Goede |
Headers | show |
On Wed, 2016-07-27 at 00:28 +0200, Hans de Goede wrote: > There is a new Orange Pi PC *Plus* version available now, > this is an extended version of the regular Orange Pi PC > with sdio wifi and an eMMC. > > The upstream kernel devs have decided that they want a separate > dts for the PC Plus rather then sharing a single dts between the > regular PC and the PC Plus. So add a new orangepi_pc_plus_defconfig > to match. > > The added dts file matches the one submitted to the upstream kernel. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Ian Campbell <ijc@hellion.org.uk>
On 27 July 2016 at 03:58, Hans de Goede <hdegoede@redhat.com> wrote: > There is a new Orange Pi PC *Plus* version available now, > this is an extended version of the regular Orange Pi PC > with sdio wifi and an eMMC. > > The upstream kernel devs have decided that they want a separate > dts for the PC Plus rather then sharing a single dts between the > regular PC and the PC Plus. So add a new orangepi_pc_plus_defconfig > to match. > > The added dts file matches the one submitted to the upstream kernel. > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts | 87 ++++++++++++++++++++++ > board/sunxi/MAINTAINERS | 1 + > configs/orangepi_pc_defconfig | 1 - > ...epi_pc_defconfig => orangepi_pc_plus_defconfig} | 3 +- > 5 files changed, 90 insertions(+), 3 deletions(-) > create mode 100644 arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts > copy configs/{orangepi_pc_defconfig => orangepi_pc_plus_defconfig} (84%) > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index ca8712a..1c3b705 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -246,6 +246,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ > sun8i-h3-orangepi-lite.dtb \ > sun8i-h3-orangepi-one.dtb \ > sun8i-h3-orangepi-pc.dtb \ > + sun8i-h3-orangepi-pc-plus.dtb \ > sun8i-h3-orangepi-plus.dtb > dtb-$(CONFIG_MACH_SUN50I) += \ > sun50i-a64-pine64-plus.dtb \ > diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts > new file mode 100644 > index 0000000..9a8cdd4 > --- /dev/null > +++ b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts > @@ -0,0 +1,87 @@ > +/* > + * Copyright (C) 2016 Hans de Goede <hdegoede@redhat.com> > + * > + * This file is dual-licensed: you can use it either under the terms > + * of the GPL or the X11 license, at your option. Note that this dual > + * licensing only applies to this file, and not this project as a > + * whole. > + * > + * a) This file is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License as > + * published by the Free Software Foundation; either version 2 of the > + * License, or (at your option) any later version. > + * > + * This file is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * Or, alternatively, > + * > + * b) Permission is hereby granted, free of charge, to any person > + * obtaining a copy of this software and associated documentation > + * files (the "Software"), to deal in the Software without > + * restriction, including without limitation the rights to use, > + * copy, modify, merge, publish, distribute, sublicense, and/or > + * sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following > + * conditions: > + * > + * The above copyright notice and this permission notice shall be > + * included in all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, > + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES > + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND > + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT > + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, > + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING > + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + */ Just to understand - why should all these sun*.dts files are not to follow u-boot licence (just because Linux has same)? SPDX-License-Identifier: GPL-2.0+
Hi, On 28-07-16 19:58, Jagan Teki wrote: > On 27 July 2016 at 03:58, Hans de Goede <hdegoede@redhat.com> wrote: >> There is a new Orange Pi PC *Plus* version available now, >> this is an extended version of the regular Orange Pi PC >> with sdio wifi and an eMMC. >> >> The upstream kernel devs have decided that they want a separate >> dts for the PC Plus rather then sharing a single dts between the >> regular PC and the PC Plus. So add a new orangepi_pc_plus_defconfig >> to match. >> >> The added dts file matches the one submitted to the upstream kernel. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >> --- >> arch/arm/dts/Makefile | 1 + >> arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts | 87 ++++++++++++++++++++++ >> board/sunxi/MAINTAINERS | 1 + >> configs/orangepi_pc_defconfig | 1 - >> ...epi_pc_defconfig => orangepi_pc_plus_defconfig} | 3 +- >> 5 files changed, 90 insertions(+), 3 deletions(-) >> create mode 100644 arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts >> copy configs/{orangepi_pc_defconfig => orangepi_pc_plus_defconfig} (84%) >> >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >> index ca8712a..1c3b705 100644 >> --- a/arch/arm/dts/Makefile >> +++ b/arch/arm/dts/Makefile >> @@ -246,6 +246,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ >> sun8i-h3-orangepi-lite.dtb \ >> sun8i-h3-orangepi-one.dtb \ >> sun8i-h3-orangepi-pc.dtb \ >> + sun8i-h3-orangepi-pc-plus.dtb \ >> sun8i-h3-orangepi-plus.dtb >> dtb-$(CONFIG_MACH_SUN50I) += \ >> sun50i-a64-pine64-plus.dtb \ >> diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts >> new file mode 100644 >> index 0000000..9a8cdd4 >> --- /dev/null >> +++ b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts >> @@ -0,0 +1,87 @@ >> +/* >> + * Copyright (C) 2016 Hans de Goede <hdegoede@redhat.com> >> + * >> + * This file is dual-licensed: you can use it either under the terms >> + * of the GPL or the X11 license, at your option. Note that this dual >> + * licensing only applies to this file, and not this project as a >> + * whole. >> + * >> + * a) This file is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU General Public License as >> + * published by the Free Software Foundation; either version 2 of the >> + * License, or (at your option) any later version. >> + * >> + * This file is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + * >> + * Or, alternatively, >> + * >> + * b) Permission is hereby granted, free of charge, to any person >> + * obtaining a copy of this software and associated documentation >> + * files (the "Software"), to deal in the Software without >> + * restriction, including without limitation the rights to use, >> + * copy, modify, merge, publish, distribute, sublicense, and/or >> + * sell copies of the Software, and to permit persons to whom the >> + * Software is furnished to do so, subject to the following >> + * conditions: >> + * >> + * The above copyright notice and this permission notice shall be >> + * included in all copies or substantial portions of the Software. >> + * >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES >> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND >> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT >> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, >> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING >> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR >> + * OTHER DEALINGS IN THE SOFTWARE. >> + */ > > Just to understand - why should all these sun*.dts files are not to > follow u-boot licence (just because Linux has same)? > SPDX-License-Identifier: GPL-2.0+ The canonical source for these files is the Linux kernel, we just copy them over to u-boot as u-boot needs them to build (and occasionally sync all of them with the kernel. Since these come from the Linux kernel sources, they get the license they have there. Regards, Hans
On 29 July 2016 at 00:09, Hans de Goede <hdegoede@redhat.com> wrote: > Hi, > > > On 28-07-16 19:58, Jagan Teki wrote: >> >> On 27 July 2016 at 03:58, Hans de Goede <hdegoede@redhat.com> wrote: >>> >>> There is a new Orange Pi PC *Plus* version available now, >>> this is an extended version of the regular Orange Pi PC >>> with sdio wifi and an eMMC. >>> >>> The upstream kernel devs have decided that they want a separate >>> dts for the PC Plus rather then sharing a single dts between the >>> regular PC and the PC Plus. So add a new orangepi_pc_plus_defconfig >>> to match. >>> >>> The added dts file matches the one submitted to the upstream kernel. >>> >>> Signed-off-by: Hans de Goede <hdegoede@redhat.com> >>> --- >>> arch/arm/dts/Makefile | 1 + >>> arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts | 87 >>> ++++++++++++++++++++++ >>> board/sunxi/MAINTAINERS | 1 + >>> configs/orangepi_pc_defconfig | 1 - >>> ...epi_pc_defconfig => orangepi_pc_plus_defconfig} | 3 +- >>> 5 files changed, 90 insertions(+), 3 deletions(-) >>> create mode 100644 arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts >>> copy configs/{orangepi_pc_defconfig => orangepi_pc_plus_defconfig} (84%) >>> >>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >>> index ca8712a..1c3b705 100644 >>> --- a/arch/arm/dts/Makefile >>> +++ b/arch/arm/dts/Makefile >>> @@ -246,6 +246,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ >>> sun8i-h3-orangepi-lite.dtb \ >>> sun8i-h3-orangepi-one.dtb \ >>> sun8i-h3-orangepi-pc.dtb \ >>> + sun8i-h3-orangepi-pc-plus.dtb \ >>> sun8i-h3-orangepi-plus.dtb >>> dtb-$(CONFIG_MACH_SUN50I) += \ >>> sun50i-a64-pine64-plus.dtb \ >>> diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts >>> b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts >>> new file mode 100644 >>> index 0000000..9a8cdd4 >>> --- /dev/null >>> +++ b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts >>> @@ -0,0 +1,87 @@ >>> +/* >>> + * Copyright (C) 2016 Hans de Goede <hdegoede@redhat.com> >>> + * >>> + * This file is dual-licensed: you can use it either under the terms >>> + * of the GPL or the X11 license, at your option. Note that this dual >>> + * licensing only applies to this file, and not this project as a >>> + * whole. >>> + * >>> + * a) This file is free software; you can redistribute it and/or >>> + * modify it under the terms of the GNU General Public License as >>> + * published by the Free Software Foundation; either version 2 of >>> the >>> + * License, or (at your option) any later version. >>> + * >>> + * This file is distributed in the hope that it will be useful, >>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >>> + * GNU General Public License for more details. >>> + * >>> + * Or, alternatively, >>> + * >>> + * b) Permission is hereby granted, free of charge, to any person >>> + * obtaining a copy of this software and associated documentation >>> + * files (the "Software"), to deal in the Software without >>> + * restriction, including without limitation the rights to use, >>> + * copy, modify, merge, publish, distribute, sublicense, and/or >>> + * sell copies of the Software, and to permit persons to whom the >>> + * Software is furnished to do so, subject to the following >>> + * conditions: >>> + * >>> + * The above copyright notice and this permission notice shall be >>> + * included in all copies or substantial portions of the Software. >>> + * >>> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, >>> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES >>> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND >>> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT >>> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, >>> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING >>> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR >>> + * OTHER DEALINGS IN THE SOFTWARE. >>> + */ >> >> >> Just to understand - why should all these sun*.dts files are not to >> follow u-boot licence (just because Linux has same)? >> SPDX-License-Identifier: GPL-2.0+ > > > The canonical source for these files is the Linux kernel, we just copy > them over to u-boot as u-boot needs them to build (and occasionally > sync all of them with the kernel. > > Since these come from the Linux kernel sources, they get the license > they have there. OK, thanks Hans.
On 27 July 2016 at 13:58, Ian Campbell <ijc@hellion.org.uk> wrote: > On Wed, 2016-07-27 at 00:28 +0200, Hans de Goede wrote: >> There is a new Orange Pi PC *Plus* version available now, >> this is an extended version of the regular Orange Pi PC >> with sdio wifi and an eMMC. >> >> The upstream kernel devs have decided that they want a separate >> dts for the PC Plus rather then sharing a single dts between the >> regular PC and the PC Plus. So add a new orangepi_pc_plus_defconfig >> to match. >> >> The added dts file matches the one submitted to the upstream kernel. >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Acked-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Jagan Teki <jteki@openedev.com>
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index ca8712a..1c3b705 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -246,6 +246,7 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h3-orangepi-lite.dtb \ sun8i-h3-orangepi-one.dtb \ sun8i-h3-orangepi-pc.dtb \ + sun8i-h3-orangepi-pc-plus.dtb \ sun8i-h3-orangepi-plus.dtb dtb-$(CONFIG_MACH_SUN50I) += \ sun50i-a64-pine64-plus.dtb \ diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts new file mode 100644 index 0000000..9a8cdd4 --- /dev/null +++ b/arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2016 Hans de Goede <hdegoede@redhat.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/* The Orange Pi PC Plus is an extended version of the regular PC */ +#include "sun8i-h3-orangepi-pc.dts" + +/ { + model = "Xunlong Orange Pi PC / PC Plus"; + + aliases { + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ + ethernet1 = &rtl8189ftv; + }; +}; + +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins_a>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + non-removable; + status = "okay"; + + /* + * Explicitly define the sdio device, so that we can add an ethernet + * alias for it (which e.g. makes u-boot set a mac-address). + */ + rtl8189ftv: sdio_wifi@1 { + reg = <1>; + }; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_8bit_pins>; + vmmc-supply = <®_vcc3v3>; + bus-width = <8>; + non-removable; + cap-mmc-hw-reset; + status = "okay"; +}; + +&mmc2_8bit_pins { + /* Increase drive strength for DDR modes */ + allwinner,drive = <SUN4I_PINCTRL_40_MA>; + /* eMMC is missing pull-ups */ + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; +}; diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 0dc84f6..de719cd 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -59,6 +59,7 @@ F: configs/orangepi_2_defconfig F: configs/orangepi_lite_defconfig F: configs/orangepi_one_defconfig F: configs/orangepi_pc_defconfig +F: configs/orangepi_pc_plus_defconfig F: configs/orangepi_plus_defconfig F: configs/polaroid_mid2407pxe03_defconfig F: configs/polaroid_mid2809pxe04_defconfig diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig index 43ec927..2281aed 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -5,7 +5,6 @@ CONFIG_DRAM_CLK=624 CONFIG_DRAM_ZQ=3881979 CONFIG_DRAM_ODT_EN=y CONFIG_MMC0_CD_PIN="PF6" -CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_VIDEO is not set CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_plus_defconfig similarity index 84% copy from configs/orangepi_pc_defconfig copy to configs/orangepi_pc_plus_defconfig index 43ec927..c78aec3 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_plus_defconfig @@ -7,7 +7,7 @@ CONFIG_DRAM_ODT_EN=y CONFIG_MMC0_CD_PIN="PF6" CONFIG_MMC_SUNXI_SLOT_EXTRA=2 # CONFIG_VIDEO is not set -CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc" +CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc-plus" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_SPL=y # CONFIG_CMD_IMLS is not set @@ -15,4 +15,3 @@ CONFIG_SPL=y # CONFIG_CMD_FPGA is not set CONFIG_SY8106A_POWER=y CONFIG_USB_EHCI_HCD=y -CONFIG_SUN8I_EMAC=y
There is a new Orange Pi PC *Plus* version available now, this is an extended version of the regular Orange Pi PC with sdio wifi and an eMMC. The upstream kernel devs have decided that they want a separate dts for the PC Plus rather then sharing a single dts between the regular PC and the PC Plus. So add a new orangepi_pc_plus_defconfig to match. The added dts file matches the one submitted to the upstream kernel. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts | 87 ++++++++++++++++++++++ board/sunxi/MAINTAINERS | 1 + configs/orangepi_pc_defconfig | 1 - ...epi_pc_defconfig => orangepi_pc_plus_defconfig} | 3 +- 5 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 arch/arm/dts/sun8i-h3-orangepi-pc-plus.dts copy configs/{orangepi_pc_defconfig => orangepi_pc_plus_defconfig} (84%)