Message ID | 1504504505-2848-1-git-send-email-stefan@olimex.com |
---|---|
State | Superseded |
Delegated to: | Jagannadha Sutradharudu Teki |
Headers | show |
Series | [U-Boot,1/1] sunxi: Add support for A20-OLinuXino-MICRO-eMMC | expand |
On 09/04/2017 08:55 AM, Stefan Mavrodiev wrote: > From rev.J A20-OLinuXino-MICRO has eMMC option. For now this is > only 4GB, but in the future size may increase. > > The dts file is the same from mainline kernel. > > Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts | 70 +++++++++++++++++++++++++ > board/sunxi/MAINTAINERS | 5 ++ > configs/A20-OLinuXino_MICRO-eMMC_defconfig | 28 ++++++++++ > 4 files changed, 104 insertions(+) > create mode 100644 arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts > create mode 100644 configs/A20-OLinuXino_MICRO-eMMC_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 762429c..a6f2cba 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -282,6 +282,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ > sun7i-a20-olinuxino-lime2.dtb \ > sun7i-a20-olinuxino-lime2-emmc.dtb \ > sun7i-a20-olinuxino-micro.dtb \ > + sun7i-a20-olinuxino-micro-emmc.dtb \ > sun7i-a20-orangepi.dtb \ > sun7i-a20-orangepi-mini.dtb \ > sun7i-a20-pcduino3.dtb \ > diff --git a/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts b/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts > new file mode 100644 > index 0000000..d99e7b1 > --- /dev/null > +++ b/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts > @@ -0,0 +1,70 @@ > + /* > + * Copyright 2017 Olimex Ltd. > + * Stefan Mavrodiev <stefan@olimex.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. > + */ > + > +#include "sun7i-a20-olinuxino-micro.dts" > + > +/ { > + model = "Olimex A20-OLinuXino-MICRO-eMMC"; > + compatible = "olimex,a20-olinuxino-micro-emmc", "allwinner,sun7i-a20"; > + > + mmc2_pwrseq: pwrseq { > + compatible = "mmc-pwrseq-emmc"; > + reset-gpios = <&pio 2 16 GPIO_ACTIVE_LOW>; > + }; > +}; > + > +&mmc2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc2_pins_a>; > + vmmc-supply = <®_vcc3v3>; > + bus-width = <4>; > + non-removable; > + mmc-pwrseq = <&mmc2_pwrseq>; > + status = "okay"; > + > + emmc: emmc@0 { > + reg = <0>; > + compatible = "mmc-card"; > + broken-hpi; > + }; > +}; > diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS > index ff6eea2..eddf38f 100644 > --- a/board/sunxi/MAINTAINERS > +++ b/board/sunxi/MAINTAINERS > @@ -83,6 +83,11 @@ M: FUKAUMI Naoki <naobsd@gmail.com> > S: Maintained > F: configs/A20-OLinuXino-Lime_defconfig > > +A20-OLINUXINO-MICRO-EMMC BOARD > +M: Stefan Mavrodiev <stefan@olimex.com> > +S: Maintained > +F: configs/A20-OLinuXino_MICRO-eMMC_defconfig > + > A20-OLINUXINO-LIME2 BOARD > M: Iain Paton <ipaton0@gmail.com> > S: Maintained > diff --git a/configs/A20-OLinuXino_MICRO-eMMC_defconfig b/configs/A20-OLinuXino_MICRO-eMMC_defconfig > new file mode 100644 > index 0000000..cfcb770 > --- /dev/null > +++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig > @@ -0,0 +1,28 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_SUNXI=y > +CONFIG_MACH_SUN7I=y > +CONFIG_DRAM_CLK=384 > +CONFIG_MMC0_CD_PIN="PH1" > +CONFIG_MMC3_CD_PIN="PH11" > +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > +CONFIG_I2C1_ENABLE=y > +CONFIG_VIDEO_VGA=y > +CONFIG_SATAPWR="PB8" > +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro-emmc" > +CONFIG_AHCI=y > +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > +CONFIG_SPL=y > +CONFIG_SPL_I2C_SUPPORT=y > +# CONFIG_CMD_IMLS is not set > +# CONFIG_CMD_FLASH is not set > +# CONFIG_CMD_FPGA is not set > +# CONFIG_SPL_DOS_PARTITION is not set > +# CONFIG_SPL_ISO_PARTITION is not set > +# CONFIG_SPL_EFI_PARTITION is not set > +CONFIG_ETH_DESIGNWARE=y > +CONFIG_SUN7I_GMAC=y > +CONFIG_AXP_ALDO3_VOLT=2800 > +CONFIG_AXP_ALDO4_VOLT=2800 > +CONFIG_SCSI=y > +CONFIG_USB_EHCI_HCD=y > +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y Can someone please review my patch? Best regards, Stefan Mavrodiev
On Mon, Sep 4, 2017 at 11:25 AM, Stefan Mavrodiev <stefan@olimex.com> wrote: > From rev.J A20-OLinuXino-MICRO has eMMC option. For now this is > only 4GB, but in the future size may increase. > > The dts file is the same from mainline kernel. > > Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> > --- > arch/arm/dts/Makefile | 1 + > arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts | 70 +++++++++++++++++++++++++ Please send this dts to Linux. thanks!
On 09/13/2017 03:24 PM, Jagan Teki wrote: > On Mon, Sep 4, 2017 at 11:25 AM, Stefan Mavrodiev <stefan@olimex.com> wrote: >> From rev.J A20-OLinuXino-MICRO has eMMC option. For now this is >> only 4GB, but in the future size may increase. >> >> The dts file is the same from mainline kernel. >> >> Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> >> --- >> arch/arm/dts/Makefile | 1 + >> arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts | 70 +++++++++++++++++++++++++ > Please send this dts to Linux. > > thanks! The dts is already acknowledged in mainline linux by Maxime Ripard, and will be available in version 4.15. https://patchwork.kernel.org/patch/9924197/ Best regards, Stefan Mavrodiev
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 762429c..a6f2cba 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -282,6 +282,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-olinuxino-lime2.dtb \ sun7i-a20-olinuxino-lime2-emmc.dtb \ sun7i-a20-olinuxino-micro.dtb \ + sun7i-a20-olinuxino-micro-emmc.dtb \ sun7i-a20-orangepi.dtb \ sun7i-a20-orangepi-mini.dtb \ sun7i-a20-pcduino3.dtb \ diff --git a/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts b/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts new file mode 100644 index 0000000..d99e7b1 --- /dev/null +++ b/arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts @@ -0,0 +1,70 @@ + /* + * Copyright 2017 Olimex Ltd. + * Stefan Mavrodiev <stefan@olimex.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. + */ + +#include "sun7i-a20-olinuxino-micro.dts" + +/ { + model = "Olimex A20-OLinuXino-MICRO-eMMC"; + compatible = "olimex,a20-olinuxino-micro-emmc", "allwinner,sun7i-a20"; + + mmc2_pwrseq: pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&pio 2 16 GPIO_ACTIVE_LOW>; + }; +}; + +&mmc2 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins_a>; + vmmc-supply = <®_vcc3v3>; + bus-width = <4>; + non-removable; + mmc-pwrseq = <&mmc2_pwrseq>; + status = "okay"; + + emmc: emmc@0 { + reg = <0>; + compatible = "mmc-card"; + broken-hpi; + }; +}; diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index ff6eea2..eddf38f 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -83,6 +83,11 @@ M: FUKAUMI Naoki <naobsd@gmail.com> S: Maintained F: configs/A20-OLinuXino-Lime_defconfig +A20-OLINUXINO-MICRO-EMMC BOARD +M: Stefan Mavrodiev <stefan@olimex.com> +S: Maintained +F: configs/A20-OLinuXino_MICRO-eMMC_defconfig + A20-OLINUXINO-LIME2 BOARD M: Iain Paton <ipaton0@gmail.com> S: Maintained diff --git a/configs/A20-OLinuXino_MICRO-eMMC_defconfig b/configs/A20-OLinuXino_MICRO-eMMC_defconfig new file mode 100644 index 0000000..cfcb770 --- /dev/null +++ b/configs/A20-OLinuXino_MICRO-eMMC_defconfig @@ -0,0 +1,28 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y +CONFIG_DRAM_CLK=384 +CONFIG_MMC0_CD_PIN="PH1" +CONFIG_MMC3_CD_PIN="PH11" +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_I2C1_ENABLE=y +CONFIG_VIDEO_VGA=y +CONFIG_SATAPWR="PB8" +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-micro-emmc" +CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +CONFIG_SPL_I2C_SUPPORT=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_ETH_DESIGNWARE=y +CONFIG_SUN7I_GMAC=y +CONFIG_AXP_ALDO3_VOLT=2800 +CONFIG_AXP_ALDO4_VOLT=2800 +CONFIG_SCSI=y +CONFIG_USB_EHCI_HCD=y +CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y
From rev.J A20-OLinuXino-MICRO has eMMC option. For now this is only 4GB, but in the future size may increase. The dts file is the same from mainline kernel. Signed-off-by: Stefan Mavrodiev <stefan@olimex.com> --- arch/arm/dts/Makefile | 1 + arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts | 70 +++++++++++++++++++++++++ board/sunxi/MAINTAINERS | 5 ++ configs/A20-OLinuXino_MICRO-eMMC_defconfig | 28 ++++++++++ 4 files changed, 104 insertions(+) create mode 100644 arch/arm/dts/sun7i-a20-olinuxino-micro-emmc.dts create mode 100644 configs/A20-OLinuXino_MICRO-eMMC_defconfig