]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/dt' into for-next
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 21:03:44 +0000 (23:03 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Jun 2013 21:03:44 +0000 (23:03 +0200)
Conflicts:
arch/arm/mach-omap2/cclock33xx_data.c

1  2 
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am33xx.dtsi
arch/arm/boot/dts/omap3430-sdp.dts
arch/arm/mach-omap2/cclock33xx_data.c

index 3e67c5509e6e8dce29ffebd11a121bbda8dda9a3,0000000000000000000000000000000000000000..fae360bd4c659026ede1ea37719a85b25e2a844e
mode 100644,000000..100644
--- /dev/null
@@@ -1,262 -1,0 +1,264 @@@
 +for-next contents for 3.11: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +      <topic branch>
 +              <contents>
 +              <...>
 +      <...>
 +
 +depends/rmk-devel-stable
 +      http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git devel-stable
 +
 +next/fixes-non-critical
 +      mvebu/fixes-non-critical
 +              git://git.infradead.org/users/jcooper/linux.git tags/fixes-non-3.11-1
 +      sirf/fixes-non-critical
 +              git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel.git tags/sirf-arm-soc-v3.10-fixes
 +      omap/fixes-non-critical
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/fixes-non-critical-signed           
 +      davinci/board
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.11/board
 +      msm/fixes
 +              git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-for-3.11
 +      patches
 +              MAINTAINERS: ARM: SIRF: add the source code tree path
 +              ARM: dts: msm: Fix merge resolution
 +              clocksource: kona: adapt to CLOCKSOURCE_OF_DECLARE change
 +              X.509: do not emit any informational output
 +              mtd: omap2: allow bulding as a module
 +              [SCSI] nsp32: use mdelay instead of large udelay constants
 +              hwrng: bcm2835: fix MODULE_LICENSE tag
 +              ARM: sirf: use CONFIG_SIRF rather than CONFIG_PRIMA2 where necessary
 +      at91/fixes
 +              git://github.com/at91linux/linux-at91.git tags/at91-fixes
 +      exynos/fixes
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/non-critical-fixes-1
 +
 +next/cleanup
 +      at91/cleanup
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      machdesc/cleanup
 +              git://github.com/mripard/linux.git tags/arm-soc-cleanups-for-3.11
 +      mvebu/cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-3
 +      dt/pci-helpers
 +              git://git.infradead.org/users/jcooper/linux.git tags/of_pci-3.11
 +      omap/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/cleanup-signed
 +      mvebu/cleanup4
 +              git://git.infradead.org/users/jcooper/linux.git tags/cleanup-3.11-4
 +      msm/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git tags/msm-fix-for-3.11
 +      sunxi/core
 +              git://github.com/mripard/linux.git tags/sunxi-core-for-3.11
 +      zynq/cleanup
 +              git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.11
 +      at91/cleanup2
 +              git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +      picoxcell/cleanup
 +              git://github.com/jamieiles/linux-2.6-ji.git picoxcell-next
 +      omap/pm-serial-cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-v3.11/pm-serial
 +      omap/pm-voltdomain-cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-voltdomain-signed
 +      omap/dma-cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/dma-signed
 +      samsung/cleanup
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-cleanup-1
 +
 +next/soc
 +      mvebu/soc
 +              git://git.infradead.org/users/jcooper/linux.git tags/soc-3.11-2
 +      mvebu/defconfig
 +              git://git.infradead.org/users/jcooper/linux.git tags/defconfig-3.11-3
 +      mvebu/pcie
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie-3.11-2
 +      mvebu/pcie-kirkwood
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11
 +      mvebu/pcie2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_bridge-3.11
 +      mvebu/clk-cleanup
 +              git://git.infradead.org/users/jcooper/linux.git tags/seb_clk-3.11
 +      vexpress/dual-cluster
 +              git://git.linaro.org/people/nico/linux VExpress_DCSCB
 +              depends on depends/rmk-devel-stable
 +              +patch "drivers/bus: arm-cci: fix combined ARMv6+v7 build"
 +      zynq/clk
 +              git://git.xilinx.com/linux-xlnx tags/zynq-clk-for-3.11
 +      mvebu/pcie-kirkwood2
 +              git://git.infradead.org/users/jcooper/linux.git tags/pcie_kw-3.11-2
 +      renesas/pinmux-gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-pinmux-for-v3.11
 +      renesas/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.11
 +      clps711x/soc
 +              patches
 +                      GPIO: clps711x: Rewrite driver for using generic GPIO cod
 +                      GPIO: clps711x: Add DT support
 +                      ARM: clps711x: Re-add GPIO support
 +                      ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency
 +                      ARM: clps711x: Set PLL clock to zero if we work from 13 mHz sourc
 +                      ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file
 +                      ARM: clps711x: autcpu12: Add support for NOR flash
 +                      ARM: clps711x: autcpu12: Special driver for handling memory is re
 +                      ARM: clps711x: autcpu12: Move remaining specific definitions to b
 +                      ARM: clps711x: p720t: Define PLD registers as GPIOs
 +                      ARM: clps711x: Move specific definitions from hardware.h to board
 +                      ARM: clps711x: Replace "arch_initcall" in common code with ".init
 +                      ARM: clps711x: Add clocksource framework
 +                      ARM: clps711x: Optimize interrupt handling
 +                      ARM: clps711x: edb7211: Add support for I2C
 +                      ARM: clps711x: edb7211: Control LCD backlight via PWM
 +                      ARM: clps711x: Add support for SYSCON driver
 +                      ARM: clps711x: Update defconfig
 +      patches
 +              ARM: socfpga: Add support to gate peripheral clocks
 +              ARM: socfpga: Add syscon to be part of socfpga
 +      samsung/s3c24xx-arch
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-arch-1
 +      omap/pm
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/pm-signed
 +      omap/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +      omap/omap5
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-signed
 +      mvebu/regmap
 +              git://git.infradead.org/users/jcooper/linux.git tags/regmap-3.11
 +                      depends on cleanup and fixes-non-critical branches
 +      renesas/usb
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-phy-rcar-usb-for-v3.11
 +      renesas/soc2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.11
 +      tegra/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.11-soc
 +      keystone/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-soc-for-arm-soc
 +      integrator/pci
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-pci-for-arm-soc
 +      u300/multiplatform
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/u300-multiplatform
 +      imx/soc
 +              git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.11
 +      davinci/soc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.11/soc-v2
 +i     sunxi/defconfig
 +              git://github.com/mripard/linux.git tags/sunxi-defconfig-for-3.11
 +      sunxi/core2
 +              git://github.com/mripard/linux.git tags/sunxi-core-for-3.11-2
 +      omap/soc2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/soc-part2-signed
 +      samsung/exynos-arch
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-arch-2
 +
 +next/boards
 +      mvebu/boards
 +                git://git.infradead.org/users/jcooper/linux.git tags/boards-3.11-2
 +      renesas/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.11
 +      renesas/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.11
 +              depends on renesas/pinmux-gpio
 +              depends on renesas/soc
 +      ux500/core
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-core-for-arm-soc
 +      ux500/pinctrl
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-pinctrl-for-arm-soc
 +      patch
 +              "ARM: ux500: board-mop500: remove unused pin modes"
 +      bcm2835/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.11-defconfig
 +      renesas/defconfig2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig2-for-v3.11
 +      tegra/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.11-defconfig
 +      omap/boards
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/mailbox-signed
 +      samsung/exynos-remove-nondt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/remove-nondt-exynos-3
 +      samsung/defconfig
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-defconfig-1
 +
 +next/dt
 +      nomadik/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-for-arm-soc
 +      mvebu/dt
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-3
 +      patch
 +              "ARM: nomadik: fix clocksource warning"
 +      at91/dt
 +              git://github.com/at91linux/linux-at91.git tags/at91-dt
 +      vt8500/dt
 +              git://github.com/linux-wmt/linux-vtwm vt8500/dts-3.11
 +      cleanup/dts-cpus
 +              git://linux-arm.org/linux-2.6-lp dts-cpus-updates
 +      patch
 +              "ARM: dts: add missing cpu #address-cell values"
 +      mvebu/dt4
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-4
 +      renesas/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.11
 +      patches
 +              ARM: socfpga: dts: Add ethernet bindings for SOCFPGA
 +              ARM: socfpga: dts: Add gate-clock bindings
 +      samsung/s3c24xx-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-1
 +      samsung/exynos-dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-1
 +      mvebu/dt5
 +              git://git.infradead.org/users/jcooper/linux.git tags/dt-3.11-5
 +      ux500/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-for-arm-soc
 +      bcm2835/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git bcm2835-for-3.11-dt
 +      tegra/dt
 +              git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git tegra-for-3.11-dt
 +      sunxi/dt
 +              git://github.com/mripard/linux.git tags/sunxi-dt-for-3.11
 +      at91/dt2
 +              git://github.com/at91linux/linux-at91.git tags/at91-dt
 +      zynq/dt
 +              git://git.xilinx.com/linux-xlnx.git tags/zynq-dt-for-3.11
 +      mxs/dt
 +              git://git.linaro.org/people/shawnguo/linux-2.6.git tags/mxs-dt-3.11
 +      imx/dt
 +              git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-dt-3.11
 +      sunxi/dt2
 +              git://github.com/mripard/linux.git tags/sunxi-dt-for-3.11-2
 +      nomadik/dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-2
 +      samsung/exynos-dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/exynos-dt-2
 +      samsung/s3c24xx-dt2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-dt-2
++      omap/dt
++              git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.11/dts
 +
 +next/drivers
 +      ux500/dma40
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc
 +      timer/dw_apb_timer_of
 +              git://github.com/mmind/linux-rockchip.git tags/dw_apb_timer_of
 +      samsung/s3c24xx-drivers
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-driver-1
 +      omap/gpmc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-signed
 +      ux500/clksrc
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-clksrc-for-arm-soc
 +      ux500/dma540_2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dma40-for-arm-soc-2
 +      renesas/rcar-gpio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-gpio-rcar-for-v3.11
 +              depends on renesas/pinmux-gpio
 +      at91/drivers
 +              git://github.com/at91linux/linux-at91.git tags/at91-drivers
 +      patch
 +              gpio: rcar: fix gpio_rcar_of_table
 +      omap/gpmc2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/gpmc-part2-signed
 +      drivers/mailbox
 +              git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.11/mailbox-signed
 +      samsung/common-clk-audio
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/common-clk-audio
 +      samsung/s3c24xx-pinctrl2
 +              git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/s3c24xx-pinctrl-2
Simple merge
Simple merge
Simple merge
index 0346de56436caf26ef2ad87b9a38bdd380fefe3d,a8140b6885e3174d690d6683502b4354c4b1da6e..68e797c61db76b9d97144b97c0ca70de343484cb
@@@ -862,33 -858,42 +858,69 @@@ static struct clk_hw_omap wdt1_fck_hw 
  
  DEFINE_STRUCT_CLK(wdt1_fck, wdt_ck_parents, gpio_fck_ops);
  
 +static const char *pwmss_clk_parents[] = {
 +      "dpll_per_m2_ck",
 +};
 +
 +static const struct clk_ops ehrpwm_tbclk_ops = {
 +      .enable         = &omap2_dflt_clk_enable,
 +      .disable        = &omap2_dflt_clk_disable,
 +};
 +
 +DEFINE_CLK_OMAP_MUX_GATE(ehrpwm0_tbclk, "l4ls_clkdm",
 +                       NULL, NULL, 0,
 +                       AM33XX_CTRL_REGADDR(AM33XX_PWMSS_TBCLK_CLKCTRL),
 +                       AM33XX_PWMSS0_TBCLKEN_SHIFT,
 +                       NULL, pwmss_clk_parents, ehrpwm_tbclk_ops);
 +
 +DEFINE_CLK_OMAP_MUX_GATE(ehrpwm1_tbclk, "l4ls_clkdm",
 +                       NULL, NULL, 0,
 +                       AM33XX_CTRL_REGADDR(AM33XX_PWMSS_TBCLK_CLKCTRL),
 +                       AM33XX_PWMSS1_TBCLKEN_SHIFT,
 +                       NULL, pwmss_clk_parents, ehrpwm_tbclk_ops);
 +
 +DEFINE_CLK_OMAP_MUX_GATE(ehrpwm2_tbclk, "l4ls_clkdm",
 +                       NULL, NULL, 0,
 +                       AM33XX_CTRL_REGADDR(AM33XX_PWMSS_TBCLK_CLKCTRL),
 +                       AM33XX_PWMSS2_TBCLKEN_SHIFT,
 +                       NULL, pwmss_clk_parents, ehrpwm_tbclk_ops);
 +
+ /*
+  * debugss optional clocks
+  */
+ DEFINE_CLK_GATE(dbg_sysclk_ck, "sys_clkin_ck", &sys_clkin_ck,
+               0x0, AM33XX_CM_WKUP_DEBUGSS_CLKCTRL,
+               AM33XX_OPTFCLKEN_DBGSYSCLK_SHIFT, 0x0, NULL);
+ DEFINE_CLK_GATE(dbg_clka_ck, "dpll_core_m4_ck", &dpll_core_m4_ck,
+               0x0, AM33XX_CM_WKUP_DEBUGSS_CLKCTRL,
+               AM33XX_OPTCLK_DEBUG_CLKA_SHIFT, 0x0, NULL);
+ static const char *stm_pmd_clock_mux_ck_parents[] = {
+       "dbg_sysclk_ck", "dbg_clka_ck",
+ };
+ DEFINE_CLK_MUX(stm_pmd_clock_mux_ck, stm_pmd_clock_mux_ck_parents, NULL, 0x0,
+              AM33XX_CM_WKUP_DEBUGSS_CLKCTRL, AM33XX_STM_PMD_CLKSEL_SHIFT,
+              AM33XX_STM_PMD_CLKSEL_WIDTH, 0x0, NULL);
+ DEFINE_CLK_MUX(trace_pmd_clk_mux_ck, stm_pmd_clock_mux_ck_parents, NULL, 0x0,
+              AM33XX_CM_WKUP_DEBUGSS_CLKCTRL,
+              AM33XX_TRC_PMD_CLKSEL_SHIFT,
+              AM33XX_TRC_PMD_CLKSEL_WIDTH, 0x0, NULL);
+ DEFINE_CLK_DIVIDER(stm_clk_div_ck, "stm_pmd_clock_mux_ck",
+                  &stm_pmd_clock_mux_ck, 0x0, AM33XX_CM_WKUP_DEBUGSS_CLKCTRL,
+                  AM33XX_STM_PMD_CLKDIVSEL_SHIFT,
+                  AM33XX_STM_PMD_CLKDIVSEL_WIDTH, CLK_DIVIDER_POWER_OF_TWO,
+                  NULL);
+ DEFINE_CLK_DIVIDER(trace_clk_div_ck, "trace_pmd_clk_mux_ck",
+                  &trace_pmd_clk_mux_ck, 0x0, AM33XX_CM_WKUP_DEBUGSS_CLKCTRL,
+                  AM33XX_TRC_PMD_CLKDIVSEL_SHIFT,
+                  AM33XX_TRC_PMD_CLKDIVSEL_WIDTH, CLK_DIVIDER_POWER_OF_TWO,
+                  NULL);
  /*
   * clkdev
   */
@@@ -969,9 -973,13 +1000,16 @@@ static struct omap_clk am33xx_clks[] = 
        CLK(NULL,       "clkout2_div_ck",       &clkout2_div_ck),
        CLK(NULL,       "timer_32k_ck",         &clkdiv32k_ick),
        CLK(NULL,       "timer_sys_ck",         &sys_clkin_ck),
 +      CLK("48300200.ehrpwm",  "tbclk",        &ehrpwm0_tbclk),
 +      CLK("48302200.ehrpwm",  "tbclk",        &ehrpwm1_tbclk),
 +      CLK("48304200.ehrpwm",  "tbclk",        &ehrpwm2_tbclk),
+       CLK(NULL,       "dbg_sysclk_ck",        &dbg_sysclk_ck),
+       CLK(NULL,       "dbg_clka_ck",          &dbg_clka_ck),
+       CLK(NULL,       "stm_pmd_clock_mux_ck", &stm_pmd_clock_mux_ck),
+       CLK(NULL,       "trace_pmd_clk_mux_ck", &trace_pmd_clk_mux_ck),
+       CLK(NULL,       "stm_clk_div_ck",       &stm_clk_div_ck),
+       CLK(NULL,       "trace_clk_div_ck",     &trace_clk_div_ck),
+       CLK(NULL,       "clkout2_ck",           &clkout2_ck),
  };