xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: sun7i: m3: Convert to DT label based syntax

Browse Source 
In order to lessen the amount of duplication of the DT tree, ease the
new and follow the trend that prefers to use label based references
when overriding DTSI nodes, convert the board to this syntax

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Maxime Ripard
2015-01-31 12:11:54 +01:00
parent 598699d073
commit 22b10010cd
1 changed files with 95 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
arch/arm/boot/dts/sun7i-a20-m3.dts
View File

@@ -59,70 +59,39 @@
model = "Mele M3"; model = "Mele M3";
compatible = "mele,m3", "allwinner,sun7i-a20"; compatible = "mele,m3", "allwinner,sun7i-a20";
soc@01c00000 { leds {
mmc0: mmc@01c0f000 { compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; pinctrl-0 = <&led_pins_m3>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
cd-inverted;
status = "okay";
};
mmc2: mmc@01c11000 { blue {
label = "m3:blue:usr";
gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>;
};
};
};
&ehci0 {
status = "okay";
};
&ehci1 {
status = "okay";
};
&gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&gmac_pins_mii_a>;
vmmc-supply = <&reg_vcc3v3>; phy = <&phy1>;
bus-width = <4>; phy-mode = "mii";
non-removable;
status = "okay"; status = "okay";
};
usbphy: phy@01c13400 { phy1: ethernet-phy@1 {
usb1_vbus-supply = <&reg_usb1_vbus>; reg = <1>;
usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay";
}; };
};
ehci0: usb@01c14000 { &i2c0 {
status = "okay";
};
ohci0: usb@01c14400 {
status = "okay";
};
ehci1: usb@01c1c000 {
status = "okay";
};
ohci1: usb@01c1c400 {
status = "okay";
};
pinctrl@01c20800 {
led_pins_m3: led_pins@0 {
allwinner,pins = "PH20";
allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
};
};
ir0: ir@01c21800 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_pins_a>;
status = "okay";
};
uart0: serial@01c28000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
i2c0: i2c@01c2ac00 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins_a>;
status = "okay"; status = "okay";
@@ -136,37 +105,66 @@
interrupt-controller; interrupt-controller;
#interrupt-cells = <1>; #interrupt-cells = <1>;
}; };
}; };
gmac: ethernet@01c50000 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&ir0_pins_a>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay"; status = "okay";
};
phy1: ethernet-phy@1 { &mmc0 {
reg = <1>;
};
};
};
leds {
compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_pins_m3>; pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
vmmc-supply = <&reg_vcc3v3>;
blue { bus-width = <4>;
label = "m3:blue:usr"; cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
gpios = <&pio 7 20 GPIO_ACTIVE_HIGH>; cd-inverted;
};
};
reg_usb1_vbus: usb1-vbus {
status = "okay"; status = "okay";
}; };
reg_usb2_vbus: usb2-vbus { &mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
non-removable;
status = "okay"; status = "okay";
};
&ohci0 {
status = "okay";
};
&ohci1 {
status = "okay";
};
&pio {
led_pins_m3: led_pins@0 {
allwinner,pins = "PH20";
allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_10_MA>;
allwinner,pull = <SUN4I_PINCTRL_NO_PULL>;
}; };
}; };
&reg_usb1_vbus {
status = "okay";
};
&reg_usb2_vbus {
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
status = "okay";
};
&usbphy {
usb1_vbus-supply = <&reg_usb1_vbus>;
usb2_vbus-supply = <&reg_usb2_vbus>;
status = "okay";
};