diff options
| author | Jaechul Lee <jcsing.lee@samsung.com> | 2019-04-29 11:13:30 +0900 |
|---|---|---|
| committer | Junghoon Kim <jhoon20.kim@samsung.com> | 2019-06-11 09:35:56 +0900 |
| commit | 03dc18ccd9c8a2c955283514cc7f8f2c209016ff (patch) | |
| tree | 7df292193170b1a2495067154632ee2b734dc008 /arch | |
| parent | 9fce77998493bbb987c89ae493256246c258bfee (diff) | |
| download | linux-rpi3-03dc18ccd9c8a2c955283514cc7f8f2c209016ff.tar.gz linux-rpi3-03dc18ccd9c8a2c955283514cc7f8f2c209016ff.tar.bz2 linux-rpi3-03dc18ccd9c8a2c955283514cc7f8f2c209016ff.zip | |
ARM64: dts: bcm2710-rpi-3-b: Changes GPIO26 to GPIO25 for play/pause
GPIO26 is already used by PIO TCT and key names are changed clearly.
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>
Change-Id: Idd74bc7e4f5c26b9d4aee89d62b8f3810ee7736f
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 34 | ||||
| -rw-r--r-- | arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 34 |
2 files changed, 34 insertions, 34 deletions
diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts index 33f7006d564e..f024be1431e5 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -38,34 +38,34 @@ gpio-keys { compatible = "gpio-keys"; - key-up { - lable = "up"; + key-volume-up { + lable = "volume-up"; linux,code = <KEY_VOLUMEUP>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - key-down { - lable = "down"; + key-volume-down { + lable = "volume-down"; linux,code = <KEY_VOLUMEDOWN>; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - key-left { - lable = "left"; + key-fastforward { + lable = "fastforward"; linux,code = <KEY_FASTFORWARD>; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; - key-right { - lable = "right"; + key-rewind { + lable = "rewind"; linux,code = <KEY_REWIND>; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; - key-center { - lable = "center"; + key-playpause { + lable = "playpause"; linux,code = <KEY_PLAYPAUSE>; - gpios = <&gpio 26 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; }; }; @@ -126,32 +126,32 @@ }; /* Needs to describe gpio settings at config.txt */ - key_up: key_up { + key_volume_up: key_volume_up { brcm,pins = <16>; brcm,function = <1>; /* BCM2835_FSEL_GPIO_IN */ brcm,pull = <2>; /* BCM2835_PUD_UP */ }; - key_down: key_down { + key_volume_down: key_volume_down { brcm,pins = <13>; brcm,function = <1>; brcm,pull = <2>; }; - key_left: key_left { + key_fastforward: key_fastforward { brcm,pins = <6>; brcm,function = <1>; brcm,pull = <2>; }; - key_right: key_right { + key_rewind: key_rewind { brcm,pins = <12>; brcm,function = <1>; brcm,pull = <2>; }; - key_center: key_center { - brcm,pins = <26>; + key_playpause: key_playpause { + brcm,pins = <25>; brcm,function = <1>; brcm,pull = <2>; }; diff --git a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts index d27ab2b35b4b..62327354f0da 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -38,34 +38,34 @@ gpio-keys { compatible = "gpio-keys"; - key-up { - lable = "up"; + key-volume-up { + lable = "volume-up"; linux,code = <KEY_VOLUMEUP>; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - key-down { - lable = "down"; + key-volume-down { + lable = "volume-down"; linux,code = <KEY_VOLUMEDOWN>; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - key-left { - lable = "left"; + key-fastforward { + lable = "fastforward"; linux,code = <KEY_FASTFORWARD>; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; - key-right { - lable = "right"; + key-rewind { + lable = "rewind"; linux,code = <KEY_REWIND>; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; - key-center { - lable = "center"; + key-playpause { + lable = "playpause"; linux,code = <KEY_PLAYPAUSE>; - gpios = <&gpio 26 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; }; }; @@ -126,32 +126,32 @@ }; /* Needs to describe gpio settings at config.txt */ - key_up: key_up { + key_volume_up: key_volume_up { brcm,pins = <16>; brcm,function = <1>; /* BCM2835_FSEL_GPIO_IN */ brcm,pull = <2>; /* BCM2835_PUD_UP */ }; - key_down: key_down { + key_volume_down: key_volume_down { brcm,pins = <13>; brcm,function = <1>; brcm,pull = <2>; }; - key_left: key_left { + key_fastforward: key_fastforward { brcm,pins = <6>; brcm,function = <1>; brcm,pull = <2>; }; - key_right: key_right { + key_rewind: key_rewind { brcm,pins = <12>; brcm,function = <1>; brcm,pull = <2>; }; - key_center: key_center { - brcm,pins = <26>; + key_playpause: key_playpause { + brcm,pins = <25>; brcm,function = <1>; brcm,pull = <2>; }; |