Skip to contentSkip to conversation

ARM: dts: sun4i: inet97fv2: Disable unused usb controllers

PATCH New Hans de Goede 2 participants 10 messages Aug 23, 2015 – Aug 24, 2015

Subsystems (2)
Device tree bindings Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Hans de Goede

author
#0 lore raw

PATCH 1/5 ARM: dts: sun4i: inet97fv2: Disable unused usb controllers

The inet97fv2 tablet only has a usb-2 wifi device connected to the second ehci controller, disable the first ehci controller and both ohci controllers.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 17 -----------------
 1 file changed, 17 deletions(-)
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +0 -17
index 6c927a8..51621c5 100644
@@ -61,10 +61,6 @@
 	};
 };
 
-&ehci0 {
-	status = "okay";
-};
-
 &ehci1 {
 	status = "okay";
 };

@@ -94,18 +90,6 @@
 	status = "okay";
 };
 
-&ohci0 {
-	status = "okay";
-};
-
-&ohci1 {
-	status = "okay";
-};
-
-&reg_usb1_vbus {
-	status = "okay";
-};
-
 &reg_usb2_vbus {
 	status = "okay";
 };

@@ -117,7 +101,6 @@
 };
 
 &usbphy {
-	usb1_vbus-supply = <&reg_usb1_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
 };
Signature · 1 line
2.4.3
author
#1 lore raw

PATCH 2/5 ARM: dts: sun4i: inet97fv2: Add regulator nodes

Use axp209.dtsi and add regulator nodes for the regulators used on the inet97fv2 tablet.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 35 +++++++++++++++++++++++++++----
 1 file changed, 31 insertions(+), 4 deletions(-)
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +31 -4
index 51621c5..69e22bd 100644
@@ -61,6 +61,10 @@
 	};
 };
 
+&cpu0 {
+	cpu-supply = <&reg_dcdc2>;
+};
+
 &ehci1 {
 	status = "okay";
 };

@@ -71,15 +75,13 @@
 	status = "okay";
 
 	axp209: pmic at 34 {
-		compatible = "x-powers,axp209";
 		reg = <0x34>;
 		interrupts = <0>;
-
-		interrupt-controller;
-		#interrupt-cells = <1>;
 	};
 };
 
+#include "axp209.dtsi"
+
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;

@@ -90,6 +92,31 @@
 	status = "okay";
 };
 
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <1000000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <1250000>;
+	regulator-max-microvolt = <1250000>;
+	regulator-name = "vdd-int-dll";
+};
+
+&reg_ldo1 {
+	regulator-name = "vdd-rtc";
+};
+
+&reg_ldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "avcc";
+};
+
 &reg_usb2_vbus {
 	status = "okay";
 };
Signature · 1 line
2.4.3
Applied
#2 lore raw

PATCH 2/5 ARM: dts: sun4i: inet97fv2: Add regulator nodes

Quoted 4 lines · Hans de Goede

Use axp209.dtsi and add regulator nodes for the regulators used on the inet97fv2 tablet.

Signed-off-by Hans de Goede <[email protected]>

Queued, thanks!

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150824/7bec9e62/attachment.sig>
author
#3 lore raw

PATCH 3/5 ARM: dts: sun4i: inet97fv2: Enable otg controller

In reply to Hans de Goede

Enable the otg controller on the inet97fv2 tablet.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 34 +++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +34 -0
index 69e22bd..309a0da 100644
@@ -92,6 +92,26 @@
 	status = "okay";
 };
 
+&otg_sram {
+	status = "okay";
+};
+
+&pio {
+	usb0_id_detect_pin: usb0_id_detect_pin at 0 {
+		allwinner,pins = "PH4";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
+	};
+
+	usb0_vbus_detect_pin: usb0_vbus_detect_pin at 0 {
+		allwinner,pins = "PH5";
+		allwinner,function = "gpio_in";
+		allwinner,drive = <SUN4I_PINCTRL_10_MA>;
+		allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
+	};
+};
+
 &reg_dcdc2 {
 	regulator-always-on;
 	regulator-min-microvolt = <1000000>;

@@ -117,6 +137,10 @@
 	regulator-name = "avcc";
 };
 
+&reg_usb0_vbus {
+	status = "okay";
+};
+
 &reg_usb2_vbus {
 	status = "okay";
 };

