| Message ID | 20210302121003.15058-10-digetx@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | NVIDIA Tegra ARM32 device-tree improvements | expand |
On Tue, Mar 02, 2021 at 03:09:58PM +0300, Dmitry Osipenko wrote: > Rename avdd supply to vdda of the touchscreen node. The old supply name > was incorrect. > > Signed-off-by: Dmitry Osipenko <digetx@gmail.com> > --- > arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) This one didn't apply cleanly, but applying it manually was fine... > > diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts > index 8a98e4a9d994..d852527db707 100644 > --- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts > +++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts > @@ -449,7 +449,7 @@ touchscreen@4c { > > reset-gpios = <&gpio TEGRA_GPIO(Q, 7) GPIO_ACTIVE_LOW>; > > - avdd-supply = <&vdd_3v3_sys>; > + vdda-supply = <&vdd_3v3_sys>; > vdd-supply = <&vdd_3v3_sys>; > > atmel,wakeup-method = <ATMEL_MXT_WAKEUP_I2C_SCL>; Looks like this line is not upstream. Did I miss a patch somewhere? Thierry
24.03.2021 18:11, Thierry Reding пишет: > On Tue, Mar 02, 2021 at 03:09:58PM +0300, Dmitry Osipenko wrote: >> Rename avdd supply to vdda of the touchscreen node. The old supply name >> was incorrect. >> >> Signed-off-by: Dmitry Osipenko <digetx@gmail.com> >> --- >> arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > This one didn't apply cleanly, but applying it manually was fine... Great, thank you. This is the correct fix for this trouble. >> diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts >> index 8a98e4a9d994..d852527db707 100644 >> --- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts >> +++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts >> @@ -449,7 +449,7 @@ touchscreen@4c { >> >> reset-gpios = <&gpio TEGRA_GPIO(Q, 7) GPIO_ACTIVE_LOW>; >> >> - avdd-supply = <&vdd_3v3_sys>; >> + vdda-supply = <&vdd_3v3_sys>; >> vdd-supply = <&vdd_3v3_sys>; >> >> atmel,wakeup-method = <ATMEL_MXT_WAKEUP_I2C_SCL>; > > Looks like this line is not upstream. Did I miss a patch somewhere? Indeed! I kept forgetting to rebase this patch properly, nevertheless that line already got into -next a day ago [1]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=f0a77ed9080a39a75faecff53fa37b3328926421 This [1] patch should be in yours inbox.
diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts index 8a98e4a9d994..d852527db707 100644 --- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts @@ -449,7 +449,7 @@ touchscreen@4c { reset-gpios = <&gpio TEGRA_GPIO(Q, 7) GPIO_ACTIVE_LOW>; - avdd-supply = <&vdd_3v3_sys>; + vdda-supply = <&vdd_3v3_sys>; vdd-supply = <&vdd_3v3_sys>; atmel,wakeup-method = <ATMEL_MXT_WAKEUP_I2C_SCL>;
Rename avdd supply to vdda of the touchscreen node. The old supply name was incorrect. Signed-off-by: Dmitry Osipenko <digetx@gmail.com> --- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)