Re: [U-Boot] [PATCH v1] apalis-tk1: support v1.2 hardware revision
Igor, -Original Message- From: Igor Opaniuk Sent: Friday, August 9, 2019 3:38 AM To: Tom Warren Cc: Marcel Ziswiler ; Philippe Schenker ; Oleksandr Suvorov ; Dominik Sliwa ; Igor Opaniuk ; Albert Aribaud ; Thierry Reding ; U-Boot Mailing List Subject: Re: [PATCH v1] apalis-tk1: support v1.2 hardware revision Hi Tom, On Fri, Aug 9, 2019 at 1:22 PM Igor Opaniuk wrote: > > From: Marcel Ziswiler > > Support the V1.2 hardware revision with the following pin muxing > changes: > > Ddc_scl_pv4 and ddc_sda_pv5 previously used as Apalis GPIO3 and GPIO4 > are now used as DDC pins. > > Gen2_i2c_scl_pt5 and gen2_i2c_sda_pt6 previously used as DDC pins are > now used as USB power enable signals. > > Usb_vbus_en0_pn4 and usb_vbus_en1_pn5 previously used as USB power > enable signals are now used as GPIO3 and GPIO4. > > Additionally a new device tree file tegra124-apalis-v1.2-eval.dtb is > loaded on V1.2 and later modules and resp. USB power enable signals > activated. > > Signed-off-by: Marcel Ziswiler > Signed-off-by: Igor Opaniuk > --- > > arch/arm/dts/tegra124-apalis.dts | 89 ++- > board/toradex/apalis-tk1/apalis-tk1.c | 37 > .../apalis-tk1/pinmux-config-apalis-tk1.h | 19 ++-- > configs/apalis-tk1_defconfig | 2 +- > include/configs/apalis-tk1.h | 12 ++- > 5 files changed, 103 insertions(+), 56 deletions(-) > > diff --git a/arch/arm/dts/tegra124-apalis.dts > b/arch/arm/dts/tegra124-apalis.dts > index a962c0a2f0..08184ab3ac 100644 > --- a/arch/arm/dts/tegra124-apalis.dts > +++ b/arch/arm/dts/tegra124-apalis.dts > @@ -1,5 +1,5 @@ > /* > - * Copyright 2016 Toradex AG > + * Copyright 2016-2019 Toradex AG > * > * This file is dual-licensed: you can use it either under the terms > * of the GPL or the X11 license, at your option. Note that this dual > @@ -230,19 +230,21 @@ > }; > > /* Apalis GPIO */ > - ddc_scl_pv4 { > - nvidia,pins = "ddc_scl_pv4"; > + usb_vbus_en0_pn4 { > + nvidia,pins = "usb_vbus_en0_pn4"; > nvidia,function = "rsvd2"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = > ; > + nvidia,open-drain = > + ; > }; > - ddc_sda_pv5 { > - nvidia,pins = "ddc_sda_pv5"; > + usb_vbus_en1_pn5 { > + nvidia,pins = "usb_vbus_en1_pn5"; > nvidia,function = "rsvd2"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = > ; > + nvidia,open-drain = > + ; > }; > pex_l0_rst_n_pdd1 { > nvidia,pins = "pex_l0_rst_n_pdd1"; @@ > -333,40 +335,40 @@ > nvidia,open-drain = ; > }; > > - /* Apalis I2C2 (DDC) */ > - gen2_i2c_scl_pt5 { > - nvidia,pins = "gen2_i2c_scl_pt5"; > - nvidia,function = "i2c2"; > + /* Apalis I2C3 (CAM) */ > + cam_i2c_scl_pbb1 { > + nvidia,pins = "cam_i2c_scl_pbb1"; > + nvidia,function = "i2c3"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = ; > nvidia,open-drain = ; > }; > - gen2_i2c_sda_pt6 { > - nvidia,pins = "gen2_i2c_sda_pt6"; > - nvidia,function = "i2c2"; > + cam_i2c_sda_pbb2 { > + nvidia,pins = "cam_i2c_sda_pbb2"; > + nvidia,function = "i2c3"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = ; > nvidia,open-drain = ; > }; > > - /* Apalis I2C3 (CAM) */ > - cam_i2c_scl_pbb1 { > - nvidia,pins = "cam_i2c_scl_pbb1"; > - nvidia,function = "i2c3"; > + /* Apalis I2C4 (DDC) */ > + ddc_scl_pv4 { > + nvidia,pins = "ddc_scl_pv4"; > + nvidia,function = "i2c
Re: [U-Boot] [PATCH v1] apalis-tk1: support v1.2 hardware revision
Hi Tom, On Fri, Aug 9, 2019 at 1:22 PM Igor Opaniuk wrote: > > From: Marcel Ziswiler > > Support the V1.2 hardware revision with the following pin muxing > changes: > > Ddc_scl_pv4 and ddc_sda_pv5 previously used as Apalis GPIO3 and GPIO4 > are now used as DDC pins. > > Gen2_i2c_scl_pt5 and gen2_i2c_sda_pt6 previously used as DDC pins are > now used as USB power enable signals. > > Usb_vbus_en0_pn4 and usb_vbus_en1_pn5 previously used as USB power > enable signals are now used as GPIO3 and GPIO4. > > Additionally a new device tree file tegra124-apalis-v1.2-eval.dtb is > loaded on V1.2 and later modules and resp. USB power enable signals > activated. > > Signed-off-by: Marcel Ziswiler > Signed-off-by: Igor Opaniuk > --- > > arch/arm/dts/tegra124-apalis.dts | 89 ++- > board/toradex/apalis-tk1/apalis-tk1.c | 37 > .../apalis-tk1/pinmux-config-apalis-tk1.h | 19 ++-- > configs/apalis-tk1_defconfig | 2 +- > include/configs/apalis-tk1.h | 12 ++- > 5 files changed, 103 insertions(+), 56 deletions(-) > > diff --git a/arch/arm/dts/tegra124-apalis.dts > b/arch/arm/dts/tegra124-apalis.dts > index a962c0a2f0..08184ab3ac 100644 > --- a/arch/arm/dts/tegra124-apalis.dts > +++ b/arch/arm/dts/tegra124-apalis.dts > @@ -1,5 +1,5 @@ > /* > - * Copyright 2016 Toradex AG > + * Copyright 2016-2019 Toradex AG > * > * This file is dual-licensed: you can use it either under the terms > * of the GPL or the X11 license, at your option. Note that this dual > @@ -230,19 +230,21 @@ > }; > > /* Apalis GPIO */ > - ddc_scl_pv4 { > - nvidia,pins = "ddc_scl_pv4"; > + usb_vbus_en0_pn4 { > + nvidia,pins = "usb_vbus_en0_pn4"; > nvidia,function = "rsvd2"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = ; > + nvidia,open-drain = ; > }; > - ddc_sda_pv5 { > - nvidia,pins = "ddc_sda_pv5"; > + usb_vbus_en1_pn5 { > + nvidia,pins = "usb_vbus_en1_pn5"; > nvidia,function = "rsvd2"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = ; > + nvidia,open-drain = ; > }; > pex_l0_rst_n_pdd1 { > nvidia,pins = "pex_l0_rst_n_pdd1"; > @@ -333,40 +335,40 @@ > nvidia,open-drain = ; > }; > > - /* Apalis I2C2 (DDC) */ > - gen2_i2c_scl_pt5 { > - nvidia,pins = "gen2_i2c_scl_pt5"; > - nvidia,function = "i2c2"; > + /* Apalis I2C3 (CAM) */ > + cam_i2c_scl_pbb1 { > + nvidia,pins = "cam_i2c_scl_pbb1"; > + nvidia,function = "i2c3"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = ; > nvidia,open-drain = ; > }; > - gen2_i2c_sda_pt6 { > - nvidia,pins = "gen2_i2c_sda_pt6"; > - nvidia,function = "i2c2"; > + cam_i2c_sda_pbb2 { > + nvidia,pins = "cam_i2c_sda_pbb2"; > + nvidia,function = "i2c3"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = ; > nvidia,open-drain = ; > }; > > - /* Apalis I2C3 (CAM) */ > - cam_i2c_scl_pbb1 { > - nvidia,pins = "cam_i2c_scl_pbb1"; > - nvidia,function = "i2c3"; > + /* Apalis I2C4 (DDC) */ > + ddc_scl_pv4 { > + nvidia,pins = "ddc_scl_pv4"; > + nvidia,function = "i2c4"; > nvidia,pull = ; > nvidia,tristate = ; > nvidia,enable-input = ; > - nvidia,open-drain = ; > + nvidia,rcv-sel = ; > }; > - cam_i2c_sda_pbb2 { > -
[U-Boot] [PATCH v1] apalis-tk1: support v1.2 hardware revision
From: Marcel Ziswiler Support the V1.2 hardware revision with the following pin muxing changes: Ddc_scl_pv4 and ddc_sda_pv5 previously used as Apalis GPIO3 and GPIO4 are now used as DDC pins. Gen2_i2c_scl_pt5 and gen2_i2c_sda_pt6 previously used as DDC pins are now used as USB power enable signals. Usb_vbus_en0_pn4 and usb_vbus_en1_pn5 previously used as USB power enable signals are now used as GPIO3 and GPIO4. Additionally a new device tree file tegra124-apalis-v1.2-eval.dtb is loaded on V1.2 and later modules and resp. USB power enable signals activated. Signed-off-by: Marcel Ziswiler Signed-off-by: Igor Opaniuk --- arch/arm/dts/tegra124-apalis.dts | 89 ++- board/toradex/apalis-tk1/apalis-tk1.c | 37 .../apalis-tk1/pinmux-config-apalis-tk1.h | 19 ++-- configs/apalis-tk1_defconfig | 2 +- include/configs/apalis-tk1.h | 12 ++- 5 files changed, 103 insertions(+), 56 deletions(-) diff --git a/arch/arm/dts/tegra124-apalis.dts b/arch/arm/dts/tegra124-apalis.dts index a962c0a2f0..08184ab3ac 100644 --- a/arch/arm/dts/tegra124-apalis.dts +++ b/arch/arm/dts/tegra124-apalis.dts @@ -1,5 +1,5 @@ /* - * Copyright 2016 Toradex AG + * Copyright 2016-2019 Toradex AG * * This file is dual-licensed: you can use it either under the terms * of the GPL or the X11 license, at your option. Note that this dual @@ -230,19 +230,21 @@ }; /* Apalis GPIO */ - ddc_scl_pv4 { - nvidia,pins = "ddc_scl_pv4"; + usb_vbus_en0_pn4 { + nvidia,pins = "usb_vbus_en0_pn4"; nvidia,function = "rsvd2"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,open-drain = ; }; - ddc_sda_pv5 { - nvidia,pins = "ddc_sda_pv5"; + usb_vbus_en1_pn5 { + nvidia,pins = "usb_vbus_en1_pn5"; nvidia,function = "rsvd2"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; + nvidia,open-drain = ; }; pex_l0_rst_n_pdd1 { nvidia,pins = "pex_l0_rst_n_pdd1"; @@ -333,40 +335,40 @@ nvidia,open-drain = ; }; - /* Apalis I2C2 (DDC) */ - gen2_i2c_scl_pt5 { - nvidia,pins = "gen2_i2c_scl_pt5"; - nvidia,function = "i2c2"; + /* Apalis I2C3 (CAM) */ + cam_i2c_scl_pbb1 { + nvidia,pins = "cam_i2c_scl_pbb1"; + nvidia,function = "i2c3"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; nvidia,open-drain = ; }; - gen2_i2c_sda_pt6 { - nvidia,pins = "gen2_i2c_sda_pt6"; - nvidia,function = "i2c2"; + cam_i2c_sda_pbb2 { + nvidia,pins = "cam_i2c_sda_pbb2"; + nvidia,function = "i2c3"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; nvidia,open-drain = ; }; - /* Apalis I2C3 (CAM) */ - cam_i2c_scl_pbb1 { - nvidia,pins = "cam_i2c_scl_pbb1"; - nvidia,function = "i2c3"; + /* Apalis I2C4 (DDC) */ + ddc_scl_pv4 { + nvidia,pins = "ddc_scl_pv4"; + nvidia,function = "i2c4"; nvidia,pull = ; nvidia,tristate = ; nvidia,enable-input = ; - nvidia,open-drain = ; + nvidia,rcv-sel = ; }; - cam_i2c_sda_pbb2 { - nvidia,pins = "cam_i2c_sda_pbb2"; - nvidia,function = "i2c3"; + ddc_sda_pv5 { + nvidia,pins = "ddc_sda_pv5"; + nvidia,function = "i