Diff
checker
텍스트
텍스트
이미지
문서
Excel
폴더
Legal
Enterprise
데스크톱
요금제
로그인
데스크톱 앱 다운로드
텍스트 비교
두 텍스트 파일의 차이점을 찾아보세요
도구
기록
표시
레이아웃
나란히 보기
합쳐 보기
실시간 편집
공백 변경 숨기기
변경 없는 행 숨기기
줄바꿈 비활성화
비교 단위
스마트
구문
없음
모양 변경
처리
제외
텍스트 변환
첫 변경으로
수정
Diffchecker Desktop
가장 안전하게 Diffchecker를 사용하는 방법. 데스크톱 앱을 사용하면 비교 데이터가 외부로 전송되지 않습니다!
데스크톱 앱 받기
Untitled diff
생성일
2년 전
비교 결과 만료 없음
초기화
내보내기
공유
설명
127 삭제
행
총
삭제
글자
총
삭제
이 기능을 계속 사용하려면 업그레이드해 주세요
Diff
checker
Pro
요금제 보기
158 행
복사
90 추가
행
총
추가
글자
총
추가
이 기능을 계속 사용하려면 업그레이드해 주세요
Diff
checker
Pro
요금제 보기
130 행
복사
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause)
/*
/*
복사
복사됨
복사
복사됨
* 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/;
복사
복사됨
복사
복사됨
#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>
/ {
/ {
복사
복사됨
복사
복사됨
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";
};
복사
복사됨
복사
복사됨
aliases
{
&adc
{
serial0 = &uart4;
status
=
"disabled"
;
serial1 = &usart3;
serial2
=
&uart7;
serial3 = &usart2
;
};
};
복사
복사됨
복사
복사됨
chosen
{
&dac
{
stdout-path
= "
serial0:115200n8
";
status
= "
disabled
";
};
};
복사
복사됨
복사
복사됨
wifi_pwrseq: wifi-pwrseq
{
&dma2
{
compatible
= "
mmc-pwrseq-simple";
status
= "
disabled";
reset-gpios = <&gpioh 4 GPIO_ACTIVE_LOW>;
};
};
복사
복사됨
복사
복사됨
&dmamux1 {
dma-masters = <&dma1>;
dma-channels = <8>;
};
};
복사
복사됨
복사
복사됨
&
cryp1 {
&
m4_adc {
vref-supply = <&vrefbuf>;
status = "okay";
status = "okay";
};
};
복사
복사됨
복사
복사됨
&
dsi {
&
m4_dac {
vref-supply = <&vrefbuf>;
status = "okay";
status = "okay";
복사
복사됨
복사
복사됨
ports {
port@0 {
reg = <0>;
dsi_in: endpoint {
remote-endpoint = <<dc_ep1_out>;
};
복사
복사됨
복사
복사됨
};
};
복사
복사됨
복사
복사됨
port@1 {
&m4_dma2
{
reg = <1>;
status
=
"okay"
;
dsi_out: endpoint
{
remote-endpoint
=
<&panel_in>;
};
}
;
};
};
복사
복사됨
복사
복사됨
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";
복사
복사됨
복사
복사됨
port {
panel_in: endpoint {
remote-endpoint = <&dsi_out>;
};
복사
복사됨
복사
복사됨
};
};
복사
복사됨
복사
복사됨
&m4_cryp2 {
status = "okay";
복사
복사됨
복사
복사됨
};
};
복사
복사됨
복사
복사됨
&m4_hash2 {
status = "okay";
};
};
복사
복사됨
복사
복사됨
&
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";
};
};
복사
복사됨
복사
복사됨
&m4_rproc {
m4_system_resources {
status = "okay";
button {
compatible = "rproc-srm-dev";
interrupt-parent = <&gpioa>;
interrupts = <14 2>;
interrupt-names = "irq";
status = "okay";
복사
복사됨
복사
복사됨
};
};
복사
복사됨
복사
복사됨
<dc {
m4_led: m4_led {
compatible = "rproc-srm-dev";
pinctrl-names = "default";
pinctrl-0 = <&m4_leds_orange_pins>;
status = "okay";
status = "okay";
복사
복사됨
복사
복사됨
port {
ltdc_ep1_out: endpoint@1 {
reg = <1>;
remote-endpoint = <&dsi_in>;
};
};
};
};
};
};
복사
복사됨
복사
복사됨
&
rtc {
&
m4_spi4 {
st,lsco = <RTC_OUT2_RMP>;
pinctrl-0 = <&rtc_out2_rmp_pins_a>;
pinctrl-names = "default";
pinctrl-names = "default";
복사
복사됨
복사
복사됨
pinctrl-0 = <&m4_spi4_pins_a>;
status = "okay";
};
};
복사
복사됨
복사
복사됨
/* 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";
복사
복사됨
복사
복사됨
brcmf: bcrmf@1 {
reg = <1>;
compatible = "brcm,bcm4329-fmac";
복사
복사됨
복사
복사됨
};
};
복사
복사됨
복사
복사됨
&m4_timers1 {
pinctrl-names = "default";
pinctrl-0 = <&m4_pwm1_pins_a_ch1>;
status = "okay";
};
};
복사
복사됨
복사
복사됨
/* 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";
복사
복사됨
복사
복사됨
};
복사
복사됨
복사
복사됨
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)
>;
}
;
};
};
};
};
복사
복사됨
복사
복사됨
&timers1 {
status = "disabled";
};
저장된 비교 결과
원본
파일 열기
// 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>; }; };
수정본
파일 열기
// 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"; };
비교하기