diff options
author | Zoltan Herpai <wigyori@uid0.hu> | 2014-03-06 00:09:30 +0000 |
---|---|---|
committer | Zoltan Herpai <wigyori@uid0.hu> | 2014-03-06 00:09:30 +0000 |
commit | ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7 (patch) | |
tree | ef1ef8907c63a75c4ac441f8c95325a6d5abb9ec /target/linux/sunxi/files/arch/arm | |
parent | 2c771cc71f3b6aceda5fe81f44a79b724e0941d0 (diff) | |
download | upstream-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.tar.gz upstream-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.tar.bz2 upstream-ac4b9dbb3c9b056008e00ee3d02fe3dad65641b7.zip |
sunxi: driver refresh for 3.13 - update gmac / mmc / usb / ahci drivers to follow mainline dev trees - add driver for spi - update clock support - update a31 support - move to new DT compats where appropriate - re-order patchqueue where needed - verified working a20 smp - move most DTSes off files/ - update defconfig
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
SVN-Revision: 39782
Diffstat (limited to 'target/linux/sunxi/files/arch/arm')
3 files changed, 0 insertions, 411 deletions
diff --git a/target/linux/sunxi/files/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/target/linux/sunxi/files/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts deleted file mode 100644 index fa5ebbdc76..0000000000 --- a/target/linux/sunxi/files/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright 2012 Stefan Roese - * Stefan Roese <sr@denx.de> - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "sun4i-a10.dtsi" - -/ { - model = "Olimex A10-Olinuxino LIME"; - compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10"; - - soc@01c00000 { - emac: ethernet@01c0b000 { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; - phy = <&phy1>; - status = "okay"; - }; - - mdio@01c0b080 { - status = "okay"; - - phy1: ethernet-phy@1 { - reg = <1>; - }; - }; - - sdc0: sdc@01c0f000 { - pinctrl-names = "default"; - pinctrl-0 = <&sdc0_pins_a>; - pinctrl-1 = <&mmc0_cd_pin_olinuxino>; - cd-gpios = <&pio 7 1 0>; /* PH1 */ - cd-mode = <1>; - status = "okay"; - }; - - sata: ahci@01c18000 { - pwr-supply = <®_ahci_5v>; - status = "okay"; - }; - - pinctrl@01c20800 { - ahci_pwr_pin: ahci_pwr_pin@0 { - allwinner,pins = "PC3"; - allwinner,function = "gpio_out"; - allwinner,drive = <0>; - allwinner,pull = <0>; - }; - - mmc0_cd_pin_olinuxino: mmc0_cd_pin@0 { - allwinner,pins = "PH1"; - allwinner,function = "gpio_in"; - allwinner,drive = <0>; - allwinner,pull = <0>; - }; - - led_pins_olinuxino: led_pins@0 { - allwinner,pins = "PH2"; - allwinner,function = "gpio_out"; - allwinner,drive = <1>; - allwinner,pull = <0>; - }; - - usb1_vbus_pin: usb1_vbus_pin@0 { - allwinner,pins = "PH6"; - allwinner,function = "gpio_out"; - allwinner,drive = <0>; - allwinner,pull = <2>; - }; - - usb2_vbus_pin: usb2_vbus_pin@0 { - allwinner,pins = "PH3"; - allwinner,function = "gpio_out"; - allwinner,drive = <0>; - allwinner,pull = <2>; - }; - }; - - uart0: serial@01c28000 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; - status = "okay"; - }; - - i2c0: i2c@01c2ac00 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; - status = "okay"; - }; - - i2c1: i2c@01c2b000 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; - status = "okay"; - }; - - ehci0: ehci0@0x01c14000 { - vbus-supply = <®_usb1_vbus>; - status = "okay"; - }; - - ehci1: ehci1@0x01c1c000 { - vbus-supply = <®_usb2_vbus>; - status = "okay"; - }; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_olinuxino>; - - green { - label = "a10-olinuxino-lime:green:usr"; - gpios = <&pio 7 2 0>; - default-state = "on"; - }; - }; - - regulators { - compatible = "simple-bus"; - - reg_usb1_vbus: usb1-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&usb1_vbus_pin>; - regulator-name = "usb1-vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&pio 7 6 0>; - }; - - reg_usb2_vbus: usb2-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&usb2_vbus_pin>; - regulator-name = "usb2-vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&pio 7 3 0>; - }; - }; - - regulators { - compatible = "simple-bus"; - pinctrl-names = "default"; - - reg_ahci_5v: ahci-5v { - compatible = "regulator-fixed"; - regulator-name = "ahci-5v"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - pinctrl-0 = <&ahci_pwr_pin>; - gpio = <&pio 2 3 0>; - enable-active-high; - }; - }; -}; diff --git a/target/linux/sunxi/files/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/target/linux/sunxi/files/arch/arm/boot/dts/sun4i-a10-pcduino.dts deleted file mode 100644 index 0cc7952030..0000000000 --- a/target/linux/sunxi/files/arch/arm/boot/dts/sun4i-a10-pcduino.dts +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright 2012 Stefan Roese - * Stefan Roese <sr@denx.de> - * - * The code contained herein is licensed under the GNU General Public - * License. You may obtain a copy of the GNU General Public License - * Version 2 or later at the following locations: - * - * http://www.opensource.org/licenses/gpl-license.html - * http://www.gnu.org/copyleft/gpl.html - */ - -/dts-v1/; -/include/ "sun4i-a10.dtsi" - -/ { - model = "pcDuino"; - compatible = "pcduino,a10-pcduino", "allwinner,sun4i-a10"; - - aliases { - serial0 = &uart0; - serial1 = &uart1; - }; - - chosen { - bootargs = "earlyprintk console=ttyS0,115200"; - }; - - soc@01c00000 { - emac: ethernet@01c0b000 { - pinctrl-names = "default"; - pinctrl-0 = <&emac_pins_a>; - phy = <&phy1>; - status = "okay"; - }; - - mdio@01c0b080 { - status = "okay"; - - phy1: ethernet-phy@1 { - reg = <1>; - }; - }; - - sdc0: sdc@01c0f000 { - pinctrl-names = "default"; - pinctrl-0 = <&sdc0_pins_a>; - pinctrl-1 = <&mmc0_cd_pin_pcduino>; - cd-gpios = <&pio 7 1 0>; /* PH1 */ - cd-mode = <1>; - status = "okay"; - }; - - pinctrl@01c20800 { - mmc0_cd_pin_pcduino: mmc0_cd_pin@0 { - allwinner,pins = "PH1"; - allwinner,function = "gpio_in"; - allwinner,drive = <0>; - allwinner,pull = <0>; - }; - - led_pins_pcduino: led_pins@0 { - allwinner,pins = "PH20", "PH21"; - allwinner,function = "gpio_out"; - allwinner,drive = <1>; - allwinner,pull = <0>; - }; - - usb1_vbus_pin: usb1_vbus_pin@0 { - allwinner,pins = "PH6"; - allwinner,function = "gpio_out"; - allwinner,drive = <0>; - allwinner,pull = <2>; - }; - - usb2_vbus_pin: usb2_vbus_pin@0 { - allwinner,pins = "PH3"; - allwinner,function = "gpio_out"; - allwinner,drive = <0>; - allwinner,pull = <2>; - }; - }; - - uart0: serial@01c28000 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; - status = "okay"; - }; - - i2c0: i2c@01c2ac00 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c0_pins_a>; - status = "okay"; - }; - - i2c1: i2c@01c2b000 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c1_pins_a>; - status = "okay"; - }; - - ehci0: ehci0@0x01c14000 { - vbus-supply = <®_usb1_vbus>; - status = "okay"; - }; - - ehci1: ehci1@0x01c1c000 { - vbus-supply = <®_usb2_vbus>; - status = "okay"; - }; - }; - - leds { - compatible = "gpio-leds"; - pinctrl-names = "default"; - pinctrl-0 = <&led_pins_pcduino>; - - blue { - label = "pcduino:blue:usr"; - gpios = <&pio 7 21 0>; /* LED1 */ - }; - - green { - label = "pcduino:green:usr"; - gpios = <&pio 7 20 0>; /* LED2 */ - linux,default-trigger = "heartbeat"; - }; - }; - - regulators { - compatible = "simple-bus"; - - reg_usb1_vbus: usb1-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&usb1_vbus_pin>; - regulator-name = "usb1-vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&pio 7 6 0>; - }; - - reg_usb2_vbus: usb2-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&usb2_vbus_pin>; - regulator-name = "usb2-vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&pio 7 3 0>; - }; - }; - - regulators { - compatible = "simple-bus"; - pinctrl-names = "default"; - - vcc_3v3_reg: regulator@0 { - compatible = "regulator-fixed"; - regulator-name = "vcc_3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - }; -}; diff --git a/target/linux/sunxi/files/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/target/linux/sunxi/files/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index 4ef28fd725..8b1477926b 100644 --- a/target/linux/sunxi/files/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/target/linux/sunxi/files/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -19,45 +19,7 @@ compatible = "cubietech,cubietruck", "allwinner,sun7i-a20"; soc@01c00000 { - sdc0: sdc@01c0f000 { - pinctrl-names = "default"; - pinctrl-0 = <&sdc0_pins_a>; - pinctrl-1 = <&mmc0_cd_pin_cubietruck>; - cd-gpios = <&pio 7 1 0>; /* PH1 */ - cd-mode = <1>; - status = "okay"; - }; - - ehci0: ehci0@0x01c14000 { - vbus-supply = <®_usb1_vbus>; - status = "okay"; - }; - - sata: ahci@01c18000 { - pwr-supply = <®_ahci_5v>; - status = "okay"; - }; - - ehci1: ehci1@0x01c1c000 { - vbus-supply = <®_usb2_vbus>; - status = "okay"; - }; - pinctrl@01c20800 { - mmc0_cd_pin_cubietruck: mmc0_cd_pin@0 { - allwinner,pins = "PH1"; - allwinner,function = "gpio_in"; - allwinner,drive = <0>; - allwinner,pull = <0>; - }; - - ahci_pwr_pin_cubietruck: ahci_pwr_pin@0 { - allwinner,pins = "PH12"; - allwinner,function = "gpio_out"; - allwinner,drive = <0>; - allwinner,pull = <0>; - }; - led_pins_cubietruck: led_pins@0 { allwinner,pins = "PH7", "PH11", "PH20", "PH21"; allwinner,function = "gpio_out"; @@ -112,41 +74,4 @@ gpios = <&pio 7 7 0>; }; }; - - regulators { - compatible = "simple-bus"; - pinctrl-names = "default"; - - reg_ahci_5v: ahci-5v { - compatible = "regulator-fixed"; - regulator-name = "ahci-5v"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - pinctrl-0 = <&ahci_pwr_pin_cubietruck>; - gpio = <&pio 7 12 0>; - enable-active-high; - }; - - reg_usb1_vbus: usb1-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&usb1_vbus_pin>; - regulator-name = "usb1-vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&pio 7 6 0>; - }; - - reg_usb2_vbus: usb2-vbus { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&usb2_vbus_pin>; - regulator-name = "usb2-vbus"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&pio 7 3 0>; - }; - }; }; |