Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9adb336 authored by Govindraj Raja's avatar Govindraj Raja Committed by Linus Walleij
Browse files

pinctrl: pistachio: fix mfio84-89 function description and pinmux. 



mfio 84 to 89 are described wrongly, fix it to describe
the right pin and add them to right pin-mux group.

The correct order is:
	pll1_lock => mips_pll	-- MFIO_83
	pll2_lock => audio_pll	-- MFIO_84
	pll3_lock => rpu_v_pll	-- MFIO_85
	pll4_lock => rpu_l_pll	-- MFIO_86
	pll5_lock => sys_pll	-- MFIO_87
	pll6_lock => wifi_pll	-- MFIO_88
	pll7_lock => bt_pll	-- MFIO_89

Cc: linux-gpio@vger.kernel.org
Cc: devicetree@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: James Hartley <James.Hartley@imgtec.com>
Cc: <stable@vger.kernel.org> # v4.2+
Fixes: cefc03e5("pinctrl: Add Pistachio SoC pin control driver")
Signed-off-by: default avatarGovindraj Raja <Govindraj.Raja@imgtec.com>
Acked-by: default avatarAndrew Bresticker <abrestic@chromium.org>
Acked-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 0129801b

Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt

+6 −6
Original line number Diff line number Diff line
@@ -134,12 +134,12 @@ mfio80 ddr_debug, mips_trace_data, mips_debug 
mfio81		dreq0, mips_trace_data, eth_debug

mfio82		dreq1, mips_trace_data, eth_debug

mfio83		mips_pll_lock, mips_trace_data, usb_debug

mfio84		sys_pll_lock, mips_trace_data, usb_debug

mfio85		wifi_pll_lock, mips_trace_data, sdhost_debug

mfio86		bt_pll_lock, mips_trace_data, sdhost_debug

mfio87		rpu_v_pll_lock, dreq2, socif_debug

mfio88		rpu_l_pll_lock, dreq3, socif_debug

mfio89		audio_pll_lock, dreq4, dreq5

mfio84		audio_pll_lock, mips_trace_data, usb_debug

mfio85		rpu_v_pll_lock, mips_trace_data, sdhost_debug

mfio86		rpu_l_pll_lock, mips_trace_data, sdhost_debug

mfio87		sys_pll_lock, dreq2, socif_debug

mfio88		wifi_pll_lock, dreq3, socif_debug

mfio89		bt_pll_lock, dreq4, dreq5

tck

trstn

tdi

drivers/pinctrl/pinctrl-pistachio.c

+12 −12
Original line number Diff line number Diff line
@@ -469,27 +469,27 @@ static const char * const pistachio_mips_pll_lock_groups[] = { 
	"mfio83",

};



static const char * const pistachio_sys_pll_lock_groups[] = {

static const char * const pistachio_audio_pll_lock_groups[] = {

	"mfio84",

};



static const char * const pistachio_wifi_pll_lock_groups[] = {

static const char * const pistachio_rpu_v_pll_lock_groups[] = {

	"mfio85",

};



static const char * const pistachio_bt_pll_lock_groups[] = {

static const char * const pistachio_rpu_l_pll_lock_groups[] = {

	"mfio86",

};



static const char * const pistachio_rpu_v_pll_lock_groups[] = {

static const char * const pistachio_sys_pll_lock_groups[] = {

	"mfio87",

};



static const char * const pistachio_rpu_l_pll_lock_groups[] = {

static const char * const pistachio_wifi_pll_lock_groups[] = {

	"mfio88",

};



static const char * const pistachio_audio_pll_lock_groups[] = {

static const char * const pistachio_bt_pll_lock_groups[] = {

	"mfio89",

};
@@ -559,12 +559,12 @@ enum pistachio_mux_option { 
	PISTACHIO_FUNCTION_DREQ4,

	PISTACHIO_FUNCTION_DREQ5,

	PISTACHIO_FUNCTION_MIPS_PLL_LOCK,

	PISTACHIO_FUNCTION_AUDIO_PLL_LOCK,

	PISTACHIO_FUNCTION_RPU_V_PLL_LOCK,

	PISTACHIO_FUNCTION_RPU_L_PLL_LOCK,

	PISTACHIO_FUNCTION_SYS_PLL_LOCK,

	PISTACHIO_FUNCTION_WIFI_PLL_LOCK,

	PISTACHIO_FUNCTION_BT_PLL_LOCK,

	PISTACHIO_FUNCTION_RPU_V_PLL_LOCK,

	PISTACHIO_FUNCTION_RPU_L_PLL_LOCK,

	PISTACHIO_FUNCTION_AUDIO_PLL_LOCK,

	PISTACHIO_FUNCTION_DEBUG_RAW_CCA_IND,

	PISTACHIO_FUNCTION_DEBUG_ED_SEC20_CCA_IND,

	PISTACHIO_FUNCTION_DEBUG_ED_SEC40_CCA_IND,
@@ -620,12 +620,12 @@ static const struct pistachio_function pistachio_functions[] = { 
	FUNCTION(dreq4),

	FUNCTION(dreq5),

	FUNCTION(mips_pll_lock),

	FUNCTION(audio_pll_lock),

	FUNCTION(rpu_v_pll_lock),

	FUNCTION(rpu_l_pll_lock),

	FUNCTION(sys_pll_lock),

	FUNCTION(wifi_pll_lock),

	FUNCTION(bt_pll_lock),

	FUNCTION(rpu_v_pll_lock),

	FUNCTION(rpu_l_pll_lock),

	FUNCTION(audio_pll_lock),

	FUNCTION(debug_raw_cca_ind),

	FUNCTION(debug_ed_sec20_cca_ind),

	FUNCTION(debug_ed_sec40_cca_ind),