[PATCH 0/9] ARM: dts: sunxi: Various sunxi dts patches

[PATCH 0/9] ARM: dts: sunxi: Various sunxi dts patches

[Hans de Goede]

Hi Maxime,

Here is a set of sunxi dts patches for your dt tree. It is a mixed collection:

-Some patches submitted earlier by others which I've picked up from the
 list and brushed up a bit were necessary.
-2 new boards
-sun4i ir support (and renaming of the compatible from sun7i-a20-ir to
 sun4i-a10-ir as they have the same ip block for this)

Regards,

Hans

[PATCH 1/9] ARM: dts: sunxi: Add #interrupt-cells to pinctrl nodes

[Hans de Goede]

From: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>

The pinctrl device is also an interrupt controller for external
interrupts. Add the missing #interrupt-cells property.

Also remove the unused #address-cells property.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
[hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: make the same change for sun4i, sun5i and sun6i]
Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun4i-a10.dtsi  | 2 +-
 arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +-
 arch/arm/boot/dts/sun5i-a13.dtsi  | 2 +-
 arch/arm/boot/dts/sun6i-a31.dtsi  | 4 ++--
 arch/arm/boot/dts/sun7i-a20.dtsi  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 9a489e2..ae6dd50 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -509,7 +509,7 @@
 			clocks = <&apb0_gates 5>;
 			gpio-controller;
 			interrupt-controller;
-			#address-cells = <1>;
+			#interrupt-cells = <2>;
 			#size-cells = <0>;
 			#gpio-cells = <3>;
 
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 25549c1..695a7c6 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -422,7 +422,7 @@
 			clocks = <&apb0_gates 5>;
 			gpio-controller;
 			interrupt-controller;
-			#address-cells = <1>;
+			#interrupt-cells = <2>;
 			#size-cells = <0>;
 			#gpio-cells = <3>;
 
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index be28b3b..74895e5 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -395,7 +395,7 @@
 			clocks = <&apb0_gates 5>;
 			gpio-controller;
 			interrupt-controller;
-			#address-cells = <1>;
+			#interrupt-cells = <2>;
 			#size-cells = <0>;
 			#gpio-cells = <3>;
 
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
index a9dfa12..baf8eff 100644
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -429,7 +429,7 @@
 			clocks = <&apb1_gates 5>;
 			gpio-controller;
 			interrupt-controller;
-			#address-cells = <1>;
+			#interrupt-cells = <2>;
 			#size-cells = <0>;
 			#gpio-cells = <3>;
 
@@ -756,7 +756,7 @@
 			resets = <&apb0_rst 0>;
 			gpio-controller;
 			interrupt-controller;
-			#address-cells = <1>;
+			#interrupt-cells = <2>;
 			#size-cells = <0>;
 			#gpio-cells = <3>;
 		};
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 7017839..7597ac1 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -586,7 +586,7 @@
 			clocks = <&apb0_gates 5>;
 			gpio-controller;
 			interrupt-controller;
-			#address-cells = <1>;
+			#interrupt-cells = <2>;
 			#size-cells = <0>;
 			#gpio-cells = <3>;
 
-- 
2.0.0

[PATCH 2/9] ARM: dts: sun4i: Add AXP209 support to various boards

[Hans de Goede]

From: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>

At a node for the axp209, and where necessary the i2c controller to the dts
for various boards. Note the axp209 regulators are omitted as we don't have
any use for them yet, and on some boards were not sure how exactly they are
wired up.

Adding support for just the axp209 without the regulators is still useful, as
it will give us power-button and poweroff support.

Signed-off-by: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
[hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Drop the regulator bits for now]
Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun4i-a10-a1000.dts          |  9 +++++++++
 arch/arm/boot/dts/sun4i-a10-cubieboard.dts     |  9 +++++++++
 arch/arm/boot/dts/sun4i-a10-hackberry.dts      | 15 +++++++++++++++
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts      | 21 +++++++++++++++------
 arch/arm/boot/dts/sun4i-a10-mini-xplus.dts     | 15 +++++++++++++++
 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 15 +++++++++++++++
 arch/arm/boot/dts/sun4i-a10-pcduino.dts        |  9 +++++++++
 7 files changed, 87 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 0b97c07..55d9510 100644
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -98,6 +98,15 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c0_pins_a>;
 			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupts = <0>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
 		};
 	};
 
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index c200eac..539b693 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -90,6 +90,15 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c0_pins_a>;
 			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupts = <0>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
 		};
 
 		i2c1: i2c@01c2b000 {
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index 547fadc..21df4e3 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -92,6 +92,21 @@
 			pinctrl-0 = <&uart0_pins_a>;
 			status = "okay";
 		};
+
+		i2c0: i2c@01c2ac00 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c0_pins_a>;
+			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupts = <0>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
+		};
 	};
 
 	reg_emac_3v3: emac-3v3 {
diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
index f13723e..6b0c378 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
@@ -40,12 +40,6 @@
 			status = "okay";
 		};
 
