Commit 36de77e3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v5.13/dt-v2-signed' of... 

Merge tag 'omap-for-v5.13/dt-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt

Devicetree changes for omaps for v5.13

Mostly configures addtional devices for various boards, and
updates the gpio line names for beagle boards so userspace can
optionally find the right lines:

- Use unique gpio line names for am335x-pocketbeagle

- Update omap3-echo led configuration and add ath6kl node

- Fix indentation for am3 tscadc node

- Prepare motorola-cpcap-mapphone for power supply dtbs_check_parsing

- Use unique gpio line names for am335x-boneblack.dts

* tag 'omap-for-v5.13/dt-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: dts: am335x-boneblack.dts: unique gpio-line-names
  ARM: dts: motorola-cpcap-mapphone: Prepare for dtbs_check parsing
  ARM: dts: am33xx-l4: fix tscadc@0 node indentation
  ARM: dts: omap3-echo: Add ath6kl node
  ARM: dts: omap3-echo: Update LED configuration
  ARM: dts: am335x-pocketbeagle: unique gpio-line-names

Link: https://lore.kernel.org/r/pull-1617703816-65652@atomide.com-2


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents aa1e345a ee368a10

arch/arm/boot/dts/am335x-boneblack.dts

+66 −66
Original line number Diff line number Diff line
@@ -26,54 +26,54 @@ 


&gpio0 {

	gpio-line-names =

		"[ethernet]",

		"[ethernet]",

		"[mdio_data]",

		"[mdio_clk]",

		"P9_22 [spi0_sclk]",

		"P9_21 [spi0_d0]",

		"P9_18 [spi0_d1]",

		"P9_17 [spi0_cs0]",

		"[sd card]",

		"P9_42A [ecappwm0]",

		"P8_35 [hdmi]",

		"P8_33 [hdmi]",

		"P8_31 [hdmi]",

		"P8_32 [hdmi]",

		"[mmc0_cd]",

		"P8_42A [ecappwm0]",

		"P8_35 [lcd d12]",

		"P8_33 [lcd d13]",

		"P8_31 [lcd d14]",

		"P8_32 [lcd d15]",

		"P9_20 [i2c2_sda]",

		"P9_19 [i2c2_scl]",

		"P9_26 [uart1_rxd]",

		"P9_24 [uart1_txd]",

		"[ethernet]",

		"[ethernet]",

		"[usb]",

		"[hdmi]",

		"[rmii1_txd3]",

		"[rmii1_txd2]",

		"[usb0_drvvbus]",

		"[hdmi cec]",

		"P9_41B",

		"[ethernet]",

		"[rmii1_txd1]",

		"P8_19 [ehrpwm2a]",

		"P8_13 [ehrpwm2b]",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"P8_14",

		"P8_17",

		"[ethernet]",

		"[ethernet]",

		"[rmii1_txd0]",

		"[rmii1_refclk]",

		"P9_11 [uart4_rxd]",

		"P9_13 [uart4_txd]";

};



