1. 24 5月, 2012 1 次提交
    • C
      mfd: Fix build break of max77693 by adding REGMAP_I2C option · 29f772d4
      Chanwoo Choi 提交于
      This patch add REGMAP_I2C config option to fix build break
      of max77693 mfd driver because max77693 use regmap interface
      for i2c communication.
      
      drivers/mfd/max77693.c:103: error: variable 'max77693_regmap_config' has initializer but incomplete type
      drivers/mfd/max77693.c:104: error: unknown field 'reg_bits' specified in initializer
      drivers/mfd/max77693.c:104: warning: excess elements in struct initializer
      drivers/mfd/max77693.c:104: warning: (near initialization for 'max77693_regmap_config')
      drivers/mfd/max77693.c:105: error: unknown field 'val_bits' specified in initializer
      drivers/mfd/max77693.c:105: warning: excess elements in struct initializer
      drivers/mfd/max77693.c:105: warning: (near initialization for 'max77693_regmap_config')
      drivers/mfd/max77693.c:106: error: unknown field 'max_register' specified in initializer
      drivers/mfd/max77693.c:106: warning: excess elements in struct initializer
      drivers/mfd/max77693.c:106: warning: (near initialization for 'max77693_regmap_config')
      drivers/mfd/max77693.c: In function 'max77693_i2c_probe':
      drivers/mfd/max77693.c:122: error: implicit declaration of function 'devm_regmap_init_i2c'
      drivers/mfd/max77693.c:122: warning: assignment makes pointer from integer without a cast
      Signed-off-by: NChanwoo Choi <cw00.choi@samsung.com>
      Signed-off-by: NMyungjoo Ham <myungjoo.ham@samsung.com>
      Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
      Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
      29f772d4
  2. 23 5月, 2012 2 次提交
    • L
      mfd: ab8500-core should depend on MFD_DB8500_PRCMU · 21f082a6
      Lee Jones 提交于
      A recent move to eliminate excess historical baggage from ab8500 core
      code resulting in errors when building with x86_64 allmodconfig:
      
      In file included from drivers/mfd/ab8500-core.c:21:0:
      include/linux/mfd/dbx500-prcmu.h:614:19: error: redefinition of 'prcmu_abb_read'
      include/linux/mfd/db8500-prcmu.h:673:19: note: previous definition of 'prcmu_abb_read' was here
      include/linux/mfd/dbx500-prcmu.h:619:19: error: redefinition of 'prcmu_abb_write'
      include/linux/mfd/db8500-prcmu.h:678:19: note: previous definition of 'prcmu_abb_write' was here
      include/linux/mfd/dbx500-prcmu.h:630:19: error: redefinition of 'prcmu_config_clkout'
      include/linux/mfd/db8500-prcmu.h:643:19: note: previous definition of 'prcmu_config_clkout' was here
      include/linux/mfd/dbx500-prcmu.h:692:20: error: redefinition of 'prcmu_ac_wake_req'
      include/linux/mfd/db8500-prcmu.h:683:20: note: previous definition of 'prcmu_ac_wake_req' was here
      include/linux/mfd/dbx500-prcmu.h:694:20: error: redefinition of 'prcmu_ac_sleep_req'
      include/linux/mfd/db8500-prcmu.h:685:20: note: previous definition of 'prcmu_ac_sleep_req' was here
      
      Problem:
      When CONFIG_AB8500_CORE is set, building ab8500-core.c and
      !(CONFIG_UX500_SOC_DB8500 | CONFIG_MFD_DB8500_PRCMU), both db8500-prcmu.h
      and dbx500-prcmu.h take it upon themselves to _both_ create 'return 0'
      inline functions for the following:
      
      prcmu_abb_read()
      prcmu_abb_write()
      prcmu_config_clkout()
      prcmu_ac_wake_req()
      prcmu_ac_sleep_req()
      
      Solution:
      Depend on MFD_DB8500_PRCMU, which in turn depends on UX500_SOC_DB8500.
      Reported-By: NStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
      21f082a6
    • M
      regmap: Use select .. if to get IRQ_DOMAIN enabled · 18d5eacb
      Mark Brown 提交于
      Ensure that we can't get randconfig breakage by doing the IRQ_DOMAIN
      select automatically. Don't just do the select from REGMAP_IRQ to ensure
      that the select actually gets noticed.
      Reported-by: NRandy Dunlap <rdunlap@xenotime.net>
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      18d5eacb
  3. 20 5月, 2012 8 次提交
  4. 18 5月, 2012 1 次提交
  5. 14 5月, 2012 1 次提交
    • M
      regmap: Convert regmap_irq to use irq_domain · 4af8be67
      Mark Brown 提交于
      This gets us up to date with the recommended current kernel infrastructure
      and should transparently give us device tree interrupt bindings for any
      devices using the framework. If an explicit IRQ mapping is passed in then
      a legacy interrupt range is created, otherwise a simple linear mapping is
      used. Previously a mapping was mandatory so existing drivers should not
      be affected.
      
      A function regmap_irq_get_virq() is provided to allow drivers to map
      individual IRQs which should be used in preference to the existing
      regmap_irq_chip_get_base() which is only valid if a legacy IRQ range is
      provided.
      Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
      4af8be67
  6. 09 5月, 2012 3 次提交
  7. 02 5月, 2012 2 次提交
    • L
      mfd/ab5500: delete AB5500 support · 72fb9220
      Linus Walleij 提交于
      This platform has been obsoleted and was only available inside of
      ST-Ericsson, no users of this code are left in the world. This
      deletes the core U5500 support entirely in the same manner as the
      obsoleted U8500 silicon was previously deleted.
      
      Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
      Cc: Rabin Vincent <rabin.vincent@stericsson.com>
      Cc: Jonas Aberg <jonas.aberg@stericsson.com>
      Cc: Per Forlin <per.forlin@stericsson.com>
      Cc: Ulf Hansson <ulf.hansson@stericsson.com>
      Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      72fb9220
    • L
      mfd/db5500-prcmu: delete DB5500 PRCMU support · dece3709
      Linus Walleij 提交于
      This platform has been obsoleted and was only available inside of
      ST-Ericsson, no users of this code are left in the world. This
      deletes the core U5500 support entirely in the same manner as the
      obsoleted U8500 silicon was previously deleted.
      
      Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
      Cc: Rabin Vincent <rabin.vincent@stericsson.com>
      Cc: Jonas Aberg <jonas.aberg@stericsson.com>
      Cc: Per Forlin <per.forlin@stericsson.com>
      Cc: Ulf Hansson <ulf.hansson@stericsson.com>
      Acked-by: NSamuel Ortiz <sameo@linux.intel.com>
      Signed-off-by: NLinus Walleij <linus.walleij@linaro.org>
      dece3709
  8. 01 5月, 2012 4 次提交
  9. 16 4月, 2012 2 次提交
  10. 20 3月, 2012 2 次提交
  11. 17 3月, 2012 2 次提交
  12. 07 3月, 2012 4 次提交
  13. 27 2月, 2012 1 次提交
  14. 19 2月, 2012 1 次提交
  15. 10 2月, 2012 1 次提交
    • R
      ARM: omap: fix broken twl-core dependencies and ifdefs · 6252547b
      Russell King 提交于
      In commit aeb5032b, a dependency on IRQ_DOMAIN was added, which causes
      regressions on previously working setups: a previously working non-DT
      kernel configuration now loses its PMIC support.  The lack of PMIC
      support in turn causes the loss of other functionality the kernel had.
      
      This dependency was added because the driver now registers its
      interrupts with the IRQ domain code, presumably to prevent a build error.
      
      The result is that OMAP3 oopses in the vp.c code (fixed by a previous
      commit) due to the lack of PMIC support.
      
      However, even with IRQ_DOMAIN enabled, the driver oopses:
      
      Unable to handle kernel NULL pointer dereference at virtual address 00000000
      pgd = c0004000
      [00000000] *pgd=00000000
      Internal error: Oops: 5 [#1] SMP
      Modules linked in:
      CPU: 1    Not tainted  (3.3.0-rc2+ #271)
      PC is at irq_domain_add+0x1c/0x134
      LR is at twl_probe+0xd0/0x370
      pc : [<c007bad0>]    lr : [<c029baac>]    psr: 00000113
      sp : df843c48  ip : df843c68  fp : df843c64
      r10: c02b93e4  r9 : 00000000  r8 : c029b9dc
      r7 : df9d8a00  r6 : c03bef90  r5 : 00000000  r4 : c03f5240
      r3 : 00000000  r2 : c03f5240  r1 : 00000015  r0 : c03f5240
      Flags: nzcv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
      Control: 10c5387d  Table: 8000404a  DAC: 00000015
      Process swapper/0 (pid: 1, stack limit = 0xdf8422f0)
      Stack: (0xdf843c48 to 0xdf844000)
      3c40:                   00000014 00000170 00000014 c03bef90 df843c9c df843c68
      3c60: c029baac c007bac0 00000000 df9d8a20 00000001 c03cd238 c02b93e4 df9d8a20
      3c80: df9d8a04 df9d8a00 c029b9dc df8cae08 df843cc4 df843ca0 c01eee70 c029b9e8
      ...
      Backtrace:
      [<c007bab4>] (irq_domain_add+0x0/0x134) from [<c029baac>] (twl_probe+0xd0/0x370)
       r6:c03bef90 r5:00000014 r4:00000170
      [<c029b9dc>] (twl_probe+0x0/0x370) from [<c01eee70>] (i2c_device_probe+0xb0/0xe4)
      [<c01eedc0>] (i2c_device_probe+0x0/0xe4) from [<c01d1f34>] (really_probe+0xa0/0x178)
       r8:df8f0070 r7:c03cd238 r6:df9d8a20 r5:df9d8a20 r4:df9d8a20
      [<c01d1e94>] (really_probe+0x0/0x178) from [<c01d205c>] (driver_probe_device+0x50/0x68)
       r7:df843d18 r6:df9d8a20 r5:c03cd238 r4:df9d8a20
      [<c01d200c>] (driver_probe_device+0x0/0x68) from [<c01d2148>] (__device_attach+0x44/0x48)
       r5:df9d8a20 r4:c03cd238
      [<c01d2104>] (__device_attach+0x0/0x48) from [<c01d0840>] (bus_for_each_drv+0x58/0x98)
       r5:c01d2104 r4:00000000
      [<c01d07e8>] (bus_for_each_drv+0x0/0x98) from [<c01d21f8>] (device_attach+0x80/0xac)
       r7:df9d8a28 r6:df9d8a54 r5:c03cd978 r4:df9d8a20
      [<c01d2178>] (device_attach+0x0/0xac) from [<c01d1430>] (bus_probe_device+0x34/0xa4)
       r6:df9d8a20 r5:c03cd978 r4:df9d8a20
      [<c01d13fc>] (bus_probe_device+0x0/0xa4) from [<c01cffb0>] (device_add+0x2a0/0x420)
       r6:00000000 r5:df9d8a20 r4:df9d8a20
      [<c01cfd10>] (device_add+0x0/0x420) from [<c01d0150>] (device_register+0x20/0x24)
       r8:df9d8a00 r7:df9d8a04 r6:df8f0048 r5:df9d8a00 r4:df9d8a20
      [<c01d0130>] (device_register+0x0/0x24) from [<c01ef8d4>] (i2c_new_device+0x118/0x180)
       r4:df9d8a20
      [<c01ef7bc>] (i2c_new_device+0x0/0x180) from [<c01efc88>] (i2c_register_adapter+0x140/0x204)
       r8:c03cd970 r7:00000000 r6:df8f0070 r5:df8a6300 r4:df8f0048
      [<c01efb48>] (i2c_register_adapter+0x0/0x204) from [<c01efe9c>] (i2c_add_numbered_adapter+0xb4/0xcc)
       r8:df8a4c54 r7:df8cae00 r6:df843e2c r5:df8f0048 r4:00000000
      [<c01efde8>] (i2c_add_numbered_adapter+0x0/0xcc) from [<c029ce1c>] (omap_i2c_probe+0x2f8/0x3b4)
       r6:00000000 r5:df8f0000 r4:df8f0070
      [<c029cb24>] (omap_i2c_probe+0x0/0x3b4) from [<c01d3484>] (platform_drv_probe+0x20/0x24)
      [<c01d3464>] (platform_drv_probe+0x0/0x24) from [<c01d1f34>] (really_probe+0xa0/0x178)
      [<c01d1e94>] (really_probe+0x0/0x178) from [<c01d205c>] (driver_probe_device+0x50/0x68)
       r7:df843ef0 r6:c03cdb2c r5:c03cdb2c r4:df8cae08
      [<c01d200c>] (driver_probe_device+0x0/0x68) from [<c01d20e0>] (__driver_attach+0x6c/0x90)
       r5:df8cae3c r4:df8cae08
      [<c01d2074>] (__driver_attach+0x0/0x90) from [<c01d08d8>] (bus_for_each_dev+0x58/0x98)
       r6:c03cdb2c r5:c01d2074 r4:00000000
      [<c01d0880>] (bus_for_each_dev+0x0/0x98) from [<c01d1d80>] (driver_attach+0x20/0x28)
       r7:df880b80 r6:c03cdb2c r5:c03cdb2c r4:c0394f28
      [<c01d1d60>] (driver_attach+0x0/0x28) from [<c01d115c>] (bus_add_driver+0xb4/0x230)
      [<c01d10a8>] (bus_add_driver+0x0/0x230) from [<c01d278c>] (driver_register+0xc8/0x154)
      [<c01d26c4>] (driver_register+0x0/0x154) from [<c01d37e4>] (platform_driver_register+0x4c/0x60)
       r8:00000000 r7:00000013 r6:c00384c8 r5:c0395180 r4:c0394f28
      [<c01d3798>] (platform_driver_register+0x0/0x60) from [<c038626c>] (omap_i2c_init_driver+0x14/0x1c)
      [<c0386258>] (omap_i2c_init_driver+0x0/0x1c) from [<c00087b8>] (do_one_initcall+0x9c/0x164)
      [<c000871c>] (do_one_initcall+0x0/0x164) from [<c036c2f4>] (kernel_init+0x90/0x138)
      [<c036c264>] (kernel_init+0x0/0x138) from [<c00384c8>] (do_exit+0x0/0x2ec)
       r5:c036c264 r4:00000000
      <0>Code: e24dd004 e5903014 e1a04000 e5905010 (e5933000)
      <4>---[ end trace 1b75b31a2719ed1c ]---
      
      This happens because we try to register an IRQ domain with a NULL ops
      structure, and the first thing irq_domain_add() does is try to
      dereference this ops structure.
      
      So, fix the problem by getting rid of the incorrect OF_IRQ ifdef and
      wrapping the IRQ domain bits of the driver with an IRQ_DOMAIN ifdef
      instead.
      Acked-by: NTony Lindgren <tony@atomide.com>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      6252547b
  16. 09 1月, 2012 5 次提交