| Message ID | 20180326075703.5834-3-vigneshr@ti.com |
|---|---|
| State | Accepted |
| Commit | 7d83803b493f2ba25fb266f61caf1278ea97e014 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | AM437x: Add runtime DTB selection for QSPI Boot | expand |
On Monday 26 March 2018 01:27 PM, Vignesh R wrote: > With U-boot runtime board detect for DTB selection a "default" dtb needs > to be created. This will be used temporarily until the "proper" dtb is > selected. > > Also, add -u-boot.dtsi for AM437x SK and IDK to enable I2C for > board detection via DM_I2C. > > Signed-off-by: Vignesh R <vigneshr@ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Thanks and regards, Lokesh > --- > arch/arm/dts/Makefile | 3 ++- > arch/arm/dts/am4372-generic-u-boot.dtsi | 15 +++++++++++++++ > arch/arm/dts/am4372-generic.dts | 24 ++++++++++++++++++++++++ > arch/arm/dts/am437x-idk-evm-u-boot.dtsi | 23 +++++++++++++++++++++++ > arch/arm/dts/am437x-sk-evm-u-boot.dtsi | 23 +++++++++++++++++++++++ > 5 files changed, 87 insertions(+), 1 deletion(-) > create mode 100644 arch/arm/dts/am4372-generic-u-boot.dtsi > create mode 100644 arch/arm/dts/am4372-generic.dts > create mode 100644 arch/arm/dts/am437x-idk-evm-u-boot.dtsi > create mode 100644 arch/arm/dts/am437x-sk-evm-u-boot.dtsi > > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 7dd1dffae599..15212acf90fa 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -167,7 +167,8 @@ dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb \ > am335x-pdu001.dtb > dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \ > am43x-epos-evm.dtb \ > - am437x-idk-evm.dtb > + am437x-idk-evm.dtb \ > + am4372-generic.dtb > dtb-$(CONFIG_TI816X) += dm8168-evm.dtb > dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb > > diff --git a/arch/arm/dts/am4372-generic-u-boot.dtsi b/arch/arm/dts/am4372-generic-u-boot.dtsi > new file mode 100644 > index 000000000000..03a8a8d17b8c > --- /dev/null > +++ b/arch/arm/dts/am4372-generic-u-boot.dtsi > @@ -0,0 +1,15 @@ > +/* > + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +/{ > + ocp { > + u-boot,dm-pre-reloc; > + }; > +}; > + > +&i2c0 { > + u-boot,dm-pre-reloc; > +}; > diff --git a/arch/arm/dts/am4372-generic.dts b/arch/arm/dts/am4372-generic.dts > new file mode 100644 > index 000000000000..0c4843901882 > --- /dev/null > +++ b/arch/arm/dts/am4372-generic.dts > @@ -0,0 +1,24 @@ > +/* > + * Device Tree Source for Generic AM4372 EVM > + * > + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +/dts-v1/; > + > +#include "am4372.dtsi" > + > +/ { > + compatible = "ti,am4372", "ti,am43"; > + model = "Texas Instruments AM4372 Generic"; > + > + chosen { > + stdout-path = &uart0; > + }; > +}; > + > +&i2c0 { > + status = "okay"; > +}; > diff --git a/arch/arm/dts/am437x-idk-evm-u-boot.dtsi b/arch/arm/dts/am437x-idk-evm-u-boot.dtsi > new file mode 100644 > index 000000000000..2f68d7ae9cdc > --- /dev/null > +++ b/arch/arm/dts/am437x-idk-evm-u-boot.dtsi > @@ -0,0 +1,23 @@ > +/* > + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +/{ > + ocp { > + u-boot,dm-spl; > + }; > +}; > + > +&uart0 { > + u-boot,dm-spl; > +}; > + > +&i2c0 { > + u-boot,dm-spl; > +}; > + > +&mmc1 { > + u-boot,dm-spl; > +}; > diff --git a/arch/arm/dts/am437x-sk-evm-u-boot.dtsi b/arch/arm/dts/am437x-sk-evm-u-boot.dtsi > new file mode 100644 > index 000000000000..2f68d7ae9cdc > --- /dev/null > +++ b/arch/arm/dts/am437x-sk-evm-u-boot.dtsi > @@ -0,0 +1,23 @@ > +/* > + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +/{ > + ocp { > + u-boot,dm-spl; > + }; > +}; > + > +&uart0 { > + u-boot,dm-spl; > +}; > + > +&i2c0 { > + u-boot,dm-spl; > +}; > + > +&mmc1 { > + u-boot,dm-spl; > +}; >
On Mon, Mar 26, 2018 at 01:27:02PM +0530, Vignesh R wrote: > With U-boot runtime board detect for DTB selection a "default" dtb needs > to be created. This will be used temporarily until the "proper" dtb is > selected. > > Also, add -u-boot.dtsi for AM437x SK and IDK to enable I2C for > board detection via DM_I2C. > > Signed-off-by: Vignesh R <vigneshr@ti.com> > Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7dd1dffae599..15212acf90fa 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -167,7 +167,8 @@ dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb \ am335x-pdu001.dtb dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \ am43x-epos-evm.dtb \ - am437x-idk-evm.dtb + am437x-idk-evm.dtb \ + am4372-generic.dtb dtb-$(CONFIG_TI816X) += dm8168-evm.dtb dtb-$(CONFIG_THUNDERX) += thunderx-88xx.dtb diff --git a/arch/arm/dts/am4372-generic-u-boot.dtsi b/arch/arm/dts/am4372-generic-u-boot.dtsi new file mode 100644 index 000000000000..03a8a8d17b8c --- /dev/null +++ b/arch/arm/dts/am4372-generic-u-boot.dtsi @@ -0,0 +1,15 @@ +/* + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/{ + ocp { + u-boot,dm-pre-reloc; + }; +}; + +&i2c0 { + u-boot,dm-pre-reloc; +}; diff --git a/arch/arm/dts/am4372-generic.dts b/arch/arm/dts/am4372-generic.dts new file mode 100644 index 000000000000..0c4843901882 --- /dev/null +++ b/arch/arm/dts/am4372-generic.dts @@ -0,0 +1,24 @@ +/* + * Device Tree Source for Generic AM4372 EVM + * + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/dts-v1/; + +#include "am4372.dtsi" + +/ { + compatible = "ti,am4372", "ti,am43"; + model = "Texas Instruments AM4372 Generic"; + + chosen { + stdout-path = &uart0; + }; +}; + +&i2c0 { + status = "okay"; +}; diff --git a/arch/arm/dts/am437x-idk-evm-u-boot.dtsi b/arch/arm/dts/am437x-idk-evm-u-boot.dtsi new file mode 100644 index 000000000000..2f68d7ae9cdc --- /dev/null +++ b/arch/arm/dts/am437x-idk-evm-u-boot.dtsi @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/{ + ocp { + u-boot,dm-spl; + }; +}; + +&uart0 { + u-boot,dm-spl; +}; + +&i2c0 { + u-boot,dm-spl; +}; + +&mmc1 { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/am437x-sk-evm-u-boot.dtsi b/arch/arm/dts/am437x-sk-evm-u-boot.dtsi new file mode 100644 index 000000000000..2f68d7ae9cdc --- /dev/null +++ b/arch/arm/dts/am437x-sk-evm-u-boot.dtsi @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/{ + ocp { + u-boot,dm-spl; + }; +}; + +&uart0 { + u-boot,dm-spl; +}; + +&i2c0 { + u-boot,dm-spl; +}; + +&mmc1 { + u-boot,dm-spl; +};
With U-boot runtime board detect for DTB selection a "default" dtb needs to be created. This will be used temporarily until the "proper" dtb is selected. Also, add -u-boot.dtsi for AM437x SK and IDK to enable I2C for board detection via DM_I2C. Signed-off-by: Vignesh R <vigneshr@ti.com> --- arch/arm/dts/Makefile | 3 ++- arch/arm/dts/am4372-generic-u-boot.dtsi | 15 +++++++++++++++ arch/arm/dts/am4372-generic.dts | 24 ++++++++++++++++++++++++ arch/arm/dts/am437x-idk-evm-u-boot.dtsi | 23 +++++++++++++++++++++++ arch/arm/dts/am437x-sk-evm-u-boot.dtsi | 23 +++++++++++++++++++++++ 5 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 arch/arm/dts/am4372-generic-u-boot.dtsi create mode 100644 arch/arm/dts/am4372-generic.dts create mode 100644 arch/arm/dts/am437x-idk-evm-u-boot.dtsi create mode 100644 arch/arm/dts/am437x-sk-evm-u-boot.dtsi