Re: [RFC PATCH 1/6] DO NOT MERGE:dt and defconfig

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



All

On 1/21/19 3:56 PM, Dan Murphy wrote:
> Signed-off-by: Dan Murphy <dmurphy@xxxxxx>
> ---
>  arch/arm/boot/dts/am335x-bone-common.dtsi     | 58 ++++++++++++++++++-
>  .../arm/boot/dts/motorola-cpcap-mapphone.dtsi |  8 ++-
>  arch/arm/configs/omap2plus_defconfig          |  7 ++-
>  3 files changed, 68 insertions(+), 5 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
> index 456eef57ef89..c36f623375f3 100644
> --- a/arch/arm/boot/dts/am335x-bone-common.dtsi
> +++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
> @@ -255,8 +255,62 @@
>  
>  	status = "okay";
>  	clock-frequency = <100000>;
> +	led-controller@29 {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +		compatible = "ti,lp5024";
> +		reg = <0x29>;
> +		enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
> +		vled-supply = <&vmmcsd_fixed>;
> +
> +		led@0 {
> +			reg = <0>;
> +			label = "led1_mod";
> +			ti,led-module = <1>;
> +		};
> +	};
> +
> +	led-controller@30 {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +		compatible = "rgb,framework_test";
> +		reg = <0x30>;
> +
> +		led@0 {
> +		        reg = <0>;
> +		        label = "rgb_test1";
> +			rgb-sources = < 0xff 1 2 >;
> +			rgb-white = < 0xd4 0x01 0x16 >;
> +		};
> +/*
> +		led@1 {
> +		        reg = <1>;
> +		        label = "rgb_test2";
> +			rgb-sources = < 0xff 3 5 >;
> +		};*/
> +	};
>  
> -	cape_eeprom0: cape_eeprom0@54 {
> +	led-controller@30 {
> +		#address-cells = <1>;
> +		#size-cells = <0>;
> +		compatible = "rgb,framework_test";
> +		reg = <0x30>;
> +
> +		led@0 {
> +		        reg = <0>;
> +		        label = "rgb_test1";
> +			rgb-sources = < 0xff 1 2 >;
> +			rgb-white = < 0xd4 0x01 0x16 >;
> +		};
> +/*
> +		led@1 {
> +		        reg = <1>;
> +		        label = "rgb_test2";
> +			rgb-sources = < 0xff 3 5 >;
> +		};*/
> +	};
> +
> +/*	cape_eeprom0: cape_eeprom0@54 {
>  		compatible = "atmel,24c256";
>  		reg = <0x54>;
>  		#address-cells = <1>;
> @@ -294,7 +348,7 @@
>  		cape3_data: cape_data@0 {
>  			reg = <0 0x100>;
>  		};
> -	};
> +	};*/
>  };
>  
>  
> diff --git a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
> index ddc7a7bb33c0..42aafffcb3e4 100644
> --- a/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
> +++ b/arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
> @@ -117,6 +117,12 @@
>  			vusb-supply = <&vusb>;
>  		};
>  
> +		led_rgb: led-rgb {
> +			compatible = "motorola,cpcap-led-rgb";
> +			vdd-supply = <&sw5>;
> +			label = "status-led:rgb";
> +		};
> +/*
>  		led_red: led-red {
>  			compatible = "motorola,cpcap-led-red";
>  			vdd-supply = <&sw5>;
> @@ -134,7 +140,7 @@
>  			vdd-supply = <&sw5>;
>  			label = "status-led:blue";
>  		};
> -
> +*/
>  		led_adl: led-adl {
>  			compatible = "motorola,cpcap-led-adl";
>  			vdd-supply = <&sw5>;
> diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
> index 9c6f436d1b12..a4e7159325ae 100644
> --- a/arch/arm/configs/omap2plus_defconfig
> +++ b/arch/arm/configs/omap2plus_defconfig
> @@ -453,8 +453,11 @@ CONFIG_MMC_OMAP=y
>  CONFIG_MMC_OMAP_HS=y
>  CONFIG_MMC_SDHCI_OMAP=y
>  CONFIG_NEW_LEDS=y
> -CONFIG_LEDS_CLASS=m
> -CONFIG_LEDS_CPCAP=m
> +CONFIG_LEDS_CLASS=y
> +CONFIG_LEDS_CLASS_RGB=y
> +CONFIG_LEDS_RGB_TEST=y
> +CONFIG_LEDS_LP50XX=y
> +CONFIG_LEDS_CPCAP=y
>  CONFIG_LEDS_GPIO=m
>  CONFIG_LEDS_PCA963X=m
>  CONFIG_LEDS_PWM=m
> 

I added this to the RFC so the DT and defconfig can be demonstrated and shared.

Dan
-- 
------------------
Dan Murphy



[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux