shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 03:40:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

pinctrl: fix some errors and add new function groups for gxl/gxm

Browse Source 
PD#138714: pinctrl: fix some errors and add new function groups

Change-Id: I25a99b8715d22c887f07f0cbbbe5b9a3ba42f927
Signed-off-by: xingyu.chen <xingyu.chen@amlogic.com>
This commit is contained in:
xingyu.chen
2017-06-01 15:52:40 +08:00
committed by Victor Wan
parent 9d2449dd33
commit 00388de1d5
3 changed files with 464 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm64/boot/dts/amlogic/mesongxl.dtsi
View File

@@ -696,9 +696,9 @@ i2c_ao: i2c@c8100500{ /*I2C-AO*/
*/
ao_to_sd_uart_pins:ao_to_sd_uart_pins {
mux {
groups = "uart_tx_ao_a_1",
"uart_rx_ao_a_1";
function = "uart_ao_a_1";
groups = "uart_tx_ao_a_card4",
"uart_rx_ao_a_card5";
function = "uart_ao_a_card";
bias-pull-up;
input-enable;
};
@@ -860,16 +860,16 @@ i2c_ao: i2c@c8100500{ /*I2C-AO*/
/* c_i2c_master_pin1: dv18 dv19 */
c_i2c_master:c_i2c {
mux {
groups = "i2c_sda_c0",
"i2c_scl_c0";
function = "i2c_c0";
groups = "i2c_sda_c_dv28",
"i2c_scl_c_dv29";
function = "i2c_c";
};
};
c_i2c_master_pin1:c_i2c_pin1{
mux {
groups = "i2c_sda_c1",
"i2c_scl_c1";
function = "i2c_c1";
groups = "i2c_sda_c_dv18",
"i2c_scl_c_dv19";
function = "i2c_c";
};
};
@@ -938,15 +938,15 @@ i2c_ao: i2c@c8100500{ /*I2C-AO*/
audio_spdif_in_pins:audio_spdif_in {
mux {
groups = "spdif_in";
groups = "spdif_in_z14";
function = "spdif_in";
};
};
audio_spdif_in_1_pins:audio_spdif_in_1 {
mux {
groups = "spdif_in_1";
function = "spdif_in_1";
groups = "spdif_in_h4";
function = "spdif_in";
};
};
@@ -961,9 +961,9 @@ i2c_ao: i2c@c8100500{ /*I2C-AO*/
};
aml_dmic_pins:audio_dmic {
mux {
groups = "pdm_in",
"pdm_clk";
function = "pdm";
groups = "dmic_in_dv24",
"dmic_clk_dv25";
function = "dmic";
};
};

30
arch/arm64/boot/dts/amlogic/mesongxm.dtsi
View File

@@ -780,9 +780,9 @@
*/
ao_to_sd_uart_pins:ao_to_sd_uart_pins {
mux {
groups = "uart_tx_ao_a_1",
"uart_rx_ao_a_1";
function = "uart_ao_a_1";
groups = "uart_tx_ao_a_card4",
"uart_rx_ao_a_card5";
function = "uart_ao_a_card";
bias-pull-up;
input-enable;
};
@@ -944,16 +944,16 @@
/* c_i2c_master_pin1: dv18 dv19 */
c_i2c_master:c_i2c {
mux {
groups = "i2c_sda_c0",
"i2c_scl_c0";
function = "i2c_c0";
groups = "i2c_sda_c_dv28",
"i2c_scl_c_dv29";
function = "i2c_c";
};
};
c_i2c_master_pin1:c_i2c_pin1{
mux {
groups = "i2c_sda_c1",
"i2c_scl_c1";
function = "i2c_c1";
groups = "i2c_sda_c_dv18",
"i2c_scl_c_dv19";
function = "i2c_c";
};
};
@@ -1022,15 +1022,15 @@
audio_spdif_in_pins:audio_spdif_in {
mux {
groups = "spdif_in";
groups = "spdif_in_z14";
function = "spdif_in";
};
};
audio_spdif_in_1_pins:audio_spdif_in_1 {
mux {
groups = "spdif_in_1";
function = "spdif_in_1";
groups = "spdif_in_h4";
function = "spdif_in";
};
};
@@ -1045,9 +1045,9 @@
};
aml_dmic_pins:audio_dmic {
mux {
groups = "pdm_in",
"pdm_clk";
function = "pdm";
groups = "dmic_in_dv24",
"dmic_clk_dv25";
function = "dmic";
};
};

722
drivers/amlogic/pinctrl/pinctrl_gxl.c
View File

File diff suppressed because it is too large Load Diff