Merge branch 'rmobile/bonito' into rmobile-latest

5 files changed, 607 insertions, 3 deletions

diff --git a/arch/arm/configs/bonito_defconfig b/arch/arm/configs/bonito_defconfig
new file mode 100644
index 000000000000..54571082d920
--- /dev/null
+++ b/arch/arm/configs/bonito_defconfig
@@ -0,0 +1,72 @@
+CONFIG_EXPERIMENTAL=y
+CONFIG_SYSVIPC=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SLAB=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_ARCH_SHMOBILE=y
+CONFIG_ARCH_R8A7740=y
+CONFIG_MACH_BONITO=y
+# CONFIG_SH_TIMER_TMU is not set
+CONFIG_AEABI=y
+# CONFIG_OABI_COMPAT is not set
+CONFIG_FORCE_MAX_ZONEORDER=12
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CMDLINE="console=ttySC5,115200 earlyprintk=sh-sci.5,115200 ignore_loglevel"
+CONFIG_KEXEC=y
+# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_SUSPEND is not set
+CONFIG_PM_RUNTIME=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MTD_BLOCK2MTD=y
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+# CONFIG_SCSI_LOWLEVEL is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_SH_SCI=y
+CONFIG_SERIAL_SH_SCI_NR_UARTS=9
+CONFIG_SERIAL_SH_SCI_CONSOLE=y
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_SH_MOBILE=y
+CONFIG_GPIO_SYSFS=y
+# CONFIG_HWMON is not set
+# CONFIG_MFD_SUPPORT is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+CONFIG_UIO=y
+CONFIG_UIO_PDRV=y
+CONFIG_UIO_PDRV_GENIRQ=y
+# CONFIG_DNOTIFY is not set
+# CONFIG_INOTIFY_USER is not set
+CONFIG_TMPFS=y
+# CONFIG_MISC_FILESYSTEMS is not set
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+# CONFIG_ARM_UNWIND is not set
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index aa63c968f420..ef0077e8771e 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -81,6 +81,11 @@ config MACH_KOTA2
         select ARCH_REQUIRE_GPIOLIB
         depends on ARCH_SH73A0
 
+config MACH_BONITO
+        bool "bonito board"
+        select ARCH_REQUIRE_GPIOLIB
+        depends on ARCH_R8A7740
+
 comment "SH-Mobile System Configuration"
 
 menu "Memory configuration"
@@ -89,7 +94,7 @@ config MEMORY_START
         hex "Physical memory start address"
         default "0x50000000" if MACH_G3EVM
         default "0x40000000" if MACH_G4EVM || MACH_AP4EVB || MACH_AG5EVM || \
-                                MACH_MACKEREL
+                                MACH_MACKEREL || MACH_BONITO
         default "0x41000000" if MACH_KOTA2
         default "0x00000000"
         ---help---
@@ -101,7 +106,7 @@ config MEMORY_SIZE
         hex "Physical memory size"
         default "0x08000000" if MACH_G3EVM
         default "0x08000000" if MACH_G4EVM
-        default "0x20000000" if MACH_AG5EVM
+        default "0x20000000" if MACH_AG5EVM || MACH_BONITO
         default "0x1e000000" if MACH_KOTA2
         default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL
         default "0x04000000"
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 83e35f254bff..957e5c7a38fe 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_MACH_AP4EVB)	+= board-ap4evb.o
 obj-$(CONFIG_MACH_AG5EVM)       += board-ag5evm.o
 obj-$(CONFIG_MACH_MACKEREL)     += board-mackerel.o
 obj-$(CONFIG_MACH_KOTA2)        += board-kota2.o
+obj-$(CONFIG_MACH_BONITO)       += board-bonito.o
 
 # Framework support
 obj-$(CONFIG_SMP)               += $(smp-y)
