Message ID | 20171207162008.28049-1-maxime.ripard@free-electrons.com |
---|---|
State | Accepted |
Commit | 03eb76b9a6777a8a935e1d20eff4698afa500d15 |
Headers | show |
Series | sunxi: Add the TBS A711 tablet | expand |
On Thu, Dec 7, 2017 at 9:50 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The TBS Tablet sports an LVDS display, an eMMC, an external SD, USB devices > and USB OTG. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/dts/Makefile | 3 +- > arch/arm/dts/sun8i-a83t-tbs-a711.dts | 76 ++++++++++++++++++++++++++++++++++++ > configs/tbs_a711_defconfig | 23 +++++++++++ > 3 files changed, 101 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/sun8i-a83t-tbs-a711.dts > create mode 100644 configs/tbs_a711_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index f54adb21847a..f82d13695136 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -316,7 +316,8 @@ dtb-$(CONFIG_MACH_SUN8I_A33) += \ > dtb-$(CONFIG_MACH_SUN8I_A83T) += \ > sun8i-a83t-allwinner-h8homlet-v2.dtb \ > sun8i-a83t-bananapi-m3.dtb \ > - sun8i-a83t-cubietruck-plus.dtb > + sun8i-a83t-cubietruck-plus.dtb \ > + sun8i-a83t-tbs-a711.dts > dtb-$(CONFIG_MACH_SUN8I_H3) += \ > sun8i-h2-plus-orangepi-zero.dtb \ > sun8i-h3-bananapi-m2-plus.dtb \ > diff --git a/arch/arm/dts/sun8i-a83t-tbs-a711.dts b/arch/arm/dts/sun8i-a83t-tbs-a711.dts > new file mode 100644 > index 000000000000..80e8b1cc9050 > --- /dev/null > +++ b/arch/arm/dts/sun8i-a83t-tbs-a711.dts > @@ -0,0 +1,76 @@ > +/* > + * Copyright 2017 Ondřej Jirman > + * Ondřej Jirman <megous@megous.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. > + */ > + > +/dts-v1/; > +#include "sun8i-a83t.dtsi" > + > +/ { > + model = "TBS A711 Tablet"; > + compatible = "tbs-biometrics,a711", "allwinner,sun8i-a83t"; > + > + aliases { > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&ohci0 { > + status = "okay"; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins_b>; > + status = "okay"; > +}; > + > +&usb_otg { > + status = "okay"; > +}; Ohh, A83t doesn't support mmc thorough dts? > diff --git a/configs/tbs_a711_defconfig b/configs/tbs_a711_defconfig > new file mode 100644 > index 000000000000..03deae084e90 > --- /dev/null > +++ b/configs/tbs_a711_defconfig > @@ -0,0 +1,23 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_SUNXI=y > +CONFIG_MACH_SUN8I_A83T=y > +CONFIG_DRAM_TYPE=7 > +CONFIG_DRAM_CLK=648 > +CONFIG_DRAM_ZQ=15355 > +CONFIG_DRAM_ODT_EN=y > +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > +CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" > +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" > +CONFIG_USB0_ID_DET="PH11" > +CONFIG_AXP_GPIO=y > +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-tbs-a711" > +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > +CONFIG_SPL=y > +# 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_AXP_DCDC5_VOLT=1200 > +CONFIG_USB_EHCI_HCD=y > +CONFIG_USB_MUSB_GADGET=y Just to check, does fastboot and ums worked? Reviewed-by: Jagan Teki <jagan@openedev.com> thanks!
Hi, On Thu, Dec 07, 2017 at 10:29:05PM +0530, Jagan Teki wrote: > > +/dts-v1/; > > +#include "sun8i-a83t.dtsi" > > + > > +/ { > > + model = "TBS A711 Tablet"; > > + compatible = "tbs-biometrics,a711", "allwinner,sun8i-a83t"; > > + > > + aliases { > > + serial0 = &uart0; > > + }; > > + > > + chosen { > > + stdout-path = "serial0:115200n8"; > > + }; > > +}; > > + > > +&ehci0 { > > + status = "okay"; > > +}; > > + > > +&ohci0 { > > + status = "okay"; > > +}; > > + > > +&uart0 { > > + pinctrl-names = "default"; > > + pinctrl-0 = <&uart0_pins_b>; > > + status = "okay"; > > +}; > > + > > +&usb_otg { > > + status = "okay"; > > +}; > > Ohh, A83t doesn't support mmc thorough dts? We're not using the device model for the MMC at the moment, on any SoC. > > diff --git a/configs/tbs_a711_defconfig b/configs/tbs_a711_defconfig > > new file mode 100644 > > index 000000000000..03deae084e90 > > --- /dev/null > > +++ b/configs/tbs_a711_defconfig > > @@ -0,0 +1,23 @@ > > +CONFIG_ARM=y > > +CONFIG_ARCH_SUNXI=y > > +CONFIG_MACH_SUN8I_A83T=y > > +CONFIG_DRAM_TYPE=7 > > +CONFIG_DRAM_CLK=648 > > +CONFIG_DRAM_ZQ=15355 > > +CONFIG_DRAM_ODT_EN=y > > +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 > > +CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" > > +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" > > +CONFIG_USB0_ID_DET="PH11" > > +CONFIG_AXP_GPIO=y > > +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-tbs-a711" > > +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > > +CONFIG_SPL=y > > +# 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_AXP_DCDC5_VOLT=1200 > > +CONFIG_USB_EHCI_HCD=y > > +CONFIG_USB_MUSB_GADGET=y > > Just to check, does fastboot and ums worked? I have no interest in UMS, but fastboot and USB-Ethernet work. > Reviewed-by: Jagan Teki <jagan@openedev.com> Will you apply it? Thanks! Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
On Thu, Dec 07, 2017 at 05:20:08PM +0100, Maxime Ripard wrote: > The TBS Tablet sports an LVDS display, an eMMC, an external SD, USB devices > and USB OTG. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Applied. Maxime -- Maxime Ripard, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index f54adb21847a..f82d13695136 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -316,7 +316,8 @@ dtb-$(CONFIG_MACH_SUN8I_A33) += \ dtb-$(CONFIG_MACH_SUN8I_A83T) += \ sun8i-a83t-allwinner-h8homlet-v2.dtb \ sun8i-a83t-bananapi-m3.dtb \ - sun8i-a83t-cubietruck-plus.dtb + sun8i-a83t-cubietruck-plus.dtb \ + sun8i-a83t-tbs-a711.dts dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h2-plus-orangepi-zero.dtb \ sun8i-h3-bananapi-m2-plus.dtb \ diff --git a/arch/arm/dts/sun8i-a83t-tbs-a711.dts b/arch/arm/dts/sun8i-a83t-tbs-a711.dts new file mode 100644 index 000000000000..80e8b1cc9050 --- /dev/null +++ b/arch/arm/dts/sun8i-a83t-tbs-a711.dts @@ -0,0 +1,76 @@ +/* + * Copyright 2017 Ondřej Jirman + * Ondřej Jirman <megous@megous.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. + */ + +/dts-v1/; +#include "sun8i-a83t.dtsi" + +/ { + model = "TBS A711 Tablet"; + compatible = "tbs-biometrics,a711", "allwinner,sun8i-a83t"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; +}; + +&ehci0 { + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_b>; + status = "okay"; +}; + +&usb_otg { + status = "okay"; +}; diff --git a/configs/tbs_a711_defconfig b/configs/tbs_a711_defconfig new file mode 100644 index 000000000000..03deae084e90 --- /dev/null +++ b/configs/tbs_a711_defconfig @@ -0,0 +1,23 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I_A83T=y +CONFIG_DRAM_TYPE=7 +CONFIG_DRAM_CLK=648 +CONFIG_DRAM_ZQ=15355 +CONFIG_DRAM_ODT_EN=y +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 +CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" +CONFIG_USB0_ID_DET="PH11" +CONFIG_AXP_GPIO=y +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-tbs-a711" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +# 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_AXP_DCDC5_VOLT=1200 +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_MUSB_GADGET=y
The TBS Tablet sports an LVDS display, an eMMC, an external SD, USB devices and USB OTG. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/sun8i-a83t-tbs-a711.dts | 76 ++++++++++++++++++++++++++++++++++++ configs/tbs_a711_defconfig | 23 +++++++++++ 3 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/sun8i-a83t-tbs-a711.dts create mode 100644 configs/tbs_a711_defconfig