Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: motorola-cpcap-mapphone: Prepare for dtbs_check parsing

'<&gpio1 parameters &gpio2 parameters>' and '<&gpio1 parameters>,
<&gpio2 parameters>' result in the same DTB, but second format has
better source code readability. Also 'dtbs_check' currently uses
this format to determine the amount of items specified, so using
this syntax is needed to successfully verify the devicetree source
against a DT schema format.

Cc: linux-omap@vger.kernel.org
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Sebastian Reichel and committed by
Tony Lindgren
c28c2b85 f5a1acab

+28 -31
+28 -31
arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
··· 27 27 28 28 cpcap_battery: battery { 29 29 compatible = "motorola,cpcap-battery"; 30 - interrupts-extended = < 31 - &cpcap 6 0 &cpcap 5 0 &cpcap 3 0 32 - &cpcap 20 0 &cpcap 54 0 &cpcap 57 0 33 - >; 30 + interrupts-extended = 31 + <&cpcap 6 0>, <&cpcap 5 0>, <&cpcap 3 0>, 32 + <&cpcap 20 0>, <&cpcap 54 0>, <&cpcap 57 0>; 34 33 interrupt-names = 35 34 "eol", "lowbph", "lowbpl", 36 - "chrgcurr1", "battdetb", 37 - "cccal"; 38 - io-channels = <&cpcap_adc 0 &cpcap_adc 1 39 - &cpcap_adc 5 &cpcap_adc 6>; 35 + "chrgcurr1", "battdetb", "cccal"; 36 + io-channels = <&cpcap_adc 0>, <&cpcap_adc 1>, 37 + <&cpcap_adc 5>, <&cpcap_adc 6>; 40 38 io-channel-names = "battdetb", "battp", 41 39 "chg_isense", "batti"; 42 40 power-supplies = <&cpcap_charger>; ··· 42 44 43 45 cpcap_charger: charger { 44 46 compatible = "motorola,mapphone-cpcap-charger"; 45 - interrupts-extended = < 46 - &cpcap 13 0 &cpcap 12 0 &cpcap 29 0 &cpcap 28 0 47 - &cpcap 22 0 &cpcap 21 0 &cpcap 20 0 &cpcap 19 0 48 - &cpcap 54 0 49 - >; 47 + interrupts-extended = 48 + <&cpcap 13 0>, <&cpcap 12 0>, <&cpcap 29 0>, 49 + <&cpcap 28 0>, <&cpcap 22 0>, <&cpcap 21 0>, 50 + <&cpcap 20 0>, <&cpcap 19 0>, <&cpcap 54 0>; 50 51 interrupt-names = 51 - "chrg_det", "rvrs_chrg", "chrg_se1b", "se0conn", 52 - "rvrs_mode", "chrgcurr2", "chrgcurr1", "vbusvld", 53 - "battdetb"; 54 - mode-gpios = <&gpio3 29 GPIO_ACTIVE_LOW 55 - &gpio3 23 GPIO_ACTIVE_LOW>; 56 - io-channels = <&cpcap_adc 0 &cpcap_adc 1 57 - &cpcap_adc 2 &cpcap_adc 5 58 - &cpcap_adc 6>; 52 + "chrg_det", "rvrs_chrg", "chrg_se1b", 53 + "se0conn", "rvrs_mode", "chrgcurr2", 54 + "chrgcurr1", "vbusvld", "battdetb"; 55 + mode-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>, 56 + <&gpio3 23 GPIO_ACTIVE_LOW>; 57 + io-channels = <&cpcap_adc 0>, <&cpcap_adc 1>, 58 + <&cpcap_adc 2>, <&cpcap_adc 5>, 59 + <&cpcap_adc 6>; 59 60 io-channel-names = "battdetb", "battp", 60 61 "vbus", "chg_isense", 61 62 "batti"; ··· 95 98 96 99 cpcap_usb2_phy: phy { 97 100 compatible = "motorola,mapphone-cpcap-usb-phy"; 98 - pinctrl-0 = <&usb_gpio_mux_sel1 &usb_gpio_mux_sel2>; 101 + pinctrl-0 = <&usb_gpio_mux_sel1>, <&usb_gpio_mux_sel2>; 99 102 pinctrl-1 = <&usb_ulpi_pins>; 100 103 pinctrl-2 = <&usb_utmi_pins>; 101 104 pinctrl-3 = <&uart3_pins>; 102 105 pinctrl-names = "default", "ulpi", "utmi", "uart"; 103 106 #phy-cells = <0>; 104 - interrupts-extended = < 105 - &cpcap 15 0 &cpcap 14 0 &cpcap 28 0 &cpcap 19 0 106 - &cpcap 18 0 &cpcap 17 0 &cpcap 16 0 &cpcap 49 0 107 - &cpcap 48 0 108 - >; 107 + interrupts-extended = 108 + <&cpcap 15 0>, <&cpcap 14 0>, <&cpcap 28 0>, 109 + <&cpcap 19 0>, <&cpcap 18 0>, <&cpcap 17 0>, 110 + <&cpcap 16 0>, <&cpcap 49 0>, <&cpcap 48 0>; 109 111 interrupt-names = 110 - "id_ground", "id_float", "se0conn", "vbusvld", 111 - "sessvld", "sessend", "se1", "dm", "dp"; 112 - mode-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH 113 - &gpio1 0 GPIO_ACTIVE_HIGH>; 112 + "id_ground", "id_float", "se0conn", 113 + "vbusvld", "sessvld", "sessend", 114 + "se1", "dm", "dp"; 115 + mode-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>, 116 + <&gpio1 0 GPIO_ACTIVE_HIGH>; 114 117 io-channels = <&cpcap_adc 2>, <&cpcap_adc 7>; 115 118 io-channel-names = "vbus", "id"; 116 119 vusb-supply = <&vusb>;