RE: [PATCH V2] ARM: dts: imx7d-sdb: add rev-a board support

[Anson Huang]

Hi, Shawn

Best Regards!
Anson Huang

> -----Original Message-----
> From: Shawn Guo [mailto:shawnguo@xxxxxxxxxx]
> Sent: 2018年11月19日 21:46
> To: Anson Huang <anson.huang@xxxxxxx>
> Cc: robh+dt@xxxxxxxxxx; mark.rutland@xxxxxxx; s.hauer@xxxxxxxxxxxxxx;
> kernel@xxxxxxxxxxxxxx; Fabio Estevam <fabio.estevam@xxxxxxx>;
> devicetree@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx;
> linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; dl-linux-imx <linux-imx@xxxxxxx>
> Subject: Re: [PATCH V2] ARM: dts: imx7d-sdb: add rev-a board support
> 
> On Fri, Nov 09, 2018 at 01:27:10AM +0000, Anson Huang wrote:
> > Current imx7d-sdb.dts has some incorrect settings about Rev-A and
> > Rev-B boards, some of the settings are based on Rev-A board but some
> > are based on Rev-B board, clean up it by adding i.MX7D SDB Rev-A board
> > support, make default imx7d-sdb.dts for Rev-B board as usual, and
> > introduce imx7d-sdb-reva.dts for Rev-A board. Below are the affected
> > differences of Rev-A and Rev-B board:
> >
> >                 Rev-A           Rev-B
> > USB_OTG2_PWR:   UART3_CTS_B     GPIO1_IO07
> > ENET_EN_B:      None            GPIO1_IO04
> > TP_INT_B:       EPDC_DATA13     EPDC_BDR1
> >
> > Signed-off-by: Anson Huang <Anson.Huang@xxxxxxx>
> > ---
> > change since V1:
> > 	remove "pinctrl-assert-gpios" which is unused in upstream, and use
> > phy-supply to control fec2's enable pin, model the enable pin as GPIO
> regulator.
> >  arch/arm/boot/dts/Makefile           |  1 +
> >  arch/arm/boot/dts/imx7d-sdb-reva.dts | 39
> ++++++++++++++++++++++++++++++++++++
> >  arch/arm/boot/dts/imx7d-sdb.dts      | 29
> +++++++++++++++++++++++++--
> >  3 files changed, 67 insertions(+), 2 deletions(-)  create mode 100644
> > arch/arm/boot/dts/imx7d-sdb-reva.dts
> >
> > diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> > index ef9ffa4..6d133b9 100644
> > --- a/arch/arm/boot/dts/Makefile
> > +++ b/arch/arm/boot/dts/Makefile
> > @@ -572,6 +572,7 @@ dtb-$(CONFIG_SOC_IMX7D) += \
> >  	imx7d-pico-pi.dtb \
> >  	imx7d-sbc-imx7.dtb \
> >  	imx7d-sdb.dtb \
> > +	imx7d-sdb-reva.dtb \
> >  	imx7d-sdb-sht11.dtb \
> >  	imx7s-colibri-eval-v3.dtb \
> >  	imx7s-warp.dtb
> > diff --git a/arch/arm/boot/dts/imx7d-sdb-reva.dts
> > b/arch/arm/boot/dts/imx7d-sdb-reva.dts
> > new file mode 100644
> > index 0000000..7741eaa
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/imx7d-sdb-reva.dts
> > @@ -0,0 +1,39 @@
> > +// SPDX-License-Identifier: GPL-2.0+ OR MIT // // Copyright (C) 2015
> > +Freescale Semiconductor, Inc.
> > +
> > +/dts-v1/;
> > +
> > +#include "imx7d-sdb.dts"
> > +
> > +/ {
> > +	reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
> > +		gpio = <&gpio4 7 GPIO_ACTIVE_HIGH>;
> > +	};
> > +};
> > +
> > +&fec2 {
> > +	/delete-property/phy-supply;
> > +};
> > +
> > +&iomuxc {
> > +	imx7d-sdb {
> > +		pinctrl_tsc2046_pendown: tsc2046_pendown {
> > +			fsl,pins = <
> > +				MX7D_PAD_EPDC_DATA13__GPIO2_IO13	0x59
> > +			>;
> > +		};
> > +
> > +		pinctrl_hog: hoggrp {
> > +			fsl,pins = <
> > +				MX7D_PAD_UART3_CTS_B__GPIO4_IO7		0x14
> > +				MX7D_PAD_ECSPI2_SS0__GPIO4_IO23		0x34  /* bt
> reg on */
> > +			>;
> > +		};
> > +	};
> > +};
> > +
> > +&iomuxc_lpsr {
> > +	/delete-property/pinctrl-names;
> > +	/delete-property/pinctrl-0;
> > +};
> > diff --git a/arch/arm/boot/dts/imx7d-sdb.dts
> > b/arch/arm/boot/dts/imx7d-sdb.dts index f1bafda..8385b9b 100644
> > --- a/arch/arm/boot/dts/imx7d-sdb.dts
> > +++ b/arch/arm/boot/dts/imx7d-sdb.dts
> > @@ -73,7 +73,7 @@
> >  		regulator-name = "usb_otg2_vbus";
> >  		regulator-min-microvolt = <5000000>;
> >  		regulator-max-microvolt = <5000000>;
> > -		gpio = <&gpio4 7 GPIO_ACTIVE_HIGH>;
> > +		gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
> >  		enable-active-high;
> >  	};
> >
> > @@ -114,6 +114,16 @@
> >  		gpio = <&gpio2 14 GPIO_ACTIVE_LOW>;
> >  	};
> >
> > +	reg_fec2_3v3: regulator-fec2-3v3 {
> > +		compatible = "regulator-fixed";
> > +		regulator-name = "fec2-3v3";
> > +		pinctrl-names = "default";
> > +		pinctrl-0 = <&pinctrl_enet2_reg>;
> > +		regulator-min-microvolt = <3300000>;
> > +		regulator-max-microvolt = <3300000>;
> > +		gpio = <&gpio1 4 GPIO_ACTIVE_LOW>;
> > +	};
> > +
> >  	backlight: backlight {
> >  		compatible = "pwm-backlight";
> >  		pwms = <&pwm1 0 5000000 0>;
> > @@ -210,6 +220,7 @@
> >  	assigned-clock-rates = <0>, <100000000>;
> >  	phy-mode = "rgmii";
> >  	phy-handle = <&ethphy1>;
> > +	phy-supply = <&reg_fec2_3v3>;
> >  	fsl,magic-packet;
> >  	status = "okay";
> >  };
> > @@ -491,6 +502,12 @@
> >  			>;
> >  		};
> >
> > +		pinctrl_enet2_reg: enet2reggrp {
> > +			fsl,pins = <
> > +				MX7D_PAD_LPSR_GPIO1_IO04__GPIO1_IO4	0x14
> > +			>;
> > +		};
> > +
> >  		pinctrl_flexcan2: flexcan2grp {
> >  			fsl,pins = <
> >  				MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX	0x59
> > @@ -513,7 +530,6 @@
> >
> >  		pinctrl_hog: hoggrp {
> >  			fsl,pins = <
> > -				MX7D_PAD_UART3_CTS_B__GPIO4_IO7		0x14
> >  				MX7D_PAD_ECSPI2_SS0__GPIO4_IO23		0x34  /* bt
> reg on */
> >  			>;
> >  		};
> > @@ -724,6 +740,9 @@
> >  };
> >
> >  &iomuxc_lpsr {
> > +	pinctrl-names = "default";
> > +	pinctrl-0 = <&pinctrl_hog_2>;
> > +
> >  	pinctrl_wdog: wdoggrp {
> >  		fsl,pins = <
> >  			MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B		0x74
> > @@ -735,4 +754,10 @@
> >  			MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT		0x30
> >  		>;
> >  	};
> > +
> > +	pinctrl_hog_2: hoggrp-2 {
> > +		fsl,pins = <
> > +			MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7	  0x14
> 
> Instead of using hog group, this should be defined by pinctrl entry to be
> referred by the fixed regulator that uses this GPIO?

Agreed, I remove the hog_2 and add usb_otg2_vbus_reg pinctrl entry for regulator
to reference, please help review V3 patch, thanks.

Anson.

> 
> Shawn
> 
> > +		>;
> > +	};
> >  };
> > --
> > 2.7.4
> >