[PATCH] ARM: imx: Add Support for Webasto ccbv2
Ahmad Fatoum
a.fatoum at pengutronix.de
Thu Jul 2 04:09:58 EDT 2020
Hi,
On 7/2/20 9:14 AM, Rouven Czerwinski wrote:
> diff --git a/arch/arm/boards/webasto-ccbv2/board.c b/arch/arm/boards/webasto-ccbv2/board.c
> new file mode 100644
> index 0000000000..36b80c5740
> --- /dev/null
> +++ b/arch/arm/boards/webasto-ccbv2/board.c
> @@ -0,0 +1,57 @@
> +/// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Rouven Czerwinski, Pengutronix
> + */
> +
> +#include <common.h>
> +#include <init.h>
> +#include <mach/generic.h>
> +#include <mach/bbu.h>
> +#include <of.h>
> +#include <string.h>
> +
> +#include "ccbv2.h"
> +
> +static int ccbv2_device_init(void)
> +{
> + if (!of_machine_is_compatible("webasto,imx6ul-ccbv2"))
> + return 0;
> +
> + /* the bootloader is stored in one of the two boot partitions */
> + imx6_bbu_internal_mmcboot_register_handler("emmc", "/dev/mmc1",
> + BBU_HANDLER_FLAG_DEFAULT);
> +
> + barebox_set_hostname("weabsto-ccbv2");
> +
> + return 0;
> +
> +}
> +device_initcall(ccbv2_device_init);
> +
> +static int ccbv2_apply_overlay(void)
> +{
> + struct device_node *overlay;
> + struct fdt_header *fdt;
> + int ret;
> +
> + if(!IS_ENABLED(CONFIG_FIRMWARE_CCBV2_OPTEE))
> + return 0;
> +
> + fdt = (void*)OPTEE_OVERLAY_LOCATION;
> + overlay = of_unflatten_dtb(fdt);
> +
> + if (IS_ERR(overlay))
> + return PTR_ERR(overlay);
> +
> + ret = of_register_overlay(overlay);
> + if (ret) {
> + printf("cannot apply oftree overlay: %s\n", strerror(-ret));
pr_warn? That way it goes into dmesg/pstore as well.
> + goto err;
> + }
> +
> + return 0;
> +err:
> + of_delete_node(overlay);
> + return ret;
> +}
> +pure_initcall(ccbv2_apply_overlay);
> diff --git a/arch/arm/boards/webasto-ccbv2/ccbv2.h b/arch/arm/boards/webasto-ccbv2/ccbv2.h
> new file mode 100644
> index 0000000000..8f5d03d533
> --- /dev/null
> +++ b/arch/arm/boards/webasto-ccbv2/ccbv2.h
> @@ -0,0 +1,14 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * optee-early.c - start OP-TEE during PBL
File name doesn't match with comment
> + *
> + * Copyright (c) 2019 Rouven Czerwinski <r.czerwinski at pengutronix.de>, Pengutronix
> + *
> + */
> +#ifndef __CCBV2_H_
> +#define __CCBV2_H_
> +
> +#define OPTEE_OVERLAY_LOCATION 0x84000000
Please also note where this is (e.g. /* MX6_MMDC_PORT0_BASE_ADDR + SZ_64M */)
> +
> +
> +#endif // __CCBV2_H_
> diff --git a/arch/arm/boards/webasto-ccbv2/flash-header-imx6ul-webasto-ccbv2.imxcfg b/arch/arm/boards/webasto-ccbv2/flash-header-imx6ul-webasto-ccbv2.imxcfg
> new file mode 100644
> index 0000000000..7b8efdfe0f
> --- /dev/null
> +++ b/arch/arm/boards/webasto-ccbv2/flash-header-imx6ul-webasto-ccbv2.imxcfg
> @@ -0,0 +1,87 @@
> +loadaddr 0x80000000
> +soc imx6
> +dcdofs 0x400
> +
> +/* Enable all clocks */
> +wm 32 0x020c4068 0xffffffff
> +wm 32 0x020c406c 0xffffffff
> +wm 32 0x020c4070 0xffffffff
> +wm 32 0x020c4074 0xffffffff
> +wm 32 0x020c4078 0xffffffff
> +wm 32 0x020c407c 0xffffffff
> +wm 32 0x020c4080 0xffffffff
> +
> +/* IOMUX */
> +/* DDR IO type */
> +wm 32 0x020E04B4 0x000C0000
> +wm 32 0x020E04AC 0x00000000
> +/* Clock */
> +wm 32 0x020E027C 0x00000028
> +/* Control */
> +wm 32 0x020E0250 0x00000028
> +wm 32 0x020E024C 0x00000028
> +wm 32 0x020E0490 0x00000028
> +wm 32 0x020E0288 0x00000028
> +wm 32 0x020E0270 0x00000000
> +wm 32 0x020E0260 0x00000028
> +wm 32 0x020E0264 0x00000028
> +wm 32 0x020E04A0 0x00000028
> +/* Data strobe */
> +wm 32 0x020E0494 0x00020000
> +wm 32 0x020E0280 0x00000028
> +wm 32 0x020E0284 0x00000028
> +/* Data */
> +wm 32 0x020E04B0 0x00020000
> +wm 32 0x020E0498 0x00000028
> +wm 32 0x020E04A4 0x00000028
> +wm 32 0x020E0244 0x00000028
> +wm 32 0x020E0248 0x00000028
> +
> +/* DDR Controller registers */
> +wm 32 0x021B001C 0x00008000
> +wm 32 0x021B0800 0xA1390003
> +/* Calibration values */
> +wm 32 0x021B080C 0x000C0000
> +wm 32 0x021B083C 0x01610162
> +wm 32 0x021B0848 0x40405050
> +wm 32 0x021B0850 0x4040544C
> +wm 32 0x021B081C 0x33333333
> +wm 32 0x021B0820 0x33333333
> +wm 32 0x021B082C 0xf3333333
> +wm 32 0x021B0830 0xf3333333
> +/* END of calibration values */
> +wm 32 0x021B08C0 0x00921012
> +wm 32 0x021B08b8 0x00000800
> +
> +/* MMDC init */
> +wm 32 0x021B0004 0x0002002D
> +wm 32 0x021B0008 0x1b333030
> +wm 32 0x021B000C 0x3F4352F3
> +wm 32 0x021B0010 0xB66D0B63
> +wm 32 0x021B0014 0x01FF00DB
> +/* Consider reducing RALAT (currently set to 5) */
> +wm 32 0x021B0018 0x00211740
> +wm 32 0x021B001C 0x00008000
> +wm 32 0x021B002C 0x000026D2
> +wm 32 0x021B0030 0x00431023
> +wm 32 0x021B0040 0x00000047
> +wm 32 0x021B0000 0x83180000
> +
> +/* Mode registers writes for CS0 */
> +wm 32 0x021B001C 0x02008032
> +wm 32 0x021B001C 0x00008033
> +wm 32 0x021B001C 0x00048031
> +wm 32 0x021B001C 0x15208030
> +wm 32 0x021B001C 0x04008040
> +
> +/* Final DDR setup */
> +wm 32 0x021B0020 0x00007800
> +wm 32 0x021B0818 0x00000227
> +wm 32 0x021B0004 0x0002556D
> +wm 32 0x021B0404 0x00011006
> +wm 32 0x021B001C 0x00000000
> +
> +/* Disable TZASC bypass */
> +wm 32 0x020E4024 0x00000001
> +
> +#include <mach/habv4-imx6-gencsf.h>
> diff --git a/arch/arm/boards/webasto-ccbv2/lowlevel.c b/arch/arm/boards/webasto-ccbv2/lowlevel.c
> new file mode 100644
> index 0000000000..b4c683b3d9
> --- /dev/null
> +++ b/arch/arm/boards/webasto-ccbv2/lowlevel.c
> @@ -0,0 +1,77 @@
> +/// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright (C) 2019 Rouven Czerwinski, Pengutronix
> + */
> +
> +#include <common.h>
> +#include <debug_ll.h>
> +#include <firmware.h>
> +#include <mach/generic.h>
> +#include <asm/barebox-arm.h>
> +#include <mach/esdctl.h>
> +#include <mach/iomux-mx6.h>
> +#include <asm/cache.h>
> +#include <tee/optee.h>
> +
> +#include "ccbv2.h"
> +
> +extern char __dtb_imx6ul_webasto_ccbv2_start[];
Any reason not to use __dtb_z_? (With ARM_USE_COMPRESSED_DTB ofc)
> +
> +static void configure_uart(void)
> +{
> + void __iomem *iomuxbase = (void *)MX6_IOMUXC_BASE_ADDR;
> +
> + imx6_ungate_all_peripherals();
> +
> + // UART7
> + writel(0x1, iomuxbase + 0x158);
> + writel(0x1, iomuxbase + 0x15c);
> + writel(0x3, iomuxbase + 0x654);
imx_setup_pad() could make this more descriptive.
> +
> + imx6_uart_setup((void *)MX6_UART7_BASE_ADDR);
You can add a
if (IS_ENABLED(CONFIG_DEBUG_LL))
putc_ll('>');
here, so you can get a very early confirmation that PBL was loaded, similar to
what other board are doing
> +}
> +
> +static void start_ccbv2(void)
This should be noinline
> +{
> + int tee_size;
> + void *tee;
> + void *fdt;
fdt could be dropped and value used directly
> +
> + /* Enable normal/secure r/w for TZC380 region0 */
> + writel(0xf0000000, 0x021D0108);
> +
> + /* disable all watchdog powerdown counters */
> + writew(0x0, 0x020bc008);
> + writew(0x0, 0x020c0008);
> + writew(0x0, 0x021e4008);
Is this strictly needed? The watchdog driver does this already.
> +
> + configure_uart();
You probably want pbl_set_putc after this, so you can get early logging without DEBUG_LL
being configured for your board.
> +
> + fdt = __dtb_imx6ul_webasto_ccbv2_start;
> +
> + if(IS_ENABLED(CONFIG_FIRMWARE_CCBV2_OPTEE)) {
> + get_builtin_firmware(ccbv2_optee_bin, &tee, &tee_size);
> +
> + memset((void *)OPTEE_OVERLAY_LOCATION, 0, 0x1000);
What happens if second stage barebox netboots and new barebox overlaps with this location?
Should you reserve this memory region in the barebox device tree?
> +
> + start_optee_early(NULL, tee);
> + }
> +
> + imx6ul_barebox_entry(fdt);
> +}
> +
> +ENTRY_FUNCTION(start_imx6ul_ccbv2, r0, r1, r2)
> +{
> +
> + imx6ul_cpu_lowlevel_init();
> +
> + arm_setup_stack(0x00910000);
> +
> + arm_early_mmu_cache_invalidate();
We enter with dcache off and already invalidate in imx6ul_barebox_entry.
This is not needed.
> +
> + relocate_to_current_adr();
> + setup_c();
> + barrier();
> +
> + start_ccbv2();
> +}
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index d61a052310..2289623762 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -120,6 +120,7 @@ lwl-$(CONFIG_MACH_VIRT2REAL) += virt2real.dtb.o
> lwl-$(CONFIG_MACH_VSCOM_BALTOS) += am335x-baltos-minimal.dtb.o
> lwl-$(CONFIG_MACH_WARP7) += imx7s-warp.dtb.o
> lwl-$(CONFIG_MACH_VF610_TWR) += vf610-twr.dtb.o
> +lwl-$(CONFIG_MACH_WEBASTO_CCBV2) += imx6ul-webasto-ccbv2.dtb.o
> lwl-$(CONFIG_MACH_ZII_RDU1) += \
> imx51-zii-rdu1.dtb.o \
> imx51-zii-scu2-mezz.dtb.o \
> diff --git a/arch/arm/dts/imx6ul-webasto-ccbv2.dts b/arch/arm/dts/imx6ul-webasto-ccbv2.dts
> new file mode 100644
> index 0000000000..e182482b11
> --- /dev/null
> +++ b/arch/arm/dts/imx6ul-webasto-ccbv2.dts
> @@ -0,0 +1,613 @@
> +// SPDX-License-Identifier: (GPL-2.0 OR MIT)
> +/*
> + * Copyright (C) 2019, Webasto SE
> + * Author: Johannes Eigner <johannes.eigner at webasto.com>
> + */
> +
> +/dts-v1/;
> +
> +#include <arm/imx6ul.dtsi>
> +
> +/ {
> + model = "Webasto common communication board version 2";
> + compatible = "webasto,imx6ul-ccbv2", "fsl,imx6ul";
> +
> + chosen {
> + /* stdout-path = &uart7; already set in Linux device tree */
You could split the Linux parts into a dtsi in the same directory. That way
you have a short two line patch, when it goes upstream.
> + stdout-path = &uart7;
> +
> + environment {
> + compatible = "barebox,environment";
> + device-path = &environment_emmc;
> + };
> + };
> +
> + aliases {
> + state = &state_emmc;
> + };
> +
> + state_emmc: state {
> + #address-cells = <1>;
> + #size-cells = <1>;
> + compatible = "barebox,state";
> + magic = <0x290cf8c6>;
> + backend-type = "raw";
> + backend = <&backend_state_emmc>;
> + backend-stridesize = <0x200>;
> +
> + bootstate {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + system0 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + remaining_attempts at 0 {
> + reg = <0x0 0x4>;
> + type = "uint32";
> + default = <3>;
> + };
> +
> + priority at 4 {
> + reg = <0x4 0x4>;
> + type = "uint32";
> + default = <20>;
> + };
> + };
> +
> + system1 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + remaining_attempts at 8 {
> + reg = <0x8 0x4>;
> + type = "uint32";
> + default = <3>;
> + };
> +
> + priority at c {
> + reg = <0xc 0x4>;
> + type = "uint32";
> + default = <21>;
> + };
> + };
> +
> + last_chosen at 10 {
> + reg = <0x10 0x4>;
> + type = "uint32";
> + };
> + };
> + };
> +
> + reg_4v: regulator-4v {
> + compatible = "regulator-fixed";
> + regulator-name = "V_+4V";
> + regulator-min-microvolt = <4000000>;
> + regulator-max-microvolt = <4000000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> +
> + reg_wl18xx_vmmc: regulator-wl18xx {
> + compatible = "regulator-fixed";
> + regulator-name = "wl1837";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + gpio = <&gpio4 22 GPIO_ACTIVE_HIGH>;
> + startup-delay-us = <70000>;
> + enable-active-high;
> + };
> +
> + reg_dp83822_en: regulator-dp83822 {
> + compatible = "regulator-fixed";
> + regulator-name = "dp83822";
> + vin-supply = <&vcc_eth>;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + gpio = <&gpio1 8 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + };
> +};
> +
> +&usdhc2 {
> + #address-cells = <1>;
> + #size-cells = <1>;
> +
> + partition at 0 {
> + label = "barebox";
> + reg = <0x0 0x100000>;
> + };
> +
> + environment_emmc: partition at 100000 {
> + label = "barebox-environment";
> + reg = <0x100000 0x100000>;
> + };
> +
> + backend_state_emmc: partition at 200000 {
> + label = "barebox-state";
> + reg = <0x200000 0x100000>;
> + };
barebox prefers a partitions node over the deprecated binding.
If upstream device tree changes, you'll be silently broken.
Better use the new binding from the get-go.
> +};
> +
> +
> +&ocotp {
> + barebox,provide-mac-address = <&fec1 0x620>;
> +};
> +
> +&usdhc1 {
> + status = "disabled";
Shouldn't be needed.
> +};
> +
> +&i2c2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_i2c2>;
> + clock-frequency = <100000>;
> + status = "okay";
> +
> + pmic: mc34pf3000 at 8 {
> + compatible = "fsl,pfuze3000";
> + reg = <0x08>;
> + regulators {
> + /* 3V3 Supply: eMMC, TPM */
> + sw1a_reg: sw1a {
> + regulator-name = "V_+3V3_SW1A";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + /* regulator-ramp-delay = <6250>; */
> + };
> + /* VDD_SOC_IN */
> + vdd_soc_in: sw1b {
> + regulator-name = "V_+1V4_SW1B";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <700000>;
> + regulator-max-microvolt = <1475000>;
> + regulator-ramp-delay = <6250>; /* from ccimx6ulsom */
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + /* 3V3 Supply: miniPCIe, ZigBee, NFC IO voltage */
> + sw2_reg: sw2 {
> + regulator-name = "V_+3V3_SW2";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + vcc_ddr3: sw3 {
> + regulator-name = "V_+1V35_SW3";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <1350000>;
> + regulator-max-microvolt = <1350000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + /* 5V for the miniPCIe USB */
> + swbst_reg: swbst {
> + regulator-name = "V_+5V0_SWBST";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <5000000>;
> + regulator-max-microvolt = <5150000>;
> + status = "disabled";
> + };
> + vdd_snvs: vsnvs {
> + regulator-name = "V_+3V0_SNVS";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <1000000>;
> + regulator-max-microvolt = <3000000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + vrefddr: vrefddr {
> + regulator-name = "V_+0V675_VREFDDR";
> + vin-supply = <&vcc_ddr3>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + /* 3V3 Supply: i.MX6 modules */
> + vgen1_reg: vldo1 {
> + regulator-name = "V_+3V3_LDO1";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + /* Not used */
> + vgen2_reg: vldo2 {
> + regulator-min-microvolt = <800000>;
> + regulator-max-microvolt = <1550000>;
> + };
> + /* Not used */
> + vgen3_reg: vccsd {
> + regulator-min-microvolt = <2850000>;
> + regulator-max-microvolt = <3300000>;
> + };
> + /* 3V3 Supply: VDD_HIGH_IN, i.MX6 ADC */
> + vdd_high_in: v33 {
> + regulator-name = "V_+3V3_V33";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + /* 1V8 Supply: ETH PHY */
> + vcc_eth: vldo3 {
> + regulator-name = "V_+1V8_LDO3";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + /* 1V8 Supply: i.MX6 modules, WiFi/BT IO voltage */
> + vgen6_reg: vldo4 {
> + regulator-name = "V_+1V8_LDO4";
> + vin-supply = <®_4v>;
> + regulator-min-microvolt = <1800000>;
> + regulator-max-microvolt = <1800000>;
> + regulator-boot-on;
> + regulator-always-on;
> + };
> + };
> + };
> +};
> +
> +&fec1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_enet1>;
> + phy-mode = "rmii";
> + phy-supply = <®_dp83822_en>;
> + phy-handle = <&dp83822i>;
> + phy-reset-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
> + status = "okay";
> +
> + mdio {
> + #address-cells = <1>;
> + #size-cells = <0>;
> +
> + dp83822i: ethernet-phy at 1 {
> + compatible = "ethernet-phy-ieee802.3-c22"; /* Use clause 22 only. clause 45 will not work */
> + reg = <1>;
> + clocks = <&clks IMX6UL_CLK_ENET_REF>;
> + clock-names = "rmii-ref";
> + };
> + };
> +};
> +
> +
> +&ecspi1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_spi1>;
> + cs-gpios = <
> + &gpio3 26 GPIO_ACTIVE_LOW
> + &gpio3 10 GPIO_ACTIVE_LOW
> + &gpio3 11 GPIO_ACTIVE_LOW
> + &gpio3 12 GPIO_ACTIVE_LOW
> + >;
> + status = "okay";
> +
> + cc2520: spi at 0 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_cc2520>;
> + compatible = "ti,cc2520";
> + reg = <0>;
> + spi-max-frequency = <4000000>;
> + fifo-gpio = <&gpio3 15 0>;
> + fifop-gpio = <&gpio3 16 0>;
> + sfd-gpio = <&gpio3 24 0>;
> + cca-gpio = <&gpio3 20 0>;
> + vreg-gpio = <&gpio3 19 0>;
> + reset-gpio = <&gpio3 23 0>;
> + vin-supply = <&sw2_reg>;
> + status = "disabled";
> + };
> + qca7000: spi at 1 {
> + compatible = "qca,qca7000";
> + reg = <1>;
> + spi-max-frequency = <8000000>; /* freq: 8 MHz */
> + interrupt-parent = <&gpio4>; /* GPIO Bank 3 */
> + interrupts = <16 0x1>; /* Index: 16, rising edge */
> + spi-cpha; /* SPI mode: CPHA=1 */
> + spi-cpol; /* SPI mode: CPOL=1 */
> + /* local-mac-address = [ A0 B0 C0 D0 E0 F0 ]; */
> + status = "disabled";
> + };
> + tfr7970: spi at 3 {
> + compatible = "ti,trf7970a";
> + reg = <3>;
> + spi-max-frequency = <2000000>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_trf7970>;
> + interrupt-parent = <&gpio3>;
> + interrupts = <14 0>;
> + ti,enable-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>, <&gpio3 17 GPIO_ACTIVE_HIGH>;
> + vin-supply = <®_4v>;
> + vdd-io-supply = <&sw2_reg>;
> + autosuspend-delay = <30000>;
> + clock-frequency = <27120000>;
> + status = "disabled";
> + };
> +};
> +
> +&uart3 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart3>;
> + uart-has-rtscts;
> + status = "okay";
> +};
> +
> +&uart4 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart4>;
> + status = "okay";
> +};
> +
> +&uart6 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart6>;
> + uart-has-rtscts;
> + status = "okay";
> + bluetooth {
> + compatible = "ti,wl1835-st";
> + enable-gpios = <&gpio2 11 GPIO_ACTIVE_HIGH>;
> + vin-supply = <®_4v>;
> + };
> +};
> +
> +&uart7 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_uart7>;
> + status = "okay";
> +};
> +
> +
> +&usdhc1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc1>;
> + bus-width = <4>;
> + vmmc-supply = <®_wl18xx_vmmc>;
> + non-removable;
> + keep-power-in-suspend;
> + cap-power-off-card;
> + max-frequency = <25000000>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + status = "okay";
> +
> + wlcore: wlcore at 2 {
> + compatible = "ti,wl1837";
> + reg = <2>;
> + interrupt-parent = <&gpio4>;
> + interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;
> + tcxo-clock-frequency = <26000000>;
> + };
> +};
> +
> +&usdhc2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_usdhc2>;
> + bus-width = <8>;
> + no-1-8-v;
> + non-removable;
> + no-sd;
> + no-sdio;
> + no-prescan-powerup;
> + keep-power-in-suspend;
> + status = "okay";
> +};
> +
> +&usbotg1 {
> + dr_mode = "otg";
> + status = "okay";
> +};
> +
> +&usbotg2 {
> + dr_mode = "host";
> + disable-over-current;
> + /* GPIOs used on miniPCIe */
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_minipcie>;
> + status = "disabled";
> +};
> +
> +&wdog1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_wdog>;
> + fsl,ext-reset-output;
> + status = "okay";
> +};
> +
> +®_arm {
> + vin-supply = <&vdd_soc_in>;
> + regulator-allow-bypass;
> +};
> +
> +®_soc {
> + vin-supply = <&vdd_soc_in>;
> + regulator-allow-bypass;
> +};
> +
> +&iomuxc {
> + pinctrl-names = "default";
> +
> + pinctrl_enet1: enet1grp {
> + fsl,pins = <
> + /* HYS=1, 100k PullUp, 100MHz, R0/6 */
> + MX6UL_PAD_GPIO1_IO06__ENET1_MDIO 0x1b0b0
> + MX6UL_PAD_GPIO1_IO07__ENET1_MDC 0x1b0b0
> + MX6UL_PAD_ENET1_RX_EN__ENET1_RX_EN 0x1b0b0
> + MX6UL_PAD_ENET1_RX_ER__ENET1_RX_ER 0x1b0b0
> + MX6UL_PAD_ENET1_RX_DATA0__ENET1_RDATA00 0x1b0b0
> + MX6UL_PAD_ENET1_RX_DATA1__ENET1_RDATA01 0x1b0b0
> + MX6UL_PAD_ENET1_TX_EN__ENET1_TX_EN 0x1b0b0
> + MX6UL_PAD_ENET1_TX_DATA0__ENET1_TDATA00 0x1b0b0
> + MX6UL_PAD_ENET1_TX_DATA1__ENET1_TDATA01 0x1b0b0
> + /* HYS=1, 100k PullUp, 50MHz, R0/6, SRE=1 */
> + MX6UL_PAD_ENET1_TX_CLK__ENET1_REF_CLK1 0x4001b031
> + /* HYS=1, 100k PullDown, 50MHz, R0/6 */
> + MX6UL_PAD_GPIO1_IO08__GPIO1_IO08 0x13030 /* ETH /PWR_DOWN */
> + MX6UL_PAD_GPIO1_IO09__GPIO1_IO09 0x13030 /* ETH /RST */
> + >;
> + };
> +
> + pinctrl_i2c2: i2c2grp {
> + fsl,pins = <
> + /* HYS=1, 100k PullUp, OpenDrain, 100MHz, R0/6 */
> + MX6UL_PAD_UART5_TX_DATA__I2C2_SCL 0x4001b8b0
> + MX6UL_PAD_UART5_RX_DATA__I2C2_SDA 0x4001b8b0
> + /* HYS=1, Disable output */
> + MX6UL_PAD_UART4_RX_DATA__GPIO1_IO29 0x10000 /* PMIC INT */
> + >;
> + };
> +
> + pinctrl_minipcie: minipciegrp {
> + fsl,pins = <
> + /* HYS=1, 100k PullDown, 50MHz, R0/6 */
> + MX6UL_PAD_LCD_HSYNC__GPIO3_IO02 0x13030 /* WAKE2 */
> + MX6UL_PAD_LCD_VSYNC__GPIO3_IO03 0x13030 /* WDISABLE */
> + MX6UL_PAD_LCD_RESET__GPIO3_IO04 0x13030 /* PERST */
> + MX6UL_PAD_LCD_DATA03__GPIO3_IO08 0x13030 /* DTR */
> + MX6UL_PAD_LCD_DATA04__GPIO3_IO09 0x13030 /* WAKE1 */
> + >;
> + };
> +
> + pinctrl_spi1: spi1grp {
> + fsl,pins = <
> + /* HYS=1, 100k PullUp, 100MHz, R0/6 */
> + MX6UL_PAD_LCD_DATA20__ECSPI1_SCLK 0x1b0b0
> + MX6UL_PAD_LCD_DATA22__ECSPI1_MOSI 0x1b0b0
> + MX6UL_PAD_LCD_DATA23__ECSPI1_MISO 0x1b0b0
> +
> + /* HYS=1, 47k PullUp, 50MHz, R0/6 */
> + MX6UL_PAD_LCD_DATA05__GPIO3_IO10 0x17030 /* PLC CS */
> + /* HYS=1, 47k PullUp, 50MHz, R0/6 */
> + MX6UL_PAD_NAND_DQS__GPIO4_IO16 0x17030 /* PLC IRQ */
> +
> + /* HYS=1, 47k PullUp, 50MHz, R0/6 */
> + MX6UL_PAD_LCD_DATA06__GPIO3_IO11 0x17030 /* TPM CS */
> + /* HYS=1, 50MHz, R0/6 */
> + MX6UL_PAD_LCD_DATA13__GPIO3_IO18 0x10030 /* TPM PIRQ */
> + >;
> + };
> +
> + pinctrl_cc2520: cc2520grp {
> + fsl,pins = <
> + MX6UL_PAD_LCD_DATA10__GPIO3_IO15 0x13030 /* ZigBee GPIO1 */
> + MX6UL_PAD_LCD_DATA11__GPIO3_IO16 0x13030 /* ZigBee GPIO2 */
> + MX6UL_PAD_LCD_DATA14__GPIO3_IO19 0x13030 /* ZigBee Vreg EN */
> + MX6UL_PAD_LCD_DATA15__GPIO3_IO20 0x13030 /* ZigBee GPIO3 */
> + MX6UL_PAD_LCD_DATA18__GPIO3_IO23 0x13030 /* ZigBee RST */
> + MX6UL_PAD_LCD_DATA19__GPIO3_IO24 0x13030 /* ZigBee GPIO4 */
> + /* HYS=1, 47k PullUp, 50MHz, R0/6 */
> + MX6UL_PAD_LCD_DATA21__GPIO3_IO26 0x17030 /* ZigBee CS */
> +
> + >;
> + };
> +
> + pinctrl_trf7970: trf7970grp {
> + fsl,pins = <
> + /* HYS=1, 47k PullUp, 50MHz, R0/6 */
> + MX6UL_PAD_LCD_DATA07__GPIO3_IO12 0x17030 /* NFC CS */
> + /* HYS=1, 50MHz, R0/6 */
> + MX6UL_PAD_LCD_DATA02__GPIO3_IO07 0x10030 /* NFC EN */
> + MX6UL_PAD_LCD_DATA12__GPIO3_IO17 0x10030 /* NFC EN2 */
> + /* HYS=1, 47k PullUp, Disable output */
> + MX6UL_PAD_LCD_DATA09__GPIO3_IO14 0x17000 /* NFC IRQ */
> + >;
> + };
> +
> + pinctrl_uart3: uart3grp {
> + fsl,pins = <
> + /* HYS=1, 100k PullUp, 100MHz, R0/6 */
> + MX6UL_PAD_NAND_READY_B__UART3_DCE_TX 0x1b0b0
> + MX6UL_PAD_NAND_CE0_B__UART3_DCE_RX 0x1b0b0
> + MX6UL_PAD_NAND_CE1_B__UART3_DCE_CTS 0x1b0b0
> + MX6UL_PAD_NAND_CLE__UART3_DCE_RTS 0x1b0b0
> + /* HYS=1, 100k PullDown, 50MHz, R0/6 */
> + MX6UL_PAD_LCD_DATA08__GPIO3_IO13 0x13030 /* X_DB_GPIO2 */
> + MX6UL_PAD_NAND_WP_B__GPIO4_IO11 0x13030 /* X_DB_GPIO1 */
> + >;
> + };
> +
> + pinctrl_uart4: uart4grp {
> + fsl,pins = <
> + MX6UL_PAD_LCD_CLK__UART4_DCE_TX 0x1b0b0
> + MX6UL_PAD_LCD_ENABLE__UART4_DCE_RX 0x1b0b0
> + >;
> + };
> +
> + pinctrl_uart6: uart6grp {
> + fsl,pins = <
> + MX6UL_PAD_CSI_MCLK__UART6_DCE_TX 0x1b0b0
> + MX6UL_PAD_CSI_PIXCLK__UART6_DCE_RX 0x1b0b0
> + MX6UL_PAD_CSI_VSYNC__UART6_DCE_RTS 0x1b0b0
> + MX6UL_PAD_CSI_HSYNC__UART6_DCE_CTS 0x1b0b0
> + /* HYS=1, 50MHz, R0/6 */
> + MX6UL_PAD_ENET2_TX_DATA0__GPIO2_IO11 0x10030 /* BT EN */
> + /* HYS=0, 50MHz, R0/2 */
> + MX6UL_PAD_GPIO1_IO03__OSC32K_32K_OUT 0x00010 /* BT SCLK */
> + >;
> + };
> +
> + pinctrl_uart7: uart7grp {
> + fsl,pins = <
> + MX6UL_PAD_LCD_DATA16__UART7_DCE_TX 0x1b0b0
> + MX6UL_PAD_LCD_DATA17__UART7_DCE_RX 0x1b0b0
> + >;
> + };
> +
> + pinctrl_usdhc1: usdhc1grp {
> + fsl,pins = <
> + /* WiFi SDIO max 50MHz */
> + /* HYS=1, 100MHz, R0/3, SRE=1 */
> + MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x10059
> + MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
> + MX6UL_PAD_SD1_DATA0__USDHC1_DATA0 0x10059
> + MX6UL_PAD_SD1_DATA1__USDHC1_DATA1 0x10059
> + MX6UL_PAD_SD1_DATA2__USDHC1_DATA2 0x10059
> + MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x10059
> + /* HYS=1, 47k PullUp, Disable output */
> + MX6UL_PAD_CSI_DATA00__GPIO4_IO21 0x17000 /* WLAN IRQ */
> + /* HYS=1, 50MHz, R0/6 */
> + MX6UL_PAD_CSI_DATA01__GPIO4_IO22 0x10030 /* WLAN EN */
> + >;
> + };
> +
> + pinctrl_usdhc2: usdhc2grp {
> + fsl,pins = <
> + /* eMMC max 200MHz */
> + /* HYS=1, 200MHz, R0/5 , SRE=1 */
> + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x100e9
> + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x100e9
> + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x100e9
> + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x100e9
> + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x100e9
> + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x100e9
> + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x100e9
> + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x100e9
> + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x100e9
> + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x100e9
> + /* HYS=1, 50MHz, R0/6 */
> + MX6UL_PAD_NAND_ALE__GPIO4_IO10 0x10030 /* eMMC RST */
> + >;
> + };
> +
> + pinctrl_wdog: wdoggrp {
> + fsl,pins = <
> + /* HYS=0, 100MHz, R0/6 */
> + MX6UL_PAD_GPIO1_IO01__WDOG1_WDOG_B 0x00b0
> + >;
> + };
> +};
> +
> +/* include the FIT public key for verifying on demand */
> +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY
> +#include CONFIG_BOOTM_FITIMAGE_PUBKEY
> +#endif
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index 6dd5cb2aca..676b6ea47f 100644
> --- a/arch/arm/mach-imx/Kconfig
> +++ b/arch/arm/mach-imx/Kconfig
> @@ -548,6 +548,10 @@ config MACH_DIGI_CCIMX6ULSBCPRO
> select ARCH_IMX6UL
> select ARM_USE_COMPRESSED_DTB
>
> +config MACH_WEBASTO_CCBV2
> + bool "Webasto Common Communication Board V2"
> + select ARCH_IMX6UL
> +
> endif
>
> # ----------------------------------------------------------
> diff --git a/arch/arm/mach-imx/include/mach/imx6-regs.h b/arch/arm/mach-imx/include/mach/imx6-regs.h
> index 1ba22b5bc6..7350ffd16f 100644
> --- a/arch/arm/mach-imx/include/mach/imx6-regs.h
> +++ b/arch/arm/mach-imx/include/mach/imx6-regs.h
> @@ -115,6 +115,7 @@
> #define MX6_IP2APB_USBPHY1_BASE_ADDR (MX6_AIPS2_OFF_BASE_ADDR + 0x78000)
> #define MX6_IP2APB_USBPHY2_BASE_ADDR (MX6_AIPS2_OFF_BASE_ADDR + 0x7C000)
>
> +#define MX6_UART7_BASE_ADDR 0x02018000
> #define MX6_SATA_BASE_ADDR 0x02200000
>
> #define MX6_MMDC_PORT01_BASE_ADDR 0x10000000
> diff --git a/firmware/Kconfig b/firmware/Kconfig
> index 169c6ee915..10b7059b7e 100644
> --- a/firmware/Kconfig
> +++ b/firmware/Kconfig
> @@ -13,4 +13,9 @@ config FIRMWARE_IMX8MM_ATF
> config FIRMWARE_IMX8MQ_ATF
> bool
>
> +config FIRMWARE_CCBV2_OPTEE
> + bool
> + depends on MACH_WEBASTO_CCBV2 && PBL_OPTEE
> + default y
Whitespace mismatch
> +
> endmenu
> diff --git a/firmware/Makefile b/firmware/Makefile
> index 020d48440d..ce0db2e094 100644
> --- a/firmware/Makefile
> +++ b/firmware/Makefile
> @@ -16,6 +16,8 @@ firmware-$(CONFIG_DRIVER_NET_FSL_FMAN) += fsl_fman_ucode_ls1046_r1.0_106_4_18.bi
>
> firmware-$(CONFIG_ARCH_LAYERSCAPE_PPA) += ppa-ls1046a.bin
>
> +firmware-$(CONFIG_FIRMWARE_CCBV2_OPTEE) += ccbv2_optee.bin
> +
> # Create $(fwabs) from $(CONFIG_EXTRA_FIRMWARE_DIR) -- if it doesn't have a
> # leading /, it's relative to $(srctree).
> fwdir := $(subst $(quote),,$(CONFIG_EXTRA_FIRMWARE_DIR))
> diff --git a/images/Makefile.imx b/images/Makefile.imx
> index 765702f26d..765ca7acdd 100644
> --- a/images/Makefile.imx
> +++ b/images/Makefile.imx
> @@ -332,6 +332,8 @@ $(call build_imx_habv4img, CONFIG_MACH_TECHNEXION_PICO_HOBBIT, start_imx6ul_pico
>
> $(call build_imx_habv4img, CONFIG_MACH_DIGI_CCIMX6ULSBCPRO, start_imx6ul_ccimx6ulsbcpro, digi-ccimx6ulsom/flash-header-imx6ul-ccimx6ulsbcpro, imx6ul-ccimx6ulsbcpro)
>
> +$(call build_imx_habv4img, CONFIG_MACH_WEBASTO_CCBV2, start_imx6ul_ccbv2, webasto-ccbv2/flash-header-imx6ul-webasto-ccbv2, imx6ul-webasto-ccbv2)
> +
> # ----------------------- vf6xx based boards ---------------------------
> pblb-$(CONFIG_MACH_VF610_TWR) += start_vf610_twr
> CFG_start_vf610_twr.pblb.imximg = $(board)/freescale-vf610-twr/flash-header-vf610-twr.imxcfg
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
More information about the barebox
mailing list