
On Mon, Jul 16, 2018 at 6:03 PM, Jagan Teki jagannadh.teki@gmail.com wrote:
On Mon, Jul 16, 2018 at 3:10 PM, Maxime Ripard maxime.ripard@bootlin.com wrote:
On Mon, Jul 16, 2018 at 01:49:39PM +0530, Jagan Teki wrote:
Reuse mmc0 node from sun7i-a20.dtsi like other board dts files for Primo73 tablet dts file, and drop in dts mmc0 definition.
Cc: Siarhei Siamashka siarhei.siamashka@gmail.com Signed-off-by: Jagan Teki jagan@amarulasolutions.com
arch/arm/dts/sun7i-a20-primo73.dts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/arch/arm/dts/sun7i-a20-primo73.dts b/arch/arm/dts/sun7i-a20-primo73.dts index 0658f82675..942a955309 100644 --- a/arch/arm/dts/sun7i-a20-primo73.dts +++ b/arch/arm/dts/sun7i-a20-primo73.dts @@ -62,16 +62,6 @@ };
soc@01c00000 {
mmc0: mmc@01c0f000 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 0>; /* PH1 */
cd-inverted;
status = "okay";
};
usbphy: phy@01c13400 { usb2_vbus-supply = <®_usb2_vbus>; status = "okay";
@@ -100,3 +90,13 @@ status = "okay"; }; };
+&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>;
vmmc-supply = <®_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
cd-inverted;
status = "okay";
+};
You're not adding the node, you're just moving it around.
ie what I mentioned on the commit message. adding mmc0 node like other board dts files and removing in dts mmc0 node definition.
If you understand the device tree, you'll know that they are one and the same. They compile down to the same node. Otherwise the original pattern wouldn't work.
The commit message should read something more like:
xxx: Convert to DT label based syntax
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
This was the commit message in a whole slew of patches that Maxime did to convert all the sunxi device tree files in the kernel.
Better yet, just drop all these conversion patches and just sync up to Linux 4.18-rc1.
ChenYu