Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7d6709a20866a885916214590b7c394a21be9e25

Authored by Benjamin Herrenschmidt
1 parent dad2f2fb0f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

powerpc: Fix build of some FSL platforms 

Commit 87ec0e98cfdd8b68da6a7f9e70142ffc0e404fbb in kumar's next branch
broke one of my test configs since it looks like Anton forgot about
that mpc832x_rdb platform which still uses the old style probing for
the SPI stuff.

I'll let them do a cleaner fix that probably involves changing the
probing method and getting rid of the platform device but for now
this will do to fix it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 3 changed files with 6 additions and 6 deletions Side-by-side Diff

arch/powerpc/platforms/83xx/mpc832x_rdb.c
Diff comments   View file @ 7d6709a
... ... @@ -74,7 +74,7 @@
74 74  
75 75 prop = of_get_property(np, "mode", NULL);
76 76 if (prop && !strcmp(prop, "cpu-qe"))
77   - pdata.qe_mode = 1;
  77 + pdata.flags = SPI_QE_CPU_MODE;
78 78  
79 79 for (j = 0; j < num_board_infos; j++) {
80 80 if (board_infos[j].bus_num == pdata.bus_num)
drivers/spi/spi_mpc8xxx.c
Diff comments   View file @ 7d6709a
... ... @@ -163,11 +163,6 @@
163 163 u32 tx_shift; /* TX data reg shift when in qe mode */
164 164  
165 165 unsigned int flags;
166   -#define SPI_QE_CPU_MODE (1 << 0) /* QE CPU ("PIO") mode */
167   -#define SPI_CPM_MODE (1 << 1) /* CPM/QE ("DMA") mode */
168   -#define SPI_CPM1 (1 << 2) /* SPI unit is in CPM1 block */
169   -#define SPI_CPM2 (1 << 3) /* SPI unit is in CPM2 block */
170   -#define SPI_QE (1 << 4) /* SPI unit is in QE block */
171 166  
172 167 struct workqueue_struct *workqueue;
173 168 struct work_struct work;
include/linux/fsl_devices.h
Diff comments   View file @ 7d6709a
... ... @@ -75,6 +75,11 @@
75 75 u32 initial_spmode; /* initial SPMODE value */
76 76 s16 bus_num;
77 77 unsigned int flags;
  78 +#define SPI_QE_CPU_MODE (1 << 0) /* QE CPU ("PIO") mode */
  79 +#define SPI_CPM_MODE (1 << 1) /* CPM/QE ("DMA") mode */
  80 +#define SPI_CPM1 (1 << 2) /* SPI unit is in CPM1 block */
  81 +#define SPI_CPM2 (1 << 3) /* SPI unit is in CPM2 block */
  82 +#define SPI_QE (1 << 4) /* SPI unit is in QE block */
78 83 /* board specific information */
79 84 u16 max_chipselect;
80 85 void (*cs_control)(struct spi_device *spi, bool on);