Message ID | 1466171182-8640-1-git-send-email-stefan.mavrodiev@gmail.com |
---|---|
State | Changes Requested |
Delegated to: | Hans de Goede |
Headers | show |
Hi, Has the dts file been submitted to the upstream kernel ? If not please do so. Also please provide a short description of the board in the commit msg, and add a line like "The dts file matches the one submitted to the upstream kernel" the commit msg. Last but not least, please add a board/sunxi/MAINTAINERS entry for this board. If you can send a v2 with all the above fixed please, then I'll merge it. Regards, Hans On 17-06-16 15:46, Stefan Mavrodiev wrote: > From: Stefan Mavrodiev <stefan.mavrodiev@gmail.com> > --- > arch/arm/dts/Makefile | 3 +- > arch/arm/dts/sun8i-a33-olinuxino.dts | 223 +++++++++++++++++++++++++++++++++++ > configs/A33_OLinuXino_defconfig | 29 +++++ > 3 files changed, 254 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/sun8i-a33-olinuxino.dts > create mode 100644 configs/A33_OLinuXino_defconfig > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index a827613..dbda275 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -221,7 +221,8 @@ dtb-$(CONFIG_MACH_SUN8I_A23) += \ > dtb-$(CONFIG_MACH_SUN8I_A33) += \ > sun8i-a33-ga10h-v1.1.dtb \ > sun8i-a33-q8-tablet.dtb \ > - sun8i-a33-sinlinx-sina33.dtb > + sun8i-a33-sinlinx-sina33.dtb \ > + sun8i-a33-olinuxino.dtb > dtb-$(CONFIG_MACH_SUN8I_A83T) += \ > sun8i-a83t-allwinner-h8homlet-v2.dtb \ > sun8i-a83t-cubietruck-plus.dtb \ > diff --git a/arch/arm/dts/sun8i-a33-olinuxino.dts b/arch/arm/dts/sun8i-a33-olinuxino.dts > new file mode 100644 > index 0000000..2eaeb55 > --- /dev/null > +++ b/arch/arm/dts/sun8i-a33-olinuxino.dts > @@ -0,0 +1,223 @@ > +/* > + * Copyright 2016 - Stefan Mavrodiev <stefan.mavrodiev@gmail.com> > + * Olimex LTD. <support@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. > + */ > + > +/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 = "A33-OLinuXino"; > + compatible = "allwinner,sun8i-a33"; > + > + aliases { > + serial0 = &uart0; > + }; > + > + chosen { > + stdout-path = "serial0:115200n8"; > + }; > + > + leds { > + compatible = "gpio-leds"; > + pinctrl-names = "default"; > + pinctrl-0 = <&led_pin_olinuxino>; > + > + green { > + label = "olinuxino:green:usr"; > + gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LED2 */ > + linux,default-trigger = "heartbeat"; > + }; > + }; > +}; > + > +&ehci0 { > + status = "okay"; > +}; > + > +&ohci0 { > + status = "okay"; > +}; > + > +&mmc0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>; > + vmmc-supply = <®_dcdc1>; > + bus-width = <4>; > + cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ > + cd-inverted; > + status = "okay"; > +}; > + > +&pio { > + mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { > + allwinner,pins = "PB4"; > + allwinner,function = "gpio_in"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + > + led_pin_olinuxino: led_pins@0 { > + allwinner,pins = "PB7"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > +}; > + > +&r_rsb { > + status = "okay"; > + > + axp22x: pmic@3a3 { > + compatible = "x-powers,axp223"; > + reg = <0x3a3>; > + interrupt-parent = <&nmi_intc>; > + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; > + eldoin-supply = <®_dcdc1>; > + }; > +}; > + > +#include "axp22x.dtsi" > + > +®_dcdc1 { > + regulator-always-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-name = "vcc-dsi"; > +}; > + > +®_dc1sw { > + regulator-always-on; > + regulator-name = "vcc-lcd"; > +}; > + > +®_dcdc2 { > + regulator-always-on; > + regulator-min-microvolt = <900000>; > + regulator-max-microvolt = <1400000>; > + regulator-name = "vdd-sys"; > +}; > + > +®_dcdc3 { > + regulator-always-on; > + regulator-min-microvolt = <900000>; > + regulator-max-microvolt = <1400000>; > + regulator-name = "vdd-cpu"; > +}; > + > +®_dcdc5 { > + regulator-always-on; > + regulator-min-microvolt = <1500000>; > + regulator-max-microvolt = <1500000>; > + regulator-name = "vcc-dram"; > +}; > + > +®_dc5ldo { > + regulator-always-on; > + regulator-min-microvolt = <900000>; > + regulator-max-microvolt = <1400000>; > + regulator-name = "vdd-cpus"; > +}; > + > +®_aldo1 { > + regulator-always-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-name = "vcc-io"; > +}; > + > +®_aldo2 { > + regulator-always-on; > + regulator-min-microvolt = <2350000>; > + regulator-max-microvolt = <2650000>; > + regulator-name = "vdd-dll"; > +}; > + > +®_aldo3 { > + regulator-always-on; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-name = "vcc-avcc"; > +}; > + > +®_dldo3 { > + regulator-always-on; > + regulator-min-microvolt = <2800000>; > + regulator-max-microvolt = <2800000>; > + regulator-name = "vcc-csi"; > +}; > + > +®_eldo2 { > + regulator-always-on; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <1800000>; > + regulator-name = "vcc-dvdd-csi"; > +}; > + > +®_rtc_ldo { > + regulator-name = "vcc-rtc"; > +}; > + > +&uart0 { > + pinctrl-names = "default"; > + pinctrl-0 = <&uart0_pins_b>; > + status = "okay"; > +}; > + > +&usb_otg { > + dr_mode = "host"; > + status = "okay"; > +}; > + > +&usbphy { > + usb0_vbus-supply = <®_vcc5v0>; > + status = "okay"; > + > +}; > + > +&simplefb_lcd { > + vcc-lcd-supply = <®_dc1sw>; > +}; > diff --git a/configs/A33_OLinuXino_defconfig b/configs/A33_OLinuXino_defconfig > new file mode 100644 > index 0000000..d8fc110 > --- /dev/null > +++ b/configs/A33_OLinuXino_defconfig > @@ -0,0 +1,29 @@ > +CONFIG_ARM=y > +CONFIG_ARCH_SUNXI=y > +CONFIG_MACH_SUN8I_A33=y > +CONFIG_DRAM_CLK=552 > +CONFIG_DRAM_ZQ=15291 > +CONFIG_MMC0_CD_PIN="PB4" > +CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" > +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" > +CONFIG_AXP_GPIO=y > +CONFIG_USB0_ID_DET="PB3" > +CONFIG_USB_MUSB_HOST=y > +CONFIG_USB_MUSB_SUNXI=y > +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-olinuxino" > +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set > +CONFIG_SPL=y > +CONFIG_HUSH_PARSER=y > +CONFIG_CMD_BOOTZ=y > +# CONFIG_CMD_IMLS is not set > +# CONFIG_CMD_FLASH is not set > +CONFIG_CMD_MMC=y > +# CONFIG_CMD_FPGA is not set > +CONFIG_CMD_DHCP=y > +CONFIG_CMD_MII=y > +CONFIG_CMD_PING=y > +CONFIG_CMD_EXT2=y > +CONFIG_CMD_EXT4=y > +CONFIG_CMD_FAT=y > +CONFIG_CMD_FS_GENERIC=y > +# CONFIG_VIDEO is not set >
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index a827613..dbda275 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -221,7 +221,8 @@ dtb-$(CONFIG_MACH_SUN8I_A23) += \ dtb-$(CONFIG_MACH_SUN8I_A33) += \ sun8i-a33-ga10h-v1.1.dtb \ sun8i-a33-q8-tablet.dtb \ - sun8i-a33-sinlinx-sina33.dtb + sun8i-a33-sinlinx-sina33.dtb \ + sun8i-a33-olinuxino.dtb dtb-$(CONFIG_MACH_SUN8I_A83T) += \ sun8i-a83t-allwinner-h8homlet-v2.dtb \ sun8i-a83t-cubietruck-plus.dtb \ diff --git a/arch/arm/dts/sun8i-a33-olinuxino.dts b/arch/arm/dts/sun8i-a33-olinuxino.dts new file mode 100644 index 0000000..2eaeb55 --- /dev/null +++ b/arch/arm/dts/sun8i-a33-olinuxino.dts @@ -0,0 +1,223 @@ +/* + * Copyright 2016 - Stefan Mavrodiev <stefan.mavrodiev@gmail.com> + * Olimex LTD. <support@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. + */ + +/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 = "A33-OLinuXino"; + compatible = "allwinner,sun8i-a33"; + + aliases { + serial0 = &uart0; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&led_pin_olinuxino>; + + green { + label = "olinuxino:green:usr"; + gpios = <&pio 1 7 GPIO_ACTIVE_HIGH>; /* LED2 */ + linux,default-trigger = "heartbeat"; + }; + }; +}; + +&ehci0 { + status = "okay"; +}; + +&ohci0 { + status = "okay"; +}; + +&mmc0 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_olinuxino>; + vmmc-supply = <®_dcdc1>; + bus-width = <4>; + cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */ + cd-inverted; + status = "okay"; +}; + +&pio { + mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { + allwinner,pins = "PB4"; + allwinner,function = "gpio_in"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + + led_pin_olinuxino: led_pins@0 { + allwinner,pins = "PB7"; + allwinner,function = "gpio_out"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; +}; + +&r_rsb { + status = "okay"; + + axp22x: pmic@3a3 { + compatible = "x-powers,axp223"; + reg = <0x3a3>; + interrupt-parent = <&nmi_intc>; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>; + eldoin-supply = <®_dcdc1>; + }; +}; + +#include "axp22x.dtsi" + +®_dcdc1 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-dsi"; +}; + +®_dc1sw { + regulator-always-on; + regulator-name = "vcc-lcd"; +}; + +®_dcdc2 { + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-sys"; +}; + +®_dcdc3 { + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-cpu"; +}; + +®_dcdc5 { + regulator-always-on; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + regulator-name = "vcc-dram"; +}; + +®_dc5ldo { + regulator-always-on; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <1400000>; + regulator-name = "vdd-cpus"; +}; + +®_aldo1 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-io"; +}; + +®_aldo2 { + regulator-always-on; + regulator-min-microvolt = <2350000>; + regulator-max-microvolt = <2650000>; + regulator-name = "vdd-dll"; +}; + +®_aldo3 { + regulator-always-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc-avcc"; +}; + +®_dldo3 { + regulator-always-on; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + regulator-name = "vcc-csi"; +}; + +®_eldo2 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc-dvdd-csi"; +}; + +®_rtc_ldo { + regulator-name = "vcc-rtc"; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_b>; + status = "okay"; +}; + +&usb_otg { + dr_mode = "host"; + status = "okay"; +}; + +&usbphy { + usb0_vbus-supply = <®_vcc5v0>; + status = "okay"; + +}; + +&simplefb_lcd { + vcc-lcd-supply = <®_dc1sw>; +}; diff --git a/configs/A33_OLinuXino_defconfig b/configs/A33_OLinuXino_defconfig new file mode 100644 index 0000000..d8fc110 --- /dev/null +++ b/configs/A33_OLinuXino_defconfig @@ -0,0 +1,29 @@ +CONFIG_ARM=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN8I_A33=y +CONFIG_DRAM_CLK=552 +CONFIG_DRAM_ZQ=15291 +CONFIG_MMC0_CD_PIN="PB4" +CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" +CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" +CONFIG_AXP_GPIO=y +CONFIG_USB0_ID_DET="PB3" +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_SUNXI=y +CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-olinuxino" +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SPL=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +# CONFIG_VIDEO is not set
From: Stefan Mavrodiev <stefan.mavrodiev@gmail.com> --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/sun8i-a33-olinuxino.dts | 223 +++++++++++++++++++++++++++++++++++ configs/A33_OLinuXino_defconfig | 29 +++++ 3 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/sun8i-a33-olinuxino.dts create mode 100644 configs/A33_OLinuXino_defconfig