Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a59a5911 authored May 21, 2014 by Olof Johansson

Merge tag 'sunxi-dt-for-3.16' of https://github.com/mripard/linux into next/dt

Merge "Allwinner DT additions for 3.16" from Maxime Ripard:

  - Introduction of the MMC controlers
  - New board: A10s R7, Mele M9, APP4-EVB1
  - Enabled the PMU on the Cortex A7-based SoCs

* tag 'sunxi-dt-for-3.16' of https://github.com/mripard/linux

: (38 commits)
  ARM: sunxi: dt: declare the r_pio pin controller for A31 SoC
  ARM: sunxi: dt: add PRCM clk and reset controller subdevices
  ARM: sunxi: dt: add APP4-EVB1 board support
  ARM: sun6i: dt: Add support for the USB controllers
  ARM: sun6i: Add the USB clocks to the DTSI
  ARM: dts: sun5i: Add new A10s r7 hdmi tv dongle board
  ARM: dts: sun7i: Add reg_vcc3v3 to sun7i board mmc nodes
  ARM: dts: sun6i: Add reg_vcc3v3 to sun6i board mmc nodes
  ARM: dts: sun5i: Add reg_vcc3v3 to sun5i board mmc nodes
  ARM: dts: sun4i: Add reg_vcc3v3 to sun4i board mmc nodes
  ARM: dts: sunxi: Add reg_vcc3v3 supply to sunxi-common-regulators.dtsi
  ARM: dts: sun7i: Add basic support for the Cubietruck WiFi module
  ARM: dts: sun7i: Enable mmc controller on various A20 boards
  ARM: dts: sun7i: Add pin-muxing info for the mmc controllers
  ARM: dts: sun7i: Add mmc controller nodes
  ARM: dts: sun6i: Add new sun6i-a31-m9 dts file for Mele M9
  ARM: dts: sun6i: Add mmc controller nodes
  ARM: dts: sun6i: Add mmc clocks
  ARM: dts: sun5i: Enable mmc controller on various A10s and A13 boards
  ARM: dts: sun5i: Add mmc controller nodes
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

parents 0673836c 209394ae

arch/arm/boot/dts/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -343,9 +343,12 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
		sun4i-a10-olinuxino-lime.dtb \
		sun4i-a10-pcduino.dtb \
		sun5i-a10s-olinuxino-micro.dtb \
		sun5i-a10s-r7-tv-dongle.dtb \
		sun5i-a13-olinuxino.dtb \
		sun5i-a13-olinuxino-micro.dtb \
		sun6i-a31-app4-evb1.dtb \
		sun6i-a31-colombus.dtb \
		sun6i-a31-m9.dtb \
		sun7i-a20-cubieboard2.dtb \
		sun7i-a20-cubietruck.dtb \
		sun7i-a20-olinuxino-micro.dtb

arch/arm/boot/dts/sun4i-a10-a1000.dts

+10 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,16 @@
		};
		};

		mmc0: mmc@01c0f000 {
		pinctrl-names = "default";
		pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
		vmmc-supply = <&reg_vcc3v3>;
		bus-width = <4>;
		cd-gpios = <&pio 7 1 0>; /* PH1 */
		cd-inverted;
		status = "okay";
		};

		usbphy: phy@01c13400 {
		usb1_vbus-supply = <&reg_usb1_vbus>;
		usb2_vbus-supply = <&reg_usb2_vbus>;

arch/arm/boot/dts/sun4i-a10-cubieboard.dts

+10 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,16 @@
		};
		};

		mmc0: mmc@01c0f000 {
		pinctrl-names = "default";
		pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
		vmmc-supply = <&reg_vcc3v3>;
		bus-width = <4>;
		cd-gpios = <&pio 7 1 0>; /* PH1 */
		cd-inverted;
		status = "okay";
		};

		usbphy: phy@01c13400 {
		usb1_vbus-supply = <&reg_usb1_vbus>;
		usb2_vbus-supply = <&reg_usb2_vbus>;

arch/arm/boot/dts/sun4i-a10-hackberry.dts

+10 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,16 @@
		};
		};

		mmc0: mmc@01c0f000 {
		pinctrl-names = "default";
		pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
		vmmc-supply = <&reg_vcc3v3>;
		bus-width = <4>;
		cd-gpios = <&pio 7 1 0>; /* PH1 */
		cd-inverted;
		status = "okay";
		};

		usbphy: phy@01c13400 {
		usb1_vbus-supply = <&reg_usb1_vbus>;
		usb2_vbus-supply = <&reg_usb2_vbus>;

arch/arm/boot/dts/sun4i-a10-inet97fv2.dts

+10 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,16 @@
		};

		soc@01c00000 {
		mmc0: mmc@01c0f000 {
		pinctrl-names = "default";
		pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
		vmmc-supply = <&reg_vcc3v3>;
		bus-width = <4>;
		cd-gpios = <&pio 7 1 0>; /* PH1 */
		cd-inverted;
		status = "okay";
		};

		uart0: serial@01c28000 {
		pinctrl-names = "default";
		pinctrl-0 = <&uart0_pins_a>;