* [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms
@ 2016-05-10 7:48 Lokesh Vutla
2016-05-10 7:48 ` [U-Boot] [PATCH 1/8] ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig Lokesh Vutla
` (8 more replies)
0 siblings, 9 replies; 19+ messages in thread
From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw)
To: u-boot
This series adds support for FIT and various AM335x based platforms
BBB: http://pastebin.ubuntu.com/16340189/
BBW: http://pastebin.ubuntu.com/16340238/
AM335x-evm: http://pastebin.ubuntu.com/16340157/
AM335x-evmsk: http://pastebin.ubuntu.com/16340327/
Lokesh Vutla (6):
ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig
board: am33xx: fit: add support for selecting dtb dynamically
ARM: dts: am335x-bone: Enable uart and timer
ARM: AM335x: Enable FIT
ARM: dts: AM335x-evmsk: Add initial support
ARM: dts: AM335x-BBG: Add initial support
Mugunthan V N (1):
ARM: dts: am335x: fix cd-gpios definition as per hardware design and
dt binding docs
Tom Rini (1):
configs: am335x_evm: Switch to env on FAT SD by default
arch/arm/dts/Makefile | 4 +-
arch/arm/dts/am335x-bone-common.dtsi | 8 +-
arch/arm/dts/am335x-bone.dts | 3 -
arch/arm/dts/am335x-bonegreen.dts | 57 +++
arch/arm/dts/am335x-evm.dts | 2 +-
arch/arm/dts/am335x-evmsk.dts | 720 +++++++++++++++++++++++++++++++++++
board/ti/am335x/MAINTAINERS | 2 +-
board/ti/am335x/board.c | 18 +
configs/am335x_evm_defconfig | 17 +-
configs/am335x_evm_nodt_defconfig | 44 +++
configs/am335x_gp_evm_defconfig | 46 ---
include/configs/am335x_evm.h | 40 +-
include/dt-bindings/pinctrl/omap.h | 37 ++
13 files changed, 919 insertions(+), 79 deletions(-)
create mode 100644 arch/arm/dts/am335x-bonegreen.dts
create mode 100644 arch/arm/dts/am335x-evmsk.dts
create mode 100644 configs/am335x_evm_nodt_defconfig
delete mode 100644 configs/am335x_gp_evm_defconfig
--
2.7.4
^ permalink raw reply [flat|nested] 19+ messages in thread* [U-Boot] [PATCH 1/8] ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla @ 2016-05-10 7:48 ` Lokesh Vutla 2016-05-10 7:48 ` [U-Boot] [PATCH 2/8] board: am33xx: fit: add support for selecting dtb dynamically Lokesh Vutla ` (7 subsequent siblings) 8 siblings, 0 replies; 19+ messages in thread From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw) To: u-boot This is to make am33xx_evm_defconfig to use DT and FIT support by default. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- board/ti/am335x/MAINTAINERS | 2 +- configs/am335x_evm_defconfig | 44 --------------------------------------- configs/am335x_evm_nodt_defconfig | 44 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 configs/am335x_evm_defconfig create mode 100644 configs/am335x_evm_nodt_defconfig diff --git a/board/ti/am335x/MAINTAINERS b/board/ti/am335x/MAINTAINERS index 7dc2b83..897b5a3 100644 --- a/board/ti/am335x/MAINTAINERS +++ b/board/ti/am335x/MAINTAINERS @@ -5,7 +5,7 @@ F: board/ti/am335x/ F: include/configs/am335x_evm.h F: configs/am335x_boneblack_defconfig F: configs/am335x_boneblack_vboot_defconfig -F: configs/am335x_evm_defconfig +F: configs/am335x_evm_nodt_defconfig F: configs/am335x_gp_evm_defconfig F: configs/am335x_evm_nor_defconfig F: configs/am335x_evm_norboot_defconfig diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig deleted file mode 100644 index 62f26b5..0000000 --- a/configs/am335x_evm_defconfig +++ /dev/null @@ -1,44 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_AM335X_EVM=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 -CONFIG_SPL=y -CONFIG_SPL_STACK_R=y -CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="NAND" -CONFIG_HUSH_PARSER=y -CONFIG_AUTOBOOT_KEYED=y -CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" -CONFIG_AUTOBOOT_DELAY_STR="d" -CONFIG_AUTOBOOT_STOP_STR=" " -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_SYS_NS16550=y -CONFIG_USB=y -CONFIG_USB_MUSB_HOST=y -CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_G_DNL_MANUFACTURER="Texas Instruments" -CONFIG_G_DNL_VENDOR_NUM=0x0451 -CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_OF_LIBFDT=y diff --git a/configs/am335x_evm_nodt_defconfig b/configs/am335x_evm_nodt_defconfig new file mode 100644 index 0000000..62f26b5 --- /dev/null +++ b/configs/am335x_evm_nodt_defconfig @@ -0,0 +1,44 @@ +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_SPL=y +CONFIG_SPL_STACK_R=y +CONFIG_FIT=y +CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_HUSH_PARSER=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_ASKENV=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SYS_NS16550=y +CONFIG_USB=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_OF_LIBFDT=y -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 2/8] board: am33xx: fit: add support for selecting dtb dynamically 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla 2016-05-10 7:48 ` [U-Boot] [PATCH 1/8] ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig Lokesh Vutla @ 2016-05-10 7:48 ` Lokesh Vutla 2016-05-13 20:45 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 3/8] ARM: dts: am335x-bone: Enable uart and timer Lokesh Vutla ` (6 subsequent siblings) 8 siblings, 1 reply; 19+ messages in thread From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw) To: u-boot FIT allows for a multiple dtb in a single image. SPL needs a way to detect the right dtb to be used. Adding support for the same. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- board/ti/am335x/board.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 4330be6..a3d1e2b 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -632,3 +632,17 @@ int board_eth_init(bd_t *bis) #endif #endif /* CONFIG_DM_ETH */ + +#ifdef CONFIG_SPL_LOAD_FIT +int board_fit_config_name_match(const char *name) +{ + if (board_is_gp_evm() && !strcmp(name, "am335x-evm")) + return 0; + else if (board_is_bone() && !strcmp(name, "am335x-bone")) + return 0; + else if (board_is_bone_lt() && !strcmp(name, "am335x-boneblack")) + return 0; + else + return -1; +} +#endif -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 2/8] board: am33xx: fit: add support for selecting dtb dynamically 2016-05-10 7:48 ` [U-Boot] [PATCH 2/8] board: am33xx: fit: add support for selecting dtb dynamically Lokesh Vutla @ 2016-05-13 20:45 ` Tom Rini 0 siblings, 0 replies; 19+ messages in thread From: Tom Rini @ 2016-05-13 20:45 UTC (permalink / raw) To: u-boot On Tue, May 10, 2016 at 01:18:18PM +0530, Lokesh Vutla wrote: > FIT allows for a multiple dtb in a single image. SPL needs a way to > detect the right dtb to be used. Adding support for the same. > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160513/ba19be6d/attachment.sig> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 3/8] ARM: dts: am335x-bone: Enable uart and timer 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla 2016-05-10 7:48 ` [U-Boot] [PATCH 1/8] ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig Lokesh Vutla 2016-05-10 7:48 ` [U-Boot] [PATCH 2/8] board: am33xx: fit: add support for selecting dtb dynamically Lokesh Vutla @ 2016-05-10 7:48 ` Lokesh Vutla 2016-05-13 20:46 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 4/8] ARM: AM335x: Enable FIT Lokesh Vutla ` (5 subsequent siblings) 8 siblings, 1 reply; 19+ messages in thread From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw) To: u-boot Allow am335x-bone.dts to be built and enable uart and timer for all beaglebones. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- arch/arm/dts/Makefile | 2 +- arch/arm/dts/am335x-bone-common.dtsi | 5 +++++ arch/arm/dts/am335x-bone.dts | 3 --- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index ada00c5..0ea7bbe 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -89,7 +89,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ zynqmp-zc1751-xm015-dc1.dtb \ zynqmp-zc1751-xm016-dc2.dtb \ zynqmp-zc1751-xm019-dc5.dtb -dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-evm.dtb +dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb am335x-evm.dtb dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \ am43x-epos-evm.dtb \ am437x-idk-evm.dtb diff --git a/arch/arm/dts/am335x-bone-common.dtsi b/arch/arm/dts/am335x-bone-common.dtsi index fec7834..a00c0cd 100644 --- a/arch/arm/dts/am335x-bone-common.dtsi +++ b/arch/arm/dts/am335x-bone-common.dtsi @@ -13,6 +13,11 @@ }; }; + chosen { + stdout-path = &uart0; + tick-timer = &timer2; + }; + memory { device_type = "memory"; reg = <0x80000000 0x10000000>; /* 256 MB */ diff --git a/arch/arm/dts/am335x-bone.dts b/arch/arm/dts/am335x-bone.dts index 81441cc..6b84937 100644 --- a/arch/arm/dts/am335x-bone.dts +++ b/arch/arm/dts/am335x-bone.dts @@ -13,9 +13,6 @@ / { model = "TI AM335x BeagleBone"; compatible = "ti,am335x-bone", "ti,am33xx"; - chosen { - stdout-path = &uart0; - }; }; &ldo3_reg { -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 3/8] ARM: dts: am335x-bone: Enable uart and timer 2016-05-10 7:48 ` [U-Boot] [PATCH 3/8] ARM: dts: am335x-bone: Enable uart and timer Lokesh Vutla @ 2016-05-13 20:46 ` Tom Rini 0 siblings, 0 replies; 19+ messages in thread From: Tom Rini @ 2016-05-13 20:46 UTC (permalink / raw) To: u-boot On Tue, May 10, 2016 at 01:18:19PM +0530, Lokesh Vutla wrote: > Allow am335x-bone.dts to be built and enable uart and timer > for all beaglebones. > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160513/cdfbdfb2/attachment.sig> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 4/8] ARM: AM335x: Enable FIT 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla ` (2 preceding siblings ...) 2016-05-10 7:48 ` [U-Boot] [PATCH 3/8] ARM: dts: am335x-bone: Enable uart and timer Lokesh Vutla @ 2016-05-10 7:48 ` Lokesh Vutla 2016-05-10 7:48 ` [U-Boot] [PATCH 5/8] ARM: dts: am335x: fix cd-gpios definition as per hardware design and dt binding docs Lokesh Vutla ` (4 subsequent siblings) 8 siblings, 0 replies; 19+ messages in thread From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw) To: u-boot Use a single defconfig for all AM335x platforms by enabling FIT Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- board/ti/am335x/MAINTAINERS | 2 +- configs/am335x_evm_defconfig | 49 +++++++++++++++++++++++++++++++++++++++++ configs/am335x_gp_evm_defconfig | 46 -------------------------------------- 3 files changed, 50 insertions(+), 47 deletions(-) create mode 100644 configs/am335x_evm_defconfig delete mode 100644 configs/am335x_gp_evm_defconfig diff --git a/board/ti/am335x/MAINTAINERS b/board/ti/am335x/MAINTAINERS index 897b5a3..b54b47b 100644 --- a/board/ti/am335x/MAINTAINERS +++ b/board/ti/am335x/MAINTAINERS @@ -6,7 +6,7 @@ F: include/configs/am335x_evm.h F: configs/am335x_boneblack_defconfig F: configs/am335x_boneblack_vboot_defconfig F: configs/am335x_evm_nodt_defconfig -F: configs/am335x_gp_evm_defconfig +F: configs/am335x_evm_defconfig F: configs/am335x_evm_nor_defconfig F: configs/am335x_evm_norboot_defconfig F: configs/am335x_evm_spiboot_defconfig diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig new file mode 100644 index 0000000..7be5479 --- /dev/null +++ b/configs/am335x_evm_defconfig @@ -0,0 +1,49 @@ +CONFIG_ARM=y +CONFIG_TARGET_AM335X_EVM=y +CONFIG_SPL_STACK_R_ADDR=0x82000000 +CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" +CONFIG_SPL=y +CONFIG_SPL_STACK_R=y +CONFIG_SYS_EXTRA_OPTIONS="NAND" +CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_ASKENV=y +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_CONTROL=y +CONFIG_DM_MMC=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_DM_ETH=y +CONFIG_SYS_NS16550=y +CONFIG_TIMER=y +CONFIG_OMAP_TIMER=y +CONFIG_USB=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_G_DNL_MANUFACTURER="Texas Instruments" +CONFIG_G_DNL_VENDOR_NUM=0x0451 +CONFIG_G_DNL_PRODUCT_NUM=0xd022 +CONFIG_RSA=y +CONFIG_FIT=y +CONFIG_SPL_OF_LIBFDT=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack" diff --git a/configs/am335x_gp_evm_defconfig b/configs/am335x_gp_evm_defconfig deleted file mode 100644 index d7f126e..0000000 --- a/configs/am335x_gp_evm_defconfig +++ /dev/null @@ -1,46 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_AM335X_EVM=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 -CONFIG_DEFAULT_DEVICE_TREE="am335x-evm" -CONFIG_SPL=y -CONFIG_SPL_STACK_R=y -CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="NAND" -CONFIG_HUSH_PARSER=y -CONFIG_CMD_BOOTZ=y -# CONFIG_CMD_IMLS is not set -CONFIG_CMD_ASKENV=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -CONFIG_CMD_DFU=y -CONFIG_CMD_GPIO=y -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_OF_CONTROL=y -CONFIG_DM_MMC=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_WINBOND=y -CONFIG_DM_ETH=y -CONFIG_SYS_NS16550=y -CONFIG_TIMER=y -CONFIG_OMAP_TIMER=y -CONFIG_USB=y -CONFIG_USB_MUSB_HOST=y -CONFIG_USB_MUSB_GADGET=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DOWNLOAD=y -CONFIG_G_DNL_MANUFACTURER="Texas Instruments" -CONFIG_G_DNL_VENDOR_NUM=0x0451 -CONFIG_G_DNL_PRODUCT_NUM=0xd022 -CONFIG_RSA=y -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 5/8] ARM: dts: am335x: fix cd-gpios definition as per hardware design and dt binding docs 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla ` (3 preceding siblings ...) 2016-05-10 7:48 ` [U-Boot] [PATCH 4/8] ARM: AM335x: Enable FIT Lokesh Vutla @ 2016-05-10 7:48 ` Lokesh Vutla 2016-05-13 20:46 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 6/8] ARM: dts: AM335x-evmsk: Add initial support Lokesh Vutla ` (3 subsequent siblings) 8 siblings, 1 reply; 19+ messages in thread From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw) To: u-boot From: Mugunthan V N <mugunthanvnm@ti.com> As per mmc device tree binding documentation card detect gpio has to be active low signal. When a hardware is designed with active high card detect, gpio polarity has to be changed with cd-inverted dt property. In AM335x the card detect gpio is designed as active low gpio. So correcting the dt card detect gpio definition. Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> --- arch/arm/dts/am335x-bone-common.dtsi | 3 +-- arch/arm/dts/am335x-evm.dts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/am335x-bone-common.dtsi b/arch/arm/dts/am335x-bone-common.dtsi index a00c0cd..40a3c35 100644 --- a/arch/arm/dts/am335x-bone-common.dtsi +++ b/arch/arm/dts/am335x-bone-common.dtsi @@ -388,8 +388,7 @@ bus-width = <0x4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; }; &aes { diff --git a/arch/arm/dts/am335x-evm.dts b/arch/arm/dts/am335x-evm.dts index c0bc2af..a6f20af 100644 --- a/arch/arm/dts/am335x-evm.dts +++ b/arch/arm/dts/am335x-evm.dts @@ -717,7 +717,7 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc1_pins>; - cd-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; }; &mmc3 { -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 5/8] ARM: dts: am335x: fix cd-gpios definition as per hardware design and dt binding docs 2016-05-10 7:48 ` [U-Boot] [PATCH 5/8] ARM: dts: am335x: fix cd-gpios definition as per hardware design and dt binding docs Lokesh Vutla @ 2016-05-13 20:46 ` Tom Rini 0 siblings, 0 replies; 19+ messages in thread From: Tom Rini @ 2016-05-13 20:46 UTC (permalink / raw) To: u-boot On Tue, May 10, 2016 at 01:18:21PM +0530, Lokesh Vutla wrote: > From: Mugunthan V N <mugunthanvnm@ti.com> > > As per mmc device tree binding documentation card detect gpio has > to be active low signal. When a hardware is designed with active > high card detect, gpio polarity has to be changed with > cd-inverted dt property. > > In AM335x the card detect gpio is designed as active low gpio. > So correcting the dt card detect gpio definition. > > Signed-off-by: Mugunthan V N <mugunthanvnm@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160513/7b0a63a1/attachment.sig> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 6/8] ARM: dts: AM335x-evmsk: Add initial support 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla ` (4 preceding siblings ...) 2016-05-10 7:48 ` [U-Boot] [PATCH 5/8] ARM: dts: am335x: fix cd-gpios definition as per hardware design and dt binding docs Lokesh Vutla @ 2016-05-10 7:48 ` Lokesh Vutla 2016-05-13 20:46 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 7/8] ARM: dts: AM335x-BBG: " Lokesh Vutla ` (2 subsequent siblings) 8 siblings, 1 reply; 19+ messages in thread From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw) To: u-boot Add initial DTS support for AM335x-evm sk. Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- arch/arm/dts/Makefile | 3 +- arch/arm/dts/am335x-evmsk.dts | 720 +++++++++++++++++++++++++++++++++++++ board/ti/am335x/board.c | 2 + configs/am335x_evm_defconfig | 2 +- include/dt-bindings/pinctrl/omap.h | 37 ++ 5 files changed, 762 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/am335x-evmsk.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 0ea7bbe..aa6ebfb 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -89,7 +89,8 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ zynqmp-zc1751-xm015-dc1.dtb \ zynqmp-zc1751-xm016-dc2.dtb \ zynqmp-zc1751-xm019-dc5.dtb -dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb am335x-evm.dtb +dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb am335x-evm.dtb \ + am335x-evmsk.dtb dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \ am43x-epos-evm.dtb \ am437x-idk-evm.dtb diff --git a/arch/arm/dts/am335x-evmsk.dts b/arch/arm/dts/am335x-evmsk.dts new file mode 100644 index 0000000..b3e9b61 --- /dev/null +++ b/arch/arm/dts/am335x-evmsk.dts @@ -0,0 +1,720 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* + * AM335x Starter Kit + * http://www.ti.com/tool/tmdssk3358 + */ + +/dts-v1/; + +#include "am33xx.dtsi" +#include <dt-bindings/pwm/pwm.h> +#include <dt-bindings/interrupt-controller/irq.h> + +/ { + model = "TI AM335x EVM-SK"; + compatible = "ti,am335x-evmsk", "ti,am33xx"; + + chosen { + stdout-path = &uart0; + tick-timer = &timer2; + }; + + cpus { + cpu at 0 { + cpu0-supply = <&vdd1_reg>; + }; + }; + + memory { + device_type = "memory"; + reg = <0x80000000 0x10000000>; /* 256 MB */ + }; + + vbat: fixedregulator at 0 { + compatible = "regulator-fixed"; + regulator-name = "vbat"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + }; + + lis3_reg: fixedregulator at 1 { + compatible = "regulator-fixed"; + regulator-name = "lis3_reg"; + regulator-boot-on; + }; + + wl12xx_vmmc: fixedregulator at 2 { + pinctrl-names = "default"; + pinctrl-0 = <&wl12xx_gpio>; + compatible = "regulator-fixed"; + regulator-name = "vwl1271"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + gpio = <&gpio1 29 0>; + startup-delay-us = <70000>; + enable-active-high; + }; + + vtt_fixed: fixedregulator at 3 { + compatible = "regulator-fixed"; + regulator-name = "vtt"; + regulator-min-microvolt = <1500000>; + regulator-max-microvolt = <1500000>; + gpio = <&gpio0 7 GPIO_ACTIVE_HIGH>; + regulator-always-on; + regulator-boot-on; + enable-active-high; + }; + + leds { + pinctrl-names = "default"; + pinctrl-0 = <&user_leds_s0>; + + compatible = "gpio-leds"; + + led at 1 { + label = "evmsk:green:usr0"; + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + + led at 2 { + label = "evmsk:green:usr1"; + gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; + default-state = "off"; + }; + + led at 3 { + label = "evmsk:green:mmc0"; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "mmc0"; + default-state = "off"; + }; + + led at 4 { + label = "evmsk:green:heartbeat"; + gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "heartbeat"; + default-state = "off"; + }; + }; + + gpio_buttons: gpio_buttons at 0 { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + + switch at 1 { + label = "button0"; + linux,code = <0x100>; + gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; + }; + + switch at 2 { + label = "button1"; + linux,code = <0x101>; + gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; + }; + + switch at 3 { + label = "button2"; + linux,code = <0x102>; + gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; + wakeup-source; + }; + + switch at 4 { + label = "button3"; + linux,code = <0x103>; + gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; + }; + }; + + backlight { + compatible = "pwm-backlight"; + pwms = <&ecap2 0 50000 PWM_POLARITY_INVERTED>; + brightness-levels = <0 58 61 66 75 90 125 170 255>; + default-brightness-level = <8>; + }; + + sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "AM335x-EVMSK"; + simple-audio-card,widgets = + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Headphone Jack", "HPLOUT", + "Headphone Jack", "HPROUT"; + simple-audio-card,format = "dsp_b"; + simple-audio-card,bitclock-master = <&sound_master>; + simple-audio-card,frame-master = <&sound_master>; + simple-audio-card,bitclock-inversion; + + simple-audio-card,cpu { + sound-dai = <&mcasp1>; + }; + + sound_master: simple-audio-card,codec { + sound-dai = <&tlv320aic3106>; + system-clock-frequency = <24000000>; + }; + }; + + panel { + compatible = "ti,tilcdc,panel"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&lcd_pins_default>; + pinctrl-1 = <&lcd_pins_sleep>; + status = "okay"; + panel-info { + ac-bias = <255>; + ac-bias-intrpt = <0>; + dma-burst-sz = <16>; + bpp = <32>; + fdd = <0x80>; + sync-edge = <0>; + sync-ctrl = <1>; + raster-order = <0>; + fifo-th = <0>; + }; + display-timings { + 480x272 { + hactive = <480>; + vactive = <272>; + hback-porch = <43>; + hfront-porch = <8>; + hsync-len = <4>; + vback-porch = <12>; + vfront-porch = <4>; + vsync-len = <10>; + clock-frequency = <9000000>; + hsync-active = <0>; + vsync-active = <0>; + }; + }; + }; +}; + +&am33xx_pinmux { + pinctrl-names = "default"; + pinctrl-0 = <&gpio_keys_s0 &clkout2_pin>; + + lcd_pins_default: lcd_pins_default { + pinctrl-single,pins = < + AM33XX_IOPAD(0x820, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad8.lcd_data23 */ + AM33XX_IOPAD(0x824, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad9.lcd_data22 */ + AM33XX_IOPAD(0x828, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad10.lcd_data21 */ + AM33XX_IOPAD(0x82c, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad11.lcd_data20 */ + AM33XX_IOPAD(0x830, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad12.lcd_data19 */ + AM33XX_IOPAD(0x834, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad13.lcd_data18 */ + AM33XX_IOPAD(0x838, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad14.lcd_data17 */ + AM33XX_IOPAD(0x83c, PIN_OUTPUT | MUX_MODE1) /* gpmc_ad15.lcd_data16 */ + AM33XX_IOPAD(0x8a0, PIN_OUTPUT | MUX_MODE0) /* lcd_data0.lcd_data0 */ + AM33XX_IOPAD(0x8a4, PIN_OUTPUT | MUX_MODE0) /* lcd_data1.lcd_data1 */ + AM33XX_IOPAD(0x8a8, PIN_OUTPUT | MUX_MODE0) /* lcd_data2.lcd_data2 */ + AM33XX_IOPAD(0x8ac, PIN_OUTPUT | MUX_MODE0) /* lcd_data3.lcd_data3 */ + AM33XX_IOPAD(0x8b0, PIN_OUTPUT | MUX_MODE0) /* lcd_data4.lcd_data4 */ + AM33XX_IOPAD(0x8b4, PIN_OUTPUT | MUX_MODE0) /* lcd_data5.lcd_data5 */ + AM33XX_IOPAD(0x8b8, PIN_OUTPUT | MUX_MODE0) /* lcd_data6.lcd_data6 */ + AM33XX_IOPAD(0x8bc, PIN_OUTPUT | MUX_MODE0) /* lcd_data7.lcd_data7 */ + AM33XX_IOPAD(0x8c0, PIN_OUTPUT | MUX_MODE0) /* lcd_data8.lcd_data8 */ + AM33XX_IOPAD(0x8c4, PIN_OUTPUT | MUX_MODE0) /* lcd_data9.lcd_data9 */ + AM33XX_IOPAD(0x8c8, PIN_OUTPUT | MUX_MODE0) /* lcd_data10.lcd_data10 */ + AM33XX_IOPAD(0x8cc, PIN_OUTPUT | MUX_MODE0) /* lcd_data11.lcd_data11 */ + AM33XX_IOPAD(0x8d0, PIN_OUTPUT | MUX_MODE0) /* lcd_data12.lcd_data12 */ + AM33XX_IOPAD(0x8d4, PIN_OUTPUT | MUX_MODE0) /* lcd_data13.lcd_data13 */ + AM33XX_IOPAD(0x8d8, PIN_OUTPUT | MUX_MODE0) /* lcd_data14.lcd_data14 */ + AM33XX_IOPAD(0x8dc, PIN_OUTPUT | MUX_MODE0) /* lcd_data15.lcd_data15 */ + AM33XX_IOPAD(0x8e0, PIN_OUTPUT | MUX_MODE0) /* lcd_vsync.lcd_vsync */ + AM33XX_IOPAD(0x8e4, PIN_OUTPUT | MUX_MODE0) /* lcd_hsync.lcd_hsync */ + AM33XX_IOPAD(0x8e8, PIN_OUTPUT | MUX_MODE0) /* lcd_pclk.lcd_pclk */ + AM33XX_IOPAD(0x8ec, PIN_OUTPUT | MUX_MODE0) /* lcd_ac_bias_en.lcd_ac_bias_en */ + >; + }; + + lcd_pins_sleep: lcd_pins_sleep { + pinctrl-single,pins = < + AM33XX_IOPAD(0x820, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad8.lcd_data23 */ + AM33XX_IOPAD(0x824, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad9.lcd_data22 */ + AM33XX_IOPAD(0x828, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad10.lcd_data21 */ + AM33XX_IOPAD(0x82c, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad11.lcd_data20 */ + AM33XX_IOPAD(0x830, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad12.lcd_data19 */ + AM33XX_IOPAD(0x834, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad13.lcd_data18 */ + AM33XX_IOPAD(0x838, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad14.lcd_data17 */ + AM33XX_IOPAD(0x83c, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad15.lcd_data16 */ + AM33XX_IOPAD(0x8a0, PULL_DISABLE | MUX_MODE7) /* lcd_data0.lcd_data0 */ + AM33XX_IOPAD(0x8a4, PULL_DISABLE | MUX_MODE7) /* lcd_data1.lcd_data1 */ + AM33XX_IOPAD(0x8a8, PULL_DISABLE | MUX_MODE7) /* lcd_data2.lcd_data2 */ + AM33XX_IOPAD(0x8ac, PULL_DISABLE | MUX_MODE7) /* lcd_data3.lcd_data3 */ + AM33XX_IOPAD(0x8b0, PULL_DISABLE | MUX_MODE7) /* lcd_data4.lcd_data4 */ + AM33XX_IOPAD(0x8b4, PULL_DISABLE | MUX_MODE7) /* lcd_data5.lcd_data5 */ + AM33XX_IOPAD(0x8b8, PULL_DISABLE | MUX_MODE7) /* lcd_data6.lcd_data6 */ + AM33XX_IOPAD(0x8bc, PULL_DISABLE | MUX_MODE7) /* lcd_data7.lcd_data7 */ + AM33XX_IOPAD(0x8c0, PULL_DISABLE | MUX_MODE7) /* lcd_data8.lcd_data8 */ + AM33XX_IOPAD(0x8c4, PULL_DISABLE | MUX_MODE7) /* lcd_data9.lcd_data9 */ + AM33XX_IOPAD(0x8c8, PULL_DISABLE | MUX_MODE7) /* lcd_data10.lcd_data10 */ + AM33XX_IOPAD(0x8cc, PULL_DISABLE | MUX_MODE7) /* lcd_data11.lcd_data11 */ + AM33XX_IOPAD(0x8d0, PULL_DISABLE | MUX_MODE7) /* lcd_data12.lcd_data12 */ + AM33XX_IOPAD(0x8d4, PULL_DISABLE | MUX_MODE7) /* lcd_data13.lcd_data13 */ + AM33XX_IOPAD(0x8d8, PULL_DISABLE | MUX_MODE7) /* lcd_data14.lcd_data14 */ + AM33XX_IOPAD(0x8dc, PULL_DISABLE | MUX_MODE7) /* lcd_data15.lcd_data15 */ + AM33XX_IOPAD(0x8e0, PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_vsync.lcd_vsync */ + AM33XX_IOPAD(0x8e4, PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_hsync.lcd_hsync */ + AM33XX_IOPAD(0x8e8, PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_pclk.lcd_pclk */ + AM33XX_IOPAD(0x8ec, PIN_INPUT_PULLDOWN | MUX_MODE7) /* lcd_ac_bias_en.lcd_ac_bias_en */ + >; + }; + + + user_leds_s0: user_leds_s0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x810, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad4.gpio1_4 */ + AM33XX_IOPAD(0x814, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad5.gpio1_5 */ + AM33XX_IOPAD(0x818, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad6.gpio1_6 */ + AM33XX_IOPAD(0x81c, PIN_OUTPUT_PULLDOWN | MUX_MODE7) /* gpmc_ad7.gpio1_7 */ + >; + }; + + gpio_keys_s0: gpio_keys_s0 { + pinctrl-single,pins = < + AM33XX_IOPAD(0x894, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_oen_ren.gpio2_3 */ + AM33XX_IOPAD(0x890, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_advn_ale.gpio2_2 */ + AM33XX_IOPAD(0x870, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_wait0.gpio0_30 */ + AM33XX_IOPAD(0x89c, PIN_INPUT_PULLDOWN | MUX_MODE7) /* gpmc_ben0_cle.gpio2_5 */ + >; + }; + + i2c0_pins: pinmux_i2c0_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x988, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_sda.i2c0_sda */ + AM33XX_IOPAD(0x98c, PIN_INPUT_PULLUP | MUX_MODE0) /* i2c0_scl.i2c0_scl */ + >; + }; + + uart0_pins: pinmux_uart0_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */ + AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ + >; + }; + + clkout2_pin: pinmux_clkout2_pin { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */ + >; + }; + + ecap2_pins: backlight_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x99c, MUX_MODE4) /* mcasp0_ahclkr.ecap2_in_pwm2_out */ + >; + }; + + cpsw_default: cpsw_default { + pinctrl-single,pins = < + /* Slave 1 */ + AM33XX_IOPAD(0x914, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txen.rgmii1_tctl */ + AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxdv.rgmii1_rctl */ + AM33XX_IOPAD(0x91c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd3.rgmii1_td3 */ + AM33XX_IOPAD(0x920, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd2.rgmii1_td2 */ + AM33XX_IOPAD(0x924, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd1.rgmii1_td1 */ + AM33XX_IOPAD(0x928, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txd0.rgmii1_td0 */ + AM33XX_IOPAD(0x92c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* mii1_txclk.rgmii1_tclk */ + AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxclk.rgmii1_rclk */ + AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd3.rgmii1_rd3 */ + AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd2.rgmii1_rd2 */ + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd1.rgmii1_rd1 */ + AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE2) /* mii1_rxd0.rgmii1_rd0 */ + + /* Slave 2 */ + AM33XX_IOPAD(0x840, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a0.rgmii2_tctl */ + AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a1.rgmii2_rctl */ + AM33XX_IOPAD(0x848, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a2.rgmii2_td3 */ + AM33XX_IOPAD(0x84c, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a3.rgmii2_td2 */ + AM33XX_IOPAD(0x850, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a4.rgmii2_td1 */ + AM33XX_IOPAD(0x854, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a5.rgmii2_td0 */ + AM33XX_IOPAD(0x858, PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a6.rgmii2_tclk */ + AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a7.rgmii2_rclk */ + AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a8.rgmii2_rd3 */ + AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a9.rgmii2_rd2 */ + AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a10.rgmii2_rd1 */ + AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a11.rgmii2_rd0 */ + >; + }; + + cpsw_sleep: cpsw_sleep { + pinctrl-single,pins = < + /* Slave 1 reset value */ + AM33XX_IOPAD(0x914, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x918, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x91c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x920, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x924, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x928, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x92c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x930, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x934, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x938, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x93c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x940, PIN_INPUT_PULLDOWN | MUX_MODE7) + + /* Slave 2 reset value*/ + AM33XX_IOPAD(0x840, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x844, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x848, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x84c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x850, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x854, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x858, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x85c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x860, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x864, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x868, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x86c, PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + davinci_mdio_default: davinci_mdio_default { + pinctrl-single,pins = < + /* MDIO */ + AM33XX_IOPAD(0x948, PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ + AM33XX_IOPAD(0x94c, PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ + >; + }; + + davinci_mdio_sleep: davinci_mdio_sleep { + pinctrl-single,pins = < + /* MDIO reset value */ + AM33XX_IOPAD(0x948, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x94c, PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + mmc1_pins: pinmux_mmc1_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7) /* spi0_cs1.gpio0_6 */ + >; + }; + + mcasp1_pins: mcasp1_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_crs.mcasp1_aclkx */ + AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE4) /* mii1_rxerr.mcasp1_fsx */ + AM33XX_IOPAD(0x908, PIN_OUTPUT_PULLDOWN | MUX_MODE4) /* mii1_col.mcasp1_axr2 */ + AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE4) /* rmii1_ref_clk.mcasp1_axr3 */ + >; + }; + + mcasp1_pins_sleep: mcasp1_pins_sleep { + pinctrl-single,pins = < + AM33XX_IOPAD(0x90c, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x910, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x908, PIN_INPUT_PULLDOWN | MUX_MODE7) + AM33XX_IOPAD(0x944, PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + mmc2_pins: pinmux_mmc2_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x874, PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_31 */ + AM33XX_IOPAD(0x880, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn1.mmc1_clk */ + AM33XX_IOPAD(0x884, PIN_INPUT_PULLUP | MUX_MODE2) /* gpmc_csn2.mmc1_cmd */ + AM33XX_IOPAD(0x800, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad0.mmc1_dat0 */ + AM33XX_IOPAD(0x804, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad1.mmc1_dat1 */ + AM33XX_IOPAD(0x808, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad2.mmc1_dat2 */ + AM33XX_IOPAD(0x80c, PIN_INPUT_PULLUP | MUX_MODE1) /* gpmc_ad3.mmc1_dat3 */ + >; + }; + + wl12xx_gpio: pinmux_wl12xx_gpio { + pinctrl-single,pins = < + AM33XX_IOPAD(0x87c, PIN_OUTPUT_PULLUP | MUX_MODE7) /* gpmc_csn0.gpio1_29 */ + >; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + + status = "okay"; +}; + +&i2c0 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_pins>; + + status = "okay"; + clock-frequency = <400000>; + + tps: tps at 2d { + reg = <0x2d>; + }; + + lis331dlh: lis331dlh at 18 { + compatible = "st,lis331dlh", "st,lis3lv02d"; + reg = <0x18>; + Vdd-supply = <&lis3_reg>; + Vdd_IO-supply = <&lis3_reg>; + + st,click-single-x; + st,click-single-y; + st,click-single-z; + st,click-thresh-x = <10>; + st,click-thresh-y = <10>; + st,click-thresh-z = <10>; + st,irq1-click; + st,irq2-click; + st,wakeup-x-lo; + st,wakeup-x-hi; + st,wakeup-y-lo; + st,wakeup-y-hi; + st,wakeup-z-lo; + st,wakeup-z-hi; + st,min-limit-x = <120>; + st,min-limit-y = <120>; + st,min-limit-z = <140>; + st,max-limit-x = <550>; + st,max-limit-y = <550>; + st,max-limit-z = <750>; + }; + + tlv320aic3106: tlv320aic3106 at 1b { + #sound-dai-cells = <0>; + compatible = "ti,tlv320aic3106"; + reg = <0x1b>; + status = "okay"; + + /* Regulators */ + AVDD-supply = <&vaux2_reg>; + IOVDD-supply = <&vaux2_reg>; + DRVDD-supply = <&vaux2_reg>; + DVDD-supply = <&vbat>; + }; +}; + +&usb { + status = "okay"; +}; + +&usb_ctrl_mod { + status = "okay"; +}; + +&usb0_phy { + status = "okay"; +}; + +&usb1_phy { + status = "okay"; +}; + +&usb0 { + status = "okay"; +}; + +&usb1 { + status = "okay"; + dr_mode = "host"; +}; + +&cppi41dma { + status = "okay"; +}; + +&epwmss2 { + status = "okay"; + + ecap2: ecap at 48304100 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&ecap2_pins>; + }; +}; + +#include "tps65910.dtsi" + +&tps { + vcc1-supply = <&vbat>; + vcc2-supply = <&vbat>; + vcc3-supply = <&vbat>; + vcc4-supply = <&vbat>; + vcc5-supply = <&vbat>; + vcc6-supply = <&vbat>; + vcc7-supply = <&vbat>; + vccio-supply = <&vbat>; + + regulators { + vrtc_reg: regulator at 0 { + regulator-always-on; + }; + + vio_reg: regulator at 1 { + regulator-always-on; + }; + + vdd1_reg: regulator at 2 { + /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ + regulator-name = "vdd_mpu"; + regulator-min-microvolt = <912500>; + regulator-max-microvolt = <1312500>; + regulator-boot-on; + regulator-always-on; + }; + + vdd2_reg: regulator at 3 { + /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ + regulator-name = "vdd_core"; + regulator-min-microvolt = <912500>; + regulator-max-microvolt = <1150000>; + regulator-boot-on; + regulator-always-on; + }; + + vdd3_reg: regulator at 4 { + regulator-always-on; + }; + + vdig1_reg: regulator at 5 { + regulator-always-on; + }; + + vdig2_reg: regulator at 6 { + regulator-always-on; + }; + + vpll_reg: regulator at 7 { + regulator-always-on; + }; + + vdac_reg: regulator at 8 { + regulator-always-on; + }; + + vaux1_reg: regulator at 9 { + regulator-always-on; + }; + + vaux2_reg: regulator at 10 { + regulator-always-on; + }; + + vaux33_reg: regulator at 11 { + regulator-always-on; + }; + + vmmc_reg: regulator at 12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; +}; + +&mac { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cpsw_default>; + pinctrl-1 = <&cpsw_sleep>; + dual_emac = <1>; + status = "okay"; +}; + +&davinci_mdio { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&davinci_mdio_default>; + pinctrl-1 = <&davinci_mdio_sleep>; + status = "okay"; +}; + +&cpsw_emac0 { + phy_id = <&davinci_mdio>, <0>; + phy-mode = "rgmii-txid"; + dual_emac_res_vlan = <1>; +}; + +&cpsw_emac1 { + phy_id = <&davinci_mdio>, <1>; + phy-mode = "rgmii-txid"; + dual_emac_res_vlan = <2>; +}; + +&mmc1 { + status = "okay"; + vmmc-supply = <&vmmc_reg>; + bus-width = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; +}; + +&sham { + status = "okay"; +}; + +&aes { + status = "okay"; +}; + +&gpio0 { + ti,no-reset-on-init; +}; + +&mmc2 { + status = "okay"; + vmmc-supply = <&wl12xx_vmmc>; + ti,non-removable; + bus-width = <4>; + cap-power-off-card; + pinctrl-names = "default"; + pinctrl-0 = <&mmc2_pins>; + + #address-cells = <1>; + #size-cells = <0>; + wlcore: wlcore at 2 { + compatible = "ti,wl1271"; + reg = <2>; + interrupt-parent = <&gpio0>; + interrupts = <31 IRQ_TYPE_LEVEL_HIGH>; /* gpio 31 */ + ref-clock-frequency = <38400000>; + }; +}; + +&mcasp1 { + #sound-dai-cells = <0>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&mcasp1_pins>; + pinctrl-1 = <&mcasp1_pins_sleep>; + + status = "okay"; + + op-mode = <0>; /* MCASP_IIS_MODE */ + tdm-slots = <2>; + /* 4 serializers */ + serial-dir = < /* 0: INACTIVE, 1: TX, 2: RX */ + 0 0 1 2 + >; + tx-num-evt = <32>; + rx-num-evt = <32>; +}; + +&tscadc { + status = "okay"; + tsc { + ti,wires = <4>; + ti,x-plate-resistance = <200>; + ti,coordinate-readouts = <5>; + ti,wire-config = <0x00 0x11 0x22 0x33>; + }; +}; + +&lcdc { + status = "okay"; +}; diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index a3d1e2b..89b12a5 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -642,6 +642,8 @@ int board_fit_config_name_match(const char *name) return 0; else if (board_is_bone_lt() && !strcmp(name, "am335x-boneblack")) return 0; + else if (board_is_evm_sk() && !strcmp(name, "am335x-evmsk")) + return 0; else return -1; } diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index 7be5479..bd04a88 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -46,4 +46,4 @@ CONFIG_RSA=y CONFIG_FIT=y CONFIG_SPL_OF_LIBFDT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack" +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk" diff --git a/include/dt-bindings/pinctrl/omap.h b/include/dt-bindings/pinctrl/omap.h index 1dd7636..672a136 100644 --- a/include/dt-bindings/pinctrl/omap.h +++ b/include/dt-bindings/pinctrl/omap.h @@ -53,5 +53,42 @@ #define PIN_OFF_INPUT_PULLDOWN (OFF_EN | OFF_PULL_EN) #define PIN_OFF_WAKEUPENABLE WAKEUP_EN +/* + * Macros to allow using the absolute physical address instead of the + * padconf registers instead of the offset from padconf base. + */ +#define OMAP_IOPAD_OFFSET(pa, offset) (((pa) & 0xffff) - (offset)) + +#define OMAP2420_CORE_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0030) (val) +#define OMAP2430_CORE_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x2030) (val) +#define OMAP3_CORE1_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x2030) (val) +#define OMAP3430_CORE2_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x25d8) (val) +#define OMAP3630_CORE2_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x25a0) (val) +#define OMAP3_WKUP_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x2a00) (val) +#define DM814X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) +#define DM816X_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) +#define AM33XX_IOPAD(pa, val) OMAP_IOPAD_OFFSET((pa), 0x0800) (val) + +/* + * Macros to allow using the offset from the padconf physical address + * instead of the offset from padconf base. + */ +#define OMAP_PADCONF_OFFSET(offset, base_offset) ((offset) - (base_offset)) + +#define OMAP4_IOPAD(offset, val) OMAP_PADCONF_OFFSET((offset), 0x0040) (val) +#define OMAP5_IOPAD(offset, val) OMAP_PADCONF_OFFSET((offset), 0x0040) (val) + +/* + * Define some commonly used pins configured by the boards. + * Note that some boards use alternative pins, so check + * the schematics before using these. + */ +#define OMAP3_UART1_RX 0x152 +#define OMAP3_UART2_RX 0x14a +#define OMAP3_UART3_RX 0x16e +#define OMAP4_UART2_RX 0xdc +#define OMAP4_UART3_RX 0x104 +#define OMAP4_UART4_RX 0x11c + #endif -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 6/8] ARM: dts: AM335x-evmsk: Add initial support 2016-05-10 7:48 ` [U-Boot] [PATCH 6/8] ARM: dts: AM335x-evmsk: Add initial support Lokesh Vutla @ 2016-05-13 20:46 ` Tom Rini 0 siblings, 0 replies; 19+ messages in thread From: Tom Rini @ 2016-05-13 20:46 UTC (permalink / raw) To: u-boot On Tue, May 10, 2016 at 01:18:22PM +0530, Lokesh Vutla wrote: > Add initial DTS support for AM335x-evm sk. > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160513/5cf17f53/attachment.sig> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 7/8] ARM: dts: AM335x-BBG: Add initial support 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla ` (5 preceding siblings ...) 2016-05-10 7:48 ` [U-Boot] [PATCH 6/8] ARM: dts: AM335x-evmsk: Add initial support Lokesh Vutla @ 2016-05-10 7:48 ` Lokesh Vutla 2016-05-13 20:46 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 8/8] configs: am335x_evm: Switch to env on FAT SD by default Lokesh Vutla 2016-05-11 16:23 ` [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Tom Rini 8 siblings, 1 reply; 19+ messages in thread From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw) To: u-boot Add initial DTS support for AM335x-BBG Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- arch/arm/dts/Makefile | 3 ++- arch/arm/dts/am335x-bonegreen.dts | 57 +++++++++++++++++++++++++++++++++++++++ board/ti/am335x/board.c | 2 ++ configs/am335x_evm_defconfig | 2 +- 4 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/am335x-bonegreen.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index aa6ebfb..800750b 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -90,7 +90,8 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \ zynqmp-zc1751-xm016-dc2.dtb \ zynqmp-zc1751-xm019-dc5.dtb dtb-$(CONFIG_AM33XX) += am335x-boneblack.dtb am335x-bone.dtb am335x-evm.dtb \ - am335x-evmsk.dtb + am335x-evmsk.dtb \ + am335x-bonegreen.dtb dtb-$(CONFIG_AM43XX) += am437x-gp-evm.dtb am437x-sk-evm.dtb \ am43x-epos-evm.dtb \ am437x-idk-evm.dtb diff --git a/arch/arm/dts/am335x-bonegreen.dts b/arch/arm/dts/am335x-bonegreen.dts new file mode 100644 index 0000000..9c59da9 --- /dev/null +++ b/arch/arm/dts/am335x-bonegreen.dts @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +/dts-v1/; + +#include "am33xx.dtsi" +#include "am335x-bone-common.dtsi" + +/ { + model = "TI AM335x BeagleBone Green"; + compatible = "ti,am335x-bone-green", "ti,am335x-bone-black", "ti,am335x-bone", "ti,am33xx"; + chosen { + stdout-path = &uart0; + tick-timer = &timer2; + }; +}; + +&ldo3_reg { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-always-on; +}; + +&mmc1 { + vmmc-supply = <&vmmcsd_fixed>; +}; + +&mmc2 { + vmmc-supply = <&vmmcsd_fixed>; + pinctrl-names = "default"; + pinctrl-0 = <&emmc_pins>; + bus-width = <8>; + status = "okay"; +}; + +&am33xx_pinmux { + uart2_pins: uart2_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x950, PIN_INPUT | MUX_MODE1) /* spi0_sclk.uart2_rxd */ + AM33XX_IOPAD(0x954, PIN_OUTPUT | MUX_MODE1) /* spi0_d0.uart2_txd */ + >; + }; +}; + +&uart2 { + pinctrl-names = "default"; + pinctrl-0 = <&uart2_pins>; + status = "okay"; +}; + +&rtc { + system-power-controller; +}; diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 89b12a5..579b4ef 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -644,6 +644,8 @@ int board_fit_config_name_match(const char *name) return 0; else if (board_is_evm_sk() && !strcmp(name, "am335x-evmsk")) return 0; + else if (board_is_bbg1() && !strcmp(name, "am335x-bonegreen")) + return 0; else return -1; } diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index bd04a88..5f917d6 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -46,4 +46,4 @@ CONFIG_RSA=y CONFIG_FIT=y CONFIG_SPL_OF_LIBFDT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk" +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk am335x-bonegreen" -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 7/8] ARM: dts: AM335x-BBG: Add initial support 2016-05-10 7:48 ` [U-Boot] [PATCH 7/8] ARM: dts: AM335x-BBG: " Lokesh Vutla @ 2016-05-13 20:46 ` Tom Rini 0 siblings, 0 replies; 19+ messages in thread From: Tom Rini @ 2016-05-13 20:46 UTC (permalink / raw) To: u-boot On Tue, May 10, 2016 at 01:18:23PM +0530, Lokesh Vutla wrote: > Add initial DTS support for AM335x-BBG > > Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160513/ae115f25/attachment.sig> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 8/8] configs: am335x_evm: Switch to env on FAT SD by default 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla ` (6 preceding siblings ...) 2016-05-10 7:48 ` [U-Boot] [PATCH 7/8] ARM: dts: AM335x-BBG: " Lokesh Vutla @ 2016-05-10 7:48 ` Lokesh Vutla 2016-05-11 16:23 ` [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Tom Rini 8 siblings, 0 replies; 19+ messages in thread From: Lokesh Vutla @ 2016-05-10 7:48 UTC (permalink / raw) To: u-boot From: Tom Rini <trini@ti.com> Re-org env sections so that we can fall back to env is in FAT on SD card, for broader board compatibility Signed-off-by: Tom Rini <trini@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> --- include/configs/am335x_evm.h | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 16935a1..dfd00de 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -249,11 +249,6 @@ "8m(NAND.kernel)," \ "-(NAND.file-system)" #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 -#undef CONFIG_ENV_IS_NOWHERE -#define CONFIG_ENV_IS_IN_NAND -#define CONFIG_ENV_OFFSET 0x001c0000 -#define CONFIG_ENV_OFFSET_REDUND 0x001e0000 -#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE /* NAND: SPL related configs */ #ifdef CONFIG_SPL_NAND_SUPPORT #define CONFIG_SPL_NAND_AM33XX_BCH @@ -415,7 +410,6 @@ "128k(u-boot-env2),3464k(kernel)," \ "-(rootfs)" #elif defined(CONFIG_EMMC_BOOT) -#undef CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SPL_ENV_SUPPORT #define CONFIG_SYS_MMC_ENV_DEV 1 @@ -423,6 +417,27 @@ #define CONFIG_ENV_OFFSET 0x0 #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) #define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#elif defined(CONFIG_NOR_BOOT) +#define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ +#define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */ +#define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */ +#define MTDIDS_DEFAULT "nor0=physmap-flash.0" +#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \ + "512k(u-boot)," \ + "128k(u-boot-env1)," \ + "128k(u-boot-env2)," \ + "4m(kernel),-(rootfs)" +#elif defined(CONFIG_ENV_IS_IN_NAND) +#define CONFIG_ENV_OFFSET 0x001c0000 +#define CONFIG_ENV_OFFSET_REDUND 0x001e0000 +#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE +#elif !defined(CONFIG_ENV_IS_NOWHERE) +/* Not NAND, SPI, NOR or eMMC env, so put ENV in a file on FAT */ +#define CONFIG_ENV_IS_IN_FAT +#define FAT_ENV_INTERFACE "mmc" +#define FAT_ENV_DEVICE_AND_PART "0:1" +#define FAT_ENV_FILE "uboot.env" #endif /* SPI flash. */ @@ -458,19 +473,6 @@ #define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_FLASH_SIZE 0x01000000 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE -/* Reduce SPL size by removing unlikey targets */ -#ifdef CONFIG_NOR_BOOT -#define CONFIG_ENV_IS_IN_FLASH -#define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */ -#define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */ -#define MTDIDS_DEFAULT "nor0=physmap-flash.0" -#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \ - "512k(u-boot)," \ - "128k(u-boot-env1)," \ - "128k(u-boot-env2)," \ - "4m(kernel),-(rootfs)" -#endif #endif /* NOR support */ #endif /* ! __CONFIG_AM335X_EVM_H */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla ` (7 preceding siblings ...) 2016-05-10 7:48 ` [U-Boot] [PATCH 8/8] configs: am335x_evm: Switch to env on FAT SD by default Lokesh Vutla @ 2016-05-11 16:23 ` Tom Rini 2016-05-12 5:48 ` Lokesh Vutla 8 siblings, 1 reply; 19+ messages in thread From: Tom Rini @ 2016-05-11 16:23 UTC (permalink / raw) To: u-boot On Tue, May 10, 2016 at 01:18:16PM +0530, Lokesh Vutla wrote: > This series adds support for FIT and various AM335x based platforms > > BBB: http://pastebin.ubuntu.com/16340189/ > BBW: http://pastebin.ubuntu.com/16340238/ > AM335x-evm: http://pastebin.ubuntu.com/16340157/ > AM335x-evmsk: http://pastebin.ubuntu.com/16340327/ > > Lokesh Vutla (6): > ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig OK, just like the am43xx series, lets just move over to FIT+DT in SPL and drop the old case, no "nodt" config. -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160511/cfb6c7e8/attachment.sig> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms 2016-05-11 16:23 ` [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Tom Rini @ 2016-05-12 5:48 ` Lokesh Vutla 2016-05-12 11:00 ` Tom Rini 0 siblings, 1 reply; 19+ messages in thread From: Lokesh Vutla @ 2016-05-12 5:48 UTC (permalink / raw) To: u-boot Hi Tom, On Wednesday 11 May 2016 09:53 PM, Tom Rini wrote: > On Tue, May 10, 2016 at 01:18:16PM +0530, Lokesh Vutla wrote: > >> This series adds support for FIT and various AM335x based platforms >> >> BBB: http://pastebin.ubuntu.com/16340189/ >> BBW: http://pastebin.ubuntu.com/16340238/ >> AM335x-evm: http://pastebin.ubuntu.com/16340157/ >> AM335x-evmsk: http://pastebin.ubuntu.com/16340327/ >> >> Lokesh Vutla (6): >> ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig > > OK, just like the am43xx series, lets just move over to FIT+DT in SPL > and drop the old case, no "nodt" config. Not sure if I get the question. So, nodt defconfig is still maintained because of the peripheral boot modes(UART and ethernet). If these modes are converted to load FIT we can drop nodt defcofcong. Thanks and regards, Lokesh > ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms 2016-05-12 5:48 ` Lokesh Vutla @ 2016-05-12 11:00 ` Tom Rini 2016-05-12 11:07 ` Lokesh Vutla 0 siblings, 1 reply; 19+ messages in thread From: Tom Rini @ 2016-05-12 11:00 UTC (permalink / raw) To: u-boot On Thu, May 12, 2016 at 11:18:05AM +0530, Lokesh Vutla wrote: > Hi Tom, > > On Wednesday 11 May 2016 09:53 PM, Tom Rini wrote: > > On Tue, May 10, 2016 at 01:18:16PM +0530, Lokesh Vutla wrote: > > > >> This series adds support for FIT and various AM335x based platforms > >> > >> BBB: http://pastebin.ubuntu.com/16340189/ > >> BBW: http://pastebin.ubuntu.com/16340238/ > >> AM335x-evm: http://pastebin.ubuntu.com/16340157/ > >> AM335x-evmsk: http://pastebin.ubuntu.com/16340327/ > >> > >> Lokesh Vutla (6): > >> ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig > > > > OK, just like the am43xx series, lets just move over to FIT+DT in SPL > > and drop the old case, no "nodt" config. > > Not sure if I get the question. So, nodt defconfig is still maintained > because of the peripheral boot modes(UART and ethernet). If these modes > are converted to load FIT we can drop nodt defcofcong. Yes, lets get those loading FIT now, it shouldn't be too bad given all of the other work you've done (thanks!) :) -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160512/39720a67/attachment.sig> ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms 2016-05-12 11:00 ` Tom Rini @ 2016-05-12 11:07 ` Lokesh Vutla 2016-05-12 11:25 ` Tom Rini 0 siblings, 1 reply; 19+ messages in thread From: Lokesh Vutla @ 2016-05-12 11:07 UTC (permalink / raw) To: u-boot On Thursday 12 May 2016 04:30 PM, Tom Rini wrote: > On Thu, May 12, 2016 at 11:18:05AM +0530, Lokesh Vutla wrote: >> Hi Tom, >> >> On Wednesday 11 May 2016 09:53 PM, Tom Rini wrote: >>> On Tue, May 10, 2016 at 01:18:16PM +0530, Lokesh Vutla wrote: >>> >>>> This series adds support for FIT and various AM335x based platforms >>>> >>>> BBB: http://pastebin.ubuntu.com/16340189/ >>>> BBW: http://pastebin.ubuntu.com/16340238/ >>>> AM335x-evm: http://pastebin.ubuntu.com/16340157/ >>>> AM335x-evmsk: http://pastebin.ubuntu.com/16340327/ >>>> >>>> Lokesh Vutla (6): >>>> ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig >>> >>> OK, just like the am43xx series, lets just move over to FIT+DT in SPL >>> and drop the old case, no "nodt" config. >> >> Not sure if I get the question. So, nodt defconfig is still maintained >> because of the peripheral boot modes(UART and ethernet). If these modes >> are converted to load FIT we can drop nodt defcofcong. > > Yes, lets get those loading FIT now, it shouldn't be too bad given all > of the other work you've done (thanks!) :) Okay, I am already working in these boot modes. But I am stuck with the XIP boot. In XIP we directly use u-boot and no header is being parsed. Any idea how to deal this issue? Thanks and regards, Lokesh ^ permalink raw reply [flat|nested] 19+ messages in thread
* [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms 2016-05-12 11:07 ` Lokesh Vutla @ 2016-05-12 11:25 ` Tom Rini 0 siblings, 0 replies; 19+ messages in thread From: Tom Rini @ 2016-05-12 11:25 UTC (permalink / raw) To: u-boot On Thu, May 12, 2016 at 04:37:42PM +0530, Lokesh Vutla wrote: > On Thursday 12 May 2016 04:30 PM, Tom Rini wrote: > > On Thu, May 12, 2016 at 11:18:05AM +0530, Lokesh Vutla wrote: > >> Hi Tom, > >> > >> On Wednesday 11 May 2016 09:53 PM, Tom Rini wrote: > >>> On Tue, May 10, 2016 at 01:18:16PM +0530, Lokesh Vutla wrote: > >>> > >>>> This series adds support for FIT and various AM335x based platforms > >>>> > >>>> BBB: http://pastebin.ubuntu.com/16340189/ > >>>> BBW: http://pastebin.ubuntu.com/16340238/ > >>>> AM335x-evm: http://pastebin.ubuntu.com/16340157/ > >>>> AM335x-evmsk: http://pastebin.ubuntu.com/16340327/ > >>>> > >>>> Lokesh Vutla (6): > >>>> ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig > >>> > >>> OK, just like the am43xx series, lets just move over to FIT+DT in SPL > >>> and drop the old case, no "nodt" config. > >> > >> Not sure if I get the question. So, nodt defconfig is still maintained > >> because of the peripheral boot modes(UART and ethernet). If these modes > >> are converted to load FIT we can drop nodt defcofcong. > > > > Yes, lets get those loading FIT now, it shouldn't be too bad given all > > of the other work you've done (thanks!) :) > > Okay, I am already working in these boot modes. But I am stuck with the > XIP boot. In XIP we directly use u-boot and no header is being parsed. > Any idea how to deal this issue? For now I suppose we just can't do XIP booting in a multi-machine config, just a single one where we don't need to be FIT to support DM+DT ? -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20160512/b10f3fca/attachment.sig> ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2016-05-13 20:46 UTC | newest] Thread overview: 19+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-05-10 7:48 [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Lokesh Vutla 2016-05-10 7:48 ` [U-Boot] [PATCH 1/8] ARM: AM33xx: configs: Rename am335x_evm to am335xx_evm_nodt defconfig Lokesh Vutla 2016-05-10 7:48 ` [U-Boot] [PATCH 2/8] board: am33xx: fit: add support for selecting dtb dynamically Lokesh Vutla 2016-05-13 20:45 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 3/8] ARM: dts: am335x-bone: Enable uart and timer Lokesh Vutla 2016-05-13 20:46 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 4/8] ARM: AM335x: Enable FIT Lokesh Vutla 2016-05-10 7:48 ` [U-Boot] [PATCH 5/8] ARM: dts: am335x: fix cd-gpios definition as per hardware design and dt binding docs Lokesh Vutla 2016-05-13 20:46 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 6/8] ARM: dts: AM335x-evmsk: Add initial support Lokesh Vutla 2016-05-13 20:46 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 7/8] ARM: dts: AM335x-BBG: " Lokesh Vutla 2016-05-13 20:46 ` Tom Rini 2016-05-10 7:48 ` [U-Boot] [PATCH 8/8] configs: am335x_evm: Switch to env on FAT SD by default Lokesh Vutla 2016-05-11 16:23 ` [U-Boot] [PATCH 0/8] ARM: AM335x: Add support for FIT and various platforms Tom Rini 2016-05-12 5:48 ` Lokesh Vutla 2016-05-12 11:00 ` Tom Rini 2016-05-12 11:07 ` Lokesh Vutla 2016-05-12 11:25 ` Tom Rini
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox