Commit 5ffdbb7e authored by Paul Cercueil's avatar Paul Cercueil Committed by Linus Walleij
Browse files

pinctrl: ingenic: Remove duplicated ingenic_chip_info structures 



Until there is the need to handle the JZ4760B and X1000E differently
there is no reason to use a separate ingenic_chip_info since the data
it contains is the same than for the JZ4760 and X1000 respectively.

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Link: https://lore.kernel.org/r/20200106232711.559727-4-paul@crapouillou.net


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent baf15647

drivers/pinctrl/pinctrl-ingenic.c

+2 −28
Original line number Diff line number Diff line
@@ -61,11 +61,9 @@ enum jz_version { 
	ID_JZ4740,

	ID_JZ4725B,

	ID_JZ4760,

	ID_JZ4760B,

	ID_JZ4770,

	ID_JZ4780,

	ID_X1000,

	ID_X1000E,

	ID_X1500,

	ID_X1830,

};
@@ -615,18 +613,6 @@ static const struct ingenic_chip_info jz4760_chip_info = { 
	.pull_downs = jz4760_pull_downs,

};



static const struct ingenic_chip_info jz4760b_chip_info = {

	.num_chips = 6,

	.reg_offset = 0x100,

	.version = ID_JZ4760B,

	.groups = jz4760_groups,

	.num_groups = ARRAY_SIZE(jz4760_groups),

	.functions = jz4760_functions,

	.num_functions = ARRAY_SIZE(jz4760_functions),

	.pull_ups = jz4760_pull_ups,

	.pull_downs = jz4760_pull_downs,

};



static const u32 jz4770_pull_ups[6] = {

	0x3fffffff, 0xfff0030c, 0xffffffff, 0xffff4fff, 0xfffffb7c, 0xffa7f00f,

};
@@ -1300,18 +1286,6 @@ static const struct ingenic_chip_info x1000_chip_info = { 
	.pull_downs = x1000_pull_downs,

};



static const struct ingenic_chip_info x1000e_chip_info = {

	.num_chips = 4,

	.reg_offset = 0x100,

	.version = ID_X1000E,

	.groups = x1000_groups,

	.num_groups = ARRAY_SIZE(x1000_groups),

	.functions = x1000_functions,

	.num_functions = ARRAY_SIZE(x1000_functions),

	.pull_ups = x1000_pull_ups,

	.pull_downs = x1000_pull_downs,

};



static int x1500_uart0_data_pins[] = { 0x4a, 0x4b, };

static int x1500_uart0_hwflow_pins[] = { 0x4c, 0x4d, };

static int x1500_uart1_data_a_pins[] = { 0x04, 0x05, };
@@ -2460,11 +2434,11 @@ static const struct of_device_id ingenic_pinctrl_of_match[] = { 
	{ .compatible = "ingenic,jz4740-pinctrl", .data = &jz4740_chip_info },

	{ .compatible = "ingenic,jz4725b-pinctrl", .data = &jz4725b_chip_info },

	{ .compatible = "ingenic,jz4760-pinctrl", .data = &jz4760_chip_info },

	{ .compatible = "ingenic,jz4760b-pinctrl", .data = &jz4760b_chip_info },

	{ .compatible = "ingenic,jz4760b-pinctrl", .data = &jz4760_chip_info },

	{ .compatible = "ingenic,jz4770-pinctrl", .data = &jz4770_chip_info },

	{ .compatible = "ingenic,jz4780-pinctrl", .data = &jz4780_chip_info },

	{ .compatible = "ingenic,x1000-pinctrl", .data = &x1000_chip_info },

	{ .compatible = "ingenic,x1000e-pinctrl", .data = &x1000e_chip_info },

	{ .compatible = "ingenic,x1000e-pinctrl", .data = &x1000_chip_info },

	{ .compatible = "ingenic,x1500-pinctrl", .data = &x1500_chip_info },

	{ .compatible = "ingenic,x1830-pinctrl", .data = &x1830_chip_info },

	{},