From Jason.Rush at gd-ms.com Tue Feb 21 17:26:24 2017 From: Jason.Rush at gd-ms.com (Rush, Jason A.) Date: Tue, 21 Feb 2017 16:26:24 +0000 Subject: [Test] [PATCH] spi: cadence_qspi_apb: Add trigger-base DT bindings from Linux Message-ID: The socfpga arch uses a different value for the indaddrtrig reg than the ahbbase address. Adopting the Linux DT bindings separates the ahbbase and trigger-base addresses. This allows the trigger-base to be set correctly on the socfpga arch. Signed-off-by: Jason A. Rush --- arch/arm/dts/socfpga.dtsi | 1 + drivers/spi/cadence_qspi.c | 2 ++ drivers/spi/cadence_qspi.h | 1 + drivers/spi/cadence_qspi_apb.c | 4 ++-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index 8588221e57..2aff0c2419 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -644,6 +644,7 @@ clocks = <&qspi_clk>; ext-decoder = <0>; /* external decoder */ num-cs = <4>; + trigger-base = <0x00000000>; fifo-depth = <128>; sram-size = <128>; bus-num = <2>; diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 9a6e41f330..a18b331f6c 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -296,6 +296,8 @@ static int cadence_spi_ofdata_to_platdata(struct udevice *bus) plat->regbase = (void *)data[0]; plat->ahbbase = (void *)data[2]; + plat->trigger_base = (void *)fdtdec_get_int(blob, node, "trigger-base", + (int)plat->ahbbase); plat->sram_size = fdtdec_get_int(blob, node, "sram-size", 128); /* All other paramters are embedded in the child node */ diff --git a/drivers/spi/cadence_qspi.h b/drivers/spi/cadence_qspi.h index d1927a4003..394820f308 100644 --- a/drivers/spi/cadence_qspi.h +++ b/drivers/spi/cadence_qspi.h @@ -18,6 +18,7 @@ struct cadence_spi_platdata { unsigned int max_hz; void *regbase; void *ahbbase; + void *trigger_base; u32 page_size; u32 block_size; diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c index e02f2217f4..0e66d5fd82 100644 --- a/drivers/spi/cadence_qspi_apb.c +++ b/drivers/spi/cadence_qspi_apb.c @@ -560,7 +560,7 @@ int cadence_qspi_apb_indirect_read_setup(struct cadence_spi_platdata *plat, addr_bytes = cmdlen - 1; /* Setup the indirect trigger address */ - writel((u32)plat->ahbbase, + writel((u32)plat->trigger_base, plat->regbase + CQSPI_REG_INDIRECTTRIGGER); /* Configure the opcode */ @@ -710,7 +710,7 @@ int cadence_qspi_apb_indirect_write_setup(struct cadence_spi_platdata *plat, return -EINVAL; } /* Setup the indirect trigger address */ - writel((u32)plat->ahbbase, + writel((u32)plat->trigger_base, plat->regbase + CQSPI_REG_INDIRECTTRIGGER); /* Configure the opcode */ -- 2.11.0 From ch at denx.de Mon Feb 27 10:48:22 2017 From: ch at denx.de (Claudius Heine) Date: Mon, 27 Feb 2017 10:48:22 +0100 Subject: [Test] TEst 2 Message-ID: <0d49e352-4666-2b26-989d-0cd56917a58b@denx.de> -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch at denx.de PGP key: 6FF2 E59F 00C6 BC28 31D8 64C1 1173 CB19 9808 B153 Keyserver: hkp://pool.sks-keyservers.net From ch at denx.de Mon Feb 27 10:28:14 2017 From: ch at denx.de (Claudius Heine) Date: Mon, 27 Feb 2017 10:28:14 +0100 Subject: [Test] test Message-ID: <37270f4e-78ac-9b12-d245-f1af72de0d77@denx.de> TEst -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-54 Fax: (+49)-8142-66989-80 Email: ch at denx.de PGP key: 6FF2 E59F 00C6 BC28 31D8 64C1 1173 CB19 9808 B153 Keyserver: hkp://pool.sks-keyservers.net -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: OpenPGP digital signature URL: From ch at denx.de Mon Feb 27 13:18:30 2017 From: ch at denx.de (Claudius Heine) Date: Mon, 27 Feb 2017 14:18:30 +0100 Subject: [Test] Test 6 Message-ID: From Claudius at lists.denx.de Mon Feb 27 13:10:42 2017 From: Claudius at lists.denx.de (Claudius at lists.denx.de) Date: Mon, 27 Feb 2017 14:10:42 +0100 Subject: [Test] Mo 27. Feb 14:10:05 CET 2017 Message-ID: <58b42552.VBBWvsCcKS8cSjVs%ch@denx.de> = From Claudius at lists.denx.de Mon Feb 27 13:08:25 2017 From: Claudius at lists.denx.de (Claudius at lists.denx.de) Date: Mon, 27 Feb 2017 14:08:25 +0100 Subject: [Test] Mo 27. Feb 14:08:24 CET 2017 Message-ID: <58b424c9.axVqCd75JEVQ9yv3%ch@denx.de> =