&gpio1 {

	gpio-line-names =

		"P8_25 [emmc]",

		"[emmc]",

		"P8_5 [emmc]",

		"P8_6 [emmc]",

		"P8_23 [emmc]",

		"P8_22 [emmc]",

		"P8_3 [emmc]",

		"P8_4 [emmc]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"P8_25 [mmc1_dat0]",

		"[mmc1_dat1]",

		"P8_5 [mmc1_dat2]",

		"P8_6 [mmc1_dat3]",

		"P8_23 [mmc1_dat4]",

		"P8_22 [mmc1_dat5]",

		"P8_3 [mmc1_dat6]",

		"P8_4 [mmc1_dat7]",

		"NC",

		"NC",

		"NC",

		"NC",

		"P8_12",

		"P8_11",

		"P8_16",
@@ -82,13 +82,13 @@ 
		"P9_23",

		"P9_14 [ehrpwm1a]",

		"P9_16 [ehrpwm1b]",

		"[emmc]",

		"[emmc rst]",

		"[usr0 led]",

		"[usr1 led]",

		"[usr2 led]",

		"[usr3 led]",

		"[hdmi]",

		"[usb]",

		"[hdmi irq]",

		"[usb vbus oc]",

		"[hdmi audio]",

		"P9_12",

		"P8_26",
@@ -116,38 +116,38 @@ 
		"P8_38 [hdmi]",

		"P8_36 [hdmi]",

		"P8_34 [hdmi]",

		"[ethernet]",

		"[ethernet]",

		"[ethernet]",

		"[ethernet]",

		"[rmii1_rxd3]",

		"[rmii1_rxd2]",

		"[rmii1_rxd1]",

		"[rmii1_rxd0]",

		"P8_27 [hdmi]",

		"P8_29 [hdmi]",

		"P8_28 [hdmi]",

		"P8_30 [hdmi]",

		"[emmc]",

		"[emmc]",

		"[emmc]",

		"[emmc]",

		"[emmc]",

		"[emmc]";

		"[mmc0_dat3]",

		"[mmc0_dat2]",

		"[mmc0_dat1]",

		"[mmc0_dat0]",

		"[mmc0_clk]",

		"[mmc0_cmd]";

};



&gpio3 {

	gpio-line-names =

		"[ethernet]",

		"[ethernet]",

		"[ethernet]",

		"[ethernet]",

		"[ethernet]",

		"[i2c0]",

		"[i2c0]",

		"[emu]",

		"[emu]",

		"[ethernet]",

		"[ethernet]",

		"[NC]",

		"[NC]",

		"[usb]",

		"[mii col]",

		"[mii crs]",

		"[mii rx err]",

		"[mii tx en]",

		"[mii rx dv]",

		"[i2c0 sda]",

		"[i2c0 scl]",

		"[jtag emu0]",

		"[jtag emu1]",

		"[mii tx clk]",

		"[mii rx clk]",

		"NC",

		"NC",

		"[usb vbus en]",

		"P9_31 [spi1_sclk]",

		"P9_29 [spi1_d0]",

		"P9_30 [spi1_d1]",
@@ -156,14 +156,14 @@ 
		"P9_27",

		"P9_41A",

		"P9_25",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]";

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC";

};

arch/arm/boot/dts/am335x-pocketbeagle.dts

+70 −70
Original line number Diff line number Diff line
@@ -61,51 +61,51 @@ 


&gpio0 {

	gpio-line-names =

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"P1.08 [SPI0_CLK]",

		"P1.10 [SPI0_MISO]",

		"P1.12 [SPI0_MOSI]",

		"P1.06 [SPI0_CS]",

		"[MMC0_CD]",

		"P2.29 [SPI1_CLK]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT 12]",

		"[SYSBOOT 13]",

		"[SYSBOOT 14]",

		"[SYSBOOT 15]",

		"P1.26 [I2C2_SDA]",

		"P1.28 [I2C2_SCL]",

		"P2.11 [I2C1_SDA]",

		"P2.09 [I2C1_SCL]",

		"[NC]",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"NC",

		"P2.31 [SPI1_CS]",

		"P1.20 [PRU0.16]",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"P2.03",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"P1.34",

		"P2.19",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"P2.05 [UART4_RX]",

		"P2.07 [UART4_TX]";

};



&gpio1 {

	gpio-line-names =

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"P2.25 [SPI1_MOSI]",

		"P1.32 [UART0_RX]",

		"P1.30 [UART0_TX]",
@@ -113,10 +113,10 @@ 
		"P2.33",

		"P2.22",

		"P2.18",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"P2.01 [PWM1A]",

		"[NC]",

		"NC",

		"P2.10",

		"[USR LED 0]",

		"[USR LED 1]",
@@ -126,35 +126,35 @@ 
		"P2.04",

		"P2.02",

		"P2.08",

		"[NC]",

		"[NC]",

		"[NC]";

		"NC",

		"NC",

		"NC";

};



