| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Mar 2023 17:42:21 +0100
From: Michal Vokáč <michal.vokac@...ft.com>
To: Shawn Guo <shawnguo@...nel.org>
Cc: Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Arnd Bergmann <arnd@...db.de>, Olof Johansson <olof@...om.net>,
Sascha Hauer <s.hauer@...gutronix.de>,
Pengutronix Kernel Team <kernel@...gutronix.de>,
Fabio Estevam <festevam@...il.com>,
NXP Linux Team <linux-imx@....com>,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH 5/6] ARM: dts: imx6dl-yapp43: Add support for new HW revision of the IOTA board
On 13. 03. 23 9:23, Shawn Guo wrote:
> On Fri, Feb 10, 2023 at 04:48:54PM +0100, Michal Vokáč wrote:
>> The PCB used for all the current boards (Ursa, Draco, Hydra, Orion, Crux)
>> was slightly redesigned and delivers some new features while some unused
>> components were removed.
>>
>> - External RTC chip with supercap added.
>> - Secure element added.
>> - LCD display power supply enable/disable signal added.
>> - Touch keyboard reset and interrupt signals added.
>> - Factory reset GPIO button added.
>> - Audio codec LM49350 (EoL) removed and replaced by PWM audio output.
>> - QCA8334 switch was replaced by Marvell 88E6141.
>> - PCIe completely removed.
>> - uSD card removed and replaced by board-to-board expansion connector.
>>
>> There are four configuration variants of the new board:
>>
>> 1. Pegasus
>> The board configuration is based on Orion with the following major changes:
>>
>> - Quad core SoC
>> - 4GB of RAM
>> - RTC with supercap added
>> - Secure element added
>>
>> 2. Pegasus+
>> This is the very same board as Pegasus but uses the i.MX6QuadPlus SoC.
>>
>> 3. Lynx
>> The board configuration is based on Draco with the following major changes:
>>
>> - DualLite SoC
>> - 1GB of RAM
>> - RTC with supercap added
>> - Secure element added
>>
>> 4. Phoenix
>> The board configuration is based on Ursa with the following major changes:
>>
>> - DualLite Soc
>> - 1GB of RAM
>> - RTC with supercap added
>> - Secure element added
>> - LCD display support removed
>> - UART2 removed
>> - Factory reset GPIO button added
>>
>> Signed-off-by: Michal Vokáč <michal.vokac@...ft.com>
>> ---
>> arch/arm/boot/dts/Makefile | 4 +
>> arch/arm/boot/dts/imx6dl-yapp4-lynx.dts | 58 ++
>> arch/arm/boot/dts/imx6dl-yapp4-phoenix.dts | 42 ++
>> arch/arm/boot/dts/imx6dl-yapp43-common.dtsi | 619 ++++++++++++++++++
>> arch/arm/boot/dts/imx6q-yapp4-pegasus.dts | 58 ++
>> .../boot/dts/imx6qp-yapp4-pegasus-plus.dts | 58 ++
>> 6 files changed, 839 insertions(+)
>> create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-lynx.dts
>> create mode 100644 arch/arm/boot/dts/imx6dl-yapp4-phoenix.dts
>> create mode 100644 arch/arm/boot/dts/imx6dl-yapp43-common.dtsi
>> create mode 100644 arch/arm/boot/dts/imx6q-yapp4-pegasus.dts
>> create mode 100644 arch/arm/boot/dts/imx6qp-yapp4-pegasus-plus.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index d08a3c450ce7..9a60d3fc0483 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -558,7 +558,9 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
>> imx6dl-wandboard-revd1.dtb \
>> imx6dl-yapp4-draco.dtb \
>> imx6dl-yapp4-hydra.dtb \
>> + imx6dl-yapp4-lynx.dtb \
>> imx6dl-yapp4-orion.dtb \
>> + imx6dl-yapp4-phoenix.dtb \
>> imx6dl-yapp4-ursa.dtb \
>> imx6q-apalis-eval.dtb \
>> imx6q-apalis-ixora.dtb \
>> @@ -625,6 +627,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
>> imx6q-nitrogen6_max.dtb \
>> imx6q-nitrogen6_som2.dtb \
>> imx6q-novena.dtb \
>> + imx6q-yapp4-pegasus.dtb \
>> imx6q-phytec-mira-rdk-emmc.dtb \
>
> Break the alphabetic order?
Sorry, for some reason I missed that line. Will be fixed in v2.
>
>> imx6q-phytec-mira-rdk-nand.dtb \
>> imx6q-phytec-pbab01.dtb \
>> @@ -680,6 +683,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
>> imx6qp-vicutp.dtb \
>> imx6qp-wandboard-revd1.dtb \
>> imx6qp-yapp4-crux-plus.dtb \
>> + imx6qp-yapp4-pegasus-plus.dtb \
>> imx6qp-zii-rdu2.dtb \
>> imx6s-dhcom-drc02.dtb
>> dtb-$(CONFIG_SOC_IMX6SL) += \
[...snip...]
>> diff --git a/arch/arm/boot/dts/imx6dl-yapp43-common.dtsi b/arch/arm/boot/dts/imx6dl-yapp43-common.dtsi
>> new file mode 100644
>> index 000000000000..30f354195e01
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/imx6dl-yapp43-common.dtsi
>> @@ -0,0 +1,619 @@
>> +// SPDX-License-Identifier: GPL-2.0
>> +//
>> +// Copyright (C) 2021 Y Soft Corporation, a.s.
>> +
>> +#include <dt-bindings/gpio/gpio.h>
>> +#include <dt-bindings/interrupt-controller/irq.h>
>> +#include <dt-bindings/input/input.h>
>> +#include <dt-bindings/leds/common.h>
>> +#include <dt-bindings/pwm/pwm.h>
>> +
>> +/ {
>> + aliases: aliases {
>> + ethernet1 = ð1;
>> + ethernet2 = ð2;
>> + mmc0 = &usdhc3;
>> + mmc1 = &usdhc4;
>> + };
>> +
>> + backlight: backlight {
>> + compatible = "pwm-backlight";
>> + pwms = <&pwm1 0 500000 PWM_POLARITY_INVERTED>;
>> + brightness-levels = <0 32 64 128 255>;
>> + default-brightness-level = <32>;
>> + num-interpolated-steps = <8>;
>> + power-supply = <&sw2_reg>;
>> + status = "disabled";
>> + };
>> +
>> + gpio_keys: gpio-keys {
>> + compatible = "gpio-keys";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_gpio_keys>;
>> + status = "disabled";
>> +
>> + button {
>> + label = "Factory RESET";
>> + linux,code = <BTN_0>;
>> + gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
>> + };
>> + };
>> +
>> + lcd_display: display {
>> + compatible = "fsl,imx-parallel-display";
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> + interface-pix-fmt = "rgb24";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_ipu1>;
>> + status = "disabled";
>> +
>> + port@0 {
>> + reg = <0>;
>> +
>> + lcd_display_in: endpoint {
>> + remote-endpoint = <&ipu1_di0_disp0>;
>> + };
>> + };
>> +
>> + port@1 {
>> + reg = <1>;
>> +
>> + lcd_display_out: endpoint {
>> + remote-endpoint = <&lcd_panel_in>;
>> + };
>> + };
>> + };
>> +
>> + panel: panel {
>> + compatible = "dataimage,scf0700c48ggu18";
>> + power-supply = <&sw2_reg>;
>> + backlight = <&backlight>;
>> + enable-gpios = <&gpio3 7 GPIO_ACTIVE_HIGH>;
>> + status = "disabled";
>> +
>> + port {
>> + lcd_panel_in: endpoint {
>> + remote-endpoint = <&lcd_display_out>;
>> + };
>> + };
>> + };
>> +
>> + reg_usb_h1_vbus: regulator-usb-h1-vbus {
>> + compatible = "regulator-fixed";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usbh1_vbus>;
>> + regulator-name = "usb_h1_vbus";
>> + regulator-min-microvolt = <5000000>;
>> + regulator-max-microvolt = <5000000>;
>> + gpio = <&gpio1 29 GPIO_ACTIVE_HIGH>;
>> + enable-active-high;
>> + status = "disabled";
>> + };
>> +
>> + reg_usb_otg_vbus: regulator-usb-otg-vbus {
>> + compatible = "regulator-fixed";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_usbotg_vbus>;
>> + regulator-name = "usb_otg_vbus";
>> + regulator-min-microvolt = <5000000>;
>> + regulator-max-microvolt = <5000000>;
>> + gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
>> + enable-active-high;
>> + status = "okay";
>> + };
>> +};
>> +
>> +&fec {
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_enet>;
>> + phy-mode = "rgmii-id";
>> + phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>;
>> + phy-reset-duration = <20>;
>
> Deprecated. Check Documentation/devicetree/bindings/net/fsl,fec.yaml.
OK, I will remove the reset-duration property and move
the reset-gpios property under the mdio switch subnode.
>> + phy-supply = <&sw2_reg>;
>> + status = "okay";
>> +
>> + fixed-link {
>> + speed = <1000>;
>> + full-duplex;
>> + };
>> +
>> + mdio {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + switch@0 {
>> + compatible = "marvell,mv88e6085";
>> + reg = <0>;
>> +
>> + switch_ports: ports {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + ethphy0: port@0 {
>> + reg = <0>;
>> + label = "cpu";
>> + phy-mode = "rgmii-id";
>> + ethernet = <&fec>;
>> +
>> + fixed-link {
>> + speed = <1000>;
>> + full-duplex;
>> + };
>> + };
>> +
>> + eth2: port@1 {
>> + reg = <1>;
>> + label = "eth2";
>> + phy-handle = <&phy_port1>;
>> + };
>> +
>> + eth1: port@2 {
>> + reg = <2>;
>> + label = "eth1";
>> + phy-handle = <&phy_port2>;
>> + };
>> + };
>> +
>> + mdio {
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + phy_port1: switchphy@11 {
>> + reg = <0x11>;
>> + };
>> +
>> + phy_port2: switchphy@12 {
>> + reg = <0x12>;
>> + };
>> + };
>> + };
>> + };
>> +};
>> +
>> +&i2c2 {
>> + clock-frequency = <100000>;
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_i2c2>;
>> + status = "okay";
>> +
>> + pmic@8 {
>> + compatible = "fsl,pfuze200";
>> + pinctrl-names = "default";
>> + pinctrl-0 = <&pinctrl_pmic>;
>> + reg = <0x8>;
>> +
>> + regulators {
>> + sw1a_reg: sw1ab {
>> + regulator-min-microvolt = <300000>;
>> + regulator-max-microvolt = <1875000>;
>> + regulator-boot-on;
>> + regulator-always-on;
>> + regulator-ramp-delay = <6250>;
>> + };
>> +
>> + sw2_reg: sw2 {
>> + regulator-min-microvolt = <800000>;
>> + regulator-max-microvolt = <3300000>;
>> + regulator-boot-on;
>> + regulator-always-on;
>> + };
>> +
>> + sw3a_reg: sw3a {
>> + regulator-min-microvolt = <400000>;
>> + regulator-max-microvolt = <1975000>;
>> + regulator-boot-on;
>> + regulator-always-on;
>> + };
>> +
>> + sw3b_reg: sw3b {
>> + regulator-min-microvolt = <400000>;
>> + regulator-max-microvolt = <1975000>;
>> + regulator-boot-on;
>> + regulator-always-on;
>> + };
>> +
>> + swbst_reg: swbst {
>> + regulator-min-microvolt = <5000000>;
>> + regulator-max-microvolt = <5150000>;
>> + };
>> +
>> + vgen1_reg: vgen1 {
>> + regulator-min-microvolt = <800000>;
>> + regulator-max-microvolt = <1550000>;
>> + };
>> +
>> + vgen2_reg: vgen2 {
>> + regulator-min-microvolt = <800000>;
>> + regulator-max-microvolt = <1550000>;
>> + };
>> +
>> + vgen3_reg: vgen3 {
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <3300000>;
>> + regulator-always-on;
>> + };
>> +
>> + vgen4_reg: vgen4 {
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <3300000>;
>> + regulator-always-on;
>> + };
>> +
>> + vgen5_reg: vgen5 {
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <3300000>;
>> + regulator-always-on;
>> + };
>> +
>> + vgen6_reg: vgen6 {
>> + regulator-min-microvolt = <1800000>;
>> + regulator-max-microvolt = <3300000>;
>> + regulator-always-on;
>> + };
>> +
>> + vref_reg: vrefddr {
>> + regulator-boot-on;
>> + regulator-always-on;
>> + };
>> +
>> + vsnvs_reg: vsnvs {
>> + regulator-min-microvolt = <1000000>;
>> + regulator-max-microvolt = <3000000>;
>> + regulator-boot-on;
>> + regulator-always-on;
>> + };
>> + };
>> + };
>> +
>> + leds: led-controller@30 {
>> + compatible = "ti,lp5562";
>> + reg = <0x30>;
>> + clock-mode = /bits/ 8 <1>;
>> + status = "disabled";
>
> Move 'status' to the end of property list.
Hmm, I am little bit surprised it is sorted like that.
I always put the status to the end. I am going to blame
author of the commit: b86d3d21cd4c (ARM: dts: imx6dl-yapp4:
Add reg property to the lp5562 channel node, 2020-08-12).
I will fix that in v2.
>> + #address-cells = <1>;
>> + #size-cells = <0>;
>> +
>> + led@0 {
>> + chan-name = "R";
>> + led-cur = /bits/ 8 <0x20>;
>> + max-cur = /bits/ 8 <0x60>;
>> + reg = <0>;
>> + color = <LED_COLOR_ID_RED>;
>> + };
>> +
>> + led@1 {
>> + chan-name = "G";
>> + led-cur = /bits/ 8 <0x20>;
>> + max-cur = /bits/ 8 <0x60>;
>> + reg = <1>;
>> + color = <LED_COLOR_ID_GREEN>;
>> + };
>> +
>> + led@2 {
>> + chan-name = "B";
>> + led-cur = /bits/ 8 <0x20>;
>> + max-cur = /bits/ 8 <0x60>;
>> + reg = <2>;
>> + color = <LED_COLOR_ID_BLUE>;
>> + };
>> + };
>> +
>> + eeprom@57 {
>> + compatible = "atmel,24c128";
>> + reg = <0x57>;
>> + pagesize = <64>;
>> + status = "okay";
>
> The "okay" status is only needed to flip a "disabled" one.
OK, I will remove the status "okay" from all device nodes defined
by this dtsi that should be enabled by default.
I assume that using status "okay" (or "disabled") for referenced
nodes coming from included SoC dtsi files is fine even if these
nodes already have the required status at the moment.
Otherwise I see no guarantee that the node will have my required
status in the future as well. The status in the included files
may be changed by someone else for whatever reason.
>> + };
>> +
>> + touchscreen: touchscreen@5c {
>> + compatible = "pixcir,pixcir_tangoc";
>> + reg = <0x5c>;
>> + pinctrl-0 = <&pinctrl_touch>;
>> + interrupt-parent = <&gpio4>;
>> + interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
>> + attb-gpio = <&gpio4 5 GPIO_ACTIVE_HIGH>;
>> + reset-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
>> + touchscreen-size-x = <800>;
>> + touchscreen-size-y = <480>;
>> + status = "disabled";
>> + };
>> +
>> + rtc: rtc@68 {
>> + compatible = "dallas,ds1341";
>> + reg = <0x68>;
>> + status = "okay";
>
> Ditto
>
> Shawn
ACK, will remove it in v2.
Thank you for the review.
Michal
[...snip...]
Powered by blists - more mailing lists