|
@@ -214,7 +214,7 @@ static void lpphy_table_init(struct b43_wldev *dev)
|
|
|
|
|
|
static void lpphy_baseband_rev0_1_init(struct b43_wldev *dev)
|
|
|
{
|
|
|
- struct ssb_bus *bus = dev->sdev->bus;
|
|
|
+ struct ssb_bus *bus = dev->dev->sdev->bus;
|
|
|
struct ssb_sprom *sprom = dev->dev->bus_sprom;
|
|
|
struct b43_phy_lp *lpphy = dev->phy.lp;
|
|
|
u16 tmp, tmp2;
|
|
@@ -519,7 +519,7 @@ struct b2062_freqdata {
|
|
|
static void lpphy_2062_init(struct b43_wldev *dev)
|
|
|
{
|
|
|
struct b43_phy_lp *lpphy = dev->phy.lp;
|
|
|
- struct ssb_bus *bus = dev->sdev->bus;
|
|
|
+ struct ssb_bus *bus = dev->dev->sdev->bus;
|
|
|
u32 crystalfreq, tmp, ref;
|
|
|
unsigned int i;
|
|
|
const struct b2062_freqdata *fd = NULL;
|
|
@@ -1289,7 +1289,7 @@ finish:
|
|
|
|
|
|
static void lpphy_rev2plus_rc_calib(struct b43_wldev *dev)
|
|
|
{
|
|
|
- struct ssb_bus *bus = dev->sdev->bus;
|
|
|
+ struct ssb_bus *bus = dev->dev->sdev->bus;
|
|
|
u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
|
|
|
u8 tmp = b43_radio_read(dev, B2063_RX_BB_SP8) & 0xFF;
|
|
|
int i;
|
|
@@ -2428,7 +2428,7 @@ static int lpphy_b2062_tune(struct b43_wldev *dev,
|
|
|
unsigned int channel)
|
|
|
{
|
|
|
struct b43_phy_lp *lpphy = dev->phy.lp;
|
|
|
- struct ssb_bus *bus = dev->sdev->bus;
|
|
|
+ struct ssb_bus *bus = dev->dev->sdev->bus;
|
|
|
const struct b206x_channel *chandata = NULL;
|
|
|
u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
|
|
|
u32 tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7, tmp8, tmp9;
|
|
@@ -2518,7 +2518,7 @@ static void lpphy_b2063_vco_calib(struct b43_wldev *dev)
|
|
|
static int lpphy_b2063_tune(struct b43_wldev *dev,
|
|
|
unsigned int channel)
|
|
|
{
|
|
|
- struct ssb_bus *bus = dev->sdev->bus;
|
|
|
+ struct ssb_bus *bus = dev->dev->sdev->bus;
|
|
|
|
|
|
static const struct b206x_channel *chandata = NULL;
|
|
|
u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
|
|
@@ -2666,6 +2666,11 @@ static int b43_lpphy_op_init(struct b43_wldev *dev)
|
|
|
{
|
|
|
int err;
|
|
|
|
|
|
+ if (dev->dev->bus_type != B43_BUS_SSB) {
|
|
|
+ b43err(dev->wl, "LP-PHY is supported only on SSB!\n");
|
|
|
+ return -EOPNOTSUPP;
|
|
|
+ }
|
|
|
+
|
|
|
lpphy_read_band_sprom(dev); //FIXME should this be in prepare_structs?
|
|
|
lpphy_baseband_init(dev);
|
|
|
lpphy_radio_init(dev);
|