AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-30 11:06:39 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Berlin DT changes for v4.10

Browse Source 
- fix DTC compiler warning
 - fix typo in chosen node
 -----BEGIN PGP SIGNATURE-----
 
 iQJIBAABCAAyFiEE2MW6uuYZ+0zBfpF41kg+k28NbwgFAlg4AvEUHGpzemhhbmdA
 bWFydmVsbC5jb20ACgkQ1kg+k28NbwgDNw/8CsSzrM+x2Py3sFwnqn7GEpGifIct
 vYsVjsOti04kLAzF7qSVwUdRFUxoUs409UoOc7iZZ/AUJ3tBdSJcKNcruMpPSpwG
 +NlGIEEU7aXmHg2R6Z0HdLHjC/NPFy6HMdgHw8sQKMRiDnIt6SzUDeTgAnMXh3Dd
 4z6iYzpErQsxq90pYCrLs95YwOsMjWlKDo6+sqjbeu5zZ+wCSGmKy0IcdhUtXS5r
 hV84ssAosrXOXPC+19Ov3FeGl6w64txunAADgJUnbA5WG1oyN7JH9AKgwX5R/Czx
 183sxabSClCAsH99cSdAOBsNLpt7snp8u0Zl4ApEoqasy9uxIWIhW9FhEIaNwEcs
 aiLg5JERZgg8V0qUfbI706CybHkRTqQ5OpuLhfnxFr0zqwU1S8eqf8RT6CDHmVsc
 vAtRxqodb0tCotbc25/9swk/olCJfyDwtl5LqEOXXDzqtbC4yNGFwLtb7wX61isd
 VZVz712RlW42iG54YctJNnvg/gKG55zaw7hNh7UVAYhGdhHWmA7cEMwlHQUMkjGR
 YPGuTzEy5eo/NchaTwADGmfSO1TAvEuBvr0KIyNo9JJZjaumeGwDGAyOrCSlg1fd
 Hdac2VPadYYtbd23AnBLqAJKLA5kqgWI9OaaI8OAu+Mch+4dl4TAP8b1FR356jsS
 6H/WUcUScv0HdRw=
 =1flG
 -----END PGP SIGNATURE-----

Merge tag 'berlin-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/dt

Pull "Berlin DT changes for v4.10" from Jisheng Zhang:

- fix DTC compiler warning
- fix typo in chosen node

* tag 'berlin-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
  ARM: dts: berlin2q-marvell-dmp: fix typo in chosen node
  ARM: dts: berlin2q-marvell-dmp: fix regulators' name
This commit is contained in:
Arnd Bergmann 2016-11-30 23:45:22 +01:00
commit 54137bf611
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/boot/dts/berlin2q-marvell-dmp.dts
View File

@ -48,7 +48,7 @@ memory@0 {
reg = <0x00000000 0x80000000>;
};
choosen {
chosen {
bootargs = "earlyprintk";
stdout-path = "serial0:115200n8";
};
@ -58,7 +58,7 @@ regulators {
#address-cells = <1>;
#size-cells = <0>;
reg_usb0_vbus: regulator@0 {
reg_usb0_vbus: regulator_usb0 {
compatible = "regulator-fixed";
regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>;
@ -67,7 +67,7 @@ reg_usb0_vbus: regulator@0 {
enable-active-high;
};
reg_usb1_vbus: regulator@1 {
reg_usb1_vbus: regulator_usb1 {
compatible = "regulator-fixed";
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
@ -76,7 +76,7 @@ reg_usb1_vbus: regulator@1 {
enable-active-high;
};
reg_usb2_vbus: regulator@2 {
reg_usb2_vbus: regulator_usb2 {
compatible = "regulator-fixed";
regulator-name = "usb2_vbus";
regulator-min-microvolt = <5000000>;
@ -85,7 +85,7 @@ reg_usb2_vbus: regulator@2 {
enable-active-high;
};
reg_sdio1_vmmc: regulator@3 {
reg_sdio1_vmmc: regulator_sdio1_vmmc {
compatible = "regulator-fixed";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
@ -95,7 +95,7 @@ reg_sdio1_vmmc: regulator@3 {
gpio = <&portb 21 GPIO_ACTIVE_HIGH>;
};
reg_sdio1_vqmmc: regulator@4 {
reg_sdio1_vqmmc: regulator_sido1_vqmmc {
compatible = "regulator-gpio";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <3300000>;