@@ -127,7 +151,17 @@
 	status = "okay";
 };
 
+&usb_otg {
+	dr_mode = "otg";
+	status = "okay";
+};
+
 &usbphy {
+	pinctrl-names = "default";
+	pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
+	usb0_id_det-gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
+	usb0_vbus_det-gpio = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
+	usb0_vbus-supply = <&reg_usb0_vbus>;
 	usb2_vbus-supply = <&reg_usb2_vbus>;
 	status = "okay";
 };
Signature · 1 line
2.4.3
Applied
#4 lore raw

PATCH 3/5 ARM: dts: sun4i: inet97fv2: Enable otg controller

Quoted 3 lines · Hans de Goede

Enable the otg controller on the inet97fv2 tablet.

Signed-off-by Hans de Goede <[email protected]>

Queued, thanks!

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150824/da8cafe4/attachment.sig>
author
#5 lore raw

PATCH 4/5 ARM: dts: sun4i: inet97fv2: Enable support for tablet keys

In reply to Hans de Goede

Enable support for the tablet keys which are connected via the lradc.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +41 -0
index 309a0da..909fde9 100644
@@ -47,6 +47,7 @@
 #include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
 
 / {
 	model = "INet-97F Rev 02";

@@ -82,6 +83,46 @@
 
 #include "axp209.dtsi"
 
+&lradc {
+	vref-supply = <&reg_ldo2>;
+	status = "okay";
+
+	button at 200 {
+		label = "Menu";
+		linux,code = <KEY_MENU>;
+		channel = <0>;
+		voltage = <200000>;
+	};
+
+	button at 600 {
+		label = "Volume Up";
+		linux,code = <KEY_VOLUMEUP>;
+		channel = <0>;
+		voltage = <600000>;
+	};
+
+	button at 800 {
+		label = "Volume Down";
+		linux,code = <KEY_VOLUMEDOWN>;
+		channel = <0>;
+		voltage = <800000>;
+	};
+
+	button at 1000 {
+		label = "Home";
+		linux,code = <KEY_HOMEPAGE>;
+		channel = <0>;
+		voltage = <1000000>;
+	};
+
+	button at 1200 {
+		label = "Esc";
+		linux,code = <KEY_ESC>;
+		channel = <0>;
+		voltage = <1200000>;
+	};
+};
+
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
Signature · 1 line
2.4.3
Applied
#6 lore raw

PATCH 4/5 ARM: dts: sun4i: inet97fv2: Enable support for tablet keys

Quoted 3 lines · Hans de Goede

Enable support for the tablet keys which are connected via the lradc.

Signed-off-by Hans de Goede <[email protected]>

Queued, thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150824/9c2fdc87/attachment.sig>
author
#7 lore raw

PATCH 5/5 ARM: dts: sun4i: inet97fv2: Enable i2c1 and i2c2 controllers

In reply to Hans de Goede

Enable i2c1 and i2c2 controllers, these are used for the touchscreen resp. the accelerometer.

Signed-off-by Hans de Goede <[email protected]>
---
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts +12 -0
index 909fde9..77c31da 100644
@@ -83,6 +83,18 @@
 
 #include "axp209.dtsi"
 
+&i2c1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c1_pins_a>;
+	status = "okay";
+};
+
+&i2c2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c2_pins_a>;
+	status = "okay";
+};
+
 &lradc {
 	vref-supply = <&reg_ldo2>;
 	status = "okay";
Signature · 1 line
2.4.3
Applied
#8 lore raw

PATCH 5/5 ARM: dts: sun4i: inet97fv2: Enable i2c1 and i2c2 controllers

Quoted 4 lines · Hans de Goede

Enable i2c1 and i2c2 controllers, these are used for the touchscreen resp. the accelerometer.

Signed-off-by Hans de Goede <[email protected]>

Queued, thanks!
Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150824/4c873b8e/attachment-0001.sig>
Applied
#9 lore raw

PATCH 1/5 ARM: dts: sun4i: inet97fv2: Disable unused usb controllers

In reply to Hans de Goede
Quoted 5 lines · Hans de Goede

The inet97fv2 tablet only has a usb-2 wifi device connected to the second ehci controller, disable the first ehci controller and both ohci controllers.

Signed-off-by Hans de Goede <[email protected]>

Queued, thanks.

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150824/c7703755/attachment-0001.sig>