-		i2c0: i2c@01c2ac00 {
-			pinctrl-names = "default";
-			pinctrl-0 = <&i2c0_pins_a>;
-			status = "okay";
-		};
-
 		usbphy: phy@01c13400 {
 			usb1_vbus-supply = <&reg_usb1_vbus>;
 			usb2_vbus-supply = <&reg_usb2_vbus>;
@@ -67,6 +61,21 @@
 		ohci1: usb@01c1c400 {
 			status = "okay";
 		};
+
+		i2c0: i2c@01c2ac00 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c0_pins_a>;
+			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupts = <0>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
+		};
 	};
 
 	reg_usb1_vbus: usb1-vbus {
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
index c01cea5..387770d 100644
--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
@@ -57,6 +57,21 @@
 			pinctrl-0 = <&uart0_pins_a>;
 			status = "okay";
 		};
+
+		i2c0: i2c@01c2ac00 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c0_pins_a>;
+			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupts = <0>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
+		};
 	};
 
 	reg_usb1_vbus: usb1-vbus {
diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
index d46a7db..d046d56 100644
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
@@ -91,6 +91,21 @@
 			pinctrl-0 = <&uart0_pins_a>;
 			status = "okay";
 		};
+
+		i2c0: i2c@01c2ac00 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c0_pins_a>;
+			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupts = <0>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
+		};
 	};
 
 	leds {
diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index fb03bcc..6675bcd 100644
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -76,6 +76,15 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c0_pins_a>;
 			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupts = <0>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
 		};
 	};
 
-- 
2.0.0

[PATCH 3/9] ARM: dts: sun7i: Add AXP209 support to various boards

[Hans de Goede]

From: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>

At a node for the axp209, and where necessary the i2c controller to the dts
for various boards. Note the axp209 regulators are omitted as we don't have
any use for them yet, and on some boards were not sure how exactly they are
wired up.

Adding support for just the axp209 without the regulators is still useful, as
it will give us power-button and poweroff support.

Signed-off-by: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
[hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Drop the regulator bits for now]
Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts     | 10 ++++++++++
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts      | 10 ++++++++++
 arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts       | 16 ++++++++++++++++
 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 10 ++++++++++
 4 files changed, 46 insertions(+)

diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index a70f0b4..5368098 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -82,6 +82,16 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c0_pins_a>;
 			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupt-parent = <&nmi_intc>;
+				interrupts = <0 8>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
 		};
 
 		i2c1: i2c@01c2b000 {
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 634d04b..f9ab5d4 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -127,6 +127,16 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c0_pins_a>;
 			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupt-parent = <&nmi_intc>;
+				interrupts = <0 8>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
 		};
 
 		i2c1: i2c@01c2b000 {
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 15c7922..4ee6b44 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -111,6 +111,22 @@
 			status = "okay";
 		};
 
+		i2c0: i2c@01c2ac00 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&i2c0_pins_a>;
+			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupt-parent = <&nmi_intc>;
+				interrupts = <0 8>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
+		};
+
 		gmac: ethernet@01c50000 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&gmac_pins_mii_a>;
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 99faff1..aa384b5 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -131,6 +131,16 @@
 			pinctrl-names = "default";
 			pinctrl-0 = <&i2c0_pins_a>;
 			status = "okay";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupt-parent = <&nmi_intc>;
+				interrupts = <0 8>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
 		};
 
 		i2c1: i2c@01c2b000 {
-- 
2.0.0

[PATCH 4/9] ARM: dts: sun7i: Rename sun7i-a20-ir to sun4i-a10-ir

[Hans de Goede]

The sun7i block is the same as the one in the sun4i, rename the compatible
to reflect this.

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

--

I've already included the matching change to sunxi-cir.c in my pull-req to
Mauro.
---
 arch/arm/boot/dts/sun7i-a20.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 7597ac1..66ffb3f 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -785,7 +785,7 @@
 		};
 
 		ir0: ir@01c21800 {
-			compatible = "allwinner,sun7i-a20-ir";
+			compatible = "allwinner,sun4i-a10-ir";
 			clocks = <&apb0_gates 6>, <&ir0_clk>;
 			clock-names = "apb", "ir";
 			interrupts = <0 5 4>;
@@ -794,7 +794,7 @@
 		};
 
 		ir1: ir@01c21c00 {
-			compatible = "allwinner,sun7i-a20-ir";
+			compatible = "allwinner,sun4i-a10-ir";
 			clocks = <&apb0_gates 7>, <&ir1_clk>;
 			clock-names = "apb", "ir";
 			interrupts = <0 6 4>;
-- 
2.0.0

[PATCH 5/9] ARM: dts: sun7i: Add ir receiver support to a20-i12-tvbox

[Hans de Goede]

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 4ee6b44..f620aea 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -105,6 +105,12 @@
 			};
 		};
 
