[PATCH v3 0/2] ARM: dts: sun9i: drop sunxi-common-regulators.dtsi

[PATCH v3 0/2] ARM: dts: sun9i: drop sunxi-common-regulators.dtsi

[Chen-Yu Tsai]

Hi Maxime,

These are the remaining 2 patches from the AXP809 series.

Changes since v2:

  - Drop sunxi-common-regulators.dtsi instead of disabling dummy regulators.


Regards
ChenYu

Chen-Yu Tsai (2):
  ARM: dts: sun9i: a80-optimus: Drop sunxi-common-regulators.dtsi
  ARM: dts: sun9i: cubieboard4: Drop sunxi-common-regulators.dtsi

 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts |  1 -
 arch/arm/boot/dts/sun9i-a80-optimus.dts     | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

-- 
2.8.1

[PATCH v3 1/2] ARM: dts: sun9i: a80-optimus: Drop sunxi-common-regulators.dtsi

[Chen-Yu Tsai]

sunxi-common-regulators.dtsi provided dummy regulators vcc3v0, vcc3v3,
vcc5v0. 3.0V/3.3V and 5.0V are commonly used voltages in Allwinner
devices. These dummy regulators provide a stand-in when bindings that
require one, but the real regulator is not supported yet.

Since these are no longer needed, we can drop the include file by
copying over reg_usb1_vbus.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun9i-a80-optimus.dts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
index 6cfc02194035..78fddd9152a5 100644
--- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
+++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
@@ -44,7 +44,6 @@
 
 /dts-v1/;
 #include "sun9i-a80.dtsi"
-#include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
@@ -85,6 +84,17 @@
 		};
 	};
 
+	reg_usb1_vbus: usb1-vbus {
+		compatible = "regulator-fixed";
+		pinctrl-names = "default";
+		pinctrl-0 = <&usb1_vbus_pin_optimus>;
+		regulator-name = "usb1-vbus";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
+	};
+
 	reg_usb3_vbus: usb3-vbus {
 		compatible = "regulator-fixed";
 		pinctrl-names = "default";
@@ -172,12 +182,6 @@
 	allwinner,drive = <SUN4I_PINCTRL_40_MA>;
 };
 
-&reg_usb1_vbus {
-	pinctrl-0 = <&usb1_vbus_pin_optimus>;
-	gpio = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
-	status = "okay";
-};
-
 &r_ir {
 	status = "okay";
 };
-- 
2.8.1

[PATCH v3 2/2] ARM: dts: sun9i: cubieboard4: Drop sunxi-common-regulators.dtsi

[Chen-Yu Tsai]

sunxi-common-regulators.dtsi provided dummy regulators vcc3v0, vcc3v3,
vcc5v0. 3.0V/3.3V and 5.0V are commonly used voltages in Allwinner
devices. These dummy regulators provide a stand-in when bindings that
require one, but the real regulator is not supported yet.

Since these are no longer needed, we can drop the include file.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
index 8d8af1189d87..db770d06c31e 100644
--- a/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
+++ b/arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
@@ -45,7 +45,6 @@
 
 /dts-v1/;
 #include "sun9i-a80.dtsi"
-#include "sunxi-common-regulators.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/sun4i-a10.h>
-- 
2.8.1

Re: [PATCH v3 1/2] ARM: dts: sun9i: a80-optimus: Drop sunxi-common-regulators.dtsi

[kbuild test robot]

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

Hi,

[auto build test ERROR on robh/for-next]
[also build test ERROR on v4.7-rc1 next-20160603]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Chen-Yu-Tsai/ARM-dts-sun9i-a80-optimus-Drop-sunxi-common-regulators-dtsi/20160603-145402
base:   https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux for-next
config: arm-multi_v7_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 5.3.1-8) 5.3.1 20160205
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All errors (new ones prefixed by >>):

>> ERROR: Input tree has errors, aborting (use -f to force output)

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 37214 bytes --]

Re: [PATCH v3 0/2] ARM: dts: sun9i: drop sunxi-common-regulators.dtsi

[Maxime Ripard]

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

On Fri, Jun 03, 2016 at 02:50:49PM +0800, Chen-Yu Tsai wrote:
> Hi Maxime,
> 
> These are the remaining 2 patches from the AXP809 series.
> 
> Changes since v2:
> 
>   - Drop sunxi-common-regulators.dtsi instead of disabling dummy regulators.

Applied both, thanks!
Maxime

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

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