| Message ID | 20240405090742.4148304-7-sumit.garg@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add SE HMBSC board support | expand |
On Fri, Apr 05, 2024 at 02:37:42PM +0530, Sumit Garg wrote: > Support for Schneider Electric HMIBSC. Features: > - Qualcomm Snapdragon 410C SoC - APQ8016 (4xCortex A53, Adreno 306) > - 2GiB RAM > - 64GiB eMMC, SD slot > - WiFi and Bluetooth > - 2x Host, 1x Device USB port > - HDMI > - Discrete TPM2 chip over SPI > > Features enabled in U-Boot: > - RAUC updates > - Environment protection > - USB based ethernet adaptors > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> I don't think this is a big deal but this patch would be a bit easier to skim over if you move the (unmodified?) import of the Linux apq8016-schneider-hmibsc.dts to a separate patch with a clear note in the commit message - where it comes from (link to Linux patch), and - that it can be removed again with a future update of the upstream DTs in U-Boot (once it is applied upstream at least). You kind of have that information in the cover letter but I think it would be good to have it in the commit message. > --- > arch/arm/dts/apq8016-schneider-hmibsc.dts | 491 ++++++++++++++++++++++ > board/schneider/hmibsc/MAINTAINERS | 6 + > configs/hmibsc_defconfig | 86 ++++ > doc/board/index.rst | 1 + > doc/board/schneider/hmibsc.rst | 45 ++ > doc/board/schneider/index.rst | 9 + > include/configs/hmibsc.h | 57 +++ > 7 files changed, 695 insertions(+) > create mode 100644 arch/arm/dts/apq8016-schneider-hmibsc.dts > create mode 100644 board/schneider/hmibsc/MAINTAINERS > create mode 100644 configs/hmibsc_defconfig > create mode 100644 doc/board/schneider/hmibsc.rst > create mode 100644 doc/board/schneider/index.rst > create mode 100644 include/configs/hmibsc.h > > [...] > diff --git a/include/configs/hmibsc.h b/include/configs/hmibsc.h > new file mode 100644 > index 00000000000..66dfa549ce1 > --- /dev/null > +++ b/include/configs/hmibsc.h > @@ -0,0 +1,57 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Board configuration file for HMIBSC > + * > + * (C) Copyright 2024 Sumit Garg <sumit.garg@linaro.org> > + */ > + > +#ifndef __CONFIGS_HMIBSC_H > +#define __CONFIGS_HMIBSC_H > + > +/* PHY needs a longer aneg time */ > +#define PHY_ANEG_TIMEOUT 8000 > + > +#define HMIBSC_BOOTCOMMAND \ > + "setenv devtype mmc; setenv devnum 0; " \ > + "test -n \"${BOOT_ORDER}\" || setenv BOOT_ORDER \"A B\"; " \ > + "test -n \"${BOOT_A_LEFT}\" || setenv BOOT_A_LEFT 3; " \ > + "test -n \"${BOOT_B_LEFT}\" || setenv BOOT_B_LEFT 3; " \ > + "setenv raucslot; " \ > + "for BOOT_SLOT in \"${BOOT_ORDER}\"; do " \ > + " if test \"x${raucslot}\" != \"x\"; then " \ > + " echo \"skip remaining slots...\"; " \ > + " elif test \"x${BOOT_SLOT}\" = \"xA\"; then " \ > + " if test ${BOOT_A_LEFT} -gt 0; then " \ > + " setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1; " \ > + " echo \"Found valid RAUC slot A\"; " \ > + " setenv raucslot \"rauc.slot=A\"; " \ > + " setenv raucpart A; setenv distro_bootpart 6;" \ > + " fi; " \ > + " elif test \"x${BOOT_SLOT}\" = \"xB\"; then " \ > + " if test ${BOOT_B_LEFT} -gt 0; then " \ > + " setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1; " \ > + " echo \"Found valid RAUC slot B\"; " \ > + " setenv raucslot \"rauc.slot=B\"; " \ > + " setenv raucpart B; setenv distro_bootpart 7;" \ > + " fi; " \ > + " fi; " \ > + "done; " \ > + "if test -n \"${raucslot}\"; then " \ > + " setenv bootargs console=ttyMSM1 root=PARTLABEL=rootfs_${raucpart} rw rootwait ${raucslot}; " \ > + " saveenv; " \ > + "else " \ > + " echo \"No valid RAUC slot found. Resetting tries to 3\"; " \ > + " setenv BOOT_A_LEFT 3; " \ > + " setenv BOOT_B_LEFT 3; " \ > + " saveenv; " \ > + " reset; " \ > + "fi; " \ > + "load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} /boot/fitImage && bootm" > + > +#define CFG_EXTRA_ENV_SETTINGS \ > + "loadaddr=0x90000000\0" \ > + "bootcmd=" HMIBSC_BOOTCOMMAND "\0" > + The "text-based environment" [1] is preferred nowadays, i.e. defining these inside board/schneider/hmibsc/hmibsc.env instead (similar to how DB410c has its environment defined in board/qualcomm/dragonboard410c/dragonboard410c.env). This should also avoid all the crazy escaping to encode it as C string. :D However, I suspect that right now it would attempt to load this file from board/qualcomm/hmibsc/hmibsc.env since you do not seem to have CONFIG_SYS_VENDOR set correctly. It looks like Caleb removed the option to customize CONFIG_SYS_VENDOR in commit 059d526af312 ("mach-snapdragon: generalise board support"). It might be easiest to add a prompt in arch/arm/mach-snapdragon/Kconfig to allow changing it (similar to CONFIG_SYS_BOARD). Thanks, Stephan [1]: https://docs.u-boot.org/en/latest/usage/environment.html#text-based-environment
On Fri, 5 Apr 2024 at 20:16, Stephan Gerhold <stephan@gerhold.net> wrote: > > On Fri, Apr 05, 2024 at 02:37:42PM +0530, Sumit Garg wrote: > > Support for Schneider Electric HMIBSC. Features: > > - Qualcomm Snapdragon 410C SoC - APQ8016 (4xCortex A53, Adreno 306) > > - 2GiB RAM > > - 64GiB eMMC, SD slot > > - WiFi and Bluetooth > > - 2x Host, 1x Device USB port > > - HDMI > > - Discrete TPM2 chip over SPI > > > > Features enabled in U-Boot: > > - RAUC updates > > - Environment protection > > - USB based ethernet adaptors > > > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > > I don't think this is a big deal but this patch would be a bit easier to > skim over if you move the (unmodified?) import of the Linux > apq8016-schneider-hmibsc.dts to a separate patch with a clear note in > the commit message > > - where it comes from (link to Linux patch), and > - that it can be removed again with a future update of the upstream DTs > in U-Boot (once it is applied upstream at least). > > You kind of have that information in the cover letter but I think it > would be good to have it in the commit message. Although the general practice in U-Boot is to have the board DTS file submitted along with board code, if it makes review easier via separating the unmodified import of the board DTS file then I can do that. > > > --- > > arch/arm/dts/apq8016-schneider-hmibsc.dts | 491 ++++++++++++++++++++++ > > board/schneider/hmibsc/MAINTAINERS | 6 + > > configs/hmibsc_defconfig | 86 ++++ > > doc/board/index.rst | 1 + > > doc/board/schneider/hmibsc.rst | 45 ++ > > doc/board/schneider/index.rst | 9 + > > include/configs/hmibsc.h | 57 +++ > > 7 files changed, 695 insertions(+) > > create mode 100644 arch/arm/dts/apq8016-schneider-hmibsc.dts > > create mode 100644 board/schneider/hmibsc/MAINTAINERS > > create mode 100644 configs/hmibsc_defconfig > > create mode 100644 doc/board/schneider/hmibsc.rst > > create mode 100644 doc/board/schneider/index.rst > > create mode 100644 include/configs/hmibsc.h > > > > [...] > > diff --git a/include/configs/hmibsc.h b/include/configs/hmibsc.h > > new file mode 100644 > > index 00000000000..66dfa549ce1 > > --- /dev/null > > +++ b/include/configs/hmibsc.h > > @@ -0,0 +1,57 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Board configuration file for HMIBSC > > + * > > + * (C) Copyright 2024 Sumit Garg <sumit.garg@linaro.org> > > + */ > > + > > +#ifndef __CONFIGS_HMIBSC_H > > +#define __CONFIGS_HMIBSC_H > > + > > +/* PHY needs a longer aneg time */ > > +#define PHY_ANEG_TIMEOUT 8000 > > + > > +#define HMIBSC_BOOTCOMMAND \ > > + "setenv devtype mmc; setenv devnum 0; " \ > > + "test -n \"${BOOT_ORDER}\" || setenv BOOT_ORDER \"A B\"; " \ > > + "test -n \"${BOOT_A_LEFT}\" || setenv BOOT_A_LEFT 3; " \ > > + "test -n \"${BOOT_B_LEFT}\" || setenv BOOT_B_LEFT 3; " \ > > + "setenv raucslot; " \ > > + "for BOOT_SLOT in \"${BOOT_ORDER}\"; do " \ > > + " if test \"x${raucslot}\" != \"x\"; then " \ > > + " echo \"skip remaining slots...\"; " \ > > + " elif test \"x${BOOT_SLOT}\" = \"xA\"; then " \ > > + " if test ${BOOT_A_LEFT} -gt 0; then " \ > > + " setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1; " \ > > + " echo \"Found valid RAUC slot A\"; " \ > > + " setenv raucslot \"rauc.slot=A\"; " \ > > + " setenv raucpart A; setenv distro_bootpart 6;" \ > > + " fi; " \ > > + " elif test \"x${BOOT_SLOT}\" = \"xB\"; then " \ > > + " if test ${BOOT_B_LEFT} -gt 0; then " \ > > + " setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1; " \ > > + " echo \"Found valid RAUC slot B\"; " \ > > + " setenv raucslot \"rauc.slot=B\"; " \ > > + " setenv raucpart B; setenv distro_bootpart 7;" \ > > + " fi; " \ > > + " fi; " \ > > + "done; " \ > > + "if test -n \"${raucslot}\"; then " \ > > + " setenv bootargs console=ttyMSM1 root=PARTLABEL=rootfs_${raucpart} rw rootwait ${raucslot}; " \ > > + " saveenv; " \ > > + "else " \ > > + " echo \"No valid RAUC slot found. Resetting tries to 3\"; " \ > > + " setenv BOOT_A_LEFT 3; " \ > > + " setenv BOOT_B_LEFT 3; " \ > > + " saveenv; " \ > > + " reset; " \ > > + "fi; " \ > > + "load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} /boot/fitImage && bootm" > > + > > +#define CFG_EXTRA_ENV_SETTINGS \ > > + "loadaddr=0x90000000\0" \ > > + "bootcmd=" HMIBSC_BOOTCOMMAND "\0" > > + > > The "text-based environment" [1] is preferred nowadays, i.e. defining > these inside board/schneider/hmibsc/hmibsc.env instead (similar to how > DB410c has its environment defined in > board/qualcomm/dragonboard410c/dragonboard410c.env). This should also > avoid all the crazy escaping to encode it as C string. :D That makes sense, I will convert to that. > > However, I suspect that right now it would attempt to load this file > from board/qualcomm/hmibsc/hmibsc.env since you do not seem to have > CONFIG_SYS_VENDOR set correctly. It looks like Caleb removed the option > to customize CONFIG_SYS_VENDOR in commit 059d526af312 ("mach-snapdragon: > generalise board support"). It might be easiest to add a prompt in > arch/arm/mach-snapdragon/Kconfig to allow changing it (similar to > CONFIG_SYS_BOARD). Although the restriction for Qualcomm being the only vendor for boards based on snapdragon SoCs shouldn't be added in the first place but since that patch did a lot of things in one go made its review harder. However, we can always fix it which I will do for the next version. -Sumit > > Thanks, > Stephan > > [1]: https://docs.u-boot.org/en/latest/usage/environment.html#text-based-environment
Hi Sumit, On 08/04/2024 11:13, Sumit Garg wrote: > On Fri, 5 Apr 2024 at 20:16, Stephan Gerhold <stephan@gerhold.net> wrote: >> >> On Fri, Apr 05, 2024 at 02:37:42PM +0530, Sumit Garg wrote: >>> Support for Schneider Electric HMIBSC. Features: >>> - Qualcomm Snapdragon 410C SoC - APQ8016 (4xCortex A53, Adreno 306) >>> - 2GiB RAM >>> - 64GiB eMMC, SD slot >>> - WiFi and Bluetooth >>> - 2x Host, 1x Device USB port >>> - HDMI >>> - Discrete TPM2 chip over SPI >>> >>> Features enabled in U-Boot: >>> - RAUC updates >>> - Environment protection >>> - USB based ethernet adaptors >>> >>> Signed-off-by: Sumit Garg <sumit.garg@linaro.org> >> >> I don't think this is a big deal but this patch would be a bit easier to >> skim over if you move the (unmodified?) import of the Linux >> apq8016-schneider-hmibsc.dts to a separate patch with a clear note in >> the commit message >> >> - where it comes from (link to Linux patch), and >> - that it can be removed again with a future update of the upstream DTs >> in U-Boot (once it is applied upstream at least). >> >> You kind of have that information in the cover letter but I think it >> would be good to have it in the commit message. > > Although the general practice in U-Boot is to have the board DTS file > submitted along with board code, if it makes review easier via > separating the unmodified import of the board DTS file then I can do > that. Given that in a few cycles we intend to drop the DTS you're adding here, having a commit we can just revert will make that much simpler. > >> >>> --- >>> arch/arm/dts/apq8016-schneider-hmibsc.dts | 491 ++++++++++++++++++++++ >>> board/schneider/hmibsc/MAINTAINERS | 6 + >>> configs/hmibsc_defconfig | 86 ++++ >>> doc/board/index.rst | 1 + >>> doc/board/schneider/hmibsc.rst | 45 ++ >>> doc/board/schneider/index.rst | 9 + >>> include/configs/hmibsc.h | 57 +++ >>> 7 files changed, 695 insertions(+) >>> create mode 100644 arch/arm/dts/apq8016-schneider-hmibsc.dts >>> create mode 100644 board/schneider/hmibsc/MAINTAINERS >>> create mode 100644 configs/hmibsc_defconfig >>> create mode 100644 doc/board/schneider/hmibsc.rst >>> create mode 100644 doc/board/schneider/index.rst >>> create mode 100644 include/configs/hmibsc.h >>> >>> [...] >>> diff --git a/include/configs/hmibsc.h b/include/configs/hmibsc.h >>> new file mode 100644 >>> index 00000000000..66dfa549ce1 >>> --- /dev/null >>> +++ b/include/configs/hmibsc.h >>> @@ -0,0 +1,57 @@ >>> +/* SPDX-License-Identifier: GPL-2.0+ */ >>> +/* >>> + * Board configuration file for HMIBSC >>> + * >>> + * (C) Copyright 2024 Sumit Garg <sumit.garg@linaro.org> >>> + */ >>> + >>> +#ifndef __CONFIGS_HMIBSC_H >>> +#define __CONFIGS_HMIBSC_H >>> + >>> +/* PHY needs a longer aneg time */ >>> +#define PHY_ANEG_TIMEOUT 8000 >>> + >>> +#define HMIBSC_BOOTCOMMAND \ >>> + "setenv devtype mmc; setenv devnum 0; " \ >>> + "test -n \"${BOOT_ORDER}\" || setenv BOOT_ORDER \"A B\"; " \ >>> + "test -n \"${BOOT_A_LEFT}\" || setenv BOOT_A_LEFT 3; " \ >>> + "test -n \"${BOOT_B_LEFT}\" || setenv BOOT_B_LEFT 3; " \ >>> + "setenv raucslot; " \ >>> + "for BOOT_SLOT in \"${BOOT_ORDER}\"; do " \ >>> + " if test \"x${raucslot}\" != \"x\"; then " \ >>> + " echo \"skip remaining slots...\"; " \ >>> + " elif test \"x${BOOT_SLOT}\" = \"xA\"; then " \ >>> + " if test ${BOOT_A_LEFT} -gt 0; then " \ >>> + " setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1; " \ >>> + " echo \"Found valid RAUC slot A\"; " \ >>> + " setenv raucslot \"rauc.slot=A\"; " \ >>> + " setenv raucpart A; setenv distro_bootpart 6;" \ >>> + " fi; " \ >>> + " elif test \"x${BOOT_SLOT}\" = \"xB\"; then " \ >>> + " if test ${BOOT_B_LEFT} -gt 0; then " \ >>> + " setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1; " \ >>> + " echo \"Found valid RAUC slot B\"; " \ >>> + " setenv raucslot \"rauc.slot=B\"; " \ >>> + " setenv raucpart B; setenv distro_bootpart 7;" \ >>> + " fi; " \ >>> + " fi; " \ >>> + "done; " \ >>> + "if test -n \"${raucslot}\"; then " \ >>> + " setenv bootargs console=ttyMSM1 root=PARTLABEL=rootfs_${raucpart} rw rootwait ${raucslot}; " \ >>> + " saveenv; " \ >>> + "else " \ >>> + " echo \"No valid RAUC slot found. Resetting tries to 3\"; " \ >>> + " setenv BOOT_A_LEFT 3; " \ >>> + " setenv BOOT_B_LEFT 3; " \ >>> + " saveenv; " \ >>> + " reset; " \ >>> + "fi; " \ >>> + "load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} /boot/fitImage && bootm" >>> + >>> +#define CFG_EXTRA_ENV_SETTINGS \ >>> + "loadaddr=0x90000000\0" \ >>> + "bootcmd=" HMIBSC_BOOTCOMMAND "\0" >>> + >> >> The "text-based environment" [1] is preferred nowadays, i.e. defining >> these inside board/schneider/hmibsc/hmibsc.env instead (similar to how >> DB410c has its environment defined in >> board/qualcomm/dragonboard410c/dragonboard410c.env). This should also >> avoid all the crazy escaping to encode it as C string. :D > > That makes sense, I will convert to that. > >> >> However, I suspect that right now it would attempt to load this file >> from board/qualcomm/hmibsc/hmibsc.env since you do not seem to have >> CONFIG_SYS_VENDOR set correctly. It looks like Caleb removed the option >> to customize CONFIG_SYS_VENDOR in commit 059d526af312 ("mach-snapdragon: >> generalise board support"). It might be easiest to add a prompt in >> arch/arm/mach-snapdragon/Kconfig to allow changing it (similar to >> CONFIG_SYS_BOARD). > > Although the restriction for Qualcomm being the only vendor for boards > based on snapdragon SoCs shouldn't be added in the first place but > since that patch did a lot of things in one go made its review harder. > However, we can always fix it which I will do for the next version. CONFIG_DEFAULT_ENV_FILE can be set relative to the source tree root, so you can put your .env file anywhere you like and specify the full path. I'm fine with allowing CONFIG_SYS_VENDOR to be overriden in the same way CONFIG_SYS_BOARD can be. > > -Sumit > >> >> Thanks, >> Stephan >> >> [1]: https://docs.u-boot.org/en/latest/usage/environment.html#text-based-environment
diff --git a/arch/arm/dts/apq8016-schneider-hmibsc.dts b/arch/arm/dts/apq8016-schneider-hmibsc.dts new file mode 100644 index 00000000000..75c6137e5a1 --- /dev/null +++ b/arch/arm/dts/apq8016-schneider-hmibsc.dts @@ -0,0 +1,491 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2024, Linaro Ltd. + */ + +/dts-v1/; + +#include "msm8916-pm8916.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/input/input.h> +#include <dt-bindings/leds/common.h> +#include <dt-bindings/pinctrl/qcom,pmic-gpio.h> +#include <dt-bindings/pinctrl/qcom,pmic-mpp.h> +#include <dt-bindings/sound/apq8016-lpass.h> + +/ { + model = "Schneider Electric HMIBSC Board"; + compatible = "schneider,apq8016-hmibsc", "qcom,apq8016"; + + aliases { + i2c1 = &blsp_i2c6; + i2c3 = &blsp_i2c4; + i2c4 = &blsp_i2c3; + mmc0 = &sdhc_1; /* eMMC */ + mmc1 = &sdhc_2; /* SD card */ + serial0 = &blsp_uart1; + serial1 = &blsp_uart2; + spi0 = &blsp_spi5; + usid0 = &pm8916_0; + }; + + chosen { + stdout-path = "serial0"; + }; + + hdmi-out { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_con: endpoint { + remote-endpoint = <&adv7533_out>; + }; + }; + }; + + gpio-keys { + compatible = "gpio-keys"; + autorepeat; + pinctrl-0 = <&msm_key_volp_n_default>; + pinctrl-names = "default"; + + button { + label = "Volume Up"; + linux,code = <KEY_VOLUMEUP>; + gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + pinctrl-0 = <&pm8916_mpps_leds>; + pinctrl-names = "default"; + + led-1 { + function = LED_FUNCTION_WLAN; + color = <LED_COLOR_ID_YELLOW>; + gpios = <&pm8916_mpps 2 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "phy0tx"; + default-state = "off"; + }; + + led-2 { + function = LED_FUNCTION_BLUETOOTH; + color = <LED_COLOR_ID_BLUE>; + gpios = <&pm8916_mpps 3 GPIO_ACTIVE_HIGH>; + linux,default-trigger = "bluetooth-power"; + default-state = "off"; + }; + }; + + memory@80000000 { + reg = <0 0x80000000 0 0x40000000>; + }; + + reserved-memory { + ramoops@bff00000 { + compatible = "ramoops"; + reg = <0x0 0xbff00000 0x0 0x100000>; + record-size = <0x20000>; + console-size = <0x20000>; + ftrace-size = <0x20000>; + ecc-size = <16>; + }; + }; + + usb-hub { + compatible = "smsc,usb3503"; + reset-gpios = <&pm8916_gpios 1 GPIO_ACTIVE_LOW>; + initial-mode = <1>; + }; + + usb_id: usb-id { + compatible = "linux,extcon-usb-gpio"; + id-gpios = <&tlmm 110 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&usb_id_default>; + pinctrl-names = "default"; + }; +}; + +&blsp_i2c3 { + status = "okay"; + + eeprom@50 { + compatible = "atmel,24c32"; + reg = <0x50>; + }; +}; + +&blsp_i2c4 { + status = "okay"; + + adv_bridge: bridge@39 { + compatible = "adi,adv7533"; + reg = <0x39>; + interrupts-extended = <&tlmm 31 IRQ_TYPE_EDGE_FALLING>; + + adi,dsi-lanes = <4>; + clocks = <&rpmcc RPM_SMD_BB_CLK2>; + clock-names = "cec"; + pd-gpios = <&tlmm 32 GPIO_ACTIVE_HIGH>; + + avdd-supply = <&pm8916_l6>; + a2vdd-supply = <&pm8916_l6>; + dvdd-supply = <&pm8916_l6>; + pvdd-supply = <&pm8916_l6>; + v1p2-supply = <&pm8916_l6>; + v3p3-supply = <&pm8916_l17>; + + pinctrl-0 = <&adv7533_int_active &adv7533_switch_active>; + pinctrl-1 = <&adv7533_int_suspend &adv7533_switch_suspend>; + pinctrl-names = "default","sleep"; + #sound-dai-cells = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + adv7533_in: endpoint { + remote-endpoint = <&mdss_dsi0_out>; + }; + }; + + port@1 { + reg = <1>; + adv7533_out: endpoint { + remote-endpoint = <&hdmi_con>; + }; + }; + }; + }; +}; + +&blsp_i2c6 { + status = "okay"; + + rtc@30 { + compatible = "sii,s35390a"; + reg = <0x30>; + }; + + eeprom@50 { + compatible = "atmel,24c256"; + reg = <0x50>; + }; +}; + +&blsp_spi5 { + cs-gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; + status = "okay"; + + tpm@0 { + compatible = "infineon,slb9670", "tcg,tpm_tis-spi"; + reg = <0>; + spi-max-frequency = <500000>; + }; +}; + +&blsp_uart1 { + label = "UART0"; + status = "okay"; +}; + +&blsp_uart2 { + label = "UART1"; + status = "okay"; +}; + +&lpass { + status = "okay"; +}; + +&mdss { + status = "okay"; +}; + +&mdss_dsi0_out { + data-lanes = <0 1 2 3>; + remote-endpoint = <&adv7533_in>; +}; + +&pm8916_codec { + qcom,mbhc-vthreshold-low = <75 150 237 450 500>; + qcom,mbhc-vthreshold-high = <75 150 237 450 500>; + status = "okay"; +}; + +&pm8916_gpios { + gpio-line-names = + "USB_HUB_RESET_N_PM", + "USB_SW_SEL_PM", + "NC", + "NC"; + + usb_hub_reset_pm: usb-hub-reset-pm-state { + pins = "gpio1"; + function = PMIC_GPIO_FUNC_NORMAL; + input-disable; + output-high; + }; + + usb_hub_reset_pm_device: usb-hub-reset-pm-device-state { + pins = "gpio1"; + function = PMIC_GPIO_FUNC_NORMAL; + input-disable; + output-low; + }; + + usb_sw_sel_pm: usb-sw-sel-pm-state { + pins = "gpio2"; + function = PMIC_GPIO_FUNC_NORMAL; + power-source = <PM8916_GPIO_VPH>; + input-disable; + output-high; + }; + + usb_sw_sel_pm_device: usb-sw-sel-pm-device-state { + pins = "gpio2"; + function = PMIC_GPIO_FUNC_NORMAL; + power-source = <PM8916_GPIO_VPH>; + input-disable; + output-low; + }; +}; + +&pm8916_mpps { + gpio-line-names = + "NC", + "WLAN_LED_CTRL", + "BT_LED_CTRL", + "NC"; + + pm8916_mpps_leds: pm8916-mpps-state { + pins = "mpp2", "mpp3"; + function = "digital"; + output-low; + }; +}; + +&pm8916_resin { + linux,code = <KEY_POWER>; + status = "okay"; +}; + +&pm8916_rpm_regulators { + pm8916_l17: l17 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; +}; + +&sdhc_1 { + status = "okay"; +}; + +&sdhc_2 { + pinctrl-0 = <&sdc2_default &sdc2_cd_default>; + pinctrl-1 = <&sdc2_sleep &sdc2_cd_default>; + pinctrl-names = "default", "sleep"; + cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; + status = "okay"; +}; + +&sound { + pinctrl-0 = <&cdc_pdm_default &sec_mi2s_default>; + pinctrl-1 = <&cdc_pdm_sleep &sec_mi2s_sleep>; + pinctrl-names = "default", "sleep"; + model = "HMIBSC"; + audio-routing = + "AMIC2", "MIC BIAS Internal2", + "AMIC3", "MIC BIAS External1"; + status = "okay"; + + quaternary-dai-link { + link-name = "ADV7533"; + cpu { + sound-dai = <&lpass MI2S_QUATERNARY>; + }; + codec { + sound-dai = <&adv_bridge 0>; + }; + }; + + primary-dai-link { + link-name = "WCD"; + cpu { + sound-dai = <&lpass MI2S_PRIMARY>; + }; + codec { + sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>; + }; + }; + + tertiary-dai-link { + link-name = "WCD-Capture"; + cpu { + sound-dai = <&lpass MI2S_TERTIARY>; + }; + codec { + sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>; + }; + }; +}; + +&tlmm { + pinctrl-0 = <&uart1_mux0_rs232_high &uart1_mux1_rs232_low>; + pinctrl-names = "default"; + + adv7533_int_active: adv533-int-active-state { + pins = "gpio31"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + }; + + adv7533_int_suspend: adv7533-int-suspend-state { + pins = "gpio31"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + adv7533_switch_active: adv7533-switch-active-state { + pins = "gpio32"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + }; + + adv7533_switch_suspend: adv7533-switch-suspend-state { + pins = "gpio32"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + msm_key_volp_n_default: msm-key-volp-n-default-state { + pins = "gpio107"; + function = "gpio"; + drive-strength = <8>; + bias-pull-up; + }; + + sdc2_cd_default: sdc2-cd-default-state { + pins = "gpio38"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; + + /* + * UART1 being the debug console supports various modes of + * operation (RS-232/485/422) controlled via GPIOs configured + * mux as follows: + * + * gpio100 gpio99 UART mode + * 0 0 loopback + * 0 1 RS-232 + * 1 0 RS-485 + * 1 1 RS-422 + * + * The default mode configured here is RS-232 mode. + */ + uart1_mux0_rs232_high: uart1-mux0-rs232-state { + bootph-all; + pins = "gpio99"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-high; + }; + + uart1_mux1_rs232_low: uart1-mux1-rs232-state { + bootph-all; + pins = "gpio100"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; + + usb_id_default: usb-id-default-state { + pins = "gpio110"; + function = "gpio"; + drive-strength = <8>; + bias-pull-up; + }; +}; + +&usb { + extcon = <&usb_id>, <&usb_id>; + pinctrl-0 = <&usb_sw_sel_pm &usb_hub_reset_pm>; + pinctrl-1 = <&usb_sw_sel_pm_device &usb_hub_reset_pm_device>; + pinctrl-names = "default", "device"; + status = "okay"; +}; + +&usb_hs_phy { + extcon = <&usb_id>; +}; + +&wcnss { + firmware-name = "qcom/apq8016/wcnss.mbn"; + status = "okay"; +}; + +&wcnss_ctrl { + firmware-name = "qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin"; +}; + +&wcnss_iris { + compatible = "qcom,wcn3620"; +}; + +&wcnss_mem { + status = "okay"; +}; + +/* PINCTRL - additions to nodes defined in msm8916.dtsi */ + +/* + * 2mA drive strength is not enough when connecting multiple + * I2C devices with different pull up resistors. + */ +&blsp_i2c4_default { + drive-strength = <16>; +}; + +&blsp_i2c6_default { + drive-strength = <16>; +}; + +&blsp_uart1_default { + bootph-all; +}; + +/* Enable CoreSight */ +&cti0 { status = "okay"; }; +&cti1 { status = "okay"; }; +&cti12 { status = "okay"; }; +&cti13 { status = "okay"; }; +&cti14 { status = "okay"; }; +&cti15 { status = "okay"; }; +&debug0 { status = "okay"; }; +&debug1 { status = "okay"; }; +&debug2 { status = "okay"; }; +&debug3 { status = "okay"; }; +&etf { status = "okay"; }; +&etm0 { status = "okay"; }; +&etm1 { status = "okay"; }; +&etm2 { status = "okay"; }; +&etm3 { status = "okay"; }; +&etr { status = "okay"; }; +&funnel0 { status = "okay"; }; +&funnel1 { status = "okay"; }; +&replicator { status = "okay"; }; +&stm { status = "okay"; }; +&tpiu { status = "okay"; }; diff --git a/board/schneider/hmibsc/MAINTAINERS b/board/schneider/hmibsc/MAINTAINERS new file mode 100644 index 00000000000..0f31bbda966 --- /dev/null +++ b/board/schneider/hmibsc/MAINTAINERS @@ -0,0 +1,6 @@ +HMIBSC BOARD +M: Sumit Garg <sumit.garg@linaro.org> +S: Maintained +F: board/schneider/hmibsc/ +F: include/configs/hmibsc.h +F: configs/hmibsc_defconfig diff --git a/configs/hmibsc_defconfig b/configs/hmibsc_defconfig new file mode 100644 index 00000000000..c41ed3d5925 --- /dev/null +++ b/configs/hmibsc_defconfig @@ -0,0 +1,86 @@ +CONFIG_ARM=y +CONFIG_SYS_BOARD="hmibsc" +CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK=y +CONFIG_ARCH_SNAPDRAGON=y +CONFIG_TEXT_BASE=0x8f600000 +CONFIG_SYS_MALLOC_LEN=0x802000 +CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y +CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x8007fff0 +CONFIG_ENV_SIZE=0x2000 +CONFIG_ENV_OFFSET=0x0 +CONFIG_DEFAULT_DEVICE_TREE="apq8016-schneider-hmibsc" +# CONFIG_OF_UPSTREAM is not set +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_IDENT_STRING="\nSchneider Electric-HMIBSC" +CONFIG_SYS_LOAD_ADDR=0x80080000 +CONFIG_REMAKE_ELF=y +# CONFIG_ANDROID_BOOT_IMAGE is not set +CONFIG_FIT=y +CONFIG_HUSH_PARSER=y +CONFIG_SYS_CBSIZE=2048 +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_SYS_PROMPT="hmibsc => " +CONFIG_SYS_MAXARGS=64 +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_CMD_FS_GENERIC=y +# CONFIG_CMD_IMI is not set +CONFIG_CMD_MD5SUM=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_FAT=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_USB=y +CONFIG_BOOTP_BOOTFILESIZE=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIMER=y +CONFIG_CMD_ENV_FLAGS=y +CONFIG_CMD_ENV_EXISTS=y +CONFIG_CMD_NVEDIT_INFO=y +CONFIG_ENV_WRITEABLE_LIST=y +CONFIG_ENV_ACCESS_IGNORE_FORCE=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_SYS_MMC_ENV_PART=2 +CONFIG_BUTTON_QCOM_PMIC=y +CONFIG_CLK=y +CONFIG_CLK_QCOM_APQ8016=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x91000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=0 +CONFIG_MSM_GPIO=y +CONFIG_QCOM_PMIC_GPIO=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_MSM=y +CONFIG_PHY=y +CONFIG_PINCTRL=y +CONFIG_PINCONF=y +CONFIG_PINCTRL_QCOM_APQ8016=y +CONFIG_DM_PMIC=y +CONFIG_PMIC_QCOM=y +CONFIG_MSM_SERIAL=y +CONFIG_SPMI_MSM=y +CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_MSM=y +CONFIG_USB_ULPI_VIEWPORT=y +CONFIG_USB_ULPI=y +CONFIG_USB_HOST_ETHER=y +CONFIG_USB_ETHER_ASIX=y +CONFIG_USB_ETHER_ASIX88179=y +CONFIG_USB_ETHER_MCS7830=y +CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_PHYLIB=y +CONFIG_USB_ETHER_LAN75XX=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_VENDOR_NUM=0x18d1 +CONFIG_USB_GADGET_PRODUCT_NUM=0xd00d +CONFIG_CI_UDC=y diff --git a/doc/board/index.rst b/doc/board/index.rst index f0a11f84ccc..428faa810be 100644 --- a/doc/board/index.rst +++ b/doc/board/index.rst @@ -42,6 +42,7 @@ Board-specific doc renesas/index rockchip/index samsung/index + schneider/index sielaff/index siemens/index sifive/index diff --git a/doc/board/schneider/hmibsc.rst b/doc/board/schneider/hmibsc.rst new file mode 100644 index 00000000000..f09fb5af1b3 --- /dev/null +++ b/doc/board/schneider/hmibsc.rst @@ -0,0 +1,45 @@ +.. SPDX-License-Identifier: GPL-2.0+ +.. sectionauthor:: Sumit Garg <sumit.garg@linaro.org> + +HMIBSC +====== + +The HMIBSC is an IIoT Edge Box Core board based on the Qualcomm APQ8016E SoC. +More information can be found on the `SE product page`_. + +U-Boot can be used as a replacement for Qualcomm's original Android bootloader +(a fork of Little Kernel/LK). Like LK, it is installed directly into the ``aboot`` +partition. Note that the U-Boot port used to be loaded as an Android boot image +through LK. This is no longer the case, now U-Boot can replace LK entirely. + +.. _SE product page: https://www.se.com/us/en/product/HMIBSCEA53D1L0T/iiot-edge-box-core-harmony-ipc-emmc-dc-linux-tpm/ + +Build steps +----------- + +First, setup ``CROSS_COMPILE`` for aarch64. Then, build U-Boot for ``hmibsc``:: + + $ export CROSS_COMPILE=<aarch64 toolchain prefix> + $ make hmibsc_defconfig + $ make + +This will build ``u-boot.elf`` in the configured output directory. + +Installation +------------ + +Although the HMIBSC does not have secure boot set up by default, the firmware +still expects firmware ELF images to be "signed". The signature does not provide +any security in this case, but it provides the firmware with some required +metadata. + +To "sign" ``u-boot.elf`` you can use e.g. `qtestsign`_:: + + $ ./qtestsign.py aboot u-boot.elf + +Then install the resulting ``u-boot-test-signed.mbn`` to the ``aboot`` partition +on your device, e.g. with ``fastboot flash aboot u-boot-test-signed.mbn``. + +U-Boot should be running after a reboot (``fastboot reboot``). + +.. _qtestsign: https://github.com/msm8916-mainline/qtestsign diff --git a/doc/board/schneider/index.rst b/doc/board/schneider/index.rst new file mode 100644 index 00000000000..55792ed3100 --- /dev/null +++ b/doc/board/schneider/index.rst @@ -0,0 +1,9 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +Schneider Electric +================== + +.. toctree:: + :maxdepth: 2 + + hmibsc diff --git a/include/configs/hmibsc.h b/include/configs/hmibsc.h new file mode 100644 index 00000000000..66dfa549ce1 --- /dev/null +++ b/include/configs/hmibsc.h @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Board configuration file for HMIBSC + * + * (C) Copyright 2024 Sumit Garg <sumit.garg@linaro.org> + */ + +#ifndef __CONFIGS_HMIBSC_H +#define __CONFIGS_HMIBSC_H + +/* PHY needs a longer aneg time */ +#define PHY_ANEG_TIMEOUT 8000 + +#define HMIBSC_BOOTCOMMAND \ + "setenv devtype mmc; setenv devnum 0; " \ + "test -n \"${BOOT_ORDER}\" || setenv BOOT_ORDER \"A B\"; " \ + "test -n \"${BOOT_A_LEFT}\" || setenv BOOT_A_LEFT 3; " \ + "test -n \"${BOOT_B_LEFT}\" || setenv BOOT_B_LEFT 3; " \ + "setenv raucslot; " \ + "for BOOT_SLOT in \"${BOOT_ORDER}\"; do " \ + " if test \"x${raucslot}\" != \"x\"; then " \ + " echo \"skip remaining slots...\"; " \ + " elif test \"x${BOOT_SLOT}\" = \"xA\"; then " \ + " if test ${BOOT_A_LEFT} -gt 0; then " \ + " setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1; " \ + " echo \"Found valid RAUC slot A\"; " \ + " setenv raucslot \"rauc.slot=A\"; " \ + " setenv raucpart A; setenv distro_bootpart 6;" \ + " fi; " \ + " elif test \"x${BOOT_SLOT}\" = \"xB\"; then " \ + " if test ${BOOT_B_LEFT} -gt 0; then " \ + " setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1; " \ + " echo \"Found valid RAUC slot B\"; " \ + " setenv raucslot \"rauc.slot=B\"; " \ + " setenv raucpart B; setenv distro_bootpart 7;" \ + " fi; " \ + " fi; " \ + "done; " \ + "if test -n \"${raucslot}\"; then " \ + " setenv bootargs console=ttyMSM1 root=PARTLABEL=rootfs_${raucpart} rw rootwait ${raucslot}; " \ + " saveenv; " \ + "else " \ + " echo \"No valid RAUC slot found. Resetting tries to 3\"; " \ + " setenv BOOT_A_LEFT 3; " \ + " setenv BOOT_B_LEFT 3; " \ + " saveenv; " \ + " reset; " \ + "fi; " \ + "load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} /boot/fitImage && bootm" + +#define CFG_EXTRA_ENV_SETTINGS \ + "loadaddr=0x90000000\0" \ + "bootcmd=" HMIBSC_BOOTCOMMAND "\0" + +#define CFG_ENV_FLAGS_LIST_STATIC "BOOT_A_LEFT:dw,BOOT_B_LEFT:dw,BOOT_ORDER:sw" + +#endif
Support for Schneider Electric HMIBSC. Features: - Qualcomm Snapdragon 410C SoC - APQ8016 (4xCortex A53, Adreno 306) - 2GiB RAM - 64GiB eMMC, SD slot - WiFi and Bluetooth - 2x Host, 1x Device USB port - HDMI - Discrete TPM2 chip over SPI Features enabled in U-Boot: - RAUC updates - Environment protection - USB based ethernet adaptors Signed-off-by: Sumit Garg <sumit.garg@linaro.org> --- arch/arm/dts/apq8016-schneider-hmibsc.dts | 491 ++++++++++++++++++++++ board/schneider/hmibsc/MAINTAINERS | 6 + configs/hmibsc_defconfig | 86 ++++ doc/board/index.rst | 1 + doc/board/schneider/hmibsc.rst | 45 ++ doc/board/schneider/index.rst | 9 + include/configs/hmibsc.h | 57 +++ 7 files changed, 695 insertions(+) create mode 100644 arch/arm/dts/apq8016-schneider-hmibsc.dts create mode 100644 board/schneider/hmibsc/MAINTAINERS create mode 100644 configs/hmibsc_defconfig create mode 100644 doc/board/schneider/hmibsc.rst create mode 100644 doc/board/schneider/index.rst create mode 100644 include/configs/hmibsc.h