+		ir0: ir@01c21800 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&ir0_pins_a>;
+			status = "okay";
+		};
+
 		uart0: serial@01c28000 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_pins_a>;
-- 
2.0.0

[PATCH 6/9] ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3

[Hans de Goede]

From: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>

The LinkSprite pcDuino V3 is an A20 based development board featuring
arduino compatible io headers, 1G RAM, 4G nand, sata, rtl8188cus usb wifi
and 100 Mbit ethernet using an ip101a phy:

http://www.pcduino.com/pcduino-v3/

Signed-off-by: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
[hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Various cleanups, correct led pins]
[hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Add axp209, ir and gpio-keys nodes]
Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

--

Changes since v2:
 - update MMC entry to comply with upstream
 - unify the 4 patches into one

Changes since v1:
 - fix cosmetic issues
 - fix i2c entry
 - remove unnecessary input bindings include
 - add MMC support
---
 arch/arm/boot/dts/Makefile               |   3 +-
 arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 173 +++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index ed0de8b..fdc590e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -380,7 +380,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
 	sun7i-a20-cubieboard2.dtb \
 	sun7i-a20-cubietruck.dtb \
 	sun7i-a20-i12-tvbox.dtb \
-	sun7i-a20-olinuxino-micro.dtb
+	sun7i-a20-olinuxino-micro.dtb \
+	sun7i-a20-pcduino3.dtb
 dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
 	tegra20-iris-512.dtb \
 	tegra20-medcom-wide.dtb \
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
new file mode 100644
index 0000000..168b0bc
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2014 Zoltan HERPAI
+ * Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
+ *
+ * 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/ "sun7i-a20.dtsi"
+/include/ "sunxi-common-regulators.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	model = "LinkSprite pcDuino3";
+	compatible = "linksprite,pcduino3", "allwinner,sun7i-a20";
+
+	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";
+		};
+
+		usbphy: phy@01c13400 {
+			usb1_vbus-supply = <&reg_usb1_vbus>;
+			usb2_vbus-supply = <&reg_usb2_vbus>;
+			status = "okay";
+		};
+
+		ehci0: usb@01c14000 {
+			status = "okay";
+		};
+
+		ohci0: usb@01c14400 {
+			status = "okay";
+		};
+
+		ahci: sata@01c18000 {
+			target-supply = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
+		ehci1: usb@01c1c000 {
+			status = "okay";
+		};
+
+		ohci1: usb@01c1c400 {
+			status = "okay";
+		};
+
+		pinctrl@01c20800 {
+			ahci_pwr_pin_a: ahci_pwr_pin@0 {
+				allwinner,pins = "PH2";
+			};
+
+			led_pins_pcduino3: led_pins@0 {
+				allwinner,pins = "PH15", "PH16";
+				allwinner,function = "gpio_out";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
+
+			key_pins_pcduino3: key_pins@0 {
+				allwinner,pins = "PH17", "PH18", "PH19";
+				allwinner,function = "gpio_in";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
+		};
+
+		ir0: ir@01c21800 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&ir0_pins_a>;
+			status = "okay";
+		};
+
+		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";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupt-parent = <&nmi_intc>;
+				interrupts = <0 8>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
+		};
+
+		gmac: ethernet@01c50000 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&gmac_pins_mii_a>;
+			phy = <&phy1>;
+			phy-mode = "mii";
+			status = "okay";
+
+			phy1: ethernet-phy@1 {
+				reg = <1>;
+			};
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+		pinctrl-names = "default";
+		pinctrl-0 = <&led_pins_pcduino3>;
+
+		tx {
+			label = "pcduino3:green:tx";
+			gpios = <&pio 7 15 GPIO_ACTIVE_LOW>;
+		};
+
+		rx {
+			label = "pcduino3:green:rx";
+			gpios = <&pio 7 16 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		pinctrl-names = "default";
+		pinctrl-0 = <&key_pins_pcduino3>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		button@0 {
+			label = "Key Back";
+			linux,code = <KEY_BACK>;
+			gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
+		};
+		button@1 {
+			label = "Key Home";
+			linux,code = <KEY_HOME>;
+			gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
+		};
+		button@2 {
+			label = "Key Menu";
+			linux,code = <KEY_MENU>;
+			gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	reg_usb1_vbus: usb1-vbus {
+		status = "okay";
+	};
+
+	reg_usb2_vbus: usb2-vbus {
+		status = "okay";
+	};
+
+	reg_ahci_5v: ahci-5v {
+		gpio = <&pio 7 2 0>;
+ 		status = "okay";
+	};
+};
-- 
2.0.0

Re: [PATCH 6/9] ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3

[Chen-Yu Tsai]

On Tue, Jul 1, 2014 at 5:57 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> From: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
>
> The LinkSprite pcDuino V3 is an A20 based development board featuring
> arduino compatible io headers, 1G RAM, 4G nand, sata, rtl8188cus usb wifi
> and 100 Mbit ethernet using an ip101a phy:
>
> http://www.pcduino.com/pcduino-v3/
>
> Signed-off-by: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Various cleanups, correct led pins]
> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Add axp209, ir and gpio-keys nodes]
> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>
> --
>
> Changes since v2:
>  - update MMC entry to comply with upstream
>  - unify the 4 patches into one
>
> Changes since v1:
>  - fix cosmetic issues
>  - fix i2c entry
>  - remove unnecessary input bindings include
>  - add MMC support
> ---
>  arch/arm/boot/dts/Makefile               |   3 +-
>  arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 173 +++++++++++++++++++++++++++++++
>  2 files changed, 175 insertions(+), 1 deletion(-)
>  create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index ed0de8b..fdc590e 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -380,7 +380,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
>         sun7i-a20-cubieboard2.dtb \
>         sun7i-a20-cubietruck.dtb \
>         sun7i-a20-i12-tvbox.dtb \
> -       sun7i-a20-olinuxino-micro.dtb
> +       sun7i-a20-olinuxino-micro.dtb \
> +       sun7i-a20-pcduino3.dtb