&gpio2 {

	gpio-line-names =

		"P2.20",

		"P2.17",

		"[NC]",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"NC",

		"[EEPROM_WP]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[SYSBOOT]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[SYSBOOT 0]",

		"[SYSBOOT 1]",

		"[SYSBOOT 2]",

		"[SYSBOOT 3]",

		"[SYSBOOT 4]",

		"[SYSBOOT 5]",

		"[SYSBOOT 6]",

		"[SYSBOOT 7]",

		"[SYSBOOT 8]",

		"[SYSBOOT 9]",

		"[SYSBOOT 10]",

		"[SYSBOOT 11]",

		"NC",

		"NC",

		"NC",

		"NC",

		"P2.35 [AIN5]",

		"P1.02 [AIN6]",

		"P1.35 [PRU1.10]",
@@ -169,19 +169,19 @@ 


&gpio3 {

	gpio-line-names =

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"[I2C0_SDA]",

		"[I2C0_SCL]",

		"[JTAG]",

		"[JTAG]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[JTAG EMU0]",

		"[JTAG EMU1]",

		"NC",

		"NC",

		"NC",

		"NC",

		"P1.03 [USB1]",

		"P1.36 [PWM0A]",

		"P1.33 [PRU0.1]",
@@ -191,16 +191,16 @@ 
		"P2.34 [PRU0.5]",

		"P2.28 [PRU0.6]",

		"P1.29 [PRU0.7]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]",

		"[NC]";

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC",

		"NC";

};



&am33xx_pinmux {

arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi

+28 −31
Original line number Diff line number Diff line
@@ -27,16 +27,14 @@ 


		cpcap_battery: battery {

			compatible = "motorola,cpcap-battery";

			interrupts-extended = <

				&cpcap 6 0 &cpcap 5 0 &cpcap 3 0

				&cpcap 20 0 &cpcap 54 0 &cpcap 57 0

			>;

			interrupts-extended =

				<&cpcap 6 0>, <&cpcap 5 0>, <&cpcap 3 0>,

				<&cpcap 20 0>, <&cpcap 54 0>, <&cpcap 57 0>;

			interrupt-names =

				"eol", "lowbph", "lowbpl",

				"chrgcurr1", "battdetb",

				"cccal";

			io-channels = <&cpcap_adc 0 &cpcap_adc 1

				       &cpcap_adc 5 &cpcap_adc 6>;

				"chrgcurr1", "battdetb", "cccal";

			io-channels = <&cpcap_adc 0>, <&cpcap_adc 1>,

				      <&cpcap_adc 5>, <&cpcap_adc 6>;

			io-channel-names = "battdetb", "battp",

					   "chg_isense", "batti";

			power-supplies = <&cpcap_charger>;
@@ -44,20 +42,19 @@ 


		cpcap_charger: charger {

			compatible = "motorola,mapphone-cpcap-charger";

			interrupts-extended = <

				&cpcap 13 0 &cpcap 12 0 &cpcap 29 0 &cpcap 28 0

				&cpcap 22 0 &cpcap 21 0 &cpcap 20 0 &cpcap 19 0

				&cpcap 54 0

			>;

			interrupts-extended =

				<&cpcap 13 0>, <&cpcap 12 0>, <&cpcap 29 0>,

				<&cpcap 28 0>, <&cpcap 22 0>, <&cpcap 21 0>,

				<&cpcap 20 0>, <&cpcap 19 0>, <&cpcap 54 0>;

			interrupt-names =

				"chrg_det", "rvrs_chrg", "chrg_se1b", "se0conn",

				"rvrs_mode", "chrgcurr2", "chrgcurr1", "vbusvld",

				"battdetb";

			mode-gpios = <&gpio3 29 GPIO_ACTIVE_LOW

				      &gpio3 23 GPIO_ACTIVE_LOW>;

			io-channels = <&cpcap_adc 0 &cpcap_adc 1

				       &cpcap_adc 2 &cpcap_adc 5

				       &cpcap_adc 6>;

				"chrg_det", "rvrs_chrg", "chrg_se1b",

				"se0conn", "rvrs_mode", "chrgcurr2",

				"chrgcurr1", "vbusvld", "battdetb";

			mode-gpios = <&gpio3 29 GPIO_ACTIVE_LOW>,

				     <&gpio3 23 GPIO_ACTIVE_LOW>;

			io-channels = <&cpcap_adc 0>, <&cpcap_adc 1>,

				      <&cpcap_adc 2>, <&cpcap_adc 5>,

				      <&cpcap_adc 6>;

			io-channel-names = "battdetb", "battp",

					   "vbus", "chg_isense",

					   "batti";
@@ -98,22 +95,22 @@ 


		cpcap_usb2_phy: phy {

			compatible = "motorola,mapphone-cpcap-usb-phy";

			pinctrl-0 = <&usb_gpio_mux_sel1 &usb_gpio_mux_sel2>;

			pinctrl-0 = <&usb_gpio_mux_sel1>, <&usb_gpio_mux_sel2>;

			pinctrl-1 = <&usb_ulpi_pins>;

			pinctrl-2 = <&usb_utmi_pins>;

			pinctrl-3 = <&uart3_pins>;

			pinctrl-names = "default", "ulpi", "utmi", "uart";

			#phy-cells = <0>;

			interrupts-extended = <

				&cpcap 15 0 &cpcap 14 0 &cpcap 28 0 &cpcap 19 0

				&cpcap 18 0 &cpcap 17 0 &cpcap 16 0 &cpcap 49 0

				&cpcap 48 0

			>;

			interrupts-extended =

				<&cpcap 15 0>, <&cpcap 14 0>, <&cpcap 28 0>,

				<&cpcap 19 0>, <&cpcap 18 0>, <&cpcap 17 0>,

				<&cpcap 16 0>, <&cpcap 49 0>, <&cpcap 48 0>;

			interrupt-names =

				"id_ground", "id_float", "se0conn", "vbusvld",

				"sessvld", "sessend", "se1", "dm", "dp";

			mode-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH

				      &gpio1 0 GPIO_ACTIVE_HIGH>;

				"id_ground", "id_float", "se0conn",

				"vbusvld", "sessvld", "sessend",

				"se1", "dm", "dp";

			mode-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>,

				     <&gpio1 0 GPIO_ACTIVE_HIGH>;

			io-channels = <&cpcap_adc 2>, <&cpcap_adc 7>;

			io-channel-names = "vbus", "id";

			vusb-supply = <&vusb>;

arch/arm/boot/dts/omap3-echo.dts

+336 −140
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "dm3725.dtsi"



#include <dt-bindings/input/input.h>

#include <dt-bindings/leds/common.h>



/ {

	model = "Amazon Echo (first generation)";
@@ -139,179 +140,367 @@ 
	clock-frequency = <400000>;



	lp5523A: lp5523A@32 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "national,lp5523";

		label = "q1";

		reg = <0x32>;

		clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */

		enable-gpio = <&gpio4 13 GPIO_ACTIVE_HIGH>; /* GPIO_109 */



		chan0 {

		multi-led@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0>;

			color = <LED_COLOR_ID_RGB>;



			led@0 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x0>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan1 {



			led@1 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x1>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan2 {



			led@6 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x6>;

				color = <LED_COLOR_ID_RED>;

			};

		};

		chan3 {

		multi-led@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x1>;

			color = <LED_COLOR_ID_RGB>;



			led@2 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x2>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan4 {



			led@3 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x3>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan5 {



			led@7 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x7>;

				color = <LED_COLOR_ID_RED>;

			};

		chan6 {

		};

		multi-led@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x2>;

			color = <LED_COLOR_ID_RGB>;



			led@4 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x4>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan7 {



			led@5 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x5>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan8 {



			led@8 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x8>;

				color = <LED_COLOR_ID_RED>;

			};

		};

	};



	lp5523B: lp5523B@33 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "national,lp5523";

		label = "q3";

		reg = <0x33>;

		clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */



		chan0 {

		multi-led@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0>;

			color = <LED_COLOR_ID_RGB>;



			led@0 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x0>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan1 {



			led@1 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x1>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan2 {



			led@6 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x6>;

				color = <LED_COLOR_ID_RED>;

			};

		};

		chan3 {

		multi-led@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x1>;

			color = <LED_COLOR_ID_RGB>;



			led@2 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x2>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan4 {



			led@3 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x3>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan5 {



			led@7 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x7>;

				color = <LED_COLOR_ID_RED>;

			};

		chan6 {

		};

		multi-led@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x2>;

			color = <LED_COLOR_ID_RGB>;



			led@4 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x4>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan7 {



			led@5 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x5>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan8 {



			led@8 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x8>;

				color = <LED_COLOR_ID_RED>;

			};

		};

	};



	lp5523C: lp5523C@34 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "national,lp5523";

		label = "q4";

		reg = <0x34>;

		clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */



		chan0 {

		multi-led@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0>;

			color = <LED_COLOR_ID_RGB>;



			led@0 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x0>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan1 {



			led@1 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x1>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan2 {



			led@6 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x6>;

				color = <LED_COLOR_ID_RED>;

			};

		chan3 {

		};

		multi-led@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x1>;

			color = <LED_COLOR_ID_RGB>;



			led@2 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x2>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan4 {



			led@3 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x3>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan5 {



			led@7 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x7>;

				color = <LED_COLOR_ID_RED>;

			};

		};

		chan6 {

		multi-led@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x2>;

			color = <LED_COLOR_ID_RGB>;



			led@4 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x4>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan7 {



			led@5 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x5>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan8 {



			led@8 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x8>;

				color = <LED_COLOR_ID_RED>;

			};

		};

	};



	lp5523D: lp552D@35 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "national,lp5523";

		label = "q2";

		reg = <0x35>;

		clock-mode = /bits/ 8 <0>; /* LP55XX_CLOCK_AUTO */



		chan0 {

		multi-led@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0>;

			color = <LED_COLOR_ID_RGB>;



			led@0 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x0>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan1 {



			led@1 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x1>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan2 {



			led@6 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x6>;

				color = <LED_COLOR_ID_RED>;

			};

		};

		chan3 {

		multi-led@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x1>;

			color = <LED_COLOR_ID_RGB>;



			led@2 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x2>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan4 {



			led@3 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x3>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan5 {



			led@7 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x7>;

				color = <LED_COLOR_ID_RED>;

			};

		};

		chan6 {

		multi-led@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x2>;

			color = <LED_COLOR_ID_RGB>;



			led@4 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x4>;

				color = <LED_COLOR_ID_GREEN>;

			};

		chan7 {



			led@5 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x5>;

				color = <LED_COLOR_ID_BLUE>;

			};

		chan8 {



			led@8 {

				led-cur = /bits/ 8 <12>;

				max-cur = /bits/ 8 <15>;

				reg = <0x8>;

				color = <LED_COLOR_ID_RED>;

			};

		};

	};

};
@@ -417,6 +606,8 @@ 
};



&mmc3 {

	#address-cells = <1>;

	#size-cells = <0>;

	status = "okay";

	bus-width = <4>;

	pinctrl-names = "default";
@@ -426,6 +617,11 @@ 
	mmc-pwrseq = <&sdio_pwrseq>;

	vmmc-supply = <&vcc3v3>;

	vqmmc-supply = <&vcc1v8>;

	atheros@0 {

		compatible = "atheros,ath6kl";

		reg = <0>;

		bus-width = <4>;

	};

};



&tps {

arch/arm/boot/dts/am33xx-l4.dtsi

+14 −14

File changed.

Contains only whitespace changes.