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

Commit 6a05d862 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

* clk-fixes:
  clk: gpio: Really allow an optional clock= DT property
  Revert "clk: qcom: Specify LE device endianness"
parents fb4dd222 4462b4bb

drivers/clk/clk-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static int gpio_clk_driver_probe(struct platform_device *pdev) 


	num_parents = of_clk_get_parent_count(node);

	if (num_parents < 0)

		return -EINVAL;

		num_parents = 0;



	if (num_parents) {

		parent_names = devm_kcalloc(&pdev->dev, num_parents,

drivers/clk/qcom/gcc-apq8084.c

+0 −1
Original line number Diff line number Diff line
@@ -3587,7 +3587,6 @@ static const struct regmap_config gcc_apq8084_regmap_config = { 
	.val_bits	= 32,

	.max_register	= 0x1fc0,

	.fast_io	= true,

	.val_format_endian = REGMAP_ENDIAN_LITTLE,

};



static const struct qcom_cc_desc gcc_apq8084_desc = {

drivers/clk/qcom/gcc-ipq806x.c

+0 −1
Original line number Diff line number Diff line
@@ -3005,7 +3005,6 @@ static const struct regmap_config gcc_ipq806x_regmap_config = { 
	.val_bits	= 32,

	.max_register	= 0x3e40,

	.fast_io	= true,

	.val_format_endian = REGMAP_ENDIAN_LITTLE,

};



static const struct qcom_cc_desc gcc_ipq806x_desc = {

drivers/clk/qcom/gcc-msm8660.c

+0 −1
Original line number Diff line number Diff line
@@ -2702,7 +2702,6 @@ static const struct regmap_config gcc_msm8660_regmap_config = { 
	.val_bits	= 32,

	.max_register	= 0x363c,

	.fast_io	= true,

	.val_format_endian = REGMAP_ENDIAN_LITTLE,

};



static const struct qcom_cc_desc gcc_msm8660_desc = {

drivers/clk/qcom/gcc-msm8916.c

+0 −1
Original line number Diff line number Diff line
@@ -3354,7 +3354,6 @@ static const struct regmap_config gcc_msm8916_regmap_config = { 
	.val_bits	= 32,

	.max_register	= 0x80000,

	.fast_io	= true,

	.val_format_endian = REGMAP_ENDIAN_LITTLE,

};



static const struct qcom_cc_desc gcc_msm8916_desc = {