You may need to rebase onto my sun8i ippo-q8h dts patch.

  https://patchwork.kernel.org/patch/4389951/

There's a likely conflict in the Makefile here.

>  dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
>         tegra20-iris-512.dtb \
>         tegra20-medcom-wide.dtb \
> diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
> new file mode 100644
> index 0000000..168b0bc
> --- /dev/null
> +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
> @@ -0,0 +1,173 @@
> +/*
> + * Copyright 2014 Zoltan HERPAI
> + * Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
> + *
> + * 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/ "sun7i-a20.dtsi"
> +/include/ "sunxi-common-regulators.dtsi"
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +
> +/ {
> +       model = "LinkSprite pcDuino3";
> +       compatible = "linksprite,pcduino3", "allwinner,sun7i-a20";
> +
> +       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";
> +               };
> +
> +               usbphy: phy@01c13400 {
> +                       usb1_vbus-supply = <&reg_usb1_vbus>;
> +                       usb2_vbus-supply = <&reg_usb2_vbus>;
> +                       status = "okay";
> +               };
> +
> +               ehci0: usb@01c14000 {
> +                       status = "okay";
> +               };
> +
> +               ohci0: usb@01c14400 {
> +                       status = "okay";
> +               };
> +
> +               ahci: sata@01c18000 {
> +                       target-supply = <&reg_ahci_5v>;
> +                       status = "okay";
> +               };
> +
> +               ehci1: usb@01c1c000 {
> +                       status = "okay";
> +               };
> +
> +               ohci1: usb@01c1c400 {
> +                       status = "okay";
> +               };
> +
> +               pinctrl@01c20800 {
> +                       ahci_pwr_pin_a: ahci_pwr_pin@0 {
> +                               allwinner,pins = "PH2";
> +                       };
> +
> +                       led_pins_pcduino3: led_pins@0 {
> +                               allwinner,pins = "PH15", "PH16";
> +                               allwinner,function = "gpio_out";
> +                               allwinner,drive = <0>;
> +                               allwinner,pull = <0>;
> +                       };
> +
> +                       key_pins_pcduino3: key_pins@0 {
> +                               allwinner,pins = "PH17", "PH18", "PH19";
> +                               allwinner,function = "gpio_in";
> +                               allwinner,drive = <0>;
> +                               allwinner,pull = <0>;
> +                       };
> +               };
> +
> +               ir0: ir@01c21800 {
> +                       pinctrl-names = "default";
> +                       pinctrl-0 = <&ir0_pins_a>;
> +                       status = "okay";
> +               };
> +
> +               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";
> +
> +                       axp209: pmic@34 {
> +                               compatible = "x-powers,axp209";
> +                               reg = <0x34>;
> +                               interrupt-parent = <&nmi_intc>;
> +                               interrupts = <0 8>;
> +
> +                               interrupt-controller;
> +                               #interrupt-cells = <1>;
> +                       };
> +               };
> +
> +               gmac: ethernet@01c50000 {
> +                       pinctrl-names = "default";
> +                       pinctrl-0 = <&gmac_pins_mii_a>;
> +                       phy = <&phy1>;
> +                       phy-mode = "mii";
> +                       status = "okay";
> +
> +                       phy1: ethernet-phy@1 {
> +                               reg = <1>;
> +                       };
> +               };
> +       };
> +
> +       leds {
> +               compatible = "gpio-leds";
> +               pinctrl-names = "default";
> +               pinctrl-0 = <&led_pins_pcduino3>;
> +
> +               tx {
> +                       label = "pcduino3:green:tx";
> +                       gpios = <&pio 7 15 GPIO_ACTIVE_LOW>;
> +               };
> +
> +               rx {
> +                       label = "pcduino3:green:rx";
> +                       gpios = <&pio 7 16 GPIO_ACTIVE_LOW>;
> +               };
> +       };
> +
> +       gpio_keys {
> +               compatible = "gpio-keys";
> +               pinctrl-names = "default";
> +               pinctrl-0 = <&key_pins_pcduino3>;
> +               #address-cells = <1>;
> +               #size-cells = <0>;
> +               button@0 {
> +                       label = "Key Back";
> +                       linux,code = <KEY_BACK>;
> +                       gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
> +               };
> +               button@1 {
> +                       label = "Key Home";
> +                       linux,code = <KEY_HOME>;
> +                       gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
> +               };
> +               button@2 {
> +                       label = "Key Menu";
> +                       linux,code = <KEY_MENU>;
> +                       gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;
> +               };
> +       };
> +
> +       reg_usb1_vbus: usb1-vbus {
> +               status = "okay";
> +       };
> +
> +       reg_usb2_vbus: usb2-vbus {
> +               status = "okay";
> +       };
> +
> +       reg_ahci_5v: ahci-5v {
> +               gpio = <&pio 7 2 0>;
> +               status = "okay";
> +       };
> +};
> --
> 2.0.0
>

Re: [PATCH 6/9] ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3

[Hans de Goede]

Hi,

On 07/01/2014 04:22 AM, Chen-Yu Tsai wrote:
> On Tue, Jul 1, 2014 at 5:57 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> From: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
>>
>> The LinkSprite pcDuino V3 is an A20 based development board featuring
>> arduino compatible io headers, 1G RAM, 4G nand, sata, rtl8188cus usb wifi
>> and 100 Mbit ethernet using an ip101a phy:
>>
>> http://www.pcduino.com/pcduino-v3/
>>
>> Signed-off-by: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
>> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Various cleanups, correct led pins]
>> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Add axp209, ir and gpio-keys nodes]
>> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>>
>> --
>>
>> Changes since v2:
>>  - update MMC entry to comply with upstream
>>  - unify the 4 patches into one
>>
>> Changes since v1:
>>  - fix cosmetic issues
>>  - fix i2c entry
>>  - remove unnecessary input bindings include
>>  - add MMC support
>> ---
>>  arch/arm/boot/dts/Makefile               |   3 +-
>>  arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 173 +++++++++++++++++++++++++++++++
>>  2 files changed, 175 insertions(+), 1 deletion(-)
>>  create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index ed0de8b..fdc590e 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -380,7 +380,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
>>         sun7i-a20-cubieboard2.dtb \
>>         sun7i-a20-cubietruck.dtb \
>>         sun7i-a20-i12-tvbox.dtb \
>> -       sun7i-a20-olinuxino-micro.dtb
>> +       sun7i-a20-olinuxino-micro.dtb \
>> +       sun7i-a20-pcduino3.dtb
> 
> You may need to rebase onto my sun8i ippo-q8h dts patch.
> 
>   https://patchwork.kernel.org/patch/4389951/
> 
> There's a likely conflict in the Makefile here.

Has that one already been accepted by Maxime ? I'm fine rebasing patches
on top of accepted stuff, but rebasing on pending stuff is not really
useful IMHO.

Regards,

Hans

Re: [PATCH 6/9] ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3

[Chen-Yu Tsai]

On Tue, Jul 1, 2014 at 3:12 PM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> Hi,
>
> On 07/01/2014 04:22 AM, Chen-Yu Tsai wrote:
>> On Tue, Jul 1, 2014 at 5:57 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>> From: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
>>>
>>> The LinkSprite pcDuino V3 is an A20 based development board featuring
>>> arduino compatible io headers, 1G RAM, 4G nand, sata, rtl8188cus usb wifi
>>> and 100 Mbit ethernet using an ip101a phy:
>>>
>>> http://www.pcduino.com/pcduino-v3/
>>>
>>> Signed-off-by: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
>>> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Various cleanups, correct led pins]
>>> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Add axp209, ir and gpio-keys nodes]
>>> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>>>
>>> --
>>>
>>> Changes since v2:
>>>  - update MMC entry to comply with upstream
>>>  - unify the 4 patches into one
>>>
>>> Changes since v1:
>>>  - fix cosmetic issues
>>>  - fix i2c entry
>>>  - remove unnecessary input bindings include
>>>  - add MMC support
>>> ---
>>>  arch/arm/boot/dts/Makefile               |   3 +-
>>>  arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 173 +++++++++++++++++++++++++++++++
>>>  2 files changed, 175 insertions(+), 1 deletion(-)
>>>  create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index ed0de8b..fdc590e 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -380,7 +380,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
>>>         sun7i-a20-cubieboard2.dtb \
>>>         sun7i-a20-cubietruck.dtb \
>>>         sun7i-a20-i12-tvbox.dtb \
>>> -       sun7i-a20-olinuxino-micro.dtb
>>> +       sun7i-a20-olinuxino-micro.dtb \
>>> +       sun7i-a20-pcduino3.dtb
>>
>> You may need to rebase onto my sun8i ippo-q8h dts patch.
>>
>>   https://patchwork.kernel.org/patch/4389951/
>>
>> There's a likely conflict in the Makefile here.
>
> Has that one already been accepted by Maxime ? I'm fine rebasing patches
> on top of accepted stuff, but rebasing on pending stuff is not really
> useful IMHO.

Maxime replied stating he applied it. See the lower part of the patchwork
page.

AFAIK he's accepted my initial sun8i patches and CIR DT patches this cycle.


ChenYu

Re: [PATCH 6/9] ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3

[Hans de Goede]

Hi,

On 07/01/2014 09:21 AM, Chen-Yu Tsai wrote:
> On Tue, Jul 1, 2014 at 3:12 PM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> Hi,
>>
>> On 07/01/2014 04:22 AM, Chen-Yu Tsai wrote:
>>> On Tue, Jul 1, 2014 at 5:57 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>>>> From: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
>>>>
>>>> The LinkSprite pcDuino V3 is an A20 based development board featuring
>>>> arduino compatible io headers, 1G RAM, 4G nand, sata, rtl8188cus usb wifi
>>>> and 100 Mbit ethernet using an ip101a phy:
>>>>
>>>> http://www.pcduino.com/pcduino-v3/
>>>>
>>>> Signed-off-by: Zoltan HERPAI <wigyori-1V5s5g7wVVk@public.gmane.org>
>>>> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Various cleanups, correct led pins]
>>>> [hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org: Add axp209, ir and gpio-keys nodes]
>>>> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>>>>
>>>> --
>>>>
>>>> Changes since v2:
>>>>  - update MMC entry to comply with upstream
>>>>  - unify the 4 patches into one
>>>>
>>>> Changes since v1:
>>>>  - fix cosmetic issues
>>>>  - fix i2c entry
>>>>  - remove unnecessary input bindings include
>>>>  - add MMC support
>>>> ---
>>>>  arch/arm/boot/dts/Makefile               |   3 +-
>>>>  arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 173 +++++++++++++++++++++++++++++++
>>>>  2 files changed, 175 insertions(+), 1 deletion(-)
>>>>  create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3.dts
>>>>
>>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>>> index ed0de8b..fdc590e 100644
>>>> --- a/arch/arm/boot/dts/Makefile
>>>> +++ b/arch/arm/boot/dts/Makefile
>>>> @@ -380,7 +380,8 @@ dtb-$(CONFIG_MACH_SUN7I) += \
>>>>         sun7i-a20-cubieboard2.dtb \
>>>>         sun7i-a20-cubietruck.dtb \
>>>>         sun7i-a20-i12-tvbox.dtb \
>>>> -       sun7i-a20-olinuxino-micro.dtb
>>>> +       sun7i-a20-olinuxino-micro.dtb \
>>>> +       sun7i-a20-pcduino3.dtb
>>>
>>> You may need to rebase onto my sun8i ippo-q8h dts patch.
>>>
>>>   https://patchwork.kernel.org/patch/4389951/
>>>
>>> There's a likely conflict in the Makefile here.
>>
>> Has that one already been accepted by Maxime ? I'm fine rebasing patches
>> on top of accepted stuff, but rebasing on pending stuff is not really
>> useful IMHO.
> 
> Maxime replied stating he applied it. See the lower part of the patchwork
> page.
> 
> AFAIK he's accepted my initial sun8i patches and CIR DT patches this cycle.

Ok, I'm not seeing anything for 3.17 here though:
https://github.com/mripard/linux/

Maxime, can you push a sunxi/dt-for-3.17 with what you currently have there?

Then I'll rebase this series on top, fix the commit msg thingie Chen pointed
out and send a v2.

Regards,

Hans

Re: [PATCH 6/9] ARM: dts: sun7i: Add board support for LinkSprite pcDuino V3

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 794 bytes --]

On Tue, Jul 01, 2014 at 09:30:18AM +0200, Hans de Goede wrote:
> Ok, I'm not seeing anything for 3.17 here though:
> https://github.com/mripard/linux/
> 
> Maxime, can you push a sunxi/dt-for-3.17 with what you currently have there?

Ah, sorry, my bad.

From 3.17, I started to use a kernel.org git tree there:

git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git

And forgot to notify you.

There will also be linux-next coverage for the patches I gather.

> Then I'll rebase this series on top, fix the commit msg thingie Chen
> pointed out and send a v2.

Fixed the whitespace error, the conflict, and the commit message, and
applied.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 7/9] ARM: dts: sun7i: Add new ba10-tvbox board

[Hans de Goede]

The ba10 tvbox is an A10 based android tvbox, with 512M RAM, 8G nand flash,
rtl8188ctv usb wifi 1 USB-A receptacle hooked up to an EHCI/OHCI controller,
1 USB-A receptacle hooked up to the OTG and 100Mbit ethernet using a
rtl8201 phy.

The PCB is labelled ba10 hence I've named the board ba10-tvbox. It is used
in noname allwinner A10 tv-boxes.

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/Makefile                 |   1 +
 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 110 +++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index fdc590e..fbba066 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -360,6 +360,7 @@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
 	stih416-b2020-revE.dtb
 dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-a1000.dtb \
+	sun4i-a10-ba10-tvbox.dtb \
 	sun4i-a10-cubieboard.dtb \
 	sun4i-a10-mini-xplus.dtb \
 	sun4i-a10-hackberry.dtb \
diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
new file mode 100644
index 0000000..1763cc7
--- /dev/null
+++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2014 Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
+ *
+ * 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"
+/include/ "sunxi-common-regulators.dtsi"
+
+/ {
+	model = "BA10 tvbox";
+	compatible = "allwinner,ba10-tvbox", "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>;
+			};
+		};
+
+		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>;
+			status = "okay";
+		};
+
+		ehci0: usb@01c14000 {
+			status = "okay";
+		};
+
+		ohci0: usb@01c14400 {
+			status = "okay";
+		};
+
+		ehci1: usb@01c1c000 {
+			status = "okay";
+		};
+
+		ohci1: usb@01c1c400 {
+			status = "okay";
+		};
+
+		pinctrl@01c20800 {
+			usb2_vbus_pin_a: usb2_vbus_pin@0 {
+				allwinner,pins = "PH12";
+			};
+		};
+
+		ir0: ir@01c21800 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&ir0_pins_a>;
+			status = "okay";
+		};
+
+		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";
+
+			axp209: pmic@34 {
+				compatible = "x-powers,axp209";
+				reg = <0x34>;
+				interrupts = <0>;
+
+				interrupt-controller;
+				#interrupt-cells = <1>;
+			};
+		};
+	};
+
+	reg_usb1_vbus: usb1-vbus {
+		status = "okay";
+	};
+
+	reg_usb2_vbus: usb2-vbus {
+		gpio = <&pio 7 12 0>;
+		status = "okay";
+	};
+};
-- 
2.0.0

Re: [PATCH 7/9] ARM: dts: sun7i: Add new ba10-tvbox board

[Chen-Yu Tsai]

On Tue, Jul 1, 2014 at 5:57 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> The ba10 tvbox is an A10 based android tvbox, with 512M RAM, 8G nand flash,
> rtl8188ctv usb wifi 1 USB-A receptacle hooked up to an EHCI/OHCI controller,
> 1 USB-A receptacle hooked up to the OTG and 100Mbit ethernet using a
> rtl8201 phy.

Nitpick on the subject, should be sun4i.

> The PCB is labelled ba10 hence I've named the board ba10-tvbox. It is used
> in noname allwinner A10 tv-boxes.
>
> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Re: Re: [PATCH 7/9] ARM: dts: sun7i: Add new ba10-tvbox board

[Hans de Goede]

Hi,

On 07/01/2014 04:16 AM, Chen-Yu Tsai wrote:
> On Tue, Jul 1, 2014 at 5:57 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> The ba10 tvbox is an A10 based android tvbox, with 512M RAM, 8G nand flash,
>> rtl8188ctv usb wifi 1 USB-A receptacle hooked up to an EHCI/OHCI controller,
>> 1 USB-A receptacle hooked up to the OTG and 100Mbit ethernet using a
>> rtl8201 phy.
> 
> Nitpick on the subject, should be sun4i.

Right, I actually noticed that myself too, but I forgot to fix this up before
sending :|

Maxime, can you fix this up, or do you want a resend (and if resend, just this
patch or the entire set?).

Regards,

Hans

Re: Re: [PATCH 7/9] ARM: dts: sun7i: Add new ba10-tvbox board

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 902 bytes --]

On Tue, Jul 01, 2014 at 09:06:31AM +0200, Hans de Goede wrote:
> Hi,
> 
> On 07/01/2014 04:16 AM, Chen-Yu Tsai wrote:
> > On Tue, Jul 1, 2014 at 5:57 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> >> The ba10 tvbox is an A10 based android tvbox, with 512M RAM, 8G nand flash,
> >> rtl8188ctv usb wifi 1 USB-A receptacle hooked up to an EHCI/OHCI controller,
> >> 1 USB-A receptacle hooked up to the OTG and 100Mbit ethernet using a
> >> rtl8201 phy.
> > 
> > Nitpick on the subject, should be sun4i.
> 
> Right, I actually noticed that myself too, but I forgot to fix this up before
> sending :|
> 
> Maxime, can you fix this up, or do you want a resend (and if resend, just this
> patch or the entire set?).

Fixed and applied.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[PATCH 8/9] ARM: dts: sun4i: Add ir controller nodes and pinmux

[Hans de Goede]

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun4i-a10.dtsi | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index ae6dd50..ec00030 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -593,6 +593,20 @@
 				allwinner,drive = <0>;
 				allwinner,pull = <1>;
 			};
+
+			ir0_pins_a: ir0@0 {
+				allwinner,pins = "PB3","PB4";
+				allwinner,function = "ir0";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
+
+			ir1_pins_a: ir1@0 {
+				allwinner,pins = "PB22","PB23";
+				allwinner,function = "ir1";
+				allwinner,drive = <0>;
+				allwinner,pull = <0>;
+			};
 		};
 
 		timer@01c20c00 {
@@ -621,6 +635,24 @@
 			status = "disabled";
 		};
 
+		ir0: ir@01c21800 {
+			compatible = "allwinner,sun4i-a10-ir";
+			clocks = <&apb0_gates 6>, <&ir0_clk>;
+			clock-names = "apb", "ir";
+			interrupts = <5>;
+			reg = <0x01c21800 0x40>;
+			status = "disabled";
+		};
+
+		ir1: ir@01c21c00 {
+			compatible = "allwinner,sun4i-a10-ir";
+			clocks = <&apb0_gates 7>, <&ir1_clk>;
+			clock-names = "apb", "ir";
+			interrupts = <6>;
+			reg = <0x01c21c00 0x40>;
+			status = "disabled";
+		};
+
 		lradc: lradc@01c22800 {
 			compatible = "allwinner,sun4i-lradc-keys";
 			reg = <0x01c22800 0x100>;
-- 
2.0.0

[PATCH 9/9] ARM: dts: sun4i: Add ir node to various boards

[Hans de Goede]

Tested on a cubieboard and the mini-x.

Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/sun4i-a10-a1000.dts      |  6 ++++++
 arch/arm/boot/dts/sun4i-a10-cubieboard.dts |  6 ++++++
 arch/arm/boot/dts/sun4i-a10-hackberry.dts  |  6 ++++++
 arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 13 +++++++++++++
 4 files changed, 31 insertions(+)

diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 55d9510..9e99ade 100644
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -88,6 +88,12 @@
 			};
 		};
 
+		ir0: ir@01c21800 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&ir0_pins_a>;
+			status = "okay";
+		};
+
 		uart0: serial@01c28000 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_pins_a>;
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index 539b693..3ce56bfb 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -80,6 +80,12 @@
 			};
 		};
 
+		ir0: ir@01c21800 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&ir0_pins_a>;
+			status = "okay";
+		};
+
 		uart0: serial@01c28000 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_pins_a>;
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index 21df4e3..891ea44 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -87,6 +87,12 @@
 			};
 		};
 
+		ir0: ir@01c21800 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&ir0_pins_a>;
+			status = "okay";
+		};
+
 		uart0: serial@01c28000 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_pins_a>;
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
index 387770d..b9ecce6 100644
--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
@@ -52,6 +52,19 @@
 			status = "okay";
 		};
 
+		pinctrl@01c20800 {
+			ir0_pins_a: ir0@0 {
+				/* The ir receiver is not always populated */
+				allwinner,pull = <1>;
+			};
+		};
+
+		ir0: ir@01c21800 {
+			pinctrl-names = "default";
+			pinctrl-0 = <&ir0_pins_a>;
+			status = "okay";
+		};
+
 		uart0: serial@01c28000 {
 			pinctrl-names = "default";
 			pinctrl-0 = <&uart0_pins_a>;
-- 
2.0.0

Re: [PATCH 0/9] ARM: dts: sunxi: Various sunxi dts patches

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

On Mon, Jun 30, 2014 at 11:57:50PM +0200, Hans de Goede wrote:
> Hi Maxime,
> 
> Here is a set of sunxi dts patches for your dt tree. It is a mixed collection:
> 
> -Some patches submitted earlier by others which I've picked up from the
>  list and brushed up a bit were necessary.
> -2 new boards
> -sun4i ir support (and renaming of the compatible from sun7i-a20-ir to
>  sun4i-a10-ir as they have the same ip block for this)

Applied, thanks!

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 0/9] ARM: dts: sunxi: Various sunxi dts patches

[Hans de Goede]

Hi,

On 07/01/2014 10:06 AM, Maxime Ripard wrote:
> On Mon, Jun 30, 2014 at 11:57:50PM +0200, Hans de Goede wrote:
>> Hi Maxime,
>>
>> Here is a set of sunxi dts patches for your dt tree. It is a mixed collection:
>>
>> -Some patches submitted earlier by others which I've picked up from the
>>  list and brushed up a bit were necessary.
>> -2 new boards
>> -sun4i ir support (and renaming of the compatible from sun7i-a20-ir to
>>  sun4i-a10-ir as they have the same ip block for this)
> 
> Applied, thanks!

Thanks, and good to know about your new tree on kernel.org. I'll use that
to base dts patches on from now on.

Regards,

Hans