diff options
Diffstat (limited to 'package/boot')
20 files changed, 58 insertions, 277 deletions
diff --git a/package/boot/uboot-sunxi/patches/001-use-dtc-in-kernel.patch b/package/boot/uboot-sunxi/patches/001-use-dtc-in-kernel.patch index afcb37c546..6471e78656 100644 --- a/package/boot/uboot-sunxi/patches/001-use-dtc-in-kernel.patch +++ b/package/boot/uboot-sunxi/patches/001-use-dtc-in-kernel.patch @@ -1,7 +1,6 @@ -diff -ruN old/Makefile new/Makefile ---- old/Makefile 2015-04-13 16:53:03.000000000 +0200 -+++ new/Makefile 2015-07-31 15:52:08.920097812 +0200 -@@ -346,7 +346,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -348,7 +348,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump AWK = awk PERL = perl PYTHON = python diff --git a/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.diff b/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.diff deleted file mode 100644 index a8c5b3d938..0000000000 --- a/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -ruN u-boot-2015.01.old/configs/OLIMEX_A13_SOM_defconfig u-boot-2015.01/configs/OLIMEX_A13_SOM_defconfig ---- u-boot-2015.01.old/configs/OLIMEX_A13_SOM_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ u-boot-2015.01/configs/OLIMEX_A13_SOM_defconfig 2015-01-18 16:25:11.908986082 +0100 -@@ -0,0 +1,16 @@ -+CONFIG_SPL=y -+CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2,NO_AXP,USB_EHCI" -+CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino" -+CONFIG_ARM=y -+CONFIG_ARCH_SUNXI=y -+CONFIG_MACH_SUN5I=y -+CONFIG_DRAM_CLK=408 -+CONFIG_DRAM_ZQ=123 -+CONFIG_DRAM_EMR1=0 -+# CONFIG_CMD_IMLS is not set -+# CONFIG_CMD_FLASH is not set -+# CONFIG_CMD_FPGA is not set -+CONFIG_DM_SERIAL=y -+CONFIG_USB=y -+CONFIG_DM_USB=y -+CONFIG_SYS_NS16550=y diff --git a/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.patch b/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.patch new file mode 100644 index 0000000000..f29ad12b75 --- /dev/null +++ b/package/boot/uboot-sunxi/patches/002-add-olimex-a13-som.patch @@ -0,0 +1,21 @@ +--- /dev/null ++++ b/configs/OLIMEX_A13_SOM_defconfig +@@ -0,0 +1,18 @@ ++CONFIG_SPL=y ++CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=2" ++CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-olinuxino" ++CONFIG_ARM=y ++CONFIG_ARCH_SUNXI=y ++CONFIG_MACH_SUN5I=y ++CONFIG_DRAM_CLK=408 ++CONFIG_DRAM_ZQ=123 ++CONFIG_DRAM_EMR1=0 ++# CONFIG_CMD_IMLS is not set ++# CONFIG_CMD_FLASH is not set ++# CONFIG_CMD_FPGA is not set ++CONFIG_DM_SERIAL=y ++CONFIG_USB=y ++CONFIG_DM_USB=y ++CONFIG_SYS_NS16550=y ++CONFIG_SUNXI_NO_PMIC=y ++CONFIG_USB_EHCI_HCD=y diff --git a/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch b/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch index 2bf5778684..e5a66d7ebe 100644 --- a/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch +++ b/package/boot/uboot-sunxi/patches/003-add-theobroma-a31-pangolin.patch @@ -1,7 +1,6 @@ -diff -ruN a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile ---- a/arch/arm/dts/Makefile 2016-01-12 15:06:54.000000000 +0100 -+++ b/arch/arm/dts/Makefile 2016-01-30 15:31:50.000000000 +0100 -@@ -142,6 +142,7 @@ +--- a/arch/arm/dts/Makefile ++++ b/arch/arm/dts/Makefile +@@ -152,6 +152,7 @@ dtb-$(CONFIG_MACH_SUN6I) += \ sun6i-a31-m9.dtb \ sun6i-a31-mele-a1000g-quad.dtb \ sun6i-a31-mixtile-loftq.dtb \ @@ -9,9 +8,8 @@ diff -ruN a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile sun6i-a31s-cs908.dtb \ sun6i-a31s-primo81.dtb \ sun6i-a31s-sinovoip-bpi-m2.dtb -diff -ruN a/arch/arm/dts/sun6i-a31.dtsi b/arch/arm/dts/sun6i-a31.dtsi ---- a/arch/arm/dts/sun6i-a31.dtsi 2016-01-12 15:06:54.000000000 +0100 -+++ b/arch/arm/dts/sun6i-a31.dtsi 2016-01-31 15:06:47.000000000 +0100 +--- a/arch/arm/dts/sun6i-a31.dtsi ++++ b/arch/arm/dts/sun6i-a31.dtsi @@ -643,6 +643,13 @@ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; }; @@ -26,9 +24,8 @@ diff -ruN a/arch/arm/dts/sun6i-a31.dtsi b/arch/arm/dts/sun6i-a31.dtsi mmc0_pins_a: mmc0@0 { allwinner,pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; -diff -ruN a/arch/arm/dts/sun6i-a31-pangolin.dts b/arch/arm/dts/sun6i-a31-pangolin.dts ---- a/arch/arm/dts/sun6i-a31-pangolin.dts 1970-01-01 01:00:00.000000000 +0100 -+++ b/arch/arm/dts/sun6i-a31-pangolin.dts 2016-02-09 01:21:44.965168099 +0100 +--- /dev/null ++++ b/arch/arm/dts/sun6i-a31-pangolin.dts @@ -0,0 +1,292 @@ +/* + * Copyright 2015, Theobroma Systems Design und Consulting GmbH @@ -322,9 +319,8 @@ diff -ruN a/arch/arm/dts/sun6i-a31-pangolin.dts b/arch/arm/dts/sun6i-a31-pangoli + status = "okay"; + usb1_vbus-supply = <®_usb1_vbus>; +}; -diff -ruN a/configs/pangolin_defconfig b/configs/pangolin_defconfig ---- a/configs/pangolin_defconfig 1970-01-01 01:00:00.000000000 +0100 -+++ b/configs/pangolin_defconfig 2016-01-30 14:43:59.000000000 +0100 +--- /dev/null ++++ b/configs/pangolin_defconfig @@ -0,0 +1,36 @@ +CONFIG_SUNXI_PANGOLIN=y +CONFIG_SPL=y @@ -362,8 +358,6 @@ diff -ruN a/configs/pangolin_defconfig b/configs/pangolin_defconfig +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SUNXI_SPI=y -diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig -index e155c4c..1b147b2 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -15,7 +15,6 @@ config SUNXI_GEN_SUN6I @@ -374,9 +368,9 @@ index e155c4c..1b147b2 100644 choice prompt "Sunxi SoC Variant" optional -@@ -80,6 +79,14 @@ config MACH_SUN8I - bool - default y if MACH_SUN8I_A23 || MACH_SUN8I_A33 +@@ -533,6 +532,14 @@ config VIDEO_LCD_PANEL_I2C_SCL + Set the SCL pin for the LCD i2c interface. This takes a string in the + format understood by sunxi_name_to_gpio, e.g. PH1 for pin 1 of port H. +choice + prompt "Sunxi Board Variant" @@ -387,8 +381,5 @@ index e155c4c..1b147b2 100644 + +endchoice - config DRAM_CLK - int "sunxi dram clock speed" --- -cgit v0.10.2 - + # Note only one of these may be selected at a time! But hidden choices are + # not supported by Kconfig diff --git a/package/boot/uboot-sunxi/patches/010-dt-sync-files-with-kernel.patch b/package/boot/uboot-sunxi/patches/010-dt-sync-files-with-kernel.patch index 70925683a6..d8fa52c7e5 100644 --- a/package/boot/uboot-sunxi/patches/010-dt-sync-files-with-kernel.patch +++ b/package/boot/uboot-sunxi/patches/010-dt-sync-files-with-kernel.patch @@ -18,9 +18,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> create mode 100644 include/dt-bindings/clock/sun4i-a10-pll2.h create mode 100644 include/dt-bindings/input/linux-event-codes.h -diff --git a/include/dt-bindings/clock/sun4i-a10-pll2.h b/include/dt-bindings/clock/sun4i-a10-pll2.h -new file mode 100644 -index 0000000..071c811 --- /dev/null +++ b/include/dt-bindings/clock/sun4i-a10-pll2.h @@ -0,0 +1,53 @@ @@ -77,8 +74,6 @@ index 0000000..071c811 +#define SUN4I_A10_PLL2_8X 3 + +#endif /* __DT_BINDINGS_CLOCK_SUN4I_A10_PLL2_H_ */ -diff --git a/include/dt-bindings/input/input.h b/include/dt-bindings/input/input.h -index 042e7b3..a214133 100644 --- a/include/dt-bindings/input/input.h +++ b/include/dt-bindings/input/input.h @@ -9,515 +9,7 @@ @@ -598,9 +593,6 @@ index 042e7b3..a214133 100644 #define MATRIX_KEY(row, col, code) \ ((((row) & 0xFF) << 24) | (((col) & 0xFF) << 16) | ((code) & 0xFFFF)) -diff --git a/include/dt-bindings/input/linux-event-codes.h b/include/dt-bindings/input/linux-event-codes.h -new file mode 100644 -index 0000000..87cf351 --- /dev/null +++ b/include/dt-bindings/input/linux-event-codes.h @@ -0,0 +1,805 @@ diff --git a/package/boot/uboot-sunxi/patches/011-dt-sync-dts-files-with-kernel.patch b/package/boot/uboot-sunxi/patches/011-dt-sync-dts-files-with-kernel.patch index 1b7a059311..e36f9e3c5a 100644 --- a/package/boot/uboot-sunxi/patches/011-dt-sync-dts-files-with-kernel.patch +++ b/package/boot/uboot-sunxi/patches/011-dt-sync-dts-files-with-kernel.patch @@ -93,8 +93,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> create mode 100644 arch/arm/dts/sun8i-a83t-cubietruck-plus.dts create mode 100644 arch/arm/dts/sunxi-itead-core-common.dtsi -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 578038b..0cea4b4 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -126,6 +126,7 @@ dtb-$(CONFIG_MACH_SUN4I) += \ @@ -105,8 +103,8 @@ index 578038b..0cea4b4 100644 sun4i-a10-pov-protab2-ips9.dtb dtb-$(CONFIG_MACH_SUN5I) += \ sun5i-a10s-auxtek-t003.dtb \ -@@ -154,7 +155,9 @@ dtb-$(CONFIG_MACH_SUN6I) += \ - sun6i-a31-mixtile-loftq.dtb \ +@@ -155,7 +156,9 @@ dtb-$(CONFIG_MACH_SUN6I) += \ + sun6i-a31-pangolin.dtb \ sun6i-a31s-cs908.dtb \ sun6i-a31s-primo81.dtb \ - sun6i-a31s-sinovoip-bpi-m2.dtb @@ -116,7 +114,7 @@ index 578038b..0cea4b4 100644 dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-ainol-aw1.dtb \ sun7i-a20-bananapi.dtb \ -@@ -163,6 +166,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \ +@@ -164,6 +167,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-cubietruck.dtb \ sun7i-a20-hummingbird.dtb \ sun7i-a20-i12-tvbox.dtb \ @@ -125,7 +123,7 @@ index 578038b..0cea4b4 100644 sun7i-a20-lamobo-r1.dtb \ sun7i-a20-m3.dtb \ sun7i-a20-m5.dtb \ -@@ -189,6 +194,7 @@ dtb-$(CONFIG_MACH_SUN8I_A33) += \ +@@ -190,6 +195,7 @@ dtb-$(CONFIG_MACH_SUN8I_A33) += \ sun8i-a33-sinlinx-sina33.dtb dtb-$(CONFIG_MACH_SUN8I_A83T) += \ sun8i-a83t-allwinner-h8homlet-v2.dtb \ @@ -133,9 +131,6 @@ index 578038b..0cea4b4 100644 sun8i-a83t-sinovoip-bpi-m3.dtb dtb-$(CONFIG_MACH_SUN8I_H3) += \ sun8i-h3-orangepi-pc.dtb \ -diff --git a/arch/arm/dts/axp22x.dtsi b/arch/arm/dts/axp22x.dtsi -new file mode 100644 -index 0000000..0cfec50 --- /dev/null +++ b/arch/arm/dts/axp22x.dtsi @@ -0,0 +1,145 @@ @@ -284,8 +279,6 @@ index 0000000..0cfec50 + }; + }; +}; -diff --git a/arch/arm/dts/sun4i-a10-a1000.dts b/arch/arm/dts/sun4i-a10-a1000.dts -index 2630d78..97570cb 100644 --- a/arch/arm/dts/sun4i-a10-a1000.dts +++ b/arch/arm/dts/sun4i-a10-a1000.dts @@ -93,6 +93,10 @@ @@ -299,8 +292,6 @@ index 2630d78..97570cb 100644 &ehci0 { status = "okay"; }; -diff --git a/arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts b/arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts -index 1430568..023b03e 100644 --- a/arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts +++ b/arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts @@ -45,6 +45,7 @@ @@ -339,8 +330,6 @@ index 1430568..023b03e 100644 &lradc { vref-supply = <®_vcc3v0>; status = "okay"; -diff --git a/arch/arm/dts/sun4i-a10-cubieboard.dts b/arch/arm/dts/sun4i-a10-cubieboard.dts -index 046a84d..710e2ef 100644 --- a/arch/arm/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/dts/sun4i-a10-cubieboard.dts @@ -83,6 +83,10 @@ @@ -354,8 +343,6 @@ index 046a84d..710e2ef 100644 &cpu0 { cpu-supply = <®_dcdc2>; }; -diff --git a/arch/arm/dts/sun4i-a10-gemei-g9.dts b/arch/arm/dts/sun4i-a10-gemei-g9.dts -index 570754d..ac64781 100644 --- a/arch/arm/dts/sun4i-a10-gemei-g9.dts +++ b/arch/arm/dts/sun4i-a10-gemei-g9.dts @@ -47,6 +47,7 @@ @@ -470,8 +457,6 @@ index 570754d..ac64781 100644 ®_usb1_vbus { status = "okay"; }; -diff --git a/arch/arm/dts/sun4i-a10-inet1.dts b/arch/arm/dts/sun4i-a10-inet1.dts -index 487ce63..e09053b 100644 --- a/arch/arm/dts/sun4i-a10-inet1.dts +++ b/arch/arm/dts/sun4i-a10-inet1.dts @@ -47,6 +47,7 @@ @@ -562,8 +547,6 @@ index 487ce63..e09053b 100644 ®_dcdc2 { regulator-always-on; regulator-min-microvolt = <1000000>; -diff --git a/arch/arm/dts/sun4i-a10-inet97fv2.dts b/arch/arm/dts/sun4i-a10-inet97fv2.dts -index 6c927a8..04b0d2d 100644 --- a/arch/arm/dts/sun4i-a10-inet97fv2.dts +++ b/arch/arm/dts/sun4i-a10-inet97fv2.dts @@ -47,6 +47,8 @@ @@ -737,8 +720,6 @@ index 6c927a8..04b0d2d 100644 usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; }; -diff --git a/arch/arm/dts/sun4i-a10-inet9f-rev03.dts b/arch/arm/dts/sun4i-a10-inet9f-rev03.dts -index 8446465..bba4f9c 100644 --- a/arch/arm/dts/sun4i-a10-inet9f-rev03.dts +++ b/arch/arm/dts/sun4i-a10-inet9f-rev03.dts @@ -59,6 +59,159 @@ @@ -949,8 +930,6 @@ index 8446465..bba4f9c 100644 usb0_id_detect_pin: usb0_id_detect_pin@0 { allwinner,pins = "PH4"; allwinner,function = "gpio_in"; -diff --git a/arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts b/arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts -index 985e155..4e798f0 100644 --- a/arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts +++ b/arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts @@ -1,5 +1,6 @@ @@ -1085,8 +1064,6 @@ index 985e155..4e798f0 100644 - usb2_vbus-supply = <®_usb2_vbus>; - status = "okay"; -}; -diff --git a/arch/arm/dts/sun4i-a10-jesurun-q5.dts b/arch/arm/dts/sun4i-a10-jesurun-q5.dts -index dc2f2ae..7afc7a6 100644 --- a/arch/arm/dts/sun4i-a10-jesurun-q5.dts +++ b/arch/arm/dts/sun4i-a10-jesurun-q5.dts @@ -156,6 +156,10 @@ @@ -1126,8 +1103,6 @@ index dc2f2ae..7afc7a6 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun4i-a10-marsboard.dts b/arch/arm/dts/sun4i-a10-marsboard.dts -index 02158bc..8e50723 100644 --- a/arch/arm/dts/sun4i-a10-marsboard.dts +++ b/arch/arm/dts/sun4i-a10-marsboard.dts @@ -91,6 +91,10 @@ @@ -1182,8 +1157,6 @@ index 02158bc..8e50723 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun4i-a10-mk802.dts b/arch/arm/dts/sun4i-a10-mk802.dts -index 3c7eebe..ee46ea8 100644 --- a/arch/arm/dts/sun4i-a10-mk802.dts +++ b/arch/arm/dts/sun4i-a10-mk802.dts @@ -44,6 +44,7 @@ @@ -1260,8 +1233,6 @@ index 3c7eebe..ee46ea8 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/dts/sun4i-a10-olinuxino-lime.dts -index 28e32ad..b350448 100644 --- a/arch/arm/dts/sun4i-a10-olinuxino-lime.dts +++ b/arch/arm/dts/sun4i-a10-olinuxino-lime.dts @@ -124,6 +124,18 @@ @@ -1283,8 +1254,6 @@ index 28e32ad..b350448 100644 &mdio { status = "okay"; -diff --git a/arch/arm/dts/sun4i-a10-pcduino.dts b/arch/arm/dts/sun4i-a10-pcduino.dts -index 4e3e1b9..39034aa 100644 --- a/arch/arm/dts/sun4i-a10-pcduino.dts +++ b/arch/arm/dts/sun4i-a10-pcduino.dts @@ -104,6 +104,10 @@ @@ -1386,9 +1355,6 @@ index 4e3e1b9..39034aa 100644 + usb2_vbus-supply = <®_vcc5v0>; /* USB2 VBUS is always on */ status = "okay"; }; -diff --git a/arch/arm/dts/sun4i-a10-pcduino2.dts b/arch/arm/dts/sun4i-a10-pcduino2.dts -new file mode 100644 -index 0000000..de483a1 --- /dev/null +++ b/arch/arm/dts/sun4i-a10-pcduino2.dts @@ -0,0 +1,78 @@ @@ -1470,8 +1436,6 @@ index 0000000..de483a1 + usb2_vbus-supply = <®_usb2_vbus>; + status = "okay"; +}; -diff --git a/arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts b/arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts -index 223515e..ea90634 100644 --- a/arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts +++ b/arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts @@ -47,6 +47,7 @@ @@ -1589,8 +1553,6 @@ index 223515e..ea90634 100644 ®_dcdc2 { regulator-always-on; regulator-min-microvolt = <1000000>; -diff --git a/arch/arm/dts/sun4i-a10.dtsi b/arch/arm/dts/sun4i-a10.dtsi -index 463bacd..2c8f5e6 100644 --- a/arch/arm/dts/sun4i-a10.dtsi +++ b/arch/arm/dts/sun4i-a10.dtsi @@ -45,6 +45,7 @@ @@ -1840,8 +1802,6 @@ index 463bacd..2c8f5e6 100644 sid: eeprom@01c23800 { compatible = "allwinner,sun4i-a10-sid"; reg = <0x01c23800 0x10>; -diff --git a/arch/arm/dts/sun5i-a10s-auxtek-t004.dts b/arch/arm/dts/sun5i-a10s-auxtek-t004.dts -index 2b3511e..a790ec8 100644 --- a/arch/arm/dts/sun5i-a10s-auxtek-t004.dts +++ b/arch/arm/dts/sun5i-a10s-auxtek-t004.dts @@ -86,6 +86,20 @@ @@ -1865,8 +1825,6 @@ index 2b3511e..a790ec8 100644 &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_t004>; -diff --git a/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts -index 5a422c1..86d046a 100644 --- a/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts +++ b/arch/arm/dts/sun5i-a10s-olinuxino-micro.dts @@ -111,7 +111,7 @@ @@ -1878,8 +1836,6 @@ index 5a422c1..86d046a 100644 pagesize = <16>; reg = <0x50>; read-only; -diff --git a/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts b/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts -index 7fbb0b0..6efbba6 100644 --- a/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts +++ b/arch/arm/dts/sun5i-a13-empire-electronix-d709.dts @@ -123,7 +123,7 @@ @@ -1920,8 +1876,6 @@ index 7fbb0b0..6efbba6 100644 allwinner,pins = "PG0"; allwinner,function = "gpio_in"; allwinner,drive = <SUN4I_PINCTRL_10_MA>; -diff --git a/arch/arm/dts/sun5i-a13-inet-98v-rev2.dts b/arch/arm/dts/sun5i-a13-inet-98v-rev2.dts -index 6d466a2..1b11ec9 100644 --- a/arch/arm/dts/sun5i-a13-inet-98v-rev2.dts +++ b/arch/arm/dts/sun5i-a13-inet-98v-rev2.dts @@ -123,21 +123,6 @@ @@ -1976,8 +1930,6 @@ index 6d466a2..1b11ec9 100644 + usb1_vbus-supply = <®_ldo3>; status = "okay"; }; -diff --git a/arch/arm/dts/sun5i-a13-utoo-p66.dts b/arch/arm/dts/sun5i-a13-utoo-p66.dts -index eb793d5..fa9ddfd 100644 --- a/arch/arm/dts/sun5i-a13-utoo-p66.dts +++ b/arch/arm/dts/sun5i-a13-utoo-p66.dts @@ -47,11 +47,21 @@ @@ -2043,8 +1995,6 @@ index eb793d5..fa9ddfd 100644 ®_dcdc2 { regulator-always-on; regulator-min-microvolt = <1000000>; -diff --git a/arch/arm/dts/sun5i-q8-common.dtsi b/arch/arm/dts/sun5i-q8-common.dtsi -index 0641d68..a78e189 100644 --- a/arch/arm/dts/sun5i-q8-common.dtsi +++ b/arch/arm/dts/sun5i-q8-common.dtsi @@ -41,11 +41,21 @@ @@ -2069,8 +2019,6 @@ index 0641d68..a78e189 100644 chosen { stdout-path = "serial0:115200n8"; }; -diff --git a/arch/arm/dts/sun5i-r8-chip.dts b/arch/arm/dts/sun5i-r8-chip.dts -index abf3ccb..6ad19e2 100644 --- a/arch/arm/dts/sun5i-r8-chip.dts +++ b/arch/arm/dts/sun5i-r8-chip.dts @@ -64,6 +64,26 @@ @@ -2151,8 +2099,6 @@ index abf3ccb..6ad19e2 100644 ®_ldo5 { regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; -diff --git a/arch/arm/dts/sun5i.dtsi b/arch/arm/dts/sun5i.dtsi -index 9ffee9b..59a9426 100644 --- a/arch/arm/dts/sun5i.dtsi +++ b/arch/arm/dts/sun5i.dtsi @@ -44,6 +44,7 @@ @@ -2214,8 +2160,6 @@ index 9ffee9b..59a9426 100644 sid: eeprom@01c23800 { compatible = "allwinner,sun4i-a10-sid"; reg = <0x01c23800 0x10>; -diff --git a/arch/arm/dts/sun6i-a31-colombus.dts b/arch/arm/dts/sun6i-a31-colombus.dts -index 0d0b6f2..f9cf368 100644 --- a/arch/arm/dts/sun6i-a31-colombus.dts +++ b/arch/arm/dts/sun6i-a31-colombus.dts @@ -60,6 +60,16 @@ @@ -2263,8 +2207,6 @@ index 0d0b6f2..f9cf368 100644 }; ®_usb2_vbus { -diff --git a/arch/arm/dts/sun6i-a31-hummingbird.dts b/arch/arm/dts/sun6i-a31-hummingbird.dts -index d0cfada..9a74637 100644 --- a/arch/arm/dts/sun6i-a31-hummingbird.dts +++ b/arch/arm/dts/sun6i-a31-hummingbird.dts @@ -54,6 +54,8 @@ @@ -2454,8 +2396,6 @@ index d0cfada..9a74637 100644 ®_usb1_vbus { gpio = <&pio 7 24 GPIO_ACTIVE_HIGH>; /* PH24 */ status = "okay"; -diff --git a/arch/arm/dts/sun6i-a31.dtsi b/arch/arm/dts/sun6i-a31.dtsi -index 44f889f..1867af2 100644 --- a/arch/arm/dts/sun6i-a31.dtsi +++ b/arch/arm/dts/sun6i-a31.dtsi @@ -61,7 +61,7 @@ @@ -2543,7 +2483,7 @@ index 44f889f..1867af2 100644 clock-output-names = "usb_phy0", "usb_phy1", "usb_phy2", "usb_ohci0", "usb_ohci1", "usb_ohci2"; -@@ -677,6 +709,16 @@ +@@ -684,6 +716,16 @@ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; }; @@ -2560,7 +2500,7 @@ index 44f889f..1867af2 100644 gmac_pins_mii_a: gmac_mii@0 { allwinner,pins = "PA0", "PA1", "PA2", "PA3", "PA8", "PA9", "PA11", -@@ -754,6 +796,13 @@ +@@ -761,6 +803,13 @@ reg = <0x01c20ca0 0x20>; }; @@ -2574,7 +2514,7 @@ index 44f889f..1867af2 100644 rtp: rtp@01c25000 { compatible = "allwinner,sun6i-a31-ts"; reg = <0x01c25000 0x100>; -@@ -900,6 +949,16 @@ +@@ -907,6 +956,16 @@ #size-cells = <0>; }; @@ -2591,7 +2531,7 @@ index 44f889f..1867af2 100644 timer@01c60000 { compatible = "allwinner,sun6i-a31-hstimer", "allwinner,sun7i-a20-hstimer"; -@@ -1061,7 +1120,7 @@ +@@ -1068,7 +1127,7 @@ resets = <&apb0_rst 0>; gpio-controller; interrupt-controller; @@ -2600,8 +2540,6 @@ index 44f889f..1867af2 100644 #size-cells = <0>; #gpio-cells = <3>; -diff --git a/arch/arm/dts/sun6i-a31s-primo81.dts b/arch/arm/dts/sun6i-a31s-primo81.dts -index cfdc03e..379746a 100644 --- a/arch/arm/dts/sun6i-a31s-primo81.dts +++ b/arch/arm/dts/sun6i-a31s-primo81.dts @@ -1,16 +1,57 @@ @@ -2871,9 +2809,6 @@ index cfdc03e..379746a 100644 + usb1_vbus-supply = <®_dldo1>; status = "okay"; }; -diff --git a/arch/arm/dts/sun6i-a31s-sina31s-core.dtsi b/arch/arm/dts/sun6i-a31s-sina31s-core.dtsi -new file mode 100644 -index 0000000..4ec0c86 --- /dev/null +++ b/arch/arm/dts/sun6i-a31s-sina31s-core.dtsi @@ -0,0 +1,142 @@ @@ -3019,9 +2954,6 @@ index 0000000..4ec0c86 + status = "okay"; +}; + -diff --git a/arch/arm/dts/sun6i-a31s-sina31s.dts b/arch/arm/dts/sun6i-a31s-sina31s.dts -new file mode 100644 -index 0000000..6ead2f5 --- /dev/null +++ b/arch/arm/dts/sun6i-a31s-sina31s.dts @@ -0,0 +1,153 @@ @@ -3178,9 +3110,6 @@ index 0000000..6ead2f5 +&usbphy { + status = "okay"; +}; -diff --git a/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts b/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts -new file mode 100644 -index 0000000..360adfb --- /dev/null +++ b/arch/arm/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts @@ -0,0 +1,205 @@ @@ -3389,8 +3318,6 @@ index 0000000..360adfb + usb2_vbus-supply = <®_dc1sw>; + status = "okay"; +}; -diff --git a/arch/arm/dts/sun7i-a20-bananapi.dts b/arch/arm/dts/sun7i-a20-bananapi.dts -index 9f7b472..67c8a76 100644 --- a/arch/arm/dts/sun7i-a20-bananapi.dts +++ b/arch/arm/dts/sun7i-a20-bananapi.dts @@ -92,6 +92,24 @@ @@ -3511,8 +3438,6 @@ index 9f7b472..67c8a76 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun7i-a20-cubieboard2.dts b/arch/arm/dts/sun7i-a20-cubieboard2.dts -index 39a51d5..1fa832d 100644 --- a/arch/arm/dts/sun7i-a20-cubieboard2.dts +++ b/arch/arm/dts/sun7i-a20-cubieboard2.dts @@ -84,6 +84,10 @@ @@ -3572,8 +3497,6 @@ index 39a51d5..1fa832d 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun7i-a20-cubietruck.dts b/arch/arm/dts/sun7i-a20-cubietruck.dts -index e6b0192..8da939a 100644 --- a/arch/arm/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/dts/sun7i-a20-cubietruck.dts @@ -101,6 +101,10 @@ @@ -3587,9 +3510,6 @@ index e6b0192..8da939a 100644 &cpu0 { cpu-supply = <®_dcdc2>; }; -diff --git a/arch/arm/dts/sun7i-a20-icnova-swac.dts b/arch/arm/dts/sun7i-a20-icnova-swac.dts -new file mode 100644 -index 0000000..f5b5325 --- /dev/null +++ b/arch/arm/dts/sun7i-a20-icnova-swac.dts @@ -0,0 +1,169 @@ @@ -3762,9 +3682,6 @@ index 0000000..f5b5325 + usb2_vbus-supply = <®_usb2_vbus>; + status = "okay"; +}; -diff --git a/arch/arm/dts/sun7i-a20-itead-ibox.dts b/arch/arm/dts/sun7i-a20-itead-ibox.dts -new file mode 100644 -index 0000000..661c21d --- /dev/null +++ b/arch/arm/dts/sun7i-a20-itead-ibox.dts @@ -0,0 +1,125 @@ @@ -3893,8 +3810,6 @@ index 0000000..661c21d +®_ahci_5v { + status = "okay"; +}; -diff --git a/arch/arm/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/dts/sun7i-a20-lamobo-r1.dts -index 975b0b2..5ee43d8 100644 --- a/arch/arm/dts/sun7i-a20-lamobo-r1.dts +++ b/arch/arm/dts/sun7i-a20-lamobo-r1.dts @@ -97,16 +97,6 @@ @@ -3914,8 +3829,6 @@ index 975b0b2..5ee43d8 100644 }; &ehci0 { -diff --git a/arch/arm/dts/sun7i-a20-mk808c.dts b/arch/arm/dts/sun7i-a20-mk808c.dts -index 4f432f8..90ff4a2 100644 --- a/arch/arm/dts/sun7i-a20-mk808c.dts +++ b/arch/arm/dts/sun7i-a20-mk808c.dts @@ -53,6 +53,7 @@ @@ -3986,8 +3899,6 @@ index 4f432f8..90ff4a2 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts -index 6904dbd..23aacce 100644 --- a/arch/arm/dts/sun7i-a20-olimex-som-evb.dts +++ b/arch/arm/dts/sun7i-a20-olimex-som-evb.dts @@ -1,5 +1,6 @@ @@ -4155,8 +4066,6 @@ index 6904dbd..23aacce 100644 usb0_vbus-supply = <®_usb0_vbus>; usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; -diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime.dts -index 0423708..35ad700 100644 --- a/arch/arm/dts/sun7i-a20-olinuxino-lime.dts +++ b/arch/arm/dts/sun7i-a20-olinuxino-lime.dts @@ -117,6 +117,18 @@ @@ -4178,8 +4087,6 @@ index 0423708..35ad700 100644 &mmc0 { pinctrl-names = "default"; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; -diff --git a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts -index 8acff78..d5c796c 100644 --- a/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/dts/sun7i-a20-olinuxino-lime2.dts @@ -170,6 +170,12 @@ @@ -4265,8 +4172,6 @@ index 8acff78..d5c796c 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/dts/sun7i-a20-olinuxino-micro.dts -index c5d70ca..7e3006f 100644 --- a/arch/arm/dts/sun7i-a20-olinuxino-micro.dts +++ b/arch/arm/dts/sun7i-a20-olinuxino-micro.dts @@ -125,6 +125,12 @@ @@ -4282,8 +4187,6 @@ index c5d70ca..7e3006f 100644 }; &i2c2 { -diff --git a/arch/arm/dts/sun7i-a20-orangepi-mini.dts b/arch/arm/dts/sun7i-a20-orangepi-mini.dts -index 73cd81e..2be04c4 100644 --- a/arch/arm/dts/sun7i-a20-orangepi-mini.dts +++ b/arch/arm/dts/sun7i-a20-orangepi-mini.dts @@ -95,6 +95,10 @@ @@ -4349,8 +4252,6 @@ index 73cd81e..2be04c4 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun7i-a20-orangepi.dts b/arch/arm/dts/sun7i-a20-orangepi.dts -index 55a06ce..71125bf 100644 --- a/arch/arm/dts/sun7i-a20-orangepi.dts +++ b/arch/arm/dts/sun7i-a20-orangepi.dts @@ -141,7 +141,18 @@ @@ -4405,8 +4306,6 @@ index 55a06ce..71125bf 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts -index 5361fce..ddac732 100644 --- a/arch/arm/dts/sun7i-a20-pcduino3-nano.dts +++ b/arch/arm/dts/sun7i-a20-pcduino3-nano.dts @@ -82,6 +82,14 @@ @@ -4527,8 +4426,6 @@ index 5361fce..ddac732 100644 + usb2_vbus-supply = <®_usb1_vbus>; status = "okay"; }; -diff --git a/arch/arm/dts/sun7i-a20-pcduino3.dts b/arch/arm/dts/sun7i-a20-pcduino3.dts -index afc9ece..1a8b39b 100644 --- a/arch/arm/dts/sun7i-a20-pcduino3.dts +++ b/arch/arm/dts/sun7i-a20-pcduino3.dts @@ -111,6 +111,14 @@ @@ -4638,8 +4535,6 @@ index afc9ece..1a8b39b 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun7i-a20-wexler-tab7200.dts b/arch/arm/dts/sun7i-a20-wexler-tab7200.dts -index 83c6d3f..2f6b21a 100644 --- a/arch/arm/dts/sun7i-a20-wexler-tab7200.dts +++ b/arch/arm/dts/sun7i-a20-wexler-tab7200.dts @@ -48,6 +48,7 @@ @@ -4787,8 +4682,6 @@ index 83c6d3f..2f6b21a 100644 usb1_vbus-supply = <®_usb1_vbus>; usb2_vbus-supply = <®_usb2_vbus>; status = "okay"; -diff --git a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts -index e7d84fe..dc31d47 100644 --- a/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts +++ b/arch/arm/dts/sun7i-a20-wits-pro-a20-dkt.dts @@ -1,13 +1,52 @@ @@ -5012,8 +4905,6 @@ index e7d84fe..dc31d47 100644 + usb2_vbus-supply = <®_usb2_vbus>; + status = "okay"; +}; -diff --git a/arch/arm/dts/sun7i-a20.dtsi b/arch/arm/dts/sun7i-a20.dtsi -index 71ab6b8..0940a78 100644 --- a/arch/arm/dts/sun7i-a20.dtsi +++ b/arch/arm/dts/sun7i-a20.dtsi @@ -47,6 +47,7 @@ @@ -5220,8 +5111,6 @@ index 71ab6b8..0940a78 100644 sid: eeprom@01c23800 { compatible = "allwinner,sun7i-a20-sid"; reg = <0x01c23800 0x200>; -diff --git a/arch/arm/dts/sun8i-a23-a33.dtsi b/arch/arm/dts/sun8i-a23-a33.dtsi -index 9c4a55c..7e05e09 100644 --- a/arch/arm/dts/sun8i-a23-a33.dtsi +++ b/arch/arm/dts/sun8i-a23-a33.dtsi @@ -56,7 +56,7 @@ @@ -5364,8 +5253,6 @@ index 9c4a55c..7e05e09 100644 + }; }; }; -diff --git a/arch/arm/dts/sun8i-a23-gt90h-v4.dts b/arch/arm/dts/sun8i-a23-gt90h-v4.dts -index 1aeb06c..b2ce284 100644 --- a/arch/arm/dts/sun8i-a23-gt90h-v4.dts +++ b/arch/arm/dts/sun8i-a23-gt90h-v4.dts @@ -47,15 +47,26 @@ @@ -5535,8 +5422,6 @@ index 1aeb06c..b2ce284 100644 + usb1_vbus-supply = <®_dldo1>; status = "okay"; }; -diff --git a/arch/arm/dts/sun8i-a23.dtsi b/arch/arm/dts/sun8i-a23.dtsi -index 2cc27c7..92e6616 100644 --- a/arch/arm/dts/sun8i-a23.dtsi +++ b/arch/arm/dts/sun8i-a23.dtsi @@ -50,6 +50,31 @@ @@ -5571,8 +5456,6 @@ index 2cc27c7..92e6616 100644 mbus_clk: clk@01c2015c { #clock-cells = <0>; compatible = "allwinner,sun8i-a23-mbus-clk"; -diff --git a/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts -index 1d5390d..fef6abc 100644 --- a/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts +++ b/arch/arm/dts/sun8i-a33-sinlinx-sina33.dts @@ -68,7 +68,7 @@ @@ -5692,8 +5575,6 @@ index 1d5390d..fef6abc 100644 &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_b>; -diff --git a/arch/arm/dts/sun8i-a33.dtsi b/arch/arm/dts/sun8i-a33.dtsi -index faa7d3c..001d840 100644 --- a/arch/arm/dts/sun8i-a33.dtsi +++ b/arch/arm/dts/sun8i-a33.dtsi @@ -72,6 +72,41 @@ @@ -5755,9 +5636,6 @@ index faa7d3c..001d840 100644 usb_otg: usb@01c19000 { compatible = "allwinner,sun8i-a33-musb"; reg = <0x01c19000 0x0400>; -diff --git a/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts -new file mode 100644 -index 0000000..88b1e09 --- /dev/null +++ b/arch/arm/dts/sun8i-a83t-cubietruck-plus.dts @@ -0,0 +1,65 @@ @@ -5826,8 +5704,6 @@ index 0000000..88b1e09 + pinctrl-0 = <&uart0_pins_b>; + status = "okay"; +}; -diff --git a/arch/arm/dts/sun8i-a83t.dtsi b/arch/arm/dts/sun8i-a83t.dtsi -index 245b819..d3473f8 100644 --- a/arch/arm/dts/sun8i-a83t.dtsi +++ b/arch/arm/dts/sun8i-a83t.dtsi @@ -52,12 +52,6 @@ @@ -6039,8 +5915,6 @@ index 245b819..d3473f8 100644 + }; }; }; -diff --git a/arch/arm/dts/sun8i-h3-orangepi-pc.dts b/arch/arm/dts/sun8i-h3-orangepi-pc.dts -index 4b25dcc..30ccca0 100644 --- a/arch/arm/dts/sun8i-h3-orangepi-pc.dts +++ b/arch/arm/dts/sun8i-h3-orangepi-pc.dts @@ -45,6 +45,7 @@ @@ -6140,8 +6014,6 @@ index 4b25dcc..30ccca0 100644 &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins_a>; -diff --git a/arch/arm/dts/sun8i-h3-orangepi-plus.dts b/arch/arm/dts/sun8i-h3-orangepi-plus.dts -index 1cb6c66..900ec4f 100644 --- a/arch/arm/dts/sun8i-h3-orangepi-plus.dts +++ b/arch/arm/dts/sun8i-h3-orangepi-plus.dts @@ -45,6 +45,7 @@ @@ -6221,8 +6093,6 @@ index 1cb6c66..900ec4f 100644 }; &ehci1 { -diff --git a/arch/arm/dts/sun8i-h3.dtsi b/arch/arm/dts/sun8i-h3.dtsi -index 0faa38a..c2f63c5 100644 --- a/arch/arm/dts/sun8i-h3.dtsi +++ b/arch/arm/dts/sun8i-h3.dtsi @@ -83,12 +83,6 @@ @@ -6590,8 +6460,6 @@ index 0faa38a..c2f63c5 100644 + }; }; }; -diff --git a/arch/arm/dts/sun8i-q8-common.dtsi b/arch/arm/dts/sun8i-q8-common.dtsi -index 07cd268..346a49d 100644 --- a/arch/arm/dts/sun8i-q8-common.dtsi +++ b/arch/arm/dts/sun8i-q8-common.dtsi @@ -41,11 +41,23 @@ @@ -6718,8 +6586,6 @@ index 07cd268..346a49d 100644 +&simplefb_lcd { + vcc-lcd-supply = <®_dc1sw>; +}; -diff --git a/arch/arm/dts/sun9i-a80-cubieboard4.dts b/arch/arm/dts/sun9i-a80-cubieboard4.dts -index 6484dcf..eb2ccd0 100644 --- a/arch/arm/dts/sun9i-a80-cubieboard4.dts +++ b/arch/arm/dts/sun9i-a80-cubieboard4.dts @@ -62,9 +62,31 @@ @@ -6775,8 +6641,6 @@ index 6484dcf..eb2ccd0 100644 status = "okay"; }; -diff --git a/arch/arm/dts/sun9i-a80-optimus.dts b/arch/arm/dts/sun9i-a80-optimus.dts -index 6ce4b5e..d7a20d9 100644 --- a/arch/arm/dts/sun9i-a80-optimus.dts +++ b/arch/arm/dts/sun9i-a80-optimus.dts @@ -65,7 +65,7 @@ @@ -6870,8 +6734,6 @@ index 6ce4b5e..d7a20d9 100644 }; &usbphy1 { -diff --git a/arch/arm/dts/sun9i-a80.dtsi b/arch/arm/dts/sun9i-a80.dtsi -index a43ad77..f68b324 100644 --- a/arch/arm/dts/sun9i-a80.dtsi +++ b/arch/arm/dts/sun9i-a80.dtsi @@ -128,6 +128,17 @@ @@ -7196,9 +7058,6 @@ index a43ad77..f68b324 100644 + }; }; }; -diff --git a/arch/arm/dts/sunxi-itead-core-common.dtsi b/arch/arm/dts/sunxi-itead-core-common.dtsi -new file mode 100644 -index 0000000..2565d51 --- /dev/null +++ b/arch/arm/dts/sunxi-itead-core-common.dtsi @@ -0,0 +1,136 @@ @@ -7338,8 +7197,6 @@ index 0000000..2565d51 + usb2_vbus-supply = <®_usb2_vbus>; + status = "okay"; +}; -diff --git a/arch/arm/dts/sunxi-q8-common.dtsi b/arch/arm/dts/sunxi-q8-common.dtsi -index 17b26ff..b824146 100644 --- a/arch/arm/dts/sunxi-q8-common.dtsi +++ b/arch/arm/dts/sunxi-q8-common.dtsi @@ -75,3 +75,9 @@ diff --git a/package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch b/package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch index 9471b39b3b..45416703a4 100644 --- a/package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch +++ b/package/boot/uboot-sunxi/patches/012-sun6i-fix-clock_twi_onoff.patch @@ -12,8 +12,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> arch/arm/cpu/armv7/sunxi/clock_sun6i.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c -index 700b605..4e1e1a4 100644 --- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c @@ -100,13 +100,18 @@ int clock_twi_onoff(int port, int state) diff --git a/package/boot/uboot-sunxi/patches/013-enable-realtek-phy.patch b/package/boot/uboot-sunxi/patches/013-enable-realtek-phy.patch index 521750c4ee..47f825c570 100644 --- a/package/boot/uboot-sunxi/patches/013-enable-realtek-phy.patch +++ b/package/boot/uboot-sunxi/patches/013-enable-realtek-phy.patch @@ -12,11 +12,9 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> include/configs/sunxi-common.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h -index b26363d..ea15e37 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h -@@ -310,6 +310,7 @@ extern int soft_i2c_gpio_scl; +@@ -314,6 +314,7 @@ extern int soft_i2c_gpio_scl; #define CONFIG_PHY_GIGE /* GMAC can use gigabit PHY */ #define CONFIG_PHY_ADDR 1 #define CONFIG_MII /* MII PHY management */ diff --git a/package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch b/package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch index a4e43869a6..cf511ce773 100644 --- a/package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch +++ b/package/boot/uboot-sunxi/patches/014-fix-gmac-init.patch @@ -28,11 +28,9 @@ Tested-by: Michael Haas <haas@computerlinguist.org> board/sunxi/gmac.c | 14 +------------- 4 files changed, 12 insertions(+), 41 deletions(-) -diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c -index e80785b..7653148 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c -@@ -152,6 +152,7 @@ void s_init(void) +@@ -136,6 +136,7 @@ void s_init(void) timer_init(); gpio_init(); i2c_init_board(); @@ -40,7 +38,7 @@ index e80785b..7653148 100644 } #ifdef CONFIG_SPL_BUILD -@@ -259,30 +260,3 @@ void enable_caches(void) +@@ -243,30 +244,3 @@ void enable_caches(void) dcache_enable(); } #endif @@ -71,8 +69,6 @@ index e80785b..7653148 100644 - return 0; -} -#endif -diff --git a/arch/arm/include/asm/arch-sunxi/sys_proto.h b/arch/arm/include/asm/arch-sunxi/sys_proto.h -index 9df3744..a373319 100644 --- a/arch/arm/include/asm/arch-sunxi/sys_proto.h +++ b/arch/arm/include/asm/arch-sunxi/sys_proto.h @@ -24,6 +24,10 @@ void sdelay(unsigned long); @@ -87,8 +83,6 @@ index 9df3744..a373319 100644 +#endif #endif -diff --git a/board/sunxi/board.c b/board/sunxi/board.c -index 80eae9c..e16718f 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -90,6 +90,11 @@ int board_init(void) @@ -103,8 +97,6 @@ index 80eae9c..e16718f 100644 /* Uses dm gpio code so do this here and not in i2c_init_board() */ return soft_i2c_board_init(); } -diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c -index 4e222d8..69eb8ff 100644 --- a/board/sunxi/gmac.c +++ b/board/sunxi/gmac.c @@ -6,7 +6,7 @@ diff --git a/package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch b/package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch index 2d49194781..95a77c68d6 100644 --- a/package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch +++ b/package/boot/uboot-sunxi/patches/015-fix-2nd-usb-ctrler-on-sun47i.patch @@ -16,8 +16,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> drivers/usb/host/ohci-sunxi.c | 15 ++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) -diff --git a/drivers/usb/host/ehci-sunxi.c b/drivers/usb/host/ehci-sunxi.c -index cf3dcc4..677a5d3 100644 --- a/drivers/usb/host/ehci-sunxi.c +++ b/drivers/usb/host/ehci-sunxi.c @@ -17,6 +17,14 @@ @@ -35,7 +33,7 @@ index cf3dcc4..677a5d3 100644 struct ehci_sunxi_priv { struct ehci_ctrl ehci; int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */ -@@ -39,8 +47,9 @@ static int ehci_usb_probe(struct udevice *dev) +@@ -39,8 +47,9 @@ static int ehci_usb_probe(struct udevice #ifdef CONFIG_MACH_SUN8I_H3 priv->ahb_gate_mask |= 1 << AHB_GATE_OFFSET_USB_OHCI0; #endif @@ -47,8 +45,6 @@ index cf3dcc4..677a5d3 100644 setbits_le32(&ccm->ahb_gate0, priv->ahb_gate_mask); #ifdef CONFIG_SUNXI_GEN_SUN6I -diff --git a/drivers/usb/host/ohci-sunxi.c b/drivers/usb/host/ohci-sunxi.c -index 1b1f651..d4fb95a 100644 --- a/drivers/usb/host/ohci-sunxi.c +++ b/drivers/usb/host/ohci-sunxi.c @@ -17,6 +17,14 @@ @@ -66,7 +62,7 @@ index 1b1f651..d4fb95a 100644 struct ohci_sunxi_priv { ohci_t ohci; int ahb_gate_mask; /* Mask of ahb_gate0 clk gate bits for this hcd */ -@@ -42,9 +50,10 @@ static int ohci_usb_probe(struct udevice *dev) +@@ -42,9 +50,10 @@ static int ohci_usb_probe(struct udevice priv->ahb_gate_mask |= 1 << AHB_GATE_OFFSET_USB_EHCI0; #endif priv->usb_gate_mask = CCM_USB_CTRL_OHCI0_CLK; diff --git a/package/boot/uboot-sunxi/patches/016-spl-print-mmc-slot.patch b/package/boot/uboot-sunxi/patches/016-spl-print-mmc-slot.patch index 65b1fd1c07..04a2af72ee 100644 --- a/package/boot/uboot-sunxi/patches/016-spl-print-mmc-slot.patch +++ b/package/boot/uboot-sunxi/patches/016-spl-print-mmc-slot.patch @@ -14,11 +14,9 @@ Reviewed-by: Tom Rini <trini@konsulko.com> common/spl/spl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/common/spl/spl.c b/common/spl/spl.c -index e5167bf..82e7f58 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c -@@ -210,9 +210,9 @@ struct boot_device_name boot_name_table[] = { +@@ -210,9 +210,9 @@ struct boot_device_name boot_name_table[ { BOOT_DEVICE_RAM, "RAM" }, #endif #ifdef CONFIG_SPL_MMC_SUPPORT diff --git a/package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch b/package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch index 8c67063688..098fe72035 100644 --- a/package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch +++ b/package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch @@ -12,8 +12,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> board/sunxi/Kconfig | 6 ++++++ 2 files changed, 7 insertions(+) -diff --git a/arch/arm/cpu/armv7/sunxi/usb_phy.c b/arch/arm/cpu/armv7/sunxi/usb_phy.c -index 6ac96cc..0749fbd 100644 --- a/arch/arm/cpu/armv7/sunxi/usb_phy.c +++ b/arch/arm/cpu/armv7/sunxi/usb_phy.c @@ -76,6 +76,7 @@ static int get_vbus_gpio(int index) @@ -24,11 +22,9 @@ index 6ac96cc..0749fbd 100644 } return -EINVAL; } -diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig -index 5e9d3af..5e72fac 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig -@@ -342,6 +342,12 @@ config USB2_VBUS_PIN +@@ -341,6 +341,12 @@ config USB2_VBUS_PIN ---help--- See USB1_VBUS_PIN help text. diff --git a/package/boot/uboot-sunxi/patches/018-usb-specify-vbus-pins-on-orangepis.patch b/package/boot/uboot-sunxi/patches/018-usb-specify-vbus-pins-on-orangepis.patch index 4d2a583d06..a216bc9f11 100644 --- a/package/boot/uboot-sunxi/patches/018-usb-specify-vbus-pins-on-orangepis.patch +++ b/package/boot/uboot-sunxi/patches/018-usb-specify-vbus-pins-on-orangepis.patch @@ -13,8 +13,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> configs/orangepi_plus_defconfig | 1 + 2 files changed, 4 insertions(+) -diff --git a/configs/orangepi_pc_defconfig b/configs/orangepi_pc_defconfig -index aaf0f68..4e9051d 100644 --- a/configs/orangepi_pc_defconfig +++ b/configs/orangepi_pc_defconfig @@ -14,3 +14,6 @@ CONFIG_SPL=y @@ -24,8 +22,6 @@ index aaf0f68..4e9051d 100644 +CONFIG_USB1_VBUS_PIN="" +CONFIG_USB2_VBUS_PIN="" +CONFIG_USB3_VBUS_PIN="" -diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig -index e52dcfc..6ecb30e 100644 --- a/configs/orangepi_plus_defconfig +++ b/configs/orangepi_plus_defconfig @@ -14,3 +14,4 @@ CONFIG_SPL=y diff --git a/package/boot/uboot-sunxi/patches/019-sid-add-efuse-support-for-h3-a83t.patch b/package/boot/uboot-sunxi/patches/019-sid-add-efuse-support-for-h3-a83t.patch index 6ceccbd6ee..e7b8cd73df 100644 --- a/package/boot/uboot-sunxi/patches/019-sid-add-efuse-support-for-h3-a83t.patch +++ b/package/boot/uboot-sunxi/patches/019-sid-add-efuse-support-for-h3-a83t.patch @@ -14,8 +14,6 @@ Signed-off-by: Hans de Goede <hdegoede@redhat.com> arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h -index b6e11eb..65c0441 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h @@ -82,7 +82,14 @@ diff --git a/package/boot/uboot-sunxi/patches/020-boot-display-board-model-on-startup.patch b/package/boot/uboot-sunxi/patches/020-boot-display-board-model-on-startup.patch index 64dff485e3..d49fc97373 100644 --- a/package/boot/uboot-sunxi/patches/020-boot-display-board-model-on-startup.patch +++ b/package/boot/uboot-sunxi/patches/020-boot-display-board-model-on-startup.patch @@ -11,8 +11,6 @@ Signed-off-by: Simon Glass <sjg@chromium.org> include/configs/sunxi-common.h | 1 + 1 file changed, 1 insertion(+) -diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h -index ff356e3..b26363d 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -174,6 +174,7 @@ diff --git a/package/boot/uboot-sunxi/patches/091-sun6i-sync-PLL1-multdiv-with-Boot1.patch b/package/boot/uboot-sunxi/patches/091-sun6i-sync-PLL1-multdiv-with-Boot1.patch index f782994c14..a402feb3cd 100644 --- a/package/boot/uboot-sunxi/patches/091-sun6i-sync-PLL1-multdiv-with-Boot1.patch +++ b/package/boot/uboot-sunxi/patches/091-sun6i-sync-PLL1-multdiv-with-Boot1.patch @@ -12,11 +12,9 @@ More specifically, the following settings are now used: * up to 1152MHz: mul=3, div=2 (unchanged) * above 1152MHz: mul=4, div=2 (was: mul=2, div=1) -diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c -index cfb32b4..2986539 100644 --- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c -@@ -102,11 +102,12 @@ void clock_set_pll1(unsigned int clk) +@@ -122,11 +122,12 @@ void clock_set_pll1(unsigned int clk) struct sunxi_ccm_reg * const ccm = (struct sunxi_ccm_reg *)SUNXI_CCM_BASE; const int p = 0; @@ -32,6 +30,3 @@ index cfb32b4..2986539 100644 } else if (clk > 768000000) { k = 3; m = 2; --- -cgit v0.10.2 - diff --git a/package/boot/uboot-sunxi/patches/093-sun6i-fix-PLL-LDO-voltselect.patch b/package/boot/uboot-sunxi/patches/093-sun6i-fix-PLL-LDO-voltselect.patch index e6af765cae..d200633bc2 100644 --- a/package/boot/uboot-sunxi/patches/093-sun6i-fix-PLL-LDO-voltselect.patch +++ b/package/boot/uboot-sunxi/patches/093-sun6i-fix-PLL-LDO-voltselect.patch @@ -16,8 +16,6 @@ order of magnitude as Boot1. Furthermore, a bit of documentation is added to clarify that the required setting for the PLL LDO is 1.37v as per the A31 manual. -diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c -index fa7ebd8..3a6e56e 100644 --- a/arch/arm/cpu/armv7/sunxi/clock_sun6i.c +++ b/arch/arm/cpu/armv7/sunxi/clock_sun6i.c @@ -24,14 +24,27 @@ void clock_init_safe(void) @@ -49,9 +47,7 @@ index fa7ebd8..3a6e56e 100644 + clock_set_pll1(408000000); - writel(AHB1_ABP1_DIV_DEFAULT, &ccm->ahb1_apb1_div); -diff --git a/arch/arm/include/asm/arch-sunxi/prcm.h b/arch/arm/include/asm/arch-sunxi/prcm.h -index 82ed541..41a62a4 100644 + writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg); --- a/arch/arm/include/asm/arch-sunxi/prcm.h +++ b/arch/arm/include/asm/arch-sunxi/prcm.h @@ -111,13 +111,13 @@ @@ -72,6 +68,3 @@ index 82ed541..41a62a4 100644 __PRCM_PLL_CTRL_VDD_LDO_OUT((((n) & 0x7) * 30) + 1160) #define PRCM_PLL_CTRL_LDO_KEY (0xa7 << 24) #define PRCM_PLL_CTRL_LDO_KEY_MASK (0xff << 24) --- -cgit v0.10.2 - diff --git a/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch b/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch index 46c497269a..bf5dc66e1a 100644 --- a/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch +++ b/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch @@ -4,11 +4,9 @@ Date: Tue, 16 Jun 2015 10:52:01 +0200 Subject: sun6i: define alternate-function for UART2 on GPG -diff --git a/arch/arm/include/asm/arch-sunxi/gpio.h b/arch/arm/include/asm/arch-sunxi/gpio.h -index 8e67b3b..1fbf494 100644 --- a/arch/arm/include/asm/arch-sunxi/gpio.h +++ b/arch/arm/include/asm/arch-sunxi/gpio.h -@@ -177,6 +177,7 @@ enum sunxi_gpio_number { +@@ -180,6 +180,7 @@ enum sunxi_gpio_number { #define SUN6I_GPG_SDC1 2 #define SUN8I_GPG_SDC1 2 #define SUN6I_GPG_TWI3 2 @@ -16,6 +14,3 @@ index 8e67b3b..1fbf494 100644 #define SUN5I_GPG_UART1 4 #define SUN4I_GPH_SDC1 5 --- -cgit v0.10.2 - diff --git a/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch b/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch index 2b17999fb9..087074d0c9 100644 --- a/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch +++ b/package/boot/uboot-sunxi/patches/101-sun6i-support-console-on-UART2.patch @@ -4,11 +4,9 @@ Date: Tue, 16 Jun 2015 10:53:11 +0200 Subject: ARM: sun6i: Support console on UART2 (GPG6/GPG7) -diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c -index 5f39aa0..99675c3 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c -@@ -76,6 +76,10 @@ static int gpio_init(void) +@@ -88,6 +88,10 @@ static int gpio_init(void) sunxi_gpio_set_cfgpin(SUNXI_GPG(3), SUN5I_GPG_UART1); sunxi_gpio_set_cfgpin(SUNXI_GPG(4), SUN5I_GPG_UART1); sunxi_gpio_set_pull(SUNXI_GPG(4), SUNXI_GPIO_PULL_UP); @@ -19,8 +17,6 @@ index 5f39aa0..99675c3 100644 #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) sunxi_gpio_set_cfgpin(SUNXI_GPB(0), SUN8I_GPB_UART2); sunxi_gpio_set_cfgpin(SUNXI_GPB(1), SUN8I_GPB_UART2); -diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h -index 9576bc1..bda4059 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -260,6 +260,8 @@ extern int soft_i2c_gpio_scl; @@ -32,6 +28,3 @@ index 9576bc1..bda4059 100644 #elif CONFIG_CONS_INDEX == 3 && defined(CONFIG_MACH_SUN8I) #define OF_STDOUT_PATH "/soc@01c00000/serial@01c28800:115200" #elif CONFIG_CONS_INDEX == 5 && defined(CONFIG_MACH_SUN8I) --- -cgit v0.10.2 - diff --git a/package/boot/uboot-sunxi/patches/102-sunxi-make_CONS_INDEX-configurable.patch b/package/boot/uboot-sunxi/patches/102-sunxi-make_CONS_INDEX-configurable.patch index bf00343ac9..ee1e3c9bfa 100644 --- a/package/boot/uboot-sunxi/patches/102-sunxi-make_CONS_INDEX-configurable.patch +++ b/package/boot/uboot-sunxi/patches/102-sunxi-make_CONS_INDEX-configurable.patch @@ -4,11 +4,9 @@ Date: Tue, 16 Jun 2015 10:59:38 +0200 Subject: ARM: sunxi: Make CONS_INDEX configurable -diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig -index 2a1cd3c..e155c4c 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig -@@ -209,6 +209,14 @@ config SYS_BOARD +@@ -229,6 +229,14 @@ config SYS_BOARD config SYS_SOC default "sunxi" @@ -23,6 +21,3 @@ index 2a1cd3c..e155c4c 100644 config UART0_PORT_F bool "UART0 on MicroSD breakout board" default n --- -cgit v0.10.2 - |