[U-Boot] [PATCH 1/2] sunxi: add proper device tree for iNet D978 rev2 boards

Icenowy Zheng
2016-08-26T14:33:14Z

26.08.2016, 22:08, "Hans de Goede" <hdegoede@redhat.com>:
> Hi,
>
> On 26-08-16 15:20, Icenowy Zheng wrote:
>> ?26.08.2016, 20:23, "Hans de Goede" <hdegoede@redhat.com>:
>>> ?Hi,
>>>
>>> ?On 26-08-16 14:03, Icenowy Zheng wrote:
>>>> ??Add a proper dts for the iNet D978 rev2 based A33 tablets.
>>>
>>> ?Hmm, this dts file is not using the new sun8i-reference-design-tablet.dtsi
>>> ?file. IIRC your kernel submission was using that ?
>>>
>>> ?Currently u-boot does not have that file yet, but I've a patch
>>> ?adding it in my sunxi-wip:
>>> ?https://github.com/jwrdegoede/u-boot-sunxi/commits/sunxi-wip
>>>
>>> ?Please resend this series once the dts file has been accepted
>>> ?in the kernel and send the exact same file as used in the kernel.
>>
>> ?Can I firstly send a defconfig which uses sun8i-a33-q8-tablet.dtb?
>> ?At least it just works.
>
> I would rather not have a defconfig like that, people may very well
> install u-boot only once, and then they will be getting the wrong
> dt file for ever and ever.
>
> I'll send a pull-req out for the u-boot dts-sync today. And getting
> a version of the dts accepted by Maxime should not be all that hard
> either and then we can move forward from there (the dts only needs
> to be in Maxime's tree, it does not need to be fully upstream).

Thanks!

>
> Regards,
>
> Hans
>

Icenowy

>>> ?You can use my sunxi-wip branch for now / until the dts-sync
>>> ?which adds sun8i-reference-design-tablet.dtsi gets merged
>>> ?in u-boot/master (which should happen soon).
>>>
>>> ?Regards,
>>>
>>> ?Hans
>>>
>>>> ??Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz>
>>>> ??---
>>>> ???arch/arm/dts/Makefile | 1 +
>>>> ???arch/arm/dts/sun8i-a33-inet-d978-rev2.dts | 139 ++++++++++++++++++++++++++++++
>>>> ???2 files changed, 140 insertions(+)
>>>> ???create mode 100644 arch/arm/dts/sun8i-a33-inet-d978-rev2.dts
>>>>
>>>> ??diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>>>> ??index 223124e..d2749da 100644
>>>> ??--- a/arch/arm/dts/Makefile
>>>> ??+++ b/arch/arm/dts/Makefile
>>>> ??@@ -239,6 +239,7 @@ dtb-$(CONFIG_MACH_SUN8I_A23) += \
>>>> ???????????sun8i-a23-q8-tablet.dtb
>>>> ???dtb-$(CONFIG_MACH_SUN8I_A33) += \
>>>> ???????????sun8i-a33-ga10h-v1.1.dtb \
>>>> ??+ sun8i-a33-inet-d978-rev2.dtb \
>>>> ???????????sun8i-a33-q8-tablet.dtb \
>>>> ???????????sun8i-a33-sinlinx-sina33.dtb \
>>>> ???????????sun8i-r16-parrot.dtb
>>>> ??diff --git a/arch/arm/dts/sun8i-a33-inet-d978-rev2.dts b/arch/arm/dts/sun8i-a33-inet-d978-rev2.dts
>>>> ??new file mode 100644
>>>> ??index 0000000..0a3ac91
>>>> ??--- /dev/null
>>>> ??+++ b/arch/arm/dts/sun8i-a33-inet-d978-rev2.dts
>>>> ??@@ -0,0 +1,139 @@
>>>> ??+/*
>>>> ??+ * Copyright 2015 Hans de Goede <hdegoede@redhat.com>
>>>> ??+ * Copyright 2015 Icenowy Zheng <icenowy@aosc.xyz>
>>>> ??+ *
>>>> ??+ * 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-a33.dtsi"
>>>> ??+#include "sunxi-common-regulators.dtsi"
>>>> ??+
>>>> ??+#include <dt-bindings/gpio/gpio.h>
>>>> ??+#include <dt-bindings/input/input.h>
>>>> ??+#include <dt-bindings/pinctrl/sun4i-a10.h>
>>>> ??+
>>>> ??+/ {
>>>> ??+ model = "Allwinner GA10H Quad Core Tablet (v1.1)";
>>>> ??+ compatible = "allwinner,ga10h-v1.1", "allwinner,sun8i-a33";
>>>> ??+
>>>> ??+ aliases {
>>>> ??+ serial0 = &r_uart;
>>>> ??+ };
>>>> ??+
>>>> ??+ chosen {
>>>> ??+ stdout-path = "serial0:115200n8";
>>>> ??+ };
>>>> ??+};
>>>> ??+
>>>> ??+&i2c0 {
>>>> ??+ pinctrl-names = "default";
>>>> ??+ pinctrl-0 = <&i2c0_pins_a>;
>>>> ??+ status = "okay";
>>>> ??+};
>>>> ??+
>>>> ??+&i2c1 {
>>>> ??+ pinctrl-names = "default";
>>>> ??+ pinctrl-0 = <&i2c1_pins_a>;
>>>> ??+ status = "okay";
>>>> ??+};
>>>> ??+
>>>> ??+&lradc {
>>>> ??+ vref-supply = <&reg_vcc3v0>;
>>>> ??+ status = "okay";
>>>> ??+
>>>> ??+ button at 200 {
>>>> ??+ label = "Volume Up";
>>>> ??+ linux,code = <KEY_VOLUMEUP>;
>>>> ??+ channel = <0>;
>>>> ??+ voltage = <200000>;
>>>> ??+ };
>>>> ??+
>>>> ??+ button at 400 {
>>>> ??+ label = "Volume Down";
>>>> ??+ linux,code = <KEY_VOLUMEDOWN>;
>>>> ??+ channel = <0>;
>>>> ??+ voltage = <400000>;
>>>> ??+ };
>>>> ??+
>>>> ??+ button at 600 {
>>>> ??+ label = "Back";
>>>> ??+ linux,code = <KEY_BACK>;
>>>> ??+ channel = <0>;
>>>> ??+ voltage = <600000>;
>>>> ??+ };
>>>> ??+};
>>>> ??+
>>>> ??+&mmc0 {
>>>> ??+ pinctrl-names = "default";
>>>> ??+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8h>;
>>>> ??+ vmmc-supply = <&reg_vcc3v0>;
>>>> ??+ bus-width = <4>;
>>>> ??+ cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
>>>> ??+ cd-inverted;
>>>> ??+ status = "okay";
>>>> ??+};
>>>> ??+
>>>> ??+&ohci0 {
>>>> ??+ status = "okay";
>>>> ??+};
>>>> ??+
>>>> ??+&pio {
>>>> ??+ mmc0_cd_pin_q8h: mmc0_cd_pin at 0 {
>>>> ??+ allwinner,pins = "PB4";
>>>> ??+ allwinner,function = "gpio_in";
>>>> ??+ allwinner,drive = <SUN4I_PINCTRL_10_MA>;
>>>> ??+ allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
>>>> ??+ };
>>>> ??+};
>>>> ??+
>>>> ??+&r_uart {
>>>> ??+ pinctrl-names = "default";
>>>> ??+ pinctrl-0 = <&r_uart_pins_a>;
>>>> ??+ status = "okay";
>>>> ??+};
>>>> ??+
>>>> ??+&usb_otg {
>>>> ??+ dr_mode = "host";
>>>> ??+ status = "okay";
>>>> ??+};
>>>> ??+
>>>> ??+&usbphy {
>>>> ??+ status = "okay";
>>>> ??+};