From 02335b2c96231dcf535aa4eecabd3d8389896de9 Mon Sep 17 00:00:00 2001 From: Jaechul Lee Date: Mon, 29 Apr 2019 11:13:30 +0900 Subject: [PATCH] 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 Change-Id: Idd74bc7e4f5c26b9d4aee89d62b8f3810ee7736f --- arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts | 34 +++++++++++++++--------------- arch/arm/boot/dts/bcm2710-rpi-3-b.dts | 34 +++++++++++++++--------------- rpi3/boot/config_32bit.txt | 2 +- rpi3/boot/config_64bit.txt | 2 +- 4 files changed, 36 insertions(+), 36 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 a366182..0d388c4 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b-plus.dts @@ -39,34 +39,34 @@ gpio-keys { compatible = "gpio-keys"; - key-up { - lable = "up"; + key-volume-up { + lable = "volume-up"; linux,code = ; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - key-down { - lable = "down"; + key-volume-down { + lable = "volume-down"; linux,code = ; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - key-left { - lable = "left"; + key-fastforward { + lable = "fastforward"; linux,code = ; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; - key-right { - lable = "right"; + key-rewind { + lable = "rewind"; linux,code = ; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; - key-center { - lable = "center"; + key-playpause { + lable = "playpause"; linux,code = ; - gpios = <&gpio 26 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; }; }; @@ -127,32 +127,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 33a79d3..2e164ef 100644 --- a/arch/arm/boot/dts/bcm2710-rpi-3-b.dts +++ b/arch/arm/boot/dts/bcm2710-rpi-3-b.dts @@ -39,34 +39,34 @@ gpio-keys { compatible = "gpio-keys"; - key-up { - lable = "up"; + key-volume-up { + lable = "volume-up"; linux,code = ; gpios = <&gpio 16 GPIO_ACTIVE_LOW>; }; - key-down { - lable = "down"; + key-volume-down { + lable = "volume-down"; linux,code = ; gpios = <&gpio 13 GPIO_ACTIVE_LOW>; }; - key-left { - lable = "left"; + key-fastforward { + lable = "fastforward"; linux,code = ; gpios = <&gpio 6 GPIO_ACTIVE_LOW>; }; - key-right { - lable = "right"; + key-rewind { + lable = "rewind"; linux,code = ; gpios = <&gpio 12 GPIO_ACTIVE_LOW>; }; - key-center { - lable = "center"; + key-playpause { + lable = "playpause"; linux,code = ; - gpios = <&gpio 26 GPIO_ACTIVE_LOW>; + gpios = <&gpio 25 GPIO_ACTIVE_LOW>; }; }; }; @@ -127,32 +127,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/rpi3/boot/config_32bit.txt b/rpi3/boot/config_32bit.txt index 20c5c1f..b0aab18 100644 --- a/rpi3/boot/config_32bit.txt +++ b/rpi3/boot/config_32bit.txt @@ -85,4 +85,4 @@ disable_camera_led=1 gpu_mem=128 # Set gpio pins to Input, Pullup mode. -gpio=6,12,13,16,26=ip,pu +gpio=6,12,13,16,25=ip,pu diff --git a/rpi3/boot/config_64bit.txt b/rpi3/boot/config_64bit.txt index 228d945..5f51835 100644 --- a/rpi3/boot/config_64bit.txt +++ b/rpi3/boot/config_64bit.txt @@ -85,4 +85,4 @@ disable_camera_led=1 gpu_mem=128 # Set gpio pins to Input, Pullup mode. -gpio=6,12,13,16,26=ip,pu +gpio=6,12,13,16,25=ip,pu -- 2.7.4