hsist
/
freifunkist-firmware
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

packages: uboot-sunxi: update Lamobo R1 patch

Browse Source 
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

SVN-Revision: 47516
master
Zoltan Herpai 9 years ago
parent 0c450f1f47
commit d5a77a0dbc
1 changed files with 185 additions and 177 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 362
      package/boot/uboot-sunxi/patches/002-add-lamobo-r1.diff

362
package/boot/uboot-sunxi/patches/002-add-lamobo-r1.diff
Unescape View File

@ -1,18 +1,22 @@
diff -ruN old/arch/arm/dts/Makefile new/arch/arm/dts/Makefile diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
--- old/arch/arm/dts/Makefile 2015-07-14 19:32:21.000000000 +0200 index 9c735c6..a32d772 100644
+++ new/arch/arm/dts/Makefile 2015-07-31 23:23:33.518767858 +0200 --- a/arch/arm/dts/Makefile
@@ -107,6 +107,7 @@ +++ b/arch/arm/dts/Makefile
@@ -103,6 +103,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \
sun7i-a20-ainol-aw1.dtb \
sun7i-a20-bananapi.dtb \
sun7i-a20-bananapro.dtb \
+ sun7i-a20-lamobo-r1.dtb \
sun7i-a20-cubieboard2.dtb \
sun7i-a20-cubietruck.dtb \ sun7i-a20-cubietruck.dtb \
sun7i-a20-hummingbird.dtb \ sun7i-a20-hummingbird.dtb \
sun7i-a20-i12-tvbox.dtb \ diff --git a/arch/arm/dts/sun7i-a20-lamobo-r1.dts
+ sun7i-a20-lamobo-r1.dtb \ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
sun7i-a20-m3.dtb \ new file mode 100644
sun7i-a20-m5.dtb \ index 0000000..a77fb5c
sun7i-a20-mk808c.dtb \ --- /dev/null
diff -ruN old/arch/arm/dts/sun7i-a20-lamobo-r1.dts new/arch/arm/dts/sun7i-a20-lamobo-r1.dts +++ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts
--- old/arch/arm/dts/sun7i-a20-lamobo-r1.dts 1970-01-01 01:00:00.000000000 +0100 @@ -0,0 +1,231 @@
+++ new/arch/arm/dts/sun7i-a20-lamobo-r1.dts 2015-07-31 23:19:30.811206714 +0200
@@ -0,0 +1,239 @@
+/* +/*
+ * Copyright 2014 Hans de Goede <hdegoede@redhat.com> + * Copyright 2014 Hans de Goede <hdegoede@redhat.com>
+ * + *
@ -33,11 +37,6 @@ diff -ruN old/arch/arm/dts/sun7i-a20-lamobo-r1.dts new/arch/arm/dts/sun7i-a20-la
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details. + * GNU General Public License for more details.
+ * + *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively, + * Or, alternatively,
+ * + *
+ * b) Permission is hereby granted, free of charge, to any person + * b) Permission is hereby granted, free of charge, to any person
@ -71,8 +70,8 @@ diff -ruN old/arch/arm/dts/sun7i-a20-lamobo-r1.dts new/arch/arm/dts/sun7i-a20-la
+#include <dt-bindings/pinctrl/sun4i-a10.h> +#include <dt-bindings/pinctrl/sun4i-a10.h>
+ +
+/ { +/ {
+ model = "Lamobo R1"; + model = "Lamobo Banana Pi R1";
+ compatible = "lamobo,lamobo-r1", "allwinner,sun7i-a20"; + compatible = "lemaker,bananapi", "allwinner,sun7i-a20";
+ +
+ aliases { + aliases {
+ serial0 = &uart0; + serial0 = &uart0;
@ -80,198 +79,207 @@ diff -ruN old/arch/arm/dts/sun7i-a20-lamobo-r1.dts new/arch/arm/dts/sun7i-a20-la
+ serial2 = &uart7; + serial2 = &uart7;
+ }; + };
+ +
+ soc@01c00000 { + chosen {
+ spi0: spi@01c05000 { + stdout-path = "serial0:115200n8";
+ pinctrl-names = "default"; + };
+ pinctrl-0 = <&spi0_pins_a>;
+ status = "okay";
+ };
+ +
+ mmc0: mmc@01c0f000 { + leds {
+ pinctrl-names = "default"; + compatible = "gpio-leds";
+ pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>; + pinctrl-names = "default";
+ vmmc-supply = <&reg_vcc3v3>; + pinctrl-0 = <&led_pins_bananapi>;
+ bus-width = <4>;
+ cd-gpios = <&pio 7 10 0>; /* PH10 */
+ cd-inverted;
+ status = "okay";
+ };
+ +
+ usbphy: phy@01c13400 { + green {
+ usb1_vbus-supply = <&reg_usb1_vbus>; + label = "bananapi:green:usr";
+ usb2_vbus-supply = <&reg_usb2_vbus>; + gpios = <&pio 7 24 GPIO_ACTIVE_HIGH>;
+ status = "okay";
+ }; + };
+ };
+ +
+ ehci0: usb@01c14000 { + reg_gmac_3v3: gmac-3v3 {
+ status = "okay"; + compatible = "regulator-fixed";
+ }; + pinctrl-names = "default";
+ pinctrl-0 = <&gmac_power_pin_bananapi>;
+ regulator-name = "gmac-3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ startup-delay-us = <100000>;
+ enable-active-high;
+ gpio = <&pio 7 23 GPIO_ACTIVE_HIGH>;
+ };
+};
+ +
+ ohci0: usb@01c14400 { +&ahci {
+ status = "okay"; + status = "okay";
+ }; +};
+ +
+ ahci: sata@01c18000 { +&ehci0 {
+ status = "okay"; + status = "okay";
+ }; +};
+ +
+ ehci1: usb@01c1c000 { +&ehci1 {
+ status = "okay"; + status = "okay";
+ }; +};
+ +
+ ohci1: usb@01c1c400 { +&gmac {
+ status = "okay"; + pinctrl-names = "default";
+ }; + pinctrl-0 = <&gmac_pins_rgmii_a>;
+ phy = <&phy1>;
+ phy-mode = "rgmii";
+ phy-supply = <&reg_gmac_3v3>;
+ status = "okay";
+ +
+ pinctrl@01c20800 { + phy1: ethernet-phy@1 {
+ mmc0_cd_pin_bananapi: mmc0_cd_pin@0 { + reg = <1>;
+ allwinner,pins = "PH10"; + };
+ allwinner,function = "gpio_in"; +};
+ allwinner,drive = <0>;
+ allwinner,pull = <1>;
+ };
+
+ gmac_power_pin_bananapi: gmac_power_pin@0 {
+ allwinner,pins = "PH23";
+ allwinner,function = "gpio_out";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
+
+ led_pins_bananapi: led_pins@0 {
+ allwinner,pins = "PH24";
+ allwinner,function = "gpio_out";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
+
+ ahci_pwr_pin_a: ahci_pwr_pin@0 {
+ allwinner,pins = "PB3";
+ allwinner,function = "gpio_out";
+ allwinner,drive = <0>;
+ allwinner,pull = <0>;
+ };
+
+ };
+ +
+&i2c0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c0_pins_a>;
+ status = "okay";
+ +
+ uart0: serial@01c28000 { + axp209: pmic@34 {
+ pinctrl-names = "default"; + compatible = "x-powers,axp209";
+ pinctrl-0 = <&uart0_pins_a>; + reg = <0x34>;
+ status = "okay"; + interrupt-parent = <&nmi_intc>;
+ }; + interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+ +
+ uart3: serial@01c28c00 { + interrupt-controller;
+ pinctrl-names = "default"; + #interrupt-cells = <1>;
+ pinctrl-0 = <&uart3_pins_b>; + };
+ status = "okay"; +};
+ };
+ +
+ uart7: serial@01c29c00 { +&i2c2 {
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&uart7_pins_a>; + pinctrl-0 = <&i2c2_pins_a>;
+ status = "okay"; + status = "okay";
+ }; +};
+ +
+ i2c0: i2c@01c2ac00 { +&ir0 {
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&i2c0_pins_a>; + pinctrl-0 = <&ir0_rx_pins_a>;
+ status = "okay"; + status = "okay";
+};
+ +
+ axp209: pmic@34 { +&mmc0 {
+ compatible = "x-powers,axp209"; + pinctrl-names = "default";
+ reg = <0x34>; + pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_bananapi>;
+ interrupt-parent = <&nmi_intc>; + vmmc-supply = <&reg_vcc3v3>;
+ interrupts = <0 8>; + bus-width = <4>;
+ cd-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
+ cd-inverted;
+ status = "okay";
+};
+ +
+ interrupt-controller; +&ohci0 {
+ #interrupt-cells = <1>; + status = "okay";
+ }; +};
+ };
+ +
+ i2c2: i2c@01c2b400 { +&ohci1 {
+ pinctrl-names = "default"; + status = "okay";
+ pinctrl-0 = <&i2c2_pins_a>; +};
+ status = "okay";
+ };
+ +
+ gmac: ethernet@01c50000 { +&pio {
+ pinctrl-names = "default"; + mmc0_cd_pin_bananapi: mmc0_cd_pin@0 {
+ pinctrl-0 = <&gmac_pins_rgmii_a>; + allwinner,pins = "PH10";
+ phy = <&phy1>; + allwinner,function = "gpio_in";
+ phy-mode = "rgmii"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+ phy-supply = <&reg_gmac_3v3>; + allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+ status = "okay";
+
+ phy1: ethernet-phy@1 {
+ reg = <1>;
+ };
+ };
+ }; + };
+ +
+ leds { + gmac_power_pin_bananapi: gmac_power_pin@0 {
+ compatible = "gpio-leds"; + allwinner,pins = "PH23";
+ pinctrl-names = "default"; + allwinner,function = "gpio_out";
+ pinctrl-0 = <&led_pins_bananapi>; + allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+ + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ green {
+ label = "bananapi:green:usr";
+ gpios = <&pio 7 24 0>;
+ };
+ }; + };
+ +
+ reg_usb1_vbus: usb1-vbus { + led_pins_bananapi: led_pins@0 {
+ status = "okay"; + allwinner,pins = "PH24";
+ allwinner,function = "gpio_out";
+ allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
+ }; + };
+ +
+ reg_usb2_vbus: usb2-vbus { + ir0_tx_pins_a: ir0@1 {
+ status = "okay"; + allwinner,pins = "PB3";
+ }; + allwinner,function = "ir0";
+ allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+ allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+ };
+ +
+ reg_gmac_3v3: gmac-3v3 { +};
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gmac_power_pin_bananapi>;
+ regulator-name = "gmac-3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ startup-delay-us = <100000>;
+ enable-active-high;
+ gpio = <&pio 7 23 0>;
+ };
+ +
+ reg_ahci_5v: ahci-5v { +&reg_usb1_vbus {
+ compatible = "regulator-fixed"; + status = "okay";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ahci_pwr_pin_a>;
+ regulator-name = "ahci-5v";
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5000000>;
+ enable-active-high;
+ gpio = <&pio 1 3 0>;
+ status = "okay";
+ };
+}; +};
diff -ruN old/configs/Lamobo_R1_defconfig new/configs/Lamobo_R1_defconfig +
--- old/configs/Lamobo_R1_defconfig 1970-01-01 01:00:00.000000000 +0100 +&reg_usb2_vbus {
+++ new/configs/Lamobo_R1_defconfig 2015-07-31 23:02:06.000000000 +0200 + status = "okay";
@@ -0,0 +1,19 @@ +};
+CONFIG_SPL=y +
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI,SATAPWR=SUNXI_GPB(3)" +&spi0 {
+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1" + pinctrl-names = "default";
+CONFIG_GMAC_TX_DELAY=4 + pinctrl-0 = <&spi0_pins_a>,
+ <&spi0_cs0_pins_a>,
+ <&spi0_cs1_pins_a>;
+ status = "okay";
+};
+
+&uart0 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_pins_a>;
+ status = "okay";
+};
+
+&uart3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart3_pins_b>;
+ status = "okay";
+};
+
+&uart7 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart7_pins_a>;
+ status = "okay";
+};
+
+&usbphy {
+ usb1_vbus-supply = <&reg_usb1_vbus>;
+ usb2_vbus-supply = <&reg_usb2_vbus>;
+ status = "okay";
+};
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS
index 7a42055..abf2c1c 100644
--- a/board/sunxi/MAINTAINERS
+++ b/board/sunxi/MAINTAINERS
@@ -30,6 +30,7 @@ F: include/configs/sun7i.h
F: configs/A20-OLinuXino_MICRO_defconfig
F: configs/Bananapi_defconfig
F: configs/Bananapro_defconfig
+F: configs/Lamobo_R1_defconfig
F: configs/i12-tvbox_defconfig
F: configs/Linksprite_pcDuino3_defconfig
F: configs/Linksprite_pcDuino3_fdt_defconfig
diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
new file mode 100644
index 0000000..bf665e7
--- /dev/null
+++ b/configs/Lamobo_R1_defconfig
@@ -0,0 +1,17 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y +CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN7I=y +CONFIG_MACH_SUN7I=y
+CONFIG_DRAM_CLK=432 +CONFIG_DRAM_CLK=432
+CONFIG_DRAM_ZQ=127 +CONFIG_GMAC_TX_DELAY=4
+CONFIG_DRAM_EMR1=4 +CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
+CONFIG_SPL=y
+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI"
+CONFIG_ETH_DESIGNWARE=y +CONFIG_ETH_DESIGNWARE=y
+CONFIG_NETDEVICES=y
+CONFIG_NET=y
+# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set +# CONFIG_CMD_FPGA is not set
+CONFIG_DM_SERIAL=y +CONFIG_DM_SERIAL=y
+CONFIG_USB=y +CONFIG_USB=y
+CONFIG_DM_USB=y +CONFIG_DM_USB=y
+CONFIG_NETDEVICES=y
+CONFIG_NET=y

Write Preview
Loading…
Cancel
Save