mirror of
https://github.com/torvalds/linux
synced 2024-09-20 02:57:25 +00:00
Minor improvements in ARM DTS for v6.7
Few cleanups and improvements: split joined reg entries for Ethernet in omap3-devkit8000, add missing spaces before '{' (MediaTek, Nuvoton) and cleanup whitespace around '=' (MediaTek). -----BEGIN PGP SIGNATURE----- iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmUf0uwQHGtyemtAa2Vy bmVsLm9yZwAKCRDBN2bmhouD11HCEACSALLob97HRyvtlPGUWeYKIFe1OKtf3Tn4 Kv+46ohImBobDYsqg0GHQ1tYY90tIA2sft9YrS79e4c4FrBulWURpaMEjSFDORXu 2Vy5ZVOhrTNe4WqZclrGzpw3kf/PdGEeTZKvoIZjWvg6LDEOXmgezkx3u051ZUce 4HY4rvQ+Jrp2qSYcFXSDlopYYnQmH5muby+LwEkerhMggi1XenwKO/BuMz17o0v5 waPszM5e6Ffk9vnbgBMOKiSf2e7pq3JftGVroI3z2O66H6FeXzEoSHF7Xkc9p5R/ 6n+KkojeqyZMs6/iWHnS6cKgMMCaqhOXMGI4wtTKKJzRWHckwKMOBrzoZ+Biszig wvNnFGqnbdXNF5BZMkipn6ZDVjY2Vfe2Kw/aZ89yqt5Rbhc3YPb0hMmdrM9eCEvw yn4lz0kUehUbi7yaYs0W7r6nYdSZop4h5+OrnOHPFvUR8kG8uQKYKHRcCiFXkbvV OBmGXfFRQvywqC99uXAQcKXNfAbwGRnxAy0kQXYFJWjLMEtrlp8YYbdxDRNLIv4v m4MabOCeEB/nZEKXA0E09Ycp7Bb/grqIvm/HKxA/H/f05gvGcRoJQeDTDSmMrwpg AlA6G6QhOXj2OBA8NuBm7SWz+zbmiYaXmvVB5R3qQWaTtzoeqQtQdYlrwOEQmH1M zXR91sbWxA== =OExn -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmUn0NMACgkQYKtH/8kJ UifoAg/7BYsh4+nSllKQfcofYgup5tDlMk83ABysH8d3mAGn4RajibHmYHMj9C22 7kPCCHecd9x6t4Fwk7m/ZNq8VwTw9Lx0wNY5C5kDy7MiZspii4omf2oVAcuqK6qi ELKd+gF4VOQ7Rsf5iN+Kap7mg8eunGU9vwjr16MyCx8oks84PN83gIhZdOpviyVy HyWDWUQdZ1TBNRrIVqqcX/a6TXF995+gMHSyMyT/daF3qVD3UmfCtay2ol0jStg8 iCebqhkncYUcKgXE8KK713xGb/B8aCCvkWseeO0M4EhAy5aQ7llT/nq4o/iA65Lz wkq7h8bko111KV5/cZbelsIWHbRxzsJM3gv2Qmr6laetkDrAN6s5EiRJFOEx6iFv AdMGwAIDqJjPZrbpAmV6G+2Q/b+XNnbHNj4T7DE5sjfP1HkhcHkSiKfm0Y1UDPqU 3e9qTai+i40jYmchHECNoQGwwbvl9h2mxinhwQNHFflb3RSvk3FjJugQrvaB0TJw NLY0xBF8EVhrZ/0T80pv/1+lySEzXdqix+Sqzech98JNpIfNlUW3YMcSe0QcboVW ZkYnV+NlfIs10iOcztRt5DpkSlBlJQLeqWDrImcWG9cfKyzOCnsh2QmXKuviLIeG TKRtL4KYvipQmGYenLBpR01dxssDmPc4o2fsAp/fDTG6N7OYvx0= =sey8 -----END PGP SIGNATURE----- Merge tag 'dt-cleanup-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt into soc/dt Minor improvements in ARM DTS for v6.7 Few cleanups and improvements: split joined reg entries for Ethernet in omap3-devkit8000, add missing spaces before '{' (MediaTek, Nuvoton) and cleanup whitespace around '=' (MediaTek). * tag 'dt-cleanup-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt: ARM: dts: nuvoton: add missing space before { ARM: dts: mediatek: minor whitespace cleanup around '=' ARM: dts: mediatek: add missing space before { ARM: dts: omap3-devkit8000: correct ethernet reg addresses (split) Link: https://lore.kernel.org/r/20231006092823.94839-2-krzysztof.kozlowski@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
commit
78857f7fe3
|
@ -244,7 +244,7 @@ &uart0 {
|
|||
&usb2 {
|
||||
status = "okay";
|
||||
usb-role-switch;
|
||||
connector{
|
||||
connector {
|
||||
compatible = "gpio-usb-b-connector", "usb-b-connector";
|
||||
type = "micro";
|
||||
id-gpios = <&pio 44 GPIO_ACTIVE_HIGH>;
|
||||
|
|
|
@ -21,10 +21,10 @@ mt6323_leds: leds {
|
|||
status = "disabled";
|
||||
};
|
||||
|
||||
mt6323regulator: mt6323regulator{
|
||||
mt6323regulator: mt6323regulator {
|
||||
compatible = "mediatek,mt6323-regulator";
|
||||
|
||||
mt6323_vproc_reg: buck_vproc{
|
||||
mt6323_vproc_reg: buck_vproc {
|
||||
regulator-name = "vproc";
|
||||
regulator-min-microvolt = < 700000>;
|
||||
regulator-max-microvolt = <1350000>;
|
||||
|
@ -33,7 +33,7 @@ mt6323_vproc_reg: buck_vproc{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vsys_reg: buck_vsys{
|
||||
mt6323_vsys_reg: buck_vsys {
|
||||
regulator-name = "vsys";
|
||||
regulator-min-microvolt = <1400000>;
|
||||
regulator-max-microvolt = <2987500>;
|
||||
|
@ -42,13 +42,13 @@ mt6323_vsys_reg: buck_vsys{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vpa_reg: buck_vpa{
|
||||
mt6323_vpa_reg: buck_vpa {
|
||||
regulator-name = "vpa";
|
||||
regulator-min-microvolt = < 500000>;
|
||||
regulator-max-microvolt = <3650000>;
|
||||
};
|
||||
|
||||
mt6323_vtcxo_reg: ldo_vtcxo{
|
||||
mt6323_vtcxo_reg: ldo_vtcxo {
|
||||
regulator-name = "vtcxo";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
|
@ -57,28 +57,28 @@ mt6323_vtcxo_reg: ldo_vtcxo{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vcn28_reg: ldo_vcn28{
|
||||
mt6323_vcn28_reg: ldo_vcn28 {
|
||||
regulator-name = "vcn28";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-enable-ramp-delay = <185>;
|
||||
};
|
||||
|
||||
mt6323_vcn33_bt_reg: ldo_vcn33_bt{
|
||||
mt6323_vcn33_bt_reg: ldo_vcn33_bt {
|
||||
regulator-name = "vcn33_bt";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3600000>;
|
||||
regulator-enable-ramp-delay = <185>;
|
||||
};
|
||||
|
||||
mt6323_vcn33_wifi_reg: ldo_vcn33_wifi{
|
||||
mt6323_vcn33_wifi_reg: ldo_vcn33_wifi {
|
||||
regulator-name = "vcn33_wifi";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3600000>;
|
||||
regulator-enable-ramp-delay = <185>;
|
||||
};
|
||||
|
||||
mt6323_va_reg: ldo_va{
|
||||
mt6323_va_reg: ldo_va {
|
||||
regulator-name = "va";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
|
@ -87,14 +87,14 @@ mt6323_va_reg: ldo_va{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vcama_reg: ldo_vcama{
|
||||
mt6323_vcama_reg: ldo_vcama {
|
||||
regulator-name = "vcama";
|
||||
regulator-min-microvolt = <1500000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vio28_reg: ldo_vio28{
|
||||
mt6323_vio28_reg: ldo_vio28 {
|
||||
regulator-name = "vio28";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
|
@ -103,7 +103,7 @@ mt6323_vio28_reg: ldo_vio28{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vusb_reg: ldo_vusb{
|
||||
mt6323_vusb_reg: ldo_vusb {
|
||||
regulator-name = "vusb";
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
|
@ -111,7 +111,7 @@ mt6323_vusb_reg: ldo_vusb{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vmc_reg: ldo_vmc{
|
||||
mt6323_vmc_reg: ldo_vmc {
|
||||
regulator-name = "vmc";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
|
@ -119,7 +119,7 @@ mt6323_vmc_reg: ldo_vmc{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vmch_reg: ldo_vmch{
|
||||
mt6323_vmch_reg: ldo_vmch {
|
||||
regulator-name = "vmch";
|
||||
regulator-min-microvolt = <3000000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
|
@ -127,7 +127,7 @@ mt6323_vmch_reg: ldo_vmch{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vemc3v3_reg: ldo_vemc3v3{
|
||||
mt6323_vemc3v3_reg: ldo_vemc3v3 {
|
||||
regulator-name = "vemc3v3";
|
||||
regulator-min-microvolt = <3000000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
|
@ -135,49 +135,49 @@ mt6323_vemc3v3_reg: ldo_vemc3v3{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vgp1_reg: ldo_vgp1{
|
||||
mt6323_vgp1_reg: ldo_vgp1 {
|
||||
regulator-name = "vgp1";
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vgp2_reg: ldo_vgp2{
|
||||
mt6323_vgp2_reg: ldo_vgp2 {
|
||||
regulator-name = "vgp2";
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vgp3_reg: ldo_vgp3{
|
||||
mt6323_vgp3_reg: ldo_vgp3 {
|
||||
regulator-name = "vgp3";
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vcn18_reg: ldo_vcn18{
|
||||
mt6323_vcn18_reg: ldo_vcn18 {
|
||||
regulator-name = "vcn18";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vsim1_reg: ldo_vsim1{
|
||||
mt6323_vsim1_reg: ldo_vsim1 {
|
||||
regulator-name = "vsim1";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vsim2_reg: ldo_vsim2{
|
||||
mt6323_vsim2_reg: ldo_vsim2 {
|
||||
regulator-name = "vsim2";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <3000000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vrtc_reg: ldo_vrtc{
|
||||
mt6323_vrtc_reg: ldo_vrtc {
|
||||
regulator-name = "vrtc";
|
||||
regulator-min-microvolt = <2800000>;
|
||||
regulator-max-microvolt = <2800000>;
|
||||
|
@ -185,28 +185,28 @@ mt6323_vrtc_reg: ldo_vrtc{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vcamaf_reg: ldo_vcamaf{
|
||||
mt6323_vcamaf_reg: ldo_vcamaf {
|
||||
regulator-name = "vcamaf";
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vibr_reg: ldo_vibr{
|
||||
mt6323_vibr_reg: ldo_vibr {
|
||||
regulator-name = "vibr";
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-enable-ramp-delay = <36>;
|
||||
};
|
||||
|
||||
mt6323_vrf18_reg: ldo_vrf18{
|
||||
mt6323_vrf18_reg: ldo_vrf18 {
|
||||
regulator-name = "vrf18";
|
||||
regulator-min-microvolt = <1825000>;
|
||||
regulator-max-microvolt = <1825000>;
|
||||
regulator-enable-ramp-delay = <187>;
|
||||
};
|
||||
|
||||
mt6323_vm_reg: ldo_vm{
|
||||
mt6323_vm_reg: ldo_vm {
|
||||
regulator-name = "vm";
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
|
@ -215,7 +215,7 @@ mt6323_vm_reg: ldo_vm{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vio18_reg: ldo_vio18{
|
||||
mt6323_vio18_reg: ldo_vio18 {
|
||||
regulator-name = "vio18";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
|
@ -224,14 +224,14 @@ mt6323_vio18_reg: ldo_vio18{
|
|||
regulator-boot-on;
|
||||
};
|
||||
|
||||
mt6323_vcamd_reg: ldo_vcamd{
|
||||
mt6323_vcamd_reg: ldo_vcamd {
|
||||
regulator-name = "vcamd";
|
||||
regulator-min-microvolt = <1200000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
regulator-enable-ramp-delay = <216>;
|
||||
};
|
||||
|
||||
mt6323_vcamio_reg: ldo_vcamio{
|
||||
mt6323_vcamio_reg: ldo_vcamio {
|
||||
regulator-name = "vcamio";
|
||||
regulator-min-microvolt = <1800000>;
|
||||
regulator-max-microvolt = <1800000>;
|
||||
|
|
|
@ -116,8 +116,8 @@ jpegdec: jpegdec@15004000 {
|
|||
"mediatek,mt2701-jpgdec";
|
||||
reg = <0 0x15004000 0 0x1000>;
|
||||
interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_LOW>;
|
||||
clocks = <&imgsys CLK_IMG_JPGDEC_SMI>,
|
||||
<&imgsys CLK_IMG_JPGDEC>;
|
||||
clocks = <&imgsys CLK_IMG_JPGDEC_SMI>,
|
||||
<&imgsys CLK_IMG_JPGDEC>;
|
||||
clock-names = "jpgdec-smi",
|
||||
"jpgdec";
|
||||
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
|
||||
|
|
|
@ -168,7 +168,7 @@ mux {
|
|||
i2c_pins: i2c-pins {
|
||||
mux {
|
||||
function = "i2c";
|
||||
groups = "i2c_0";
|
||||
groups = "i2c_0";
|
||||
};
|
||||
|
||||
conf {
|
||||
|
|
|
@ -146,7 +146,7 @@ partitions {
|
|||
compatible = "fixed-partitions";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
bmc@0{
|
||||
bmc@0 {
|
||||
label = "bmc";
|
||||
reg = <0x000000 0x2000000>;
|
||||
};
|
||||
|
@ -155,7 +155,7 @@ u-boot@0 {
|
|||
reg = <0x0000000 0x80000>;
|
||||
read-only;
|
||||
};
|
||||
u-boot-env@100000{
|
||||
u-boot-env@100000 {
|
||||
label = "u-boot-env";
|
||||
reg = <0x00100000 0x40000>;
|
||||
};
|
||||
|
|
|
@ -397,7 +397,7 @@ u-boot@0 {
|
|||
reg = <0x0000000 0xC0000>;
|
||||
read-only;
|
||||
};
|
||||
u-boot-env@100000{
|
||||
u-boot-env@100000 {
|
||||
label = "u-boot-env";
|
||||
reg = <0x00100000 0x40000>;
|
||||
};
|
||||
|
|
|
@ -111,7 +111,7 @@ partitions {
|
|||
compatible = "fixed-partitions";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
bmc@0{
|
||||
bmc@0 {
|
||||
label = "bmc";
|
||||
reg = <0x000000 0x2000000>;
|
||||
};
|
||||
|
@ -120,7 +120,7 @@ u-boot@0 {
|
|||
reg = <0x0000000 0x80000>;
|
||||
read-only;
|
||||
};
|
||||
u-boot-env@100000{
|
||||
u-boot-env@100000 {
|
||||
label = "u-boot-env";
|
||||
reg = <0x00100000 0x40000>;
|
||||
};
|
||||
|
|
|
@ -275,8 +275,8 @@ filesystem@680000 {
|
|||
|
||||
ethernet@6,0 {
|
||||
compatible = "davicom,dm9000";
|
||||
reg = <6 0x000 2
|
||||
6 0x400 2>; /* CS6, offset 0 and 0x400, IO size 2 */
|
||||
reg = <6 0x000 2>,
|
||||
<6 0x400 2>; /* CS6, offset 0 and 0x400, IO size 2 */
|
||||
bank-width = <2>;
|
||||
interrupt-parent = <&gpio1>;
|
||||
interrupts = <25 IRQ_TYPE_LEVEL_LOW>;
|
||||
|
|
Loading…
Reference in a new issue