Diff
checker
Texte
Texte
Images
Documents
Excel
Dossiers
Legal
Enterprise
Application de bureau
Prix
Se connecter
Télécharger Diffchecker Desktop
Comparer le texte
Trouver la différence entre deux fichiers texte
Outils
Historique
Affichage
Vue
Divisé
Unifié
Éditeur live
Masquer les espaces
Cacher identiques
Sans retour à la ligne
Niveau de précision
Intelligent
Syntaxe
Aucun
Modifier l’apparence
Traitement
Ignorer
Transformer le texte
Aller au premier écart
Modifier l'entrée
Diffchecker Desktop
La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !
Obtenir Desktop
Untitled diff
Créé
il y a 2 ans
Le diff n'expire jamais
Effacer
Exporter
Partager
Expliquer
127 suppressions
Lignes
Total
Supprimé
Caractères
Total
Supprimé
Pour continuer à utiliser cette fonctionnalité, passez à
Diff
checker
Pro
Voir les prix
158 lignes
Copier tout
90 ajouts
Lignes
Total
Ajouté
Caractères
Total
Ajouté
Pour continuer à utiliser cette fonctionnalité, passez à
Diff
checker
Pro
Voir les prix
130 lignes
Copier tout
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
/*
Copier
Copié
Copier
Copié
* Copyright (C) STMicroelectronics 201
9
- All Rights Reserved
* Copyright (C) STMicroelectronics 201
7
- All Rights Reserved
* Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
* Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics.
*/
*/
/dts-v1/;
/dts-v1/;
Copier
Copié
Copier
Copié
#include "
stm32mp157.dtsi"
#include "
stm32mp157c-dk2.dts"
#include "stm32mp15xc.dtsi"
#include "stm32mp15-pinctrl.dtsi"
#include "stm32mp15xxac-pinctrl.dtsi"
#include "stm32mp15xx-dkx.dtsi"
#include <dt-bindings/rtc/rtc-stm32.h>
/ {
/ {
Copier
Copié
Copier
Copié
model = "STMicroelectronics STM32MP157C-DK2
Discovery Board
";
model = "STMicroelectronics STM32MP157C-DK2
configured to run M4 examples
";
compatible =
"st,stm32mp157c-dk2", "st,stm32mp157";
compatible =
"st,stm32mp157c-dk2-m4-examples",
"st,stm32mp157c-dk2", "st,stm32mp157";
};
Copier
Copié
Copier
Copié
aliases
{
&adc
{
serial0 = &uart4;
status
=
"disabled"
;
serial1 = &usart3;
serial2
=
&uart7;
serial3 = &usart2
;
};
};
Copier
Copié
Copier
Copié
chosen
{
&dac
{
stdout-path
= "
serial0:115200n8
";
status
= "
disabled
";
};
};
Copier
Copié
Copier
Copié
wifi_pwrseq: wifi-pwrseq
{
&dma2
{
compatible
= "
mmc-pwrseq-simple";
status
= "
disabled";
reset-gpios = <&gpioh 4 GPIO_ACTIVE_LOW>;
};
};
Copier
Copié
Copier
Copié
&dmamux1 {
dma-masters = <&dma1>;
dma-channels = <8>;
};
};
Copier
Copié
Copier
Copié
&
cryp1 {
&
m4_adc {
vref-supply = <&vrefbuf>;
status = "okay";
status = "okay";
};
};
Copier
Copié
Copier
Copié
&
dsi {
&
m4_dac {
vref-supply = <&vrefbuf>;
status = "okay";
status = "okay";
Copier
Copié
Copier
Copié
ports {
port@0 {
reg = <0>;
dsi_in: endpoint {
remote-endpoint = <<dc_ep1_out>;
};
Copier
Copié
Copier
Copié
};
};
Copier
Copié
Copier
Copié
port@1 {
&m4_dma2
{
reg = <1>;
status
=
"okay"
;
dsi_out: endpoint
{
remote-endpoint
=
<&panel_in>;
};
}
;
};
};
Copier
Copié
Copier
Copié
panel_otm8009a: panel-otm8009a@0 {
&m4_crc2 {
compatible = "orisetech,otm8009a";
reg = <0>;
reset-gpios = <&gpioe 4 GPIO_ACTIVE_LOW>;
power-supply = <&v3v3>;
status = "okay";
status = "okay";
Copier
Copié
Copier
Copié
port {
panel_in: endpoint {
remote-endpoint = <&dsi_out>;
};
Copier
Copié
Copier
Copié
};
};
Copier
Copié
Copier
Copié
&m4_cryp2 {
status = "okay";
Copier
Copié
Copier
Copié
};
};
Copier
Copié
Copier
Copié
&m4_hash2 {
status = "okay";
};
};
Copier
Copié
Copier
Copié
&
i2c
1
{
&
m4_
i2c
5
{
touchscreen@2a {
pinctrl-names
= "
default
";
compatible
= "
focaltech,ft6236
";
pinctrl-0 = <&m4_i2c5_pins_a>;
reg = <0x2a>;
interrupts = <2 2>;
interrupt-parent = <&gpiof>;
interrupt-controller;
touchscreen-size-x = <480>;
touchscreen-size-y = <800>;
panel = <&panel_otm8009a>;
vcc-supply = <&v3v3>;
status = "okay";
status = "okay";
};
};
touchscreen@38 {
compatible = "focaltech,ft6236";
&m4_rng2 {
reg = <0x38>;
interrupts = <2 2>;
interrupt-parent = <&gpiof>;
interrupt-controller;
touchscreen-size-x = <480>;
touchscreen-size-y = <800>;
panel = <&panel_otm8009a>;
vcc-supply = <&v3v3>;
status = "okay";
status = "okay";
};
};
Copier
Copié
Copier
Copié
&m4_rproc {
m4_system_resources {
status = "okay";
button {
compatible = "rproc-srm-dev";
interrupt-parent = <&gpioa>;
interrupts = <14 2>;
interrupt-names = "irq";
status = "okay";
Copier
Copié
Copier
Copié
};
};
Copier
Copié
Copier
Copié
<dc {
m4_led: m4_led {
compatible = "rproc-srm-dev";
pinctrl-names = "default";
pinctrl-0 = <&m4_leds_orange_pins>;
status = "okay";
status = "okay";
Copier
Copié
Copier
Copié
port {
ltdc_ep1_out: endpoint@1 {
reg = <1>;
remote-endpoint = <&dsi_in>;
};
};
};
};
};
};
Copier
Copié
Copier
Copié
&
rtc {
&
m4_spi4 {
st,lsco = <RTC_OUT2_RMP>;
pinctrl-0 = <&rtc_out2_rmp_pins_a>;
pinctrl-names = "default";
pinctrl-names = "default";
Copier
Copié
Copier
Copié
pinctrl-0 = <&m4_spi4_pins_a>;
status = "okay";
};
};
Copier
Copié
Copier
Copié
/* Wifi */
&sdmmc2 {
&m4_timers2 {
arm,primecell-periphid = <0x10153180>;
pinctrl-names = "default", "opendrain", "sleep";
pinctrl-0 = <&sdmmc2_b4_pins_a>;
pinctrl-1 = <&sdmmc2_b4_od_pins_a>;
pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>;
non-removable;
st,neg-edge;
bus-width = <4>;
vmmc-supply = <&v3v3>;
mmc-pwrseq = <&wifi_pwrseq>;
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
status = "okay";
Copier
Copié
Copier
Copié
brcmf: bcrmf@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
Copier
Copié
Copier
Copié
};
};
Copier
Copié
Copier
Copié
&m4_timers1 {
pinctrl-names = "default";
pinctrl-0 = <&m4_pwm1_pins_a_ch1>;
status = "okay";
};
};
Copier
Copié
Copier
Copié
/* Bluetooth */
&m4_u
art
7
{
&us
art
2
{
pinctrl-names = "default"
;
pinctrl-names = "default"
, "sleep", "idle"
;
pinctrl-0 = <&
m4_u
art
7
_pins_
a>;
pinctrl-0 = <&
usart2_pins_c>;
pinctrl-1 = <&us
art
2_sleep
_pins_
c>;
pinctrl-2 = <&usart2_idle_pins_c>;
uart-has-rtscts;
status = "okay";
status = "okay";
Copier
Copié
Copier
Copié
};
Copier
Copié
Copier
Copié
bluetooth
{
&pinctrl {
shutdown-gpios
= <
&gpioz 6 GPIO_ACTIVE_HIGH
>;
m4_leds_orange_pins: m4-leds-orange-0
{
compatible = "brcm,bcm43438-bt";
pins {
max-speed = <3000000>;
pinmux
= <
STM32_PINMUX('H', 7, RSVD)
>;
vbat-supply
= <
&v3v3
>;
};
vddio-supply = <&v3v3>
;
};
m4_pwm1_pins_a_ch1: m4-pwm1-0-ch1 {
pins {
pinmux
= <
STM32_PINMUX('E', 9, RSVD)
>;
}
;
};
};
};
};
Copier
Copié
Copier
Copié
&timers1 {
status = "disabled";
};
Différences enregistrées
Texte d'origine
Ouvrir un fichier
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2019 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics. */ /dts-v1/; #include "stm32mp157.dtsi" #include "stm32mp15xc.dtsi" #include "stm32mp15-pinctrl.dtsi" #include "stm32mp15xxac-pinctrl.dtsi" #include "stm32mp15xx-dkx.dtsi" #include <dt-bindings/rtc/rtc-stm32.h> / { model = "STMicroelectronics STM32MP157C-DK2 Discovery Board"; compatible = "st,stm32mp157c-dk2", "st,stm32mp157"; aliases { serial0 = &uart4; serial1 = &usart3; serial2 = &uart7; serial3 = &usart2; }; chosen { stdout-path = "serial0:115200n8"; }; wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; reset-gpios = <&gpioh 4 GPIO_ACTIVE_LOW>; }; }; &cryp1 { status = "okay"; }; &dsi { status = "okay"; ports { port@0 { reg = <0>; dsi_in: endpoint { remote-endpoint = <<dc_ep1_out>; }; }; port@1 { reg = <1>; dsi_out: endpoint { remote-endpoint = <&panel_in>; }; }; }; panel_otm8009a: panel-otm8009a@0 { compatible = "orisetech,otm8009a"; reg = <0>; reset-gpios = <&gpioe 4 GPIO_ACTIVE_LOW>; power-supply = <&v3v3>; status = "okay"; port { panel_in: endpoint { remote-endpoint = <&dsi_out>; }; }; }; }; &i2c1 { touchscreen@2a { compatible = "focaltech,ft6236"; reg = <0x2a>; interrupts = <2 2>; interrupt-parent = <&gpiof>; interrupt-controller; touchscreen-size-x = <480>; touchscreen-size-y = <800>; panel = <&panel_otm8009a>; vcc-supply = <&v3v3>; status = "okay"; }; touchscreen@38 { compatible = "focaltech,ft6236"; reg = <0x38>; interrupts = <2 2>; interrupt-parent = <&gpiof>; interrupt-controller; touchscreen-size-x = <480>; touchscreen-size-y = <800>; panel = <&panel_otm8009a>; vcc-supply = <&v3v3>; status = "okay"; }; }; <dc { status = "okay"; port { ltdc_ep1_out: endpoint@1 { reg = <1>; remote-endpoint = <&dsi_in>; }; }; }; &rtc { st,lsco = <RTC_OUT2_RMP>; pinctrl-0 = <&rtc_out2_rmp_pins_a>; pinctrl-names = "default"; }; /* Wifi */ &sdmmc2 { arm,primecell-periphid = <0x10153180>; pinctrl-names = "default", "opendrain", "sleep"; pinctrl-0 = <&sdmmc2_b4_pins_a>; pinctrl-1 = <&sdmmc2_b4_od_pins_a>; pinctrl-2 = <&sdmmc2_b4_sleep_pins_a>; non-removable; st,neg-edge; bus-width = <4>; vmmc-supply = <&v3v3>; mmc-pwrseq = <&wifi_pwrseq>; #address-cells = <1>; #size-cells = <0>; status = "okay"; brcmf: bcrmf@1 { reg = <1>; compatible = "brcm,bcm4329-fmac"; }; }; /* Bluetooth */ &usart2 { pinctrl-names = "default", "sleep", "idle"; pinctrl-0 = <&usart2_pins_c>; pinctrl-1 = <&usart2_sleep_pins_c>; pinctrl-2 = <&usart2_idle_pins_c>; uart-has-rtscts; status = "okay"; bluetooth { shutdown-gpios = <&gpioz 6 GPIO_ACTIVE_HIGH>; compatible = "brcm,bcm43438-bt"; max-speed = <3000000>; vbat-supply = <&v3v3>; vddio-supply = <&v3v3>; }; };
Texte modifié
Ouvrir un fichier
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) /* * Copyright (C) STMicroelectronics 2017 - All Rights Reserved * Author: Alexandre Torgue <alexandre.torgue@st.com> for STMicroelectronics. */ /dts-v1/; #include "stm32mp157c-dk2.dts" / { model = "STMicroelectronics STM32MP157C-DK2 configured to run M4 examples"; compatible = "st,stm32mp157c-dk2-m4-examples", "st,stm32mp157c-dk2", "st,stm32mp157"; }; &adc { status = "disabled"; }; &dac { status = "disabled"; }; &dma2 { status = "disabled"; }; &dmamux1 { dma-masters = <&dma1>; dma-channels = <8>; }; &m4_adc { vref-supply = <&vrefbuf>; status = "okay"; }; &m4_dac { vref-supply = <&vrefbuf>; status = "okay"; }; &m4_dma2 { status = "okay"; }; &m4_crc2 { status = "okay"; }; &m4_cryp2 { status = "okay"; }; &m4_hash2 { status = "okay"; }; &m4_i2c5 { pinctrl-names = "default"; pinctrl-0 = <&m4_i2c5_pins_a>; status = "okay"; }; &m4_rng2 { status = "okay"; }; &m4_rproc { m4_system_resources { status = "okay"; button { compatible = "rproc-srm-dev"; interrupt-parent = <&gpioa>; interrupts = <14 2>; interrupt-names = "irq"; status = "okay"; }; m4_led: m4_led { compatible = "rproc-srm-dev"; pinctrl-names = "default"; pinctrl-0 = <&m4_leds_orange_pins>; status = "okay"; }; }; }; &m4_spi4 { pinctrl-names = "default"; pinctrl-0 = <&m4_spi4_pins_a>; status = "okay"; }; &m4_timers2 { status = "okay"; }; &m4_timers1 { pinctrl-names = "default"; pinctrl-0 = <&m4_pwm1_pins_a_ch1>; status = "okay"; }; &m4_uart7 { pinctrl-names = "default"; pinctrl-0 = <&m4_uart7_pins_a>; status = "okay"; }; &pinctrl { m4_leds_orange_pins: m4-leds-orange-0 { pins { pinmux = <STM32_PINMUX('H', 7, RSVD)>; }; }; m4_pwm1_pins_a_ch1: m4-pwm1-0-ch1 { pins { pinmux = <STM32_PINMUX('E', 9, RSVD)>; }; }; }; &timers1 { status = "disabled"; };
Trouver la différence