From 0b70bd13363b560039788f60e1bdd5f3727f489c Mon Sep 17 00:00:00 2001 From: Vadim Bendebury Date: Mon, 23 Jun 2014 10:41:38 -0700 Subject: ipq806x: move GPIO definitions to the proper include file When the IPQ SPI driver was ported to coreboot, a few GPIO related definitions ended up in a wrong include file. Move them to the proper place and get rid of duplicated definition of GPIO_OUT. BUG=chrome-os-partner:27784, chrome-os-partner:29871 TEST=proto0 still boots with the new firmware Original-Change-Id: I4b06067a71c85efaf0e48f29e232f83fd1f725a8 Original-Signed-off-by: Vadim Bendebury Original-Reviewed-on: https://chromium-review.googlesource.com/205328 Original-Reviewed-by: Stefan Reinauer Original-Reviewed-by: Trevor Bourget (cherry picked from commit df73bb0023f5eaf5594ef41b3632c4402ebf126c) Signed-off-by: Marc Jones Change-Id: I109e62e3bfc9bd15640ff697be7634f42435a3e4 Reviewed-on: http://review.coreboot.org/8058 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel --- src/soc/qualcomm/ipq806x/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/soc/qualcomm/ipq806x/spi.c') diff --git a/src/soc/qualcomm/ipq806x/spi.c b/src/soc/qualcomm/ipq806x/spi.c index 52d11c19c4..f1a180ba88 100644 --- a/src/soc/qualcomm/ipq806x/spi.c +++ b/src/soc/qualcomm/ipq806x/spi.c @@ -277,9 +277,9 @@ static void CS_change(int port_num, int cs_num, int enable) uint32_t addr = GPIO_IN_OUT_ADDR(cs_gpio); uint32_t val = readl_i(addr); - val &= (~(1 << GPIO_OUT)); + val &= (~(1 << GPIO_OUTPUT)); if (!enable) - val |= (1 << GPIO_OUT); + val |= (1 << GPIO_OUTPUT); writel_i(val, addr); } -- cgit v1.2.3