mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-04-29 04:41:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'at91-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt

Browse Source 
AT91 DT for 5.11:

 - fix USB host pinctrl
 - fix DT schema warnings

* tag 'at91-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: sama5d3_xplained: add pincontrol for USB Host
  ARM: dts: at91: sama5d4_xplained: add pincontrol for USB Host
  ARM: dts: at91: sam9x60: add pincontrol for USB Host
  ARM: dts: at91: at91-sama5d27_som1: fix EEPROM compatible
  ARM: dts: at91: Fix schema warnings for pwm-leds
  ARM: dts: at91: smartkiz: Reference led node directly

Link: https://lore.kernel.org/r/20201127220403.GA1735041@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2020-12-08 23:33:36 +01:00
parent 914b8de3dd e1062fa729
commit ab8d302c48
12 changed files with 62 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/boot/dts/at91-kizbox.dts
View File

@@ -48,31 +48,31 @@ user {
};
};
pwm_leds {
led-controller {
compatible = "pwm-leds";
network_green {
led-1 {
label = "pwm:green:network";
pwms = <&tcb_pwm 2 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
linux,default-trigger = "default-on";
};
network_red {
led-2 {
label = "pwm:red:network";
pwms = <&tcb_pwm 4 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
linux,default-trigger = "default-on";
};
user_green {
led-3 {
label = "pwm:green:user";
pwms = <&tcb_pwm 0 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
linux,default-trigger = "default-on";
};
user_red {
led-4 {
label = "pwm:red:user";
pwms = <&tcb_pwm 1 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;

8
arch/arm/boot/dts/at91-kizbox2-common.dtsi
View File

@@ -58,24 +58,24 @@ user {
};
};
pwm_leds {
led-controller {
compatible = "pwm-leds";
blue {
led-1 {
label = "pwm:blue:user";
pwms = <&pwm0 2 10000000 0>;
max-brightness = <255>;
linux,default-trigger = "none";
};
green {
led-2 {
label = "pwm:green:user";
pwms = <&pwm0 1 10000000 0>;
max-brightness = <255>;
linux,default-trigger = "default-on";
};
red {
led-3 {
label = "pwm:red:user";
pwms = <&pwm0 0 10000000 0>;
max-brightness = <255>;

16
arch/arm/boot/dts/at91-kizbox3-hs.dts
View File

@@ -15,40 +15,40 @@ / {
model = "Overkiz KIZBOX3-HS";
compatible = "overkiz,kizbox3-hs", "atmel,sama5d2", "atmel,sama5";
pwm_leds {
led-controller-1 {
status = "okay";
red {
led-1 {
status = "okay";
};
green {
led-2 {
status = "okay";
};
blue {
led-3 {
status = "okay";
};
white {
led-4 {
status = "okay";
};
};
leds {
led-controller-2 {
compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_led_red
&pinctrl_led_white>;
status = "okay";
red {
led-5 {
label = "pio:red:user";
gpios = <&pioA PIN_PB1 GPIO_ACTIVE_HIGH>;
default-state = "off";
};
white {
led-6 {
label = "pio:white:user";
gpios = <&pioA PIN_PB8 GPIO_ACTIVE_HIGH>;
default-state = "off";

10
arch/arm/boot/dts/at91-kizbox3_common.dtsi
View File

@@ -62,7 +62,7 @@ vdd_adc_vref: supply_3v3_ref {
regulator-always-on;
};
pwm_leds {
led-controller-1 {
compatible = "pwm-leds";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_pwm0_pwm_h0
@@ -71,7 +71,7 @@ &pinctrl_pwm0_pwm_h2
&pinctrl_pwm0_pwm_h3>;
status = "disabled";
red {
led-1 {
label = "pwm:red:user";
pwms = <&pwm0 0 10000000 0>;
max-brightness = <255>;
@@ -79,7 +79,7 @@ red {
status = "disabled";
};
green {
led-2 {
label = "pwm:green:user";
pwms = <&pwm0 1 10000000 0>;
max-brightness = <255>;
@@ -87,14 +87,14 @@ green {
status = "disabled";
};
blue {
led-3 {
label = "pwm:blue:user";
pwms = <&pwm0 2 10000000 0>;
max-brightness = <255>;
status = "disabled";
};
white {
led-4 {
label = "pwm:white:user";
pwms = <&pwm0 3 10000000 0>;
max-brightness = <255>;

8
arch/arm/boot/dts/at91-kizboxmini-common.dtsi
View File

@@ -54,10 +54,10 @@ reset {
};
};
leds: pwm_leds {
leds: led-controller-1 {
compatible = "pwm-leds";
led_blue: pwm_blue {
led_blue: led-1 {
label = "pwm:blue:user";
pwms = <&pwm0 2 10000000 0>;
max-brightness = <255>;
@@ -65,14 +65,14 @@ led_blue: pwm_blue {
status = "disabled";
};
led_green: pwm_green {
led_green: led-2 {
label = "pwm:green:user";
pwms = <&pwm0 0 10000000 0>;
max-brightness = <255>;
linux,default-trigger = "default-on";
};
led_red: pwm_red {
led_red: led-3 {
label = "pwm:red:user";
pwms = <&pwm0 1 10000000 0>;
max-brightness = <255>;

9
arch/arm/boot/dts/at91-sam9x60ek.dts
View File

@@ -569,6 +569,13 @@ pinctrl_usba_vbus: usba_vbus {
atmel,pins = <AT91_PIOB 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
usb1 {
pinctrl_usb_default: usb_default {
atmel,pins = <AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOD 16 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
}; /* pinctrl */
&pmc {
@@ -684,6 +691,8 @@ &usb1 {
atmel,vbus-gpio = <0
&pioD 15 GPIO_ACTIVE_HIGH
&pioD 16 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb_default>;
status = "okay";
};

2
arch/arm/boot/dts/at91-sama5d27_som1.dtsi
View File

@@ -100,7 +100,7 @@ i2c0: i2c@f8028000 {
status = "okay";
at24@50 {
compatible = "24c02";
compatible = "atmel,24c02";
reg = <0x50>;
pagesize = <8>;
};

7
arch/arm/boot/dts/at91-sama5d3_xplained.dts
View File

@@ -242,6 +242,11 @@ pinctrl_usba_vbus: usba_vbus {
atmel,pins =
<AT91_PIOE 9 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PE9, conflicts with A9 */
};
pinctrl_usb_default: usb_default {
atmel,pins =
<AT91_PIOE 3 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOE 4 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
};
};
};
@@ -259,6 +264,8 @@ usb1: ohci@600000 {
&pioE 3 GPIO_ACTIVE_LOW
&pioE 4 GPIO_ACTIVE_LOW
>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb_default>;
status = "okay";
};

7
arch/arm/boot/dts/at91-sama5d4_xplained.dts
View File

@@ -134,6 +134,11 @@ pinctrl_usba_vbus: usba_vbus {
atmel,pins =
<AT91_PIOE 31 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>;
};
pinctrl_usb_default: usb_default {
atmel,pins =
<AT91_PIOE 11 AT91_PERIPH_GPIO AT91_PINCTRL_NONE
AT91_PIOE 14 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;
};
pinctrl_key_gpio: key_gpio_0 {
atmel,pins =
<AT91_PIOE 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
@@ -159,6 +164,8 @@ usb1: ohci@500000 {
&pioE 11 GPIO_ACTIVE_HIGH
&pioE 14 GPIO_ACTIVE_HIGH
>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usb_default>;
status = "okay";
};

6
arch/arm/boot/dts/at91-smartkiz.dts
View File

@@ -84,10 +84,8 @@ &rtc {
status = "okay";
};
&leds {
blue {
status = "okay";
};
&led_blue {
status = "okay";
};
&adc0 {

10
arch/arm/boot/dts/at91sam9m10g45ek.dts
View File

@@ -315,27 +315,27 @@ usb1: ehci@800000 {
};
};
leds {
led-controller-1 {
compatible = "gpio-leds";
d8 {
led-1 {
label = "d8";
gpios = <&pioD 30 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
};
pwmleds {
led-controller-2 {
compatible = "pwm-leds";
d6 {
led-2 {
label = "d6";
pwms = <&pwm0 3 5000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
linux,default-trigger = "nand-disk";
};
d7 {
led-3 {
label = "d7";
pwms = <&pwm0 1 5000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;

10
arch/arm/boot/dts/at91sam9rlek.dts
View File

@@ -218,26 +218,26 @@ rtc@fffffe00 {
};
};
pwmleds {
led-controller-1 {
compatible = "pwm-leds";
ds1 {
led-1 {
label = "ds1";
pwms = <&pwm0 1 5000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
};
ds2 {
led-2 {
label = "ds2";
pwms = <&pwm0 2 5000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
};
};
leds {
led-controller-2 {
compatible = "gpio-leds";
ds3 {
led-3 {
label = "ds3";
gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";