diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 11:21:32 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-05 11:21:32 -0700 |
commit | 9e5b14bdba6b91524fc6a6f0989b8457f8de2d30 (patch) | |
tree | ce5f294d2f3b7df2d6f54b8e8e415086743c2b91 | |
parent | 8f0d28994209eb63745b297ad0c0794be8727a81 (diff) | |
download | ltsi-kernel-9e5b14bdba6b91524fc6a6f0989b8457f8de2d30.tar.gz |
Some more kzm9g bugfixes
-rw-r--r-- | patches.kzm9g/001-ltsi-backport-arm-mach-shmobile-kzm9g-add-smsc-9221-support.patch | 96 | ||||
-rw-r--r-- | patches.kzm9g/002-lsti-backport-arm-mach-shmobile-kzm9g-add-external-usb-host-support.patch | 82 | ||||
-rw-r--r-- | patches.kzm9g/003-ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch (renamed from patches.ltsi/ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch) | 29 | ||||
-rw-r--r-- | patches.kzm9g/004-ltsi-arm-mach_shmobile-kzm9g-update-defconfig.patch | 48 | ||||
-rw-r--r-- | patches.kzm9g/arm-shmobile-sh73a0-bugfix-sy-dmac-number.patch | 86 | ||||
-rw-r--r-- | series | 7 |
6 files changed, 336 insertions, 12 deletions
diff --git a/patches.kzm9g/001-ltsi-backport-arm-mach-shmobile-kzm9g-add-smsc-9221-support.patch b/patches.kzm9g/001-ltsi-backport-arm-mach-shmobile-kzm9g-add-smsc-9221-support.patch new file mode 100644 index 0000000000000..19dc86158db1e --- /dev/null +++ b/patches.kzm9g/001-ltsi-backport-arm-mach-shmobile-kzm9g-add-smsc-9221-support.patch @@ -0,0 +1,96 @@ +From ltsi-dev-bounces@lists.linuxfoundation.org Tue Jun 26 04:09:54 2012 +From: Tetsuyuki Kobayashi <koba@kmckk.co.jp> +Date: Tue, 26 Jun 2012 20:09:49 +0900 +Subject: [LTSI-dev] [PATCH 1/4] LTSI: backport: ARM: mach-shmobile: kzm9g: add SMSC 9221 support +To: ltsi-dev@lists.linuxfoundation.org +Cc: kuninori.morimoto.gx@gmail.com +Message-ID: <4FE9987D.9080304@kmckk.co.jp> + + +This is backport of +commit c15c4257a7858c6670f54c667f804df86a9fff1c + +Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> +--- + arch/arm/mach-shmobile/board-kzm9g.c | 38 ++++++++++++++++++++++++++++++++++ + 1 file changed, 38 insertions(+) + +diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c +index e0fd6e2..35af2f8 100644 +--- a/arch/arm/mach-shmobile/board-kzm9g.c ++++ b/arch/arm/mach-shmobile/board-kzm9g.c +@@ -30,6 +30,7 @@ + #include <linux/mmc/sh_mobile_sdhi.h> + #include <linux/mfd/tmio.h> + #include <linux/platform_device.h> ++#include <linux/smsc911x.h> + #include <linux/videodev2.h> + #include <sound/sh_fsi.h> + #include <sound/simple_card.h> +@@ -62,6 +63,35 @@ + * # amixer set "LINEOUT Mixer DACL" on + */ + ++/* SMSC 9221 */ ++static struct resource smsc9221_resources[] = { ++ [0] = { ++ .start = 0x10000000, /* CS4 */ ++ .end = 0x100000ff, ++ .flags = IORESOURCE_MEM, ++ }, ++ [1] = { ++ .start = intcs_evt2irq(0x260), /* IRQ3 */ ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct smsc911x_platform_config smsc9221_platdata = { ++ .flags = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS, ++ .phy_interface = PHY_INTERFACE_MODE_MII, ++ .irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_LOW, ++ .irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL, ++}; ++ ++static struct platform_device smsc_device = { ++ .name = "smsc911x", ++ .dev = { ++ .platform_data = &smsc9221_platdata, ++ }, ++ .resource = smsc9221_resources, ++ .num_resources = ARRAY_SIZE(smsc9221_resources), ++}; ++ + /* LCDC */ + static struct fb_videomode kzm_lcdc_mode = { + .name = "WVGA Panel", +@@ -299,6 +329,7 @@ static struct i2c_board_info i2c3_devices[] = { + }; + + static struct platform_device *kzm_devices[] __initdata = { ++ &smsc_device, + &lcdc_device, + &mmc_device, + &sdhi0_device, +@@ -443,6 +474,13 @@ static void __init kzm_init(void) + gpio_request(GPIO_FN_FSIAISLD, NULL); + gpio_request(GPIO_FN_FSIAOSLD, NULL); + ++ /* CS4 for SMSC/USB */ ++ gpio_request(GPIO_FN_CS4_, NULL); /* CS4 */ ++ ++ /* SMSC */ ++ gpio_request(GPIO_PORT224, NULL); /* IRQ3 */ ++ gpio_direction_input(GPIO_PORT224); ++ + #ifdef CONFIG_CACHE_L2X0 + /* Early BRESP enable, Shared attribute override enable, 64K*8way */ + l2x0_init(__io(0xf0100000), 0x40460000, 0x82000fff); +-- +1.7.9.5 + + +_______________________________________________ +LTSI-dev mailing list +LTSI-dev@lists.linuxfoundation.org +https://lists.linuxfoundation.org/mailman/listinfo/ltsi-dev + diff --git a/patches.kzm9g/002-lsti-backport-arm-mach-shmobile-kzm9g-add-external-usb-host-support.patch b/patches.kzm9g/002-lsti-backport-arm-mach-shmobile-kzm9g-add-external-usb-host-support.patch new file mode 100644 index 0000000000000..023be87566cfa --- /dev/null +++ b/patches.kzm9g/002-lsti-backport-arm-mach-shmobile-kzm9g-add-external-usb-host-support.patch @@ -0,0 +1,82 @@ +From ltsi-dev-bounces@lists.linuxfoundation.org Tue Jun 26 04:10:44 2012 +From: Tetsuyuki Kobayashi <koba@kmckk.co.jp> +Date: Tue, 26 Jun 2012 20:10:41 +0900 +Subject: [LTSI-dev] [PATCH 2/4] LSTI: backport: ARM: mach-shmobile: kzm9g: add external USB Host support +To: ltsi-dev@lists.linuxfoundation.org +Cc: kuninori.morimoto.gx@gmail.com +Message-ID: <4FE998B1.1050308@kmckk.co.jp> + + +This is backport of +commit dd818180f9303eed270513e8ccd4516bb3a577f5 + +Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> +--- + arch/arm/mach-shmobile/board-kzm9g.c | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) + +diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c +index 35af2f8..297cda9 100644 +--- a/arch/arm/mach-shmobile/board-kzm9g.c ++++ b/arch/arm/mach-shmobile/board-kzm9g.c +@@ -31,6 +31,7 @@ + #include <linux/mfd/tmio.h> + #include <linux/platform_device.h> + #include <linux/smsc911x.h> ++#include <linux/usb/r8a66597.h> + #include <linux/videodev2.h> + #include <sound/sh_fsi.h> + #include <sound/simple_card.h> +@@ -92,6 +93,35 @@ static struct platform_device smsc_device = { + .num_resources = ARRAY_SIZE(smsc9221_resources), + }; + ++/* USB external chip */ ++static struct r8a66597_platdata usb_host_data = { ++ .on_chip = 0, ++ .xtal = R8A66597_PLATDATA_XTAL_48MHZ, ++}; ++ ++static struct resource usb_resources[] = { ++ [0] = { ++ .start = 0x10010000, ++ .end = 0x1001ffff - 1, ++ .flags = IORESOURCE_MEM, ++ }, ++ [1] = { ++ .start = intcs_evt2irq(0x220), /* IRQ1 */ ++ .flags = IORESOURCE_IRQ, ++ }, ++}; ++ ++static struct platform_device usb_host_device = { ++ .name = "r8a66597_hcd", ++ .dev = { ++ .platform_data = &usb_host_data, ++ .dma_mask = NULL, ++ .coherent_dma_mask = 0xffffffff, ++ }, ++ .num_resources = ARRAY_SIZE(usb_resources), ++ .resource = usb_resources, ++}; ++ + /* LCDC */ + static struct fb_videomode kzm_lcdc_mode = { + .name = "WVGA Panel", +@@ -330,6 +360,7 @@ static struct i2c_board_info i2c3_devices[] = { + + static struct platform_device *kzm_devices[] __initdata = { + &smsc_device, ++ &usb_host_device, + &lcdc_device, + &mmc_device, + &sdhi0_device, +-- +1.7.9.5 + + +_______________________________________________ +LTSI-dev mailing list +LTSI-dev@lists.linuxfoundation.org +https://lists.linuxfoundation.org/mailman/listinfo/ltsi-dev + diff --git a/patches.ltsi/ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch b/patches.kzm9g/003-ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch index 453ede70a0a2c..a2c38d49cd679 100644 --- a/patches.ltsi/ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch +++ b/patches.kzm9g/003-ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch @@ -1,10 +1,10 @@ -From kuninori.morimoto.gx@gmail.com Tue Jun 12 21:51:37 2012 -From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> -Date: Tue, 12 Jun 2012 21:51:35 -0700 (PDT) -Subject: [PATCH 2/2] LTSI: bugfix: sh73a0: add lost CLK_ENABLE_ON_INIT for DIV6_ZB1 -To: Greg KH <gregkh@linuxfoundation.org>, ltsi-dev@lists.linuxfoundation.org -Cc: Simon <horms@verge.net.au>, Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>, (KMC)tuji <kunihiko@kmckk.co.jp> -Message-ID: <87y5nr7r1o.wl%kuninori.morimoto.gx@renesas.com> +From ltsi-dev-bounces@lists.linuxfoundation.org Tue Jun 26 04:11:21 2012 +From: Tetsuyuki Kobayashi <koba@kmckk.co.jp> +Date: Tue, 26 Jun 2012 20:11:18 +0900 +Subject: [LTSI-dev] [PATCH 3/4] LTSI: bugfix: sh73a0: add lost CLK_ENABLE_ON_INIT for DIV6_ZB1 +To: ltsi-dev@lists.linuxfoundation.org +Cc: kuninori.morimoto.gx@gmail.com +Message-ID: <4FE998D6.9050209@kmckk.co.jp> On upstream kernel, on one branch, @@ -21,11 +21,12 @@ timing on upstream kernel. But unfortunately, this solution seems had be lost on backporting. This patch fixes it up for LTSI. -Reported-by: Kunihiko Tsuji <kunihiko@kmckk.co.jp> -Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> +Reported-by: Kunihiko Tsuji <kunihiko at kmckk.co.jp> +Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com> +Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> --- arch/arm/mach-shmobile/clock-sh73a0.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c index 012b284..fcecbdc 100644 @@ -41,5 +42,11 @@ index 012b284..fcecbdc 100644 [DIV6_FLCTL] = SH_CLK_DIV6_EXT(FLCKCR, 0, pll_parent, ARRAY_SIZE(pll_parent), 7, 1), -- -1.7.5.4 +1.7.9.5 + + +_______________________________________________ +LTSI-dev mailing list +LTSI-dev@lists.linuxfoundation.org +https://lists.linuxfoundation.org/mailman/listinfo/ltsi-dev diff --git a/patches.kzm9g/004-ltsi-arm-mach_shmobile-kzm9g-update-defconfig.patch b/patches.kzm9g/004-ltsi-arm-mach_shmobile-kzm9g-update-defconfig.patch new file mode 100644 index 0000000000000..5e0b726747806 --- /dev/null +++ b/patches.kzm9g/004-ltsi-arm-mach_shmobile-kzm9g-update-defconfig.patch @@ -0,0 +1,48 @@ +From ltsi-dev-bounces@lists.linuxfoundation.org Tue Jun 26 04:12:14 2012 +From: Tetsuyuki Kobayashi <koba@kmckk.co.jp> +Date: Tue, 26 Jun 2012 20:12:11 +0900 +Subject: [LTSI-dev] [PATCH 4/4] LTSI: ARM: mach_shmobile: kzm9g: update defconfig +To: ltsi-dev@lists.linuxfoundation.org, kuninori.morimoto.gx@gmail.com +Message-ID: <4FE9990B.7040207@kmckk.co.jp> + + +Add NET_ETHERNET and HID. + +Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp> +--- + arch/arm/configs/kzm9g_defconfig | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig +index 6fb27eb..b9b3722 100644 +--- a/arch/arm/configs/kzm9g_defconfig ++++ b/arch/arm/configs/kzm9g_defconfig +@@ -64,6 +64,9 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" + CONFIG_SCSI=y + CONFIG_BLK_DEV_SD=y + CONFIG_NETDEVICES=y ++CONFIG_MII=y ++CONFIG_PHYLIB=y ++CONFIG_NET_ETHERNET=y + CONFIG_SMSC911X=y + # CONFIG_WLAN is not set + CONFIG_INPUT_SPARSEKMAP=y +@@ -97,7 +100,9 @@ CONFIG_SND=y + # CONFIG_SND_USB is not set + CONFIG_SND_SOC=y + CONFIG_SND_SOC_SH4_FSI=y +-# CONFIG_HID_SUPPORT is not set ++CONFIG_HID_SUPPORT=y ++CONFIG_HID=y ++CONFIG_USB_HID=y + CONFIG_USB=y + CONFIG_USB_DEVICEFS=y + CONFIG_USB_R8A66597_HCD=y +-- +1.7.9.5 + +_______________________________________________ +LTSI-dev mailing list +LTSI-dev@lists.linuxfoundation.org +https://lists.linuxfoundation.org/mailman/listinfo/ltsi-dev + diff --git a/patches.kzm9g/arm-shmobile-sh73a0-bugfix-sy-dmac-number.patch b/patches.kzm9g/arm-shmobile-sh73a0-bugfix-sy-dmac-number.patch new file mode 100644 index 0000000000000..771486ee8fb98 --- /dev/null +++ b/patches.kzm9g/arm-shmobile-sh73a0-bugfix-sy-dmac-number.patch @@ -0,0 +1,86 @@ +From horms@vergenet.net Thu Jun 21 17:52:36 2012 +From: Simon Horman <horms@verge.net.au> +Date: Fri, 22 Jun 2012 09:51:53 +0900 +Subject: [PATCH] ARM: shmobile: sh73a0: bugfix: SY-DMAC number +To: ltsi-dev@lists.linuxfoundation.org +Cc: Greg KH <gregkh@linuxfoundation.org> +Message-ID: <1340326313-1672-1-git-send-email-horms@verge.net.au> + + +From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> + +681e1b3eeb3606e06a7c4984e8058df84296f8bb +(ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC) +adds SY-DMAC, but it is 218, not 318 + +This patch is based on v2.0 manual + +Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> +Acked-by: Magnus Damm <damm@opensource.se> +Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> +(cherry picked from commit 32103c7ba7d274bcb3ace48bc3366e1df37ebb56) + +Conflicts: + arch/arm/mach-shmobile/clock-sh73a0.c + +Signed-off-by: Simon Horman <horms@verge.net.au> + +--- + +Greg, this is a bugfix for the sh73a0 and thus my work on the KZM9G +(not the D!) board. +--- + arch/arm/mach-shmobile/clock-sh73a0.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c +index 012b284..a7ae9c3 100644 +--- a/arch/arm/mach-shmobile/clock-sh73a0.c ++++ b/arch/arm/mach-shmobile/clock-sh73a0.c +@@ -474,9 +474,9 @@ static struct clk *late_main_clks[] = { + + enum { MSTP001, + MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100, +- MSTP219, ++ MSTP219, MSTP218, + MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200, +- MSTP331, MSTP329, MSTP328, MSTP325, MSTP323, MSTP318, ++ MSTP331, MSTP329, MSTP328, MSTP325, MSTP323, + MSTP314, MSTP313, MSTP312, MSTP311, + MSTP303, MSTP302, MSTP301, MSTP300, + MSTP411, MSTP410, MSTP403, +@@ -496,6 +496,7 @@ static struct clk mstp_clks[MSTP_NR] = { + [MSTP116] = MSTP(&div4_clks[DIV4_HP], SMSTPCR1, 16, 0), /* IIC0 */ + [MSTP100] = MSTP(&div4_clks[DIV4_B], SMSTPCR1, 0, 0), /* LCDC0 */ + [MSTP219] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 19, 0), /* SCIFA7 */ ++ [MSTP218] = MSTP(&div4_clks[DIV4_HP], SMSTPCR2, 18, 0), /* SY-DMAC */ + [MSTP207] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 7, 0), /* SCIFA5 */ + [MSTP206] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 6, 0), /* SCIFB */ + [MSTP204] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 4, 0), /* SCIFA0 */ +@@ -508,7 +509,6 @@ static struct clk mstp_clks[MSTP_NR] = { + [MSTP328] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 28, 0), /*FSI*/ + [MSTP325] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 25, 0), /* IrDA */ + [MSTP323] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 23, 0), /* IIC1 */ +- [MSTP318] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 18, 0), /* SY-DMAC */ + [MSTP314] = MSTP(&div6_clks[DIV6_SDHI0], SMSTPCR3, 14, 0), /* SDHI0 */ + [MSTP313] = MSTP(&div6_clks[DIV6_SDHI1], SMSTPCR3, 13, 0), /* SDHI1 */ + [MSTP312] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 12, 0), /* MMCIF0 */ +@@ -552,6 +552,7 @@ static struct clk_lookup lookups[] = { + CLKDEV_DEV_ID("i2c-sh_mobile.0", &mstp_clks[MSTP116]), /* I2C0 */ + CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0", &mstp_clks[MSTP100]), /* LCDC0 */ + CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP219]), /* SCIFA7 */ ++ CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP218]), /* SY-DMAC */ + CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP207]), /* SCIFA5 */ + CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP206]), /* SCIFB */ + CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]), /* SCIFA0 */ +@@ -564,7 +565,6 @@ static struct clk_lookup lookups[] = { + CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI */ + CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */ + CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* I2C1 */ +- CLKDEV_DEV_ID("sh-dma-engine.0", &mstp_clks[MSTP318]), /* SY-DMAC */ + CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */ + CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP313]), /* SDHI1 */ + CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP312]), /* MMCIF0 */ +-- +1.7.10.2.484.gcd07cc5 + @@ -859,6 +859,12 @@ patches.kzm9g/0063-mach-shmobile-KZM9D-board-Ethernet-support-V3.patch patches.kzm9g/ltsi-arm-shmobile-kzm9g-support-real-time-clock.patch patches.kzm9g/ltsi-bugfix-add-config_i2c-to-kzm9g_defconfig.patch +patches.kzm9g/arm-shmobile-sh73a0-bugfix-sy-dmac-number.patch + +patches.kzm9g/001-ltsi-backport-arm-mach-shmobile-kzm9g-add-smsc-9221-support.patch +patches.kzm9g/002-lsti-backport-arm-mach-shmobile-kzm9g-add-external-usb-host-support.patch +patches.kzm9g/003-ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch +patches.kzm9g/004-ltsi-arm-mach_shmobile-kzm9g-update-defconfig.patch patches.sh7757lcr/001-spi-add-support-for-renesas-rspi.patch @@ -901,5 +907,4 @@ patches.r8a66597-udc/012-usb-gadget-r8a66597-udc-fix-flush-fifo-handling.patch # This is usually due to merge issues, or specific things like config file # changes that are needed for the BSP being added. -patches.ltsi/ltsi-bugfix-sh73a0-add-lost-clk_enable_on_init-for-div6_zb1.patch |