diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-07-20 13:41:42 +0200 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-07-20 13:42:42 +0200 |
| commit | 60d26202537d95aeda2d9903ab8668ce9cc7326b (patch) | |
| tree | c1b9798b2aa8076f6938f78f5cfdc004b2d2b43c /target/linux/generic/patches-4.4/022-bcma-from-4.8.patch | |
| parent | d12e276cb04717013ab243bbb37360ed6f456e70 (diff) | |
| download | upstream-60d26202537d95aeda2d9903ab8668ce9cc7326b.tar.gz upstream-60d26202537d95aeda2d9903ab8668ce9cc7326b.tar.bz2 upstream-60d26202537d95aeda2d9903ab8668ce9cc7326b.zip | |
kernel: update bcma backporting changes up to 4.8
This allows building bcm47xxsflash on ARM.
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Diffstat (limited to 'target/linux/generic/patches-4.4/022-bcma-from-4.8.patch')
| -rw-r--r-- | target/linux/generic/patches-4.4/022-bcma-from-4.8.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.4/022-bcma-from-4.8.patch b/target/linux/generic/patches-4.4/022-bcma-from-4.8.patch new file mode 100644 index 0000000000..3ff4e94967 --- /dev/null +++ b/target/linux/generic/patches-4.4/022-bcma-from-4.8.patch @@ -0,0 +1,52 @@ +--- a/drivers/bcma/Kconfig ++++ b/drivers/bcma/Kconfig +@@ -76,9 +76,16 @@ config BCMA_PFLASH + default y + + config BCMA_SFLASH +- bool +- depends on BCMA_DRIVER_MIPS ++ bool "ChipCommon-attached serial flash support" ++ depends on BCMA_HOST_SOC + default y ++ help ++ Some cheap devices have serial flash connected to the ChipCommon ++ instead of independent SPI controller. It requires using a separated ++ driver that implements ChipCommon specific interface communication. ++ ++ Enabling this symbol will let bcma recognize serial flash and register ++ it as platform device. + + config BCMA_NFLASH + bool +--- a/drivers/bcma/driver_chipcommon_b.c ++++ b/drivers/bcma/driver_chipcommon_b.c +@@ -33,11 +33,12 @@ static bool bcma_wait_reg(struct bcma_bu + void bcma_chipco_b_mii_write(struct bcma_drv_cc_b *ccb, u32 offset, u32 value) + { + struct bcma_bus *bus = ccb->core->bus; ++ void __iomem *mii = ccb->mii; + +- writel(offset, ccb->mii + 0x00); +- bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100); +- writel(value, ccb->mii + 0x04); +- bcma_wait_reg(bus, ccb->mii + 0x00, 0x0100, 0x0000, 100); ++ writel(offset, mii + BCMA_CCB_MII_MNG_CTL); ++ bcma_wait_reg(bus, mii + BCMA_CCB_MII_MNG_CTL, 0x0100, 0x0000, 100); ++ writel(value, mii + BCMA_CCB_MII_MNG_CMD_DATA); ++ bcma_wait_reg(bus, mii + BCMA_CCB_MII_MNG_CTL, 0x0100, 0x0000, 100); + } + EXPORT_SYMBOL_GPL(bcma_chipco_b_mii_write); + +--- a/include/linux/bcma/bcma_driver_chipcommon.h ++++ b/include/linux/bcma/bcma_driver_chipcommon.h +@@ -504,6 +504,9 @@ + #define BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_MASK 0x1ff00000 + #define BCMA_CC_PMU1_PLL0_PC2_NDIV_INT_SHIFT 20 + ++#define BCMA_CCB_MII_MNG_CTL 0x0000 ++#define BCMA_CCB_MII_MNG_CMD_DATA 0x0004 ++ + /* BCM4331 ChipControl numbers. */ + #define BCMA_CHIPCTL_4331_BT_COEXIST BIT(0) /* 0 disable */ + #define BCMA_CHIPCTL_4331_SECI BIT(1) /* 0 SECI is disabled (JATG functional) */ |