diff --git a/arch/arm/mach-shmobile/board-bonito.c b/arch/arm/mach-shmobile/board-bonito.c
new file mode 100644
index 000000000000..4d2201622323
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-bonito.c
@@ -0,0 +1,522 @@
+/*
+ * bonito board support
+ *
+ * Copyright (C) 2011 Renesas Solutions Corp.
+ * Copyright (C) 2011 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+#include <linux/smsc911x.h>
+#include <mach/common.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/time.h>
+#include <asm/hardware/cache-l2x0.h>
+#include <mach/r8a7740.h>
+#include <video/sh_mobile_lcdc.h>
+
+/*
+ * CS   Address         device                  note
+ *----------------------------------------------------------------
+ * 0    0x0000_0000     NOR Flash (64MB)        SW12 : bit3 = OFF
+ * 2    0x0800_0000     ExtNOR (64MB)           SW12 : bit3 = OFF
+ * 4                    -
+ * 5A                   -
+ * 5B   0x1600_0000     SRAM (8MB)
+ * 6    0x1800_0000     FPGA (64K)
+ *      0x1801_0000     Ether (4KB)
+ *      0x1801_1000     USB (4KB)
+ */
+
+/*
+ * SW12
+ *
+ *      bit1                    bit2                    bit3
+ *----------------------------------------------------------------------------
+ * ON   NOR WriteProtect        NAND WriteProtect       CS0 ExtNOR / CS2 NOR
+ * OFF  NOR Not WriteProtect    NAND Not WriteProtect   CS0 NOR    / CS2 ExtNOR
+ */
+
+/*
+ * SCIFA5 (CN42)
+ *
+ * S38.3 = ON
+ * S39.6 = ON
+ * S43.1 = ON
+ */
+
+/*
+ * LCDC0 (CN3/CN4/CN7)
+ *
+ * S38.1 = OFF
+ * S38.2 = OFF
+ */
+
+/*
+ * FPGA
+ */
+#define IRQSR0          0x0020
+#define IRQSR1          0x0022
+#define IRQMR0          0x0030
+#define IRQMR1          0x0032
+#define BUSSWMR1        0x0070
+#define BUSSWMR2        0x0072
+#define BUSSWMR3        0x0074
+#define BUSSWMR4        0x0076
+
+#define LCDCR           0x10B4
+#define DEVRSTCR1       0x10D0
+#define DEVRSTCR2       0x10D2
+#define A1MDSR          0x10E0
+#define BVERR           0x1100
+
+/* FPGA IRQ */
+#define FPGA_IRQ_BASE           (512)
+#define FPGA_IRQ0               (FPGA_IRQ_BASE)
+#define FPGA_IRQ1               (FPGA_IRQ_BASE + 16)
+#define FPGA_ETH_IRQ            (FPGA_IRQ0 + 15)
+static u16 bonito_fpga_read(u32 offset)
+{
+        return __raw_readw(0xf0003000 + offset);
+}
+
+static void bonito_fpga_write(u32 offset, u16 val)
+{
+        __raw_writew(val, 0xf0003000 + offset);
+}
+
+static void bonito_fpga_irq_disable(struct irq_data *data)
+{
+        unsigned int irq = data->irq;
+        u32 addr = (irq < 1016) ? IRQMR0 : IRQMR1;
+        int shift = irq % 16;
+
+        bonito_fpga_write(addr, bonito_fpga_read(addr) | (1 << shift));
+}
+
+static void bonito_fpga_irq_enable(struct irq_data *data)
+{
+        unsigned int irq = data->irq;
+        u32 addr = (irq < 1016) ? IRQMR0 : IRQMR1;
+        int shift = irq % 16;
+
+        bonito_fpga_write(addr, bonito_fpga_read(addr) & ~(1 << shift));
+}
+
+static struct irq_chip bonito_fpga_irq_chip __read_mostly = {
+        .name           = "bonito FPGA",
+        .irq_mask       = bonito_fpga_irq_disable,
+        .irq_unmask     = bonito_fpga_irq_enable,
+};
+
+static void bonito_fpga_irq_demux(unsigned int irq, struct irq_desc *desc)
+{
+        u32 val =  bonito_fpga_read(IRQSR1) << 16 |
+                   bonito_fpga_read(IRQSR0);
+        u32 mask = bonito_fpga_read(IRQMR1) << 16 |
+                   bonito_fpga_read(IRQMR0);
+
+        int i;
+
+        val &= ~mask;
+
+        for (i = 0; i < 32; i++) {
+                if (!(val & (1 << i)))
+                        continue;
+
+                generic_handle_irq(FPGA_IRQ_BASE + i);
+        }
+}
+
+static void bonito_fpga_init(void)
+{
+        int i;
+
+        bonito_fpga_write(IRQMR0, 0xffff); /* mask all */
+        bonito_fpga_write(IRQMR1, 0xffff); /* mask all */
+
+        /* Device reset */
+        bonito_fpga_write(DEVRSTCR1,
+                   (1 << 2));   /* Eth */
+
+        /* FPGA irq require special handling */
+        for (i = FPGA_IRQ_BASE; i < FPGA_IRQ_BASE + 32; i++) {
+                irq_set_chip_and_handler_name(i, &bonito_fpga_irq_chip,
+                                              handle_level_irq, "level");
+                set_irq_flags(i, IRQF_VALID); /* yuck */
+        }
+
+        irq_set_chained_handler(evt2irq(0x0340), bonito_fpga_irq_demux);
+        irq_set_irq_type(evt2irq(0x0340), IRQ_TYPE_LEVEL_LOW);
+}
+
+/*
+* PMIC settings
+*
+* FIXME
+*
+* bonito board needs some settings by pmic which use i2c access.
+* pmic settings use device_initcall() here for use it.
+*/
+static __u8 *pmic_settings = NULL;
+static __u8 pmic_do_2A[] = {
+        0x1C, 0x09,
+        0x1A, 0x80,
+        0xff, 0xff,
+};
+
+static int __init pmic_init(void)
+{
+        struct i2c_adapter *a = i2c_get_adapter(0);
+        struct i2c_msg msg;
+        __u8 buf[2];
+        int i, ret;
+
+        if (!pmic_settings)
+                return 0;
+        if (!a)
+                return 0;
+
+        msg.addr        = 0x46;
+        msg.buf         = buf;
+        msg.len         = 2;
+        msg.flags       = 0;
+
+        for (i = 0; ; i += 2) {
+                buf[0] = pmic_settings[i + 0];
+                buf[1] = pmic_settings[i + 1];
+
+                if ((0xff == buf[0]) && (0xff == buf[1]))
+                        break;
+
+                ret = i2c_transfer(a, &msg, 1);
+                if (ret < 0) {
+                        pr_err("i2c transfer fail\n");
+                        break;
+                }
+        }
+
+        return 0;
+}
+device_initcall(pmic_init);
+
+/*
+ * LCDC0
+ */
+static const struct fb_videomode lcdc0_mode = {
+        .name           = "WVGA Panel",
+        .xres           = 800,
+        .yres           = 480,
+        .left_margin    = 88,
+        .right_margin   = 40,
+        .hsync_len      = 128,
+        .upper_margin   = 20,
+        .lower_margin   = 5,
+        .vsync_len      = 5,
+        .sync           = 0,
+};
+
+static struct sh_mobile_lcdc_info lcdc0_info = {
+        .clock_source   = LCDC_CLK_BUS,
+        .ch[0] = {
+                .chan                   = LCDC_CHAN_MAINLCD,
+                .bpp                    = 16,
+                .interface_type         = RGB24,
+                .clock_divider          = 5,
+                .flags                  = 0,
+                .lcd_cfg                = &lcdc0_mode,
+                .num_cfg                = 1,
+                .lcd_size_cfg = {
+                        .width  = 152,
+                        .height = 91,
+                },
+        },
+};
+
+static struct resource lcdc0_resources[] = {
+        [0] = {
+                .name   = "LCDC0",
+                .start  = 0xfe940000,
+                .end    = 0xfe943fff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = intcs_evt2irq(0x0580),
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device lcdc0_device = {
+        .name           = "sh_mobile_lcdc_fb",
+        .id             = 0,
+        .resource       = lcdc0_resources,
+        .num_resources  = ARRAY_SIZE(lcdc0_resources),
+        .dev    = {
+                .platform_data  = &lcdc0_info,
+                .coherent_dma_mask = ~0,
+        },
+};
+
+/*
+ * SMSC 9221
+ */
+static struct resource smsc_resources[] = {
+        [0] = {
+                .start          = 0x18010000,
+                .end            = 0x18011000 - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start          = FPGA_ETH_IRQ,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+static struct smsc911x_platform_config smsc_platdata = {
+        .flags          = SMSC911X_USE_16BIT,
+        .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 = &smsc_platdata,
+        },
+        .resource       = smsc_resources,
+        .num_resources  = ARRAY_SIZE(smsc_resources),
+};
+
+/*
+ * core board devices
+ */
+static struct platform_device *bonito_core_devices[] __initdata = {
+};
+
+/*
+ * base board devices
+ */
+static struct platform_device *bonito_base_devices[] __initdata = {
+        &lcdc0_device,
+        &smsc_device,
+};
+
+/*
+ * map I/O
+ */
+static struct map_desc bonito_io_desc[] __initdata = {
+         /*
+          * for CPGA/INTC/PFC
+          * 0xe6000000-0xefffffff -> 0xe6000000-0xefffffff
+          */
+        {
+                .virtual        = 0xe6000000,
+                .pfn            = __phys_to_pfn(0xe6000000),
+                .length         = 160 << 20,
+                .type           = MT_DEVICE_NONSHARED
+        },
+#ifdef CONFIG_CACHE_L2X0
+        /*
+         * for l2x0_init()
+         * 0xf0100000-0xf0101000 -> 0xf0002000-0xf0003000
+         */
+        {
+                .virtual        = 0xf0002000,
+                .pfn            = __phys_to_pfn(0xf0100000),
+                .length         = PAGE_SIZE,
+                .type           = MT_DEVICE_NONSHARED
+        },
+#endif
+        /*
+         * for FPGA (0x1800000-0x19ffffff)
+         * 0x18000000-0x18002000 -> 0xf0003000-0xf0005000
+         */
+        {
+                .virtual        = 0xf0003000,
+                .pfn            = __phys_to_pfn(0x18000000),
+                .length         = PAGE_SIZE * 2,
+                .type           = MT_DEVICE_NONSHARED
+        }
+};
+
+static void __init bonito_map_io(void)
+{
+        iotable_init(bonito_io_desc, ARRAY_SIZE(bonito_io_desc));
+
+        /* setup early devices and console here as well */
+        r8a7740_add_early_devices();
+        shmobile_setup_console();
+}
+
+/*
+ * board init
+ */
+#define BIT_ON(sw, bit)         (sw & (1 << bit))
+#define BIT_OFF(sw, bit)        (!(sw & (1 << bit)))
+
+#define VCCQ1CR         0xE6058140
+#define VCCQ1LCDCR      0xE6058186
+
+static void __init bonito_init(void)
+{
+        u16 val;
+
+        r8a7740_pinmux_init();
+        bonito_fpga_init();
+
+        pmic_settings = pmic_do_2A;
+
+        /*
+         * core board settings
+         */
+
+#ifdef CONFIG_CACHE_L2X0
+        /* Early BRESP enable, Shared attribute override enable, 32K*8way */
+        l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
+#endif
+
+        r8a7740_add_standard_devices();
+
+        platform_add_devices(bonito_core_devices,
+                             ARRAY_SIZE(bonito_core_devices));
+
+        /*
+         * base board settings
+         */
+        gpio_request(GPIO_PORT176, NULL);
+        gpio_direction_input(GPIO_PORT176);
+        if (!gpio_get_value(GPIO_PORT176)) {
+                u16 bsw2;
+                u16 bsw3;
+                u16 bsw4;
+
+                /*
+                 * FPGA
+                 */
+                gpio_request(GPIO_FN_CS5B,              NULL);
+                gpio_request(GPIO_FN_CS6A,              NULL);
+                gpio_request(GPIO_FN_CS5A_PORT105,      NULL);
+                gpio_request(GPIO_FN_IRQ10,             NULL);
+
+                val = bonito_fpga_read(BVERR);
+                pr_info("bonito version: cpu %02x, base %02x\n",
+                        ((val >> 8) & 0xFF),
+                        ((val >> 0) & 0xFF));
+
+                bsw2 = bonito_fpga_read(BUSSWMR2);
+                bsw3 = bonito_fpga_read(BUSSWMR3);
+                bsw4 = bonito_fpga_read(BUSSWMR4);
+
+                /*
+                 * SCIFA5 (CN42)
+                 */
+                if (BIT_OFF(bsw2, 1) && /* S38.3 = ON */
+                    BIT_OFF(bsw3, 9) && /* S39.6 = ON */
+                    BIT_OFF(bsw4, 4)) { /* S43.1 = ON */
+                        gpio_request(GPIO_FN_SCIFA5_TXD_PORT91, NULL);
+                        gpio_request(GPIO_FN_SCIFA5_RXD_PORT92, NULL);
+                }
+
+                /*
+                 * LCDC0 (CN3)
+                 */
+                if (BIT_ON(bsw2, 3) &&  /* S38.1 = OFF */
+                    BIT_ON(bsw2, 2)) {  /* S38.2 = OFF */
+                        gpio_request(GPIO_FN_LCDC0_SELECT,      NULL);
+                        gpio_request(GPIO_FN_LCD0_D0,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D1,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D2,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D3,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D4,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D5,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D6,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D7,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D8,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D9,           NULL);
+                        gpio_request(GPIO_FN_LCD0_D10,          NULL);
+                        gpio_request(GPIO_FN_LCD0_D11,          NULL);
+                        gpio_request(GPIO_FN_LCD0_D12,          NULL);
+                        gpio_request(GPIO_FN_LCD0_D13,          NULL);
+                        gpio_request(GPIO_FN_LCD0_D14,          NULL);
+                        gpio_request(GPIO_FN_LCD0_D15,          NULL);
+                        gpio_request(GPIO_FN_LCD0_D16,          NULL);
+                        gpio_request(GPIO_FN_LCD0_D17,          NULL);
+                        gpio_request(GPIO_FN_LCD0_D18_PORT163,  NULL);
+                        gpio_request(GPIO_FN_LCD0_D19_PORT162,  NULL);
+                        gpio_request(GPIO_FN_LCD0_D20_PORT161,  NULL);
+                        gpio_request(GPIO_FN_LCD0_D21_PORT158,  NULL);
+                        gpio_request(GPIO_FN_LCD0_D22_PORT160,  NULL);
+                        gpio_request(GPIO_FN_LCD0_D23_PORT159,  NULL);
+                        gpio_request(GPIO_FN_LCD0_DCK,          NULL);
+                        gpio_request(GPIO_FN_LCD0_VSYN,         NULL);
+                        gpio_request(GPIO_FN_LCD0_HSYN,         NULL);
+                        gpio_request(GPIO_FN_LCD0_DISP,         NULL);
+                        gpio_request(GPIO_FN_LCD0_LCLK_PORT165, NULL);
+
+                        gpio_request(GPIO_PORT61, NULL); /* LCDDON */
+                        gpio_direction_output(GPIO_PORT61, 1);
+
+                        /* backlight on */
+                        bonito_fpga_write(LCDCR, 1);
+
+                        /*  drivability Max */
+                        __raw_writew(0x00FF , VCCQ1LCDCR);
+                        __raw_writew(0xFFFF , VCCQ1CR);
+                }
+
+                platform_add_devices(bonito_base_devices,
+                                     ARRAY_SIZE(bonito_base_devices));
+        }
+}
+
+static void __init bonito_timer_init(void)
+{
+        u16 val;
+        u8 md_ck = 0;
+
+        /* read MD_CK value */
+        val = bonito_fpga_read(A1MDSR);
+        if (val & (1 << 10))
+                md_ck |= MD_CK2;
+        if (val & (1 << 9))
+                md_ck |= MD_CK1;
+        if (val & (1 << 8))
+                md_ck |= MD_CK0;
+
+        r8a7740_clock_init(md_ck);
+        shmobile_timer.init();
+}
+
+struct sys_timer bonito_timer = {
+        .init   = bonito_timer_init,
+};
+
+MACHINE_START(BONITO, "bonito")
+        .map_io         = bonito_map_io,
+        .init_irq       = r8a7740_init_irq,
+        .handle_irq     = shmobile_handle_irq_intc,
+        .init_machine   = bonito_init,
+        .timer          = &bonito_timer,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index 5bb02f224077..3b35b9afc001 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -251,7 +251,7 @@ static struct clk div6_clks[DIV6_NR] = {
 
 enum {
         MSTP125,
-        MSTP116, MSTP111,
+        MSTP116, MSTP111, MSTP100, MSTP117,
 
         MSTP230,
         MSTP222,
@@ -264,8 +264,10 @@ enum {
 
 static struct clk mstp_clks[MSTP_NR] = {
         [MSTP125] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR1, 25, 0), /* TMU0 */
+        [MSTP117] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   SMSTPCR1, 17, 0), /* LCDC1 */
         [MSTP116] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR1, 16, 0), /* IIC0 */
         [MSTP111] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR1, 11, 0), /* TMU1 */
+        [MSTP100] = SH_CLK_MSTP32(&div4_clks[DIV4_B],   SMSTPCR1,  0, 0), /* LCDC0 */
 
         [MSTP230] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR2, 30, 0), /* SCIFA6 */
         [MSTP222] = SH_CLK_MSTP32(&div6_clks[DIV6_SUB], SMSTPCR2, 22, 0), /* SCIFA7 */
@@ -314,8 +316,10 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("sub_clk",                &div6_clks[DIV6_SUB]),
 
         /* MSTP32 clocks */
+        CLKDEV_DEV_ID("sh_mobile_lcdc_fb.0",    &mstp_clks[MSTP100]),
         CLKDEV_DEV_ID("sh_tmu.1",               &mstp_clks[MSTP111]),
         CLKDEV_DEV_ID("i2c-sh_mobile.0",        &mstp_clks[MSTP116]),
+        CLKDEV_DEV_ID("sh_mobile_lcdc_fb.1",    &mstp_clks[MSTP117]),
         CLKDEV_DEV_ID("sh_tmu.0",               &mstp_clks[MSTP125]),
 
         CLKDEV_DEV_ID("sh-sci.4",               &mstp_clks[MSTP200]),