| Message ID | 1343956968-5248-1-git-send-email-ike.pan@canonical.com |
|---|---|
| State | New |
| Headers | show |
On 08/02/2012 07:22 PM, Ike Panhc wrote: > BugLink: http://launchpad.net/bugs/1008345 > > And also fix for ethernet, power button handling and SATA. > > The following changes since commit c9499363691baac8cf3cd3a8e094ad9b65f427ea: > > UBUNTU: Ubuntu-3.5.0-7.7 (2012-07-30 11:11:33 -0700) > > are available in the git repository at: > > git://kernel.ubuntu.com/ikepanhc/public.git lp1008345-quantal-new > > for you to fetch changes up to 1e930e3850099268b9be89f1cfb7c91082253c84: > > UBUNTU: [Config] Enable EDAC/CLK for highbank (2012-08-02 15:45:16 +0800) > > > Grant Likely (2): > UBUNTU: (drop after 3.6-rc1) clk: add DT clock binding support > UBUNTU: (drop after 3.6-rc1) clk: add DT fixed-clock binding support > > Ike Panhc (1): > UBUNTU: [Config] Enable EDAC/CLK for highbank > > Rob Herring (11): > UBUNTU: (drop after 3.6-rc1) clk: add highbank clock support > UBUNTU: (drop after 3.6-rc1) edac: add support for Calxeda highbank > memory controller > UBUNTU: (drop after 3.6-rc1) edac: add support for Calxeda highbank > L2 cache ecc > UBUNTU: (drop after 3.6-rc1) net: calxedaxgmac: enable rx cut-thru > mode > UBUNTU: (drop after 3.6-rc1) net: calxedaxgmac: fix hang on rx refill > UBUNTU: SAUCE: net: calxedaxgmac: add write barriers around setting > owner bit > UBUNTU: SAUCE: ARM smp_twd: add back "arm,smp-twd" compatible > property > UBUNTU: SAUCE: ARM: highbank: add soft power and reset key event > handling > UBUNTU: SAUCE: ARM: highbank: use writel_relaxed variant for pwr > requests > UBUNTU: SAUCE: ahci: un-staticize ahci_dev_classify > UBUNTU: SAUCE: ahci_platform: add custom hard reset for Calxeda ahci > ctrlr > > .../devicetree/bindings/arm/calxeda/l2ecc.txt | 15 + > .../devicetree/bindings/arm/calxeda/mem-ctrlr.txt | 14 + > .../devicetree/bindings/clock/calxeda.txt | 17 + > .../devicetree/bindings/clock/clock-bindings.txt | 117 +++++++ > .../devicetree/bindings/clock/fixed-clock.txt | 21 ++ > arch/arm/Kconfig | 1 + > arch/arm/boot/dts/highbank.dts | 103 +++++- > arch/arm/kernel/smp_twd.c | 1 + > arch/arm/mach-highbank/Makefile | 2 +- > arch/arm/mach-highbank/clock.c | 67 ---- > arch/arm/mach-highbank/highbank.c | 29 ++ > arch/arm/mach-highbank/sysregs.h | 8 +- > debian.master/config/amd64/config.common.amd64 | 2 + > debian.master/config/armel/config.common.armel | 1 + > debian.master/config/armhf/config.common.armhf | 1 + > debian.master/config/armhf/config.flavour.highbank | 1 + > debian.master/config/armhf/config.flavour.omap | 1 + > debian.master/config/config.common.ubuntu | 7 +- > debian.master/config/i386/config.common.i386 | 2 + > debian.master/config/powerpc/config.common.powerpc | 2 + > debian.master/config/ppc64/config.common.ppc64 | 2 + > drivers/ata/ahci.h | 1 + > drivers/ata/ahci_platform.c | 74 ++++- > drivers/ata/libahci.c | 3 +- > drivers/clk/Makefile | 1 + > drivers/clk/clk-fixed-rate.c | 23 ++ > drivers/clk/clk-highbank.c | 346 ++++++++++++++++++++ > drivers/clk/clk.c | 141 ++++++++ > drivers/clk/clkdev.c | 77 +++++ > drivers/edac/Kconfig | 16 +- > drivers/edac/Makefile | 3 + > drivers/edac/highbank_l2_edac.c | 149 +++++++++ > drivers/edac/highbank_mc_edac.c | 238 ++++++++++++++ > drivers/net/ethernet/calxeda/xgmac.c | 41 +-- > include/linux/clk-provider.h | 16 + > include/linux/clk.h | 19 ++ > 36 files changed, 1458 insertions(+), 104 deletions(-) > create mode 100644 Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt > create mode 100644 Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt > create mode 100644 Documentation/devicetree/bindings/clock/calxeda.txt > create mode 100644 Documentation/devicetree/bindings/clock/clock-bindings.txt > create mode 100644 Documentation/devicetree/bindings/clock/fixed-clock.txt > delete mode 100644 arch/arm/mach-highbank/clock.c > create mode 100644 drivers/clk/clk-highbank.c > create mode 100644 drivers/edac/highbank_l2_edac.c > create mode 100644 drivers/edac/highbank_mc_edac.c > drivers/built-in.o: In function `of_clk_get': /home/rtg/ukb/quantal/armhf/master-next/ubuntu-quantal/drivers/clk/clkdev.c:42: undefined reference to `of_clk_get_from_provider' make[2]: *** [vmlinux] Error 1 make[1]: *** [sub-make] Error 2 make[1]: Leaving directory `/home/rtg/ukb/quantal/armhf/master-next/ubuntu-quantal' make: *** [/home/rtg/ukb/quantal/armhf/master-next/ubuntu-quantal/debian/stamps/stamp-build-omap] Error 2 dpkg-buildpackage: error: debian/rules build gave error exit status 2 ~/quantal/kern/ubuntu-quantal While you're figuring out the omap build problem, how about replacing the '(drop after 3.6-rc1)' with clean cherry picks since 3.6-rc1 has been released. rtg
On 08/03/2012 10:58 PM, Tim Gardner wrote: > On 08/02/2012 07:22 PM, Ike Panhc wrote: >> BugLink: http://launchpad.net/bugs/1008345 >> >> And also fix for ethernet, power button handling and SATA. >> >> The following changes since commit c9499363691baac8cf3cd3a8e094ad9b65f427ea: >> >> UBUNTU: Ubuntu-3.5.0-7.7 (2012-07-30 11:11:33 -0700) >> >> are available in the git repository at: >> >> git://kernel.ubuntu.com/ikepanhc/public.git lp1008345-quantal-new >> >> for you to fetch changes up to 1e930e3850099268b9be89f1cfb7c91082253c84: >> >> UBUNTU: [Config] Enable EDAC/CLK for highbank (2012-08-02 15:45:16 +0800) >> >> >> Grant Likely (2): >> UBUNTU: (drop after 3.6-rc1) clk: add DT clock binding support >> UBUNTU: (drop after 3.6-rc1) clk: add DT fixed-clock binding support >> >> Ike Panhc (1): >> UBUNTU: [Config] Enable EDAC/CLK for highbank >> >> Rob Herring (11): >> UBUNTU: (drop after 3.6-rc1) clk: add highbank clock support >> UBUNTU: (drop after 3.6-rc1) edac: add support for Calxeda highbank >> memory controller >> UBUNTU: (drop after 3.6-rc1) edac: add support for Calxeda highbank >> L2 cache ecc >> UBUNTU: (drop after 3.6-rc1) net: calxedaxgmac: enable rx cut-thru >> mode >> UBUNTU: (drop after 3.6-rc1) net: calxedaxgmac: fix hang on rx refill >> UBUNTU: SAUCE: net: calxedaxgmac: add write barriers around setting >> owner bit >> UBUNTU: SAUCE: ARM smp_twd: add back "arm,smp-twd" compatible >> property >> UBUNTU: SAUCE: ARM: highbank: add soft power and reset key event >> handling >> UBUNTU: SAUCE: ARM: highbank: use writel_relaxed variant for pwr >> requests >> UBUNTU: SAUCE: ahci: un-staticize ahci_dev_classify >> UBUNTU: SAUCE: ahci_platform: add custom hard reset for Calxeda ahci >> ctrlr >> >> .../devicetree/bindings/arm/calxeda/l2ecc.txt | 15 + >> .../devicetree/bindings/arm/calxeda/mem-ctrlr.txt | 14 + >> .../devicetree/bindings/clock/calxeda.txt | 17 + >> .../devicetree/bindings/clock/clock-bindings.txt | 117 +++++++ >> .../devicetree/bindings/clock/fixed-clock.txt | 21 ++ >> arch/arm/Kconfig | 1 + >> arch/arm/boot/dts/highbank.dts | 103 +++++- >> arch/arm/kernel/smp_twd.c | 1 + >> arch/arm/mach-highbank/Makefile | 2 +- >> arch/arm/mach-highbank/clock.c | 67 ---- >> arch/arm/mach-highbank/highbank.c | 29 ++ >> arch/arm/mach-highbank/sysregs.h | 8 +- >> debian.master/config/amd64/config.common.amd64 | 2 + >> debian.master/config/armel/config.common.armel | 1 + >> debian.master/config/armhf/config.common.armhf | 1 + >> debian.master/config/armhf/config.flavour.highbank | 1 + >> debian.master/config/armhf/config.flavour.omap | 1 + >> debian.master/config/config.common.ubuntu | 7 +- >> debian.master/config/i386/config.common.i386 | 2 + >> debian.master/config/powerpc/config.common.powerpc | 2 + >> debian.master/config/ppc64/config.common.ppc64 | 2 + >> drivers/ata/ahci.h | 1 + >> drivers/ata/ahci_platform.c | 74 ++++- >> drivers/ata/libahci.c | 3 +- >> drivers/clk/Makefile | 1 + >> drivers/clk/clk-fixed-rate.c | 23 ++ >> drivers/clk/clk-highbank.c | 346 ++++++++++++++++++++ >> drivers/clk/clk.c | 141 ++++++++ >> drivers/clk/clkdev.c | 77 +++++ >> drivers/edac/Kconfig | 16 +- >> drivers/edac/Makefile | 3 + >> drivers/edac/highbank_l2_edac.c | 149 +++++++++ >> drivers/edac/highbank_mc_edac.c | 238 ++++++++++++++ >> drivers/net/ethernet/calxeda/xgmac.c | 41 +-- >> include/linux/clk-provider.h | 16 + >> include/linux/clk.h | 19 ++ >> 36 files changed, 1458 insertions(+), 104 deletions(-) >> create mode 100644 Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt >> create mode 100644 Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt >> create mode 100644 Documentation/devicetree/bindings/clock/calxeda.txt >> create mode 100644 Documentation/devicetree/bindings/clock/clock-bindings.txt >> create mode 100644 Documentation/devicetree/bindings/clock/fixed-clock.txt >> delete mode 100644 arch/arm/mach-highbank/clock.c >> create mode 100644 drivers/clk/clk-highbank.c >> create mode 100644 drivers/edac/highbank_l2_edac.c >> create mode 100644 drivers/edac/highbank_mc_edac.c >> > > drivers/built-in.o: In function `of_clk_get': > /home/rtg/ukb/quantal/armhf/master-next/ubuntu-quantal/drivers/clk/clkdev.c:42: > undefined reference to `of_clk_get_from_provider' > make[2]: *** [vmlinux] Error 1 > make[1]: *** [sub-make] Error 2 > make[1]: Leaving directory > `/home/rtg/ukb/quantal/armhf/master-next/ubuntu-quantal' > make: *** > [/home/rtg/ukb/quantal/armhf/master-next/ubuntu-quantal/debian/stamps/stamp-build-omap] > Error 2 > dpkg-buildpackage: error: debian/rules build gave error exit status 2 > ~/quantal/kern/ubuntu-quantal > > While you're figuring out the omap build problem, how about replacing > the '(drop after 3.6-rc1)' with clean cherry picks since 3.6-rc1 has > been released. > > rtg > I've renew the git branch at git://kernel.ubuntu.com/ikepanhc/public.git lp1008345-quantal-new with several modification 1) Use ifdef to isolate the new added code for highbank only in drivers/clk/clkdev.c Now every new code in C file is isolated by either ifdef, config or device tree. Also have full test build with amd64 and armhf, all looks good. Smoke test on highbank machine also looks good. 2) Modify subject to be the same with upstream one. 3) If not clean cherry-pick, write the modification into comment.
BugLink: http://launchpad.net/bugs/1008345 And also fix for ethernet, power button handling and SATA. The following changes since commit c9499363691baac8cf3cd3a8e094ad9b65f427ea: UBUNTU: Ubuntu-3.5.0-7.7 (2012-07-30 11:11:33 -0700) are available in the git repository at: git://kernel.ubuntu.com/ikepanhc/public.git lp1008345-quantal-new for you to fetch changes up to 1e930e3850099268b9be89f1cfb7c91082253c84: UBUNTU: [Config] Enable EDAC/CLK for highbank (2012-08-02 15:45:16 +0800) Grant Likely (2): UBUNTU: (drop after 3.6-rc1) clk: add DT clock binding support UBUNTU: (drop after 3.6-rc1) clk: add DT fixed-clock binding support Ike Panhc (1): UBUNTU: [Config] Enable EDAC/CLK for highbank Rob Herring (11): UBUNTU: (drop after 3.6-rc1) clk: add highbank clock support UBUNTU: (drop after 3.6-rc1) edac: add support for Calxeda highbank memory controller UBUNTU: (drop after 3.6-rc1) edac: add support for Calxeda highbank L2 cache ecc UBUNTU: (drop after 3.6-rc1) net: calxedaxgmac: enable rx cut-thru mode UBUNTU: (drop after 3.6-rc1) net: calxedaxgmac: fix hang on rx refill UBUNTU: SAUCE: net: calxedaxgmac: add write barriers around setting owner bit UBUNTU: SAUCE: ARM smp_twd: add back "arm,smp-twd" compatible property UBUNTU: SAUCE: ARM: highbank: add soft power and reset key event handling UBUNTU: SAUCE: ARM: highbank: use writel_relaxed variant for pwr requests UBUNTU: SAUCE: ahci: un-staticize ahci_dev_classify UBUNTU: SAUCE: ahci_platform: add custom hard reset for Calxeda ahci ctrlr .../devicetree/bindings/arm/calxeda/l2ecc.txt | 15 + .../devicetree/bindings/arm/calxeda/mem-ctrlr.txt | 14 + .../devicetree/bindings/clock/calxeda.txt | 17 + .../devicetree/bindings/clock/clock-bindings.txt | 117 +++++++ .../devicetree/bindings/clock/fixed-clock.txt | 21 ++ arch/arm/Kconfig | 1 + arch/arm/boot/dts/highbank.dts | 103 +++++- arch/arm/kernel/smp_twd.c | 1 + arch/arm/mach-highbank/Makefile | 2 +- arch/arm/mach-highbank/clock.c | 67 ---- arch/arm/mach-highbank/highbank.c | 29 ++ arch/arm/mach-highbank/sysregs.h | 8 +- debian.master/config/amd64/config.common.amd64 | 2 + debian.master/config/armel/config.common.armel | 1 + debian.master/config/armhf/config.common.armhf | 1 + debian.master/config/armhf/config.flavour.highbank | 1 + debian.master/config/armhf/config.flavour.omap | 1 + debian.master/config/config.common.ubuntu | 7 +- debian.master/config/i386/config.common.i386 | 2 + debian.master/config/powerpc/config.common.powerpc | 2 + debian.master/config/ppc64/config.common.ppc64 | 2 + drivers/ata/ahci.h | 1 + drivers/ata/ahci_platform.c | 74 ++++- drivers/ata/libahci.c | 3 +- drivers/clk/Makefile | 1 + drivers/clk/clk-fixed-rate.c | 23 ++ drivers/clk/clk-highbank.c | 346 ++++++++++++++++++++ drivers/clk/clk.c | 141 ++++++++ drivers/clk/clkdev.c | 77 +++++ drivers/edac/Kconfig | 16 +- drivers/edac/Makefile | 3 + drivers/edac/highbank_l2_edac.c | 149 +++++++++ drivers/edac/highbank_mc_edac.c | 238 ++++++++++++++ drivers/net/ethernet/calxeda/xgmac.c | 41 +-- include/linux/clk-provider.h | 16 + include/linux/clk.h | 19 ++ 36 files changed, 1458 insertions(+), 104 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/calxeda/l2ecc.txt create mode 100644 Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt create mode 100644 Documentation/devicetree/bindings/clock/calxeda.txt create mode 100644 Documentation/devicetree/bindings/clock/clock-bindings.txt create mode 100644 Documentation/devicetree/bindings/clock/fixed-clock.txt delete mode 100644 arch/arm/mach-highbank/clock.c create mode 100644 drivers/clk/clk-highbank.c create mode 100644 drivers/edac/highbank_l2_edac.c create mode 100644 drivers/edac/highbank_mc_edac.c