Message ID | 20160827141613.63710-1-icenowy@aosc.xyz |
---|---|
State | Accepted |
Commit | 8e71a7ebdc02f8a5812b608b3014a4839ebd2aed |
Delegated to: | Hans de Goede |
Headers | show |
Hi, On 27-08-16 16:16, Icenowy Zheng wrote: > Add a proper dts for the iNet D978 rev2 based A33 tablets. > > Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> Thank you, I've merged both patches and pushed them to u-boot-sunxi/next Next time when you add a defconfig file please also update board/sunxi/MAINTAINERS (I've added an update of it to the second patch before pushing) Regards, Hans > --- > Changes since v2: > - Use Hans's sun8i-reference-design-tablet.dtsi. (Note: it makes the patch depends > on the sun8i-reference-design-tablet.dtsi patch) > - Use the same dt file as applied into linux kernel. > > arch/arm/dts/Makefile | 1 + > arch/arm/dts/sun8i-a33-inet-d978-rev2.dts | 88 +++++++++++++++++++++++++++++++ > 2 files changed, 89 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..0f52cd9 > --- /dev/null > +++ b/arch/arm/dts/sun8i-a33-inet-d978-rev2.dts > @@ -0,0 +1,88 @@ > +/* > + * Copyright 2015 Hans de Goede <hdegoede@redhat.com> > + * Copyright 2016 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 "sun8i-reference-design-tablet.dtsi" > + > +/ { > + model = "INet-D978 Rev 02"; > + compatible = "primux,inet-d978-rev2", "allwinner,sun8i-a33"; > + > + leds { > + compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = <&led_pin_d978>; > + > + home { > + label = "d978:blue:home"; > + gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */ > + }; > + }; > +}; > + > +&mmc1_pins_a { > + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; > +}; > + > +&mmc1 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc1_pins_a>; > + vmmc-supply = <®_dldo1>; > + bus-width = <4>; > + non-removable; > + status = "okay"; > + > + rtl8723bs: sdio_wifi@1 { > + reg = <1>; > + }; > +}; > + > +&r_pio { > + led_pin_d978: led_pin_d978@0 { > + allwinner,pins = "PL5"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <SUN4I_PINCTRL_20_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > +}; >
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..0f52cd9 --- /dev/null +++ b/arch/arm/dts/sun8i-a33-inet-d978-rev2.dts @@ -0,0 +1,88 @@ +/* + * Copyright 2015 Hans de Goede <hdegoede@redhat.com> + * Copyright 2016 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 "sun8i-reference-design-tablet.dtsi" + +/ { + model = "INet-D978 Rev 02"; + compatible = "primux,inet-d978-rev2", "allwinner,sun8i-a33"; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pin_d978>; + + home { + label = "d978:blue:home"; + gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */ + }; + }; +}; + +&mmc1_pins_a { + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>; +}; + +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins_a>; + vmmc-supply = <®_dldo1>; + bus-width = <4>; + non-removable; + status = "okay"; + + rtl8723bs: sdio_wifi@1 { + reg = <1>; + }; +}; + +&r_pio { + led_pin_d978: led_pin_d978@0 { + allwinner,pins = "PL5"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_20_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; +};
Add a proper dts for the iNet D978 rev2 based A33 tablets. Signed-off-by: Icenowy Zheng <icenowy@aosc.xyz> --- Changes since v2: - Use Hans's sun8i-reference-design-tablet.dtsi. (Note: it makes the patch depends on the sun8i-reference-design-tablet.dtsi patch) - Use the same dt file as applied into linux kernel. arch/arm/dts/Makefile | 1 + arch/arm/dts/sun8i-a33-inet-d978-rev2.dts | 88 +++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 arch/arm/dts/sun8i-a33-inet-d978-